diff -Nru orage-4.8.3/aclocal.m4 orage-4.12.1/aclocal.m4
--- orage-4.8.3/aclocal.m4	2012-01-04 12:52:45.000000000 +0000
+++ orage-4.12.1/aclocal.m4	2015-04-10 10:26:49.000000000 +0000
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,13 +11,14 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
@@ -260,6 +261,10 @@
 	      [CATOBJEXT=.mo
                DATADIRNAME=lib])
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -301,7 +306,7 @@
 
     dnl These rules are solely for the distribution goal.  While doing this
     dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.in.
+    dnl in configure.ac.
     for lang in $ALL_LINGUAS; do
       GMOFILES="$GMOFILES $lang.gmo"
       POFILES="$POFILES $lang.po"
@@ -332,7 +337,6 @@
 dnl
 glib_DEFUN([GLIB_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
    
    GLIB_LC_MESSAGES
    GLIB_WITH_NLS
@@ -430,7 +434,7 @@
 dnl
 dnl Now the definitions that aclocal will find
 dnl
-ifdef(glib_configure_in,[],[
+ifdef(glib_configure_ac,[],[
 AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
 AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
 ])dnl
@@ -454,7 +458,7 @@
 
 
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 40 IT_PROG_INTLTOOL
+# serial 42 IT_PROG_INTLTOOL
 AC_DEFUN([IT_PROG_INTLTOOL], [
 AC_PREREQ([2.50])dnl
 AC_REQUIRE([AM_NLS])dnl
@@ -467,13 +471,11 @@
     ;;
 esac
 
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
 if test -n "$1"; then
     AC_MSG_CHECKING([for intltool >= $1])
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    ]
     AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
 	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
@@ -486,25 +488,48 @@
     AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
 fi
 
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
+fi
+AC_SUBST([AM_DEFAULT_VERBOSITY])
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo "  ITMRG " [$]@;'
+AC_SUBST(INTLTOOL_V_MERGE)
+AC_SUBST(INTLTOOL__v_MERGE_)
+AC_SUBST(INTLTOOL__v_MERGE_0)
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
+AC_SUBST(intltool__v_merge_options_)
+AC_SUBST(intltool__v_merge_options_0)
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
+else
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
+fi
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
 
 _IT_SUBST(INTLTOOL_DESKTOP_RULE)
 _IT_SUBST(INTLTOOL_DIRECTORY_RULE)
@@ -550,7 +575,7 @@
 if test $? -ne 0; then
    AC_MSG_ERROR([perl 5.8.1 is required for intltool])
 else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
    AC_MSG_RESULT([$IT_PERL_VERSION])
 fi
 if test "x$2" != "xno-xml"; then
@@ -603,7 +628,7 @@
 AC_DEFUN([IT_PO_SUBDIR],
 [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
 dnl
-dnl The following CONFIG_COMMANDS should be exetuted at the very end
+dnl The following CONFIG_COMMANDS should be executed at the very end
 dnl of config.status.
 AC_CONFIG_COMMANDS_PRE([
   AC_CONFIG_COMMANDS([$1/stamp-it], [
@@ -649,7 +674,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -658,7 +684,8 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -685,7 +712,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ])
 
-# serial 56 LT_INIT
+# serial 57 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -714,6 +741,7 @@
 # ------------------
 AC_DEFUN([LT_INIT],
 [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_BEFORE([$0], [LT_LANG])dnl
 AC_BEFORE([$0], [LT_OUTPUT])dnl
 AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -730,6 +758,8 @@
 AC_REQUIRE([LTOBSOLETE_VERSION])dnl
 m4_require([_LT_PROG_LTMAIN])dnl
 
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
 dnl Parse OPTIONS
 _LT_SET_OPTIONS([$0], [$1])
 
@@ -766,7 +796,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 ])
 
 
@@ -786,6 +816,11 @@
 m4_defun([_LT_SETUP],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -808,10 +843,13 @@
 dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
 m4_require([_LT_CMD_RELOAD])dnl
 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
 
 _LT_CONFIG_LIBTOOL_INIT([
 # See if we are running on zsh, and set the options which allow our
@@ -827,7 +865,6 @@
 _LT_CHECK_OBJDIR
 
 m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
 
 case $host_os in
 aix3*)
@@ -841,23 +878,6 @@
   ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
 # Global variables:
 ofile=libtool
 can_build_shared=yes
@@ -898,6 +918,28 @@
 ])# _LT_SETUP
 
 
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
 # _LT_PROG_LTMAIN
 # ---------------
 # Note that this code is called both from `configure', and `config.status'
@@ -1050,7 +1092,7 @@
 # declaration there will have the same value as in `configure'.  VARNAME
 # must have a single quote delimited value for this to work.
 m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
 
 
 # _LT_CONFIG_STATUS_DECLARATIONS
@@ -1060,7 +1102,7 @@
 # embedded single quotes properly.  In configure, this macro expands
 # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
 #
-#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
 m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
 [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
     [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
@@ -1159,12 +1201,20 @@
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
 # Quote evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -1175,9 +1225,9 @@
 # Double-quote double-evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -1185,16 +1235,38 @@
     esac
 done
 
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\[$]0 --fallback-echo"')dnl "
-  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
-  ;;
-esac
-
 _LT_OUTPUT_LIBTOOL_INIT
 ])
 
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
 
 # LT_OUTPUT
 # ---------
@@ -1204,20 +1276,11 @@
 AC_DEFUN([LT_OUTPUT],
 [: ${CONFIG_LT=./config.lt}
 AC_MSG_NOTICE([creating $CONFIG_LT])
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
 
 cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
+lt_cl_silent=false
 exec AS_MESSAGE_LOG_FD>>config.log
 {
   echo
@@ -1243,7 +1306,7 @@
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -1288,15 +1351,13 @@
 # appending to config.log, which fails on DOS, as config.log is still kept
 # open by configure.  Here we exec the FD to /dev/null, effectively closing
 # config.log, so it can be properly (re)opened and appended to by config.lt.
-if test "$no_create" != yes; then
-  lt_cl_success=:
-  test "$silent" = yes &&
-    lt_config_lt_args="$lt_config_lt_args --quiet"
-  exec AS_MESSAGE_LOG_FD>/dev/null
-  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-  exec AS_MESSAGE_LOG_FD>>config.log
-  $lt_cl_success || AS_EXIT(1)
-fi
+lt_cl_success=:
+test "$silent" = yes &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
 ])# LT_OUTPUT
 
 
@@ -1359,15 +1420,12 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_XSI_SHELLFNS
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
 
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
+  _LT_PROG_REPLACE_SHELLFNS
 
-  mv -f "$cfgfile" "$ofile" ||
+   mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 ],
@@ -1412,6 +1470,7 @@
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -1433,6 +1492,29 @@
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -1463,6 +1545,10 @@
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -1473,11 +1559,13 @@
 AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
 AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
 AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
 dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
 dnl AC_DEFUN([AC_LIBTOOL_F77], [])
 dnl AC_DEFUN([AC_LIBTOOL_FC], [])
 dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
 
 
 # _LT_TAG_COMPILER
@@ -1563,7 +1651,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1571,6 +1665,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -1582,6 +1677,34 @@
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
     case $host_os in
     rhapsody* | darwin1.[[012]])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -1609,7 +1732,7 @@
     else
       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
     fi
-    if test "$DSYMUTIL" != ":"; then
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -1619,8 +1742,8 @@
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1629,7 +1752,13 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_automatic, $1)=yes
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
   _LT_TAGVAR(link_all_deplibs, $1)=yes
   _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -1637,7 +1766,7 @@
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
+    output_verbose_link_cmd=func_echo_all
     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -1653,203 +1782,142 @@
   fi
 ])
 
-# _LT_SYS_MODULE_PATH_AIX
-# -----------------------
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
 # Links a minimal program and checks the executable
 # for the system default hardcoded library path. In most cases,
 # this is /usr/lib:/lib, but when the MPI compilers are used
 # the location of the communication and MPI libs are included too.
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
 m4_defun([_LT_SYS_MODULE_PATH_AIX],
 [m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
 ])# _LT_SYS_MODULE_PATH_AIX
 
 
 # _LT_SHELL_INIT(ARG)
 # -------------------
 m4_define([_LT_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_SHELL_INIT
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
 
 
 # _LT_PROG_ECHO_BACKSLASH
 # -----------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
 m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[_LT_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
 else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-[$]*
-_LT_EOF
-  exit 0
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
 fi
 
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*" 
+}
 
-	  if test "$prev" != 'sed 50q "[$]0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
+case "$ECHO" in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
 
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
 
-AC_SUBST(lt_ECHO)
-])
 _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1],
-    [An echo program that does not interpret backslashes])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
 ])# _LT_PROG_ECHO_BACKSLASH
 
 
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([${with_sysroot}])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
+
 # _LT_ENABLE_LOCK
 # ---------------
 m4_defun([_LT_ENABLE_LOCK],
@@ -1878,7 +1946,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     if test "$lt_cv_prog_gnu_ld" = yes; then
       case `/usr/bin/file conftest.$ac_objext` in
@@ -1909,7 +1977,7 @@
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -1921,9 +1989,19 @@
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpc64le-*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -1942,7 +2020,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+	  powerpcle-*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -1971,14 +2052,27 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1996,14 +2090,47 @@
 ])# _LT_ENABLE_LOCK
 
 
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
 # _LT_CMD_OLD_ARCHIVE
 # -------------------
 m4_defun([_LT_CMD_OLD_ARCHIVE],
-[AC_CHECK_TOOL(AR, ar, false)
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1])
+[_LT_PROG_AR
 
 AC_CHECK_TOOL(STRIP, strip, :)
 test -z "$STRIP" && STRIP=:
@@ -2022,18 +2149,27 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
 _LT_DECL([], [old_postinstall_cmds], [2])
 _LT_DECL([], [old_postuninstall_cmds], [2])
 _LT_TAGDECL([], [old_archive_cmds], [2],
     [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
 ])# _LT_CMD_OLD_ARCHIVE
 
 
@@ -2058,15 +2194,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        $2=yes
@@ -2106,7 +2242,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          $2=yes
@@ -2169,6 +2305,11 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.
@@ -2194,6 +2335,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -2220,7 +2366,8 @@
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
@@ -2233,8 +2380,8 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
         i=`expr $i + 1`
@@ -2285,7 +2432,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-[#line __oline__ "configure"
+[#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -2326,7 +2473,13 @@
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -2335,7 +2488,11 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -2511,16 +2668,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
@@ -2679,6 +2836,7 @@
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_OBJDUMP])dnl
 m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
 AC_MSG_CHECKING([dynamic linker characteristics])
 m4_if([$1],
 	[], [
@@ -2687,16 +2845,23 @@
     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
     *) lt_awk_arg="/^libraries:/" ;;
   esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
   # Ok, now we have the path, separated by spaces, we can step through it
   # and add multilib dir if necessary.
   lt_tmp_lt_search_path_spec=
@@ -2709,7 +2874,7 @@
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
 BEGIN {RS=" "; FS="/|\n";} {
   lt_foo="";
   lt_count=0;
@@ -2729,7 +2894,13 @@
   if (lt_foo != "") { lt_freq[[lt_foo]]++; }
   if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
 }'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi])
@@ -2755,7 +2926,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2764,7 +2935,7 @@
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2817,7 +2988,7 @@
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
@@ -2829,7 +3000,7 @@
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -2848,8 +3019,9 @@
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -2870,36 +3042,83 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
+    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -2920,7 +3139,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2928,10 +3147,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2939,7 +3154,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -2957,7 +3172,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2976,13 +3191,16 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
+  dynamic_linker="$host_os runtime_loader"
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -3028,12 +3246,14 @@
     soname_spec='${libname}${release}${shared_ext}$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -3049,7 +3269,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -3086,9 +3306,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3096,16 +3316,21 @@
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
   # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-       [shlibpath_overrides_runpath=yes])])
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
@@ -3114,7 +3339,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -3158,7 +3383,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -3227,7 +3452,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3252,7 +3477,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3276,7 +3501,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -3307,7 +3532,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -3317,7 +3542,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3359,6 +3584,8 @@
     The last name is the one that the linker finds with -lNAME]])
 _LT_DECL([], [soname_spec], [1],
     [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
 _LT_DECL([], [postinstall_cmds], [2],
     [Command to use after installation of a shared archive])
 _LT_DECL([], [postuninstall_cmds], [2],
@@ -3471,6 +3698,7 @@
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 m4_require([_LT_DECL_SED])dnl
 m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
 
 AC_ARG_WITH([gnu-ld],
     [AS_HELP_STRING([--with-gnu-ld],
@@ -3592,7 +3820,12 @@
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
-  darwin*)
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
     if test "$GCC" = yes; then
       reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
     else
@@ -3600,8 +3833,8 @@
     fi
     ;;
 esac
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_DECL([], [reload_cmds], [2])dnl
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
 ])# _LT_CMD_RELOAD
 
 
@@ -3653,16 +3886,18 @@
   # Base MSYS/MinGW do not provide the 'file' command needed by
   # func_win32_libid shell function, so use a weaker test based on 'objdump',
   # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
-cegcc)
+cegcc*)
   # use the weaker test based on 'objdump'. See mingw*.
   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -3688,7 +3923,7 @@
   fi
   ;;
 
-gnu*)
+haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -3700,11 +3935,11 @@
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
     ;;
   hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
@@ -3725,8 +3960,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -3804,6 +4039,21 @@
   ;;
 esac
 ])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -3811,7 +4061,11 @@
 _LT_DECL([], [deplibs_check_method], [1],
     [Method to check whether dependent libraries are shared objects])
 _LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method == "file_magic"])
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
 ])# _LT_CHECK_MAGIC_METHOD
 
 
@@ -3868,7 +4122,19 @@
   NM="$lt_cv_path_NM"
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
-  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
   AC_SUBST([DUMPBIN])
   if test "$DUMPBIN" != ":"; then
     NM="$DUMPBIN"
@@ -3881,13 +4147,13 @@
 AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
   [lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
   cat conftest.out >&AS_MESSAGE_LOG_FD
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -3902,6 +4168,67 @@
 dnl AC_DEFUN([AM_PROG_NM], [])
 dnl AC_DEFUN([AC_PROG_NM], [])
 
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
 
 # LT_LIB_M
 # --------
@@ -3910,7 +4237,7 @@
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
   # These system don't have libm, or don't need it
   ;;
 *-ncr-sysv4.3*)
@@ -3938,7 +4265,12 @@
 _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 
 if test "$GCC" = yes; then
-  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
 
   _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
     lt_cv_prog_compiler_rtti_exceptions,
@@ -3955,6 +4287,7 @@
 m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
 AC_REQUIRE([LT_PATH_LD])dnl
 m4_require([_LT_DECL_SED])dnl
@@ -4022,8 +4355,8 @@
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -4047,6 +4380,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -4059,6 +4393,7 @@
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -4080,7 +4415,7 @@
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -4092,6 +4427,18 @@
       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -4103,7 +4450,7 @@
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
-const struct {
+LT@&t@_DLSYM_CONST struct {
   const char *name;
   void       *address;
 }
@@ -4129,15 +4476,15 @@
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
 	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
 	else
 	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
 	fi
@@ -4170,6 +4517,13 @@
   AC_MSG_RESULT(ok)
 fi
 
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
     [Take the output of nm and produce a listing of raw symbols and C names])
 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
@@ -4180,6 +4534,8 @@
 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
     [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
     [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
 ]) # _LT_CMD_GLOBAL_SYMBOLS
 
 
@@ -4191,7 +4547,6 @@
 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 _LT_TAGVAR(lt_prog_compiler_static, $1)=
 
-AC_MSG_CHECKING([for $compiler option to produce PIC])
 m4_if([$1], [CXX], [
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -4242,6 +4597,11 @@
       # DJGPP does not support shared libraries at all
       _LT_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
     interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -4291,6 +4651,12 @@
 	  ;;
 	esac
 	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
       dgux*)
 	case $cc_basename in
 	  ec++*)
@@ -4347,7 +4713,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4380,8 +4746,8 @@
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    ;;
-	  xlc* | xlC*)
-	    # IBM XL 8.0 on PPC
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -4443,7 +4809,7 @@
 	;;
       solaris*)
 	case $cc_basename in
-	  CC*)
+	  CC* | sunCC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -4547,6 +4913,12 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -4589,6 +4961,15 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
     esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
@@ -4631,7 +5012,7 @@
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -4652,7 +5033,13 @@
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
 	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -4664,25 +5051,40 @@
         # All Alpha code is PIC.
         _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
         ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
 	esac
 	;;
@@ -4714,7 +5116,7 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95*)
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
       *)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
@@ -4771,9 +5173,11 @@
     _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
     ;;
 esac
-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
 
 #
 # Check to make sure the PIC flag actually works.
@@ -4792,6 +5196,8 @@
 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
 	[Additional compiler flags for building library objects])
 
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
 #
 # Check to make sure the static flag actually works.
 #
@@ -4812,6 +5218,7 @@
 m4_defun([_LT_LINKER_SHLIBS],
 [AC_REQUIRE([LT_PATH_LD])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
 m4_require([_LT_DECL_SED])dnl
@@ -4820,30 +5227,40 @@
 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 m4_if([$1], [CXX], [
   _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   case $host_os in
   aix[[4-9]]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     else
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
     _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
+    ;;
   cygwin* | mingw* | cegcc*)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  linux* | k*bsd*-gnu)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
     _LT_TAGVAR(link_all_deplibs, $1)=no
-  ;;
+    ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
+    ;;
   esac
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 ], [
   runpath_var=
   _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -4858,7 +5275,6 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4903,13 +5319,39 @@
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu)
+  linux* | k*bsd*-gnu | gnu*)
     _LT_TAGVAR(link_all_deplibs, $1)=no
     ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
   if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
@@ -4943,11 +5385,12 @@
 	_LT_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
 
 _LT_EOF
       fi
@@ -4983,10 +5426,12 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
       # as there is no search path for DLLs.
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_TAGVAR(always_export_symbols, $1)=no
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -5004,6 +5449,11 @@
       fi
       ;;
 
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
     interix[[3-9]]*)
       _LT_TAGVAR(hardcode_direct, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -5029,15 +5479,16 @@
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 	 && test "$tmp_diet" = no
       then
-	tmp_addflag=
+	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -5048,13 +5499,17 @@
 	lf95*)				# Lahey Fortran 8.1
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 	  tmp_sharedflag='--shared' ;;
-	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
@@ -5070,17 +5525,16 @@
         fi
 
 	case $cc_basename in
-	xlf*)
+	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
 	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
 	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -5094,8 +5548,8 @@
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -5113,8 +5567,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -5160,8 +5614,8 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -5201,8 +5655,10 @@
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	else
 	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	fi
@@ -5290,9 +5746,9 @@
 	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        _LT_SYS_MODULE_PATH_AIX
+        _LT_SYS_MODULE_PATH_AIX([$1])
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       else
 	if test "$host_cpu" = ia64; then
 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -5301,14 +5757,19 @@
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX
+	 _LT_SYS_MODULE_PATH_AIX([$1])
 	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
 	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
 	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 	  # This is similar to how AIX traditionally builds its shared libraries.
 	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -5340,20 +5801,64 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -5366,10 +5871,6 @@
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5382,7 +5883,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5391,7 +5892,7 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -5399,7 +5900,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -5414,14 +5915,13 @@
       ;;
 
     hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5433,16 +5933,16 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
 	hppa*64*)
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
@@ -5454,7 +5954,14 @@
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
 	  ;;
 	esac
       fi
@@ -5482,19 +5989,34 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        AC_LINK_IFELSE(int foo(void) {},
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-        )
-        LDFLAGS="$save_LDFLAGS"
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS="$save_LDFLAGS"])
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
       fi
       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -5556,17 +6078,17 @@
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
       fi
       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -5576,13 +6098,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5595,9 +6117,9 @@
       _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
@@ -5773,36 +6295,38 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-        _LT_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
       ;;
     esac
   fi
@@ -5839,9 +6363,6 @@
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -5867,8 +6388,6 @@
     to runtime path list])
 _LT_TAGDECL([], [link_all_deplibs], [0],
     [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [fix_srcfile_path], [1],
-    [Fix the shell variable $srcfile for the compiler])
 _LT_TAGDECL([], [always_export_symbols], [0],
     [Set to "yes" if exported symbols are required])
 _LT_TAGDECL([], [export_symbols_cmds], [2],
@@ -5879,6 +6398,8 @@
     [Symbols that must always be exported])
 _LT_TAGDECL([], [prelink_cmds], [2],
     [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
 _LT_TAGDECL([], [file_list_spec], [1],
     [Specify filename containing input files])
 dnl FIXME: Not yet implemented
@@ -5968,37 +6489,22 @@
 ])# _LT_LANG_C_CONFIG
 
 
-# _LT_PROG_CXX
-# ------------
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-# compiler, we have our own version here.
-m4_defun([_LT_PROG_CXX],
-[
-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-AC_PROG_CXX
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_CXX
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_CXX], [])
-
-
 # _LT_LANG_CXX_CONFIG([TAG])
 # --------------------------
 # Ensure that the configuration variables for a C++ compiler are suitably
 # defined.  These variables are subsequently used by _LT_CONFIG to write
 # the compiler configuration to `libtool'.
 m4_defun([_LT_LANG_CXX_CONFIG],
-[AC_REQUIRE([_LT_PROG_CXX])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
 
 AC_LANG_PUSH(C++)
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -6010,7 +6516,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6020,6 +6525,8 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6051,6 +6558,7 @@
 
   # Allow CC to be a program name with arguments.
   lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
   lt_save_LD=$LD
   lt_save_GCC=$GCC
   GCC=$GXX
@@ -6068,6 +6576,7 @@
   fi
   test -z "${LDCXX+set}" || LD=$LDCXX
   CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
   _LT_CC_BASENAME([$compiler])
@@ -6089,8 +6598,8 @@
       # Check if GNU C++ uses GNU ld as the underlying linker, since the
       # archiving commands below assume that GNU ld is being used.
       if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6122,7 +6631,7 @@
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
     else
       GXX=no
@@ -6231,10 +6740,10 @@
           _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
           # Determine the default libpath from the value encoded in an empty
           # executable.
-          _LT_SYS_MODULE_PATH_AIX
+          _LT_SYS_MODULE_PATH_AIX([$1])
           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
         else
           if test "$host_cpu" = ia64; then
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -6243,14 +6752,19 @@
           else
 	    # Determine the default libpath from the value encoded in an
 	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX
+	    _LT_SYS_MODULE_PATH_AIX([$1])
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 	    # Warning - without using the other run time loading flags,
 	    # -berok will link without error, but may produce a broken library.
 	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
 	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 	    # This is similar to how AIX traditionally builds its shared
 	    # libraries.
@@ -6280,28 +6794,75 @@
         ;;
 
       cygwin* | mingw* | pw32* | cegcc*)
-        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-        # as there is no search path for DLLs.
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-        _LT_TAGVAR(always_export_symbols, $1)=no
-        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-          # If the export-symbols file already is a .def file (1st line
-          # is EXPORTS), use it as is; otherwise, prepend...
-          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    cp $export_symbols $output_objdir/$soname.def;
-          else
-	    echo EXPORTS > $output_objdir/$soname.def;
-	    cat $export_symbols >> $output_objdir/$soname.def;
-          fi~
-          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-        else
-          _LT_TAGVAR(ld_shlibs, $1)=no
-        fi
-        ;;
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
       darwin* | rhapsody*)
         _LT_DARWIN_LINKER_FEATURES($1)
 	;;
@@ -6324,7 +6885,7 @@
         esac
         ;;
 
-      freebsd[[12]]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6340,7 +6901,9 @@
         _LT_TAGVAR(ld_shlibs, $1)=yes
         ;;
 
-      gnu*)
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
         ;;
 
       hpux9*)
@@ -6367,11 +6930,11 @@
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
             ;;
           *)
             if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
             else
               # FIXME: insert proper C++ library support
               _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6432,7 +6995,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
           *)
 	    if test "$GXX" = yes; then
@@ -6442,10 +7005,10 @@
 	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	        esac
 	      fi
@@ -6475,7 +7038,7 @@
         case $cc_basename in
           CC*)
 	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -6486,9 +7049,9 @@
           *)
 	    if test "$GXX" = yes; then
 	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
 	      fi
 	    fi
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6499,7 +7062,7 @@
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -6517,7 +7080,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6554,26 +7117,26 @@
           pgCC* | pgcpp*)
             # Portland Group C++ compiler
 	    case `$CC -V` in
-	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
 	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
 	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
 		$RANLIB $oldlib'
 	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
-	    *) # Version 6 will use weak symbols
+	    *) # Version 6 and above use weak symbols
 	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
@@ -6581,7 +7144,7 @@
 
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
             ;;
 	  cxx*)
 	    # Compaq C++
@@ -6600,9 +7163,9 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
 	    ;;
-	  xl*)
+	  xl* | mpixl* | bgxl*)
 	    # IBM XL 8.0 on PPC, with GNU ld
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6622,13 +7185,13 @@
 	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	      _LT_TAGVAR(compiler_needs_object, $1)=yes
 
 	      # Not sure whether something based on
 	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
 	      # would be better.
-	      output_verbose_link_cmd='echo'
+	      output_verbose_link_cmd='func_echo_all'
 
 	      # Archives containing C++ object files must be created using
 	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -6697,7 +7260,7 @@
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 	  fi
-	  output_verbose_link_cmd=echo
+	  output_verbose_link_cmd=func_echo_all
 	else
 	  _LT_TAGVAR(ld_shlibs, $1)=no
 	fi
@@ -6732,15 +7295,15 @@
 	    case $host in
 	      osf3*)
 	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 		;;
 	      *)
 	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
 	          $RM $lib.exp'
 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 		;;
@@ -6756,17 +7319,17 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
 	  *)
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 	      case $host in
 	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	      esac
 
@@ -6776,7 +7339,7 @@
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -6812,7 +7375,7 @@
 
       solaris*)
         case $cc_basename in
-          CC*)
+          CC* | sunCC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
             _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
 	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -6833,7 +7396,7 @@
 	    esac
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
 
-	    output_verbose_link_cmd='echo'
+	    output_verbose_link_cmd='func_echo_all'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -6853,14 +7416,14 @@
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      else
 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
 	        # platform.
@@ -6871,7 +7434,7 @@
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      fi
 
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -6925,6 +7488,10 @@
           CC*)
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+	      '"$_LT_TAGVAR(reload_cmds, $1)"
 	    ;;
 	  *)
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -6980,6 +7547,7 @@
   fi # test -n "$compiler"
 
   CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
   LDCXX=$LD
   LD=$lt_save_LD
   GCC=$lt_save_GCC
@@ -6994,6 +7562,29 @@
 ])# _LT_LANG_CXX_CONFIG
 
 
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
 # ---------------------------------
 # Figure out "hidden" library dependencies from verbose
@@ -7002,6 +7593,7 @@
 # objects, libraries and library flags.
 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
 # Dependencies to place before and after the object being linked:
 _LT_TAGVAR(predep_objects, $1)=
 _LT_TAGVAR(postdep_objects, $1)=
@@ -7051,7 +7643,20 @@
   }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
 dnl Parse the compiler output and extract the necessary
 dnl objects, libraries and library flags.
 if AC_TRY_EVAL(ac_compile); then
@@ -7063,7 +7668,7 @@
   pre_test_object_deps_done=no
 
   for p in `eval "$output_verbose_link_cmd"`; do
-    case $p in
+    case ${prev}${p} in
 
     -L* | -R* | -l*)
        # Some compilers place space between "-{L,R}" and the path.
@@ -7072,13 +7677,22 @@
           test $p = "-R"; then
 	 prev=$p
 	 continue
-       else
-	 prev=
        fi
 
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
        if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
+	 case ${prev} in
+	 -L | -R)
 	   # Internal compiler library paths should come after those
 	   # provided the user.  The postdeps already come after the
 	   # user supplied libs so there is no need to process them.
@@ -7098,8 +7712,10 @@
 	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
 	 fi
        fi
+       prev=
        ;;
 
+    *.lto.$objext) ;; # Ignore GCC LTO objects
     *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
@@ -7135,6 +7751,7 @@
 fi
 
 $RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
 
 # PORTME: override above test on systems where it is broken
 m4_if([$1], [CXX],
@@ -7171,7 +7788,7 @@
 
 solaris*)
   case $cc_basename in
-  CC*)
+  CC* | sunCC*)
     # The more standards-conforming stlport4 library is
     # incompatible with the Cstd library. Avoid specifying
     # it if it's in CXXFLAGS. Ignore libCrun as
@@ -7215,32 +7832,16 @@
 ])# _LT_SYS_HIDDEN_LIBDEPS
 
 
-# _LT_PROG_F77
-# ------------
-# Since AC_PROG_F77 is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_F77],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-AC_PROG_F77
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_F77
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_F77], [])
-
-
 # _LT_LANG_F77_CONFIG([TAG])
 # --------------------------
 # Ensure that the configuration variables for a Fortran 77 compiler are
 # suitably defined.  These variables are subsequently used by _LT_CONFIG
 # to write the compiler configuration to `libtool'.
 m4_defun([_LT_LANG_F77_CONFIG],
-[AC_REQUIRE([_LT_PROG_F77])dnl
-AC_LANG_PUSH(Fortran 77)
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
 
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -7250,7 +7851,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7259,6 +7859,8 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -7298,7 +7900,9 @@
   # Allow CC to be a program name with arguments.
   lt_save_CC="$CC"
   lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
   CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
   _LT_CC_BASENAME([$compiler])
@@ -7352,38 +7956,24 @@
 
   GCC=$lt_save_GCC
   CC="$lt_save_CC"
+  CFLAGS="$lt_save_CFLAGS"
 fi # test "$_lt_disable_F77" != yes
 
 AC_LANG_POP
 ])# _LT_LANG_F77_CONFIG
 
 
-# _LT_PROG_FC
-# -----------
-# Since AC_PROG_FC is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_FC],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-AC_PROG_FC
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_FC
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_FC], [])
-
-
 # _LT_LANG_FC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for a Fortran compiler are
 # suitably defined.  These variables are subsequently used by _LT_CONFIG
 # to write the compiler configuration to `libtool'.
 m4_defun([_LT_LANG_FC_CONFIG],
-[AC_REQUIRE([_LT_PROG_FC])dnl
-AC_LANG_PUSH(Fortran)
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
 
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -7393,7 +7983,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7402,6 +7991,8 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -7441,7 +8032,9 @@
   # Allow CC to be a program name with arguments.
   lt_save_CC="$CC"
   lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
   CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
   compiler=$CC
   GCC=$ac_cv_fc_compiler_gnu
 
@@ -7497,7 +8090,8 @@
   fi # test -n "$compiler"
 
   GCC=$lt_save_GCC
-  CC="$lt_save_CC"
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
 fi # test "$_lt_disable_FC" != yes
 
 AC_LANG_POP
@@ -7534,10 +8128,12 @@
 _LT_LINKER_BOILERPLATE
 
 # Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=yes
 CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
 _LT_TAGVAR(LD, $1)="$LD"
@@ -7547,6 +8143,8 @@
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 
 if test -n "$compiler"; then
   _LT_COMPILER_NO_RTTI($1)
@@ -7562,31 +8160,32 @@
 AC_LANG_RESTORE
 
 GCC=$lt_save_GCC
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_GCJ_CONFIG
 
 
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
 # are suitably defined.  These variables are subsequently used by _LT_CONFIG
 # to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
 AC_LANG_SAVE
 
-# Source file extension for RC test sources.
-ac_ext=rc
+# Source file extension for Go test sources.
+ac_ext=go
 
-# Object file extension for compiled RC test sources.
+# Object file extension for compiled Go test sources.
 objext=o
 _LT_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+lt_simple_compile_test_code="package main; func main() { }"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
+lt_simple_link_test_code='package main; func main() { }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_TAG_COMPILER
@@ -7596,10 +8195,79 @@
 _LT_LINKER_BOILERPLATE
 
 # Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
 _LT_CC_BASENAME([$compiler])
@@ -7612,7 +8280,8 @@
 
 GCC=$lt_save_GCC
 AC_LANG_RESTORE
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_RC_CONFIG
 
 
@@ -7632,6 +8301,13 @@
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
@@ -7671,6 +8347,15 @@
 AC_SUBST([OBJDUMP])
 ])
 
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
 
 # _LT_DECL_SED
 # ------------
@@ -7762,8 +8447,8 @@
 # Try some XSI features
 xsi_shell=no
 ( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
@@ -7802,222 +8487,177 @@
 ])# _LT_CHECK_SHELL_FEATURES
 
 
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
-# Bourne and XSI compatible variants of some useful shell functions.
-m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $[*] ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
+[dnl {
+sed -e '/^$1 ()$/,/^} # $1 /c\
+$1 ()\
+{\
+m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+])
 
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
 
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
+# equivalent extended shell implementations where those features are available..
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
+[if test x"$xsi_shell" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac])
 
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
+    func_basename_result="${1##*/}"])
 
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac
+    func_basename_result="${1##*/}"])
 
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary parameter first.
+    func_stripname_result=${3}
+    func_stripname_result=${func_stripname_result#"${1}"}
+    func_stripname_result=${func_stripname_result%"${2}"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+    func_split_long_opt_name=${1%%=*}
+    func_split_long_opt_arg=${1#*=}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+    case ${1} in
+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+      *)    func_lo2o_result=${1} ;;
+    esac])
 
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
 
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
 
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
+fi
 
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-}
+if test x"$lt_shell_append" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
 
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$[@]"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
+    func_quote_for_eval "${2}"
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
 
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
 
-_LT_EOF
-esac
+if test x"$_lt_function_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
 
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]+=\$[2]"
-}
-_LT_EOF
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine which file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
     ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]=\$$[1]\$[2]"
-}
-
-_LT_EOF
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
     ;;
-  esac
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
 ])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
 
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+#   Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 6 ltoptions.m4
+# serial 7 ltoptions.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -8132,7 +8772,7 @@
 [enable_win32_dll=yes
 
 case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -8140,13 +8780,13 @@
 esac
 
 test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [0], [Assembler program])dnl
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
 
 test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
 
 test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
 ])# win32-dll
 
 AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
@@ -8332,9 +8972,24 @@
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
@@ -8504,31 +9159,31 @@
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# Generated from ltversion.in.
+# @configure_input@
 
-# serial 3017 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3017])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6b'
-macro_revision='1.3017'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
 
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 4 lt~obsolete.m4
+# serial 5 lt~obsolete.m4
 
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
@@ -8598,7 +9253,6 @@
 m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
 m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
 m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
 m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
 m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
 m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -8611,9 +9265,17 @@
 m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
 m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-
-# nls.m4 serial 3 (gettext-0.15)
-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
+
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8631,20 +9293,235 @@
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
 dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
 
-AC_PREREQ(2.50)
+AC_PREREQ([2.50])
 
 AC_DEFUN([AM_NLS],
 [
   AC_MSG_CHECKING([whether NLS is requested])
   dnl Default is enabled NLS
-  AC_ARG_ENABLE(nls,
+  AC_ARG_ENABLE([nls],
     [  --disable-nls           do not use Native Language Support],
     USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT($USE_NLS)
-  AC_SUBST(USE_NLS)
+  AC_MSG_RESULT([$USE_NLS])
+  AC_SUBST([USE_NLS])
 ])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -8656,10 +9533,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.14.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -8675,22 +9552,22 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -8709,7 +9586,7 @@
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -8727,30 +9604,26 @@
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -8769,16 +9642,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -8788,7 +9659,7 @@
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -8801,12 +9672,13 @@
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -8814,8 +9686,9 @@
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -8854,16 +9727,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -8872,16 +9745,16 @@
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -8929,7 +9802,7 @@
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -8939,34 +9812,39 @@
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -8979,7 +9857,7 @@
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -8991,21 +9869,19 @@
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -9023,7 +9899,7 @@
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
+# is enabled.  FIXME.  This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -9031,32 +9907,23 @@
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 16
-
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -9069,7 +9936,7 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -9098,31 +9965,40 @@
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@@ -9133,34 +10009,79 @@
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+])
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi
 ])
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -9182,7 +10103,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9201,16 +10122,14 @@
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -9224,21 +10143,18 @@
 rmdir .tst 2>/dev/null
 AC_SUBST([am__leading_dot])])
 
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1998-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # AM_PROG_LEX
 # -----------
 # Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
 # "missing" invocation, for better error output.
 AC_DEFUN([AM_PROG_LEX],
-[AC_PREREQ(2.50)dnl
+[AC_PREREQ([2.50])dnl
 AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
 AC_REQUIRE([AC_PROG_LEX])dnl
 if test "$LEX" = :; then
@@ -9248,20 +10164,17 @@
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # AM_MAINTAINER_MODE([DEFAULT-MODE])
 # ----------------------------------
 # Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well.  Anyway, the user
+# Default is to disable them, unless 'enable' is passed literally.
+# For symmetry, 'disable' may be passed as well.  Anyway, the user
 # can override the default with the --enable/--disable switch.
 AC_DEFUN([AM_MAINTAINER_MODE],
 [m4_case(m4_default([$1], [disable]),
@@ -9269,13 +10182,14 @@
        [disable], [m4_define([am_maintainer_other], [enable])],
        [m4_define([am_maintainer_other], [enable])
         m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],
-[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer],
-      [USE_MAINTAINER_MODE=$enableval],
-      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+      am_maintainer_other[ make rules and dependencies not useful
+      (and sometimes confusing) to the casual installer])],
+    [USE_MAINTAINER_MODE=$enableval],
+    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
   AC_MSG_RESULT([$USE_MAINTAINER_MODE])
   AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
   MAINT=$MAINTAINER_MODE_TRUE
@@ -9283,18 +10197,14 @@
 ]
 )
 
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -9312,7 +10222,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -9337,52 +10247,14 @@
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -9390,11 +10262,10 @@
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -9407,63 +10278,64 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
+  AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+#  -*- Autoconf -*-
+# Obsolete and "removed" macros, that must however still report explicit
+# error messages when used, to smooth transition.
+#
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
+AC_DEFUN([AM_CONFIG_HEADER],
+[AC_DIAGNOSE([obsolete],
+['$0': this macro is obsolete.
+You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
+AC_CONFIG_HEADERS($@)])
+
+AC_DEFUN([AM_PROG_CC_STDC],
+[AC_PROG_CC
+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
+AC_DIAGNOSE([obsolete],
+['$0': this macro is obsolete.
+You should simply use the 'AC][_PROG_CC' macro instead.
+Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
+but upon 'ac_cv_prog_cc_stdc'.])])
+
+AC_DEFUN([AM_C_PROTOTYPES],
+         [AC_FATAL([automatic de-ANSI-fication support has been removed])])
+AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -9474,24 +10346,82 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -9502,32 +10432,40 @@
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
 
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$[2]" = conftest.file
    )
 then
@@ -9537,9 +10475,85 @@
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
+
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9547,34 +10561,32 @@
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -9582,24 +10594,22 @@
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -9609,99 +10619,138 @@
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-dnl $Id: xdt-depends.m4 21591 2006-05-08 09:10:26Z benny $
+dnl $Id$
 dnl
 dnl Copyright (c) 2002-2006
 dnl         The Xfce development team. All rights reserved.
 dnl
 dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>.
 dnl
-dnl This program is free software; you can redistribute it and/or modify it
-dnl under the terms of the GNU General Public License as published by the Free
-dnl Software Foundation; either version 2 of the License, or (at your option)
-dnl any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful, but WITHOUT
-dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-dnl FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-dnl more details.
-dnl
-dnl You should have received a copy of the GNU General Public License along with
-dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-dnl Place, Suite 330, Boston, MA  02111-1307  USA
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License along
+dnl with this program; if not, write to the Free Software Foundation, Inc.,
+dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 dnl
 dnl xdt-depends
 dnl -----------
@@ -9727,11 +10776,23 @@
   # minimum supported version of pkg-config
   xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
 
-  # lookup pkg-config utility
-  if test x"$PKG_CONFIG" = x""; then
-    AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
+  m4_ifdef([PKG_PROG_PKG_CONFIG],
+    [
+      PKG_PROG_PKG_CONFIG([$xdt_cv_PKG_CONFIG_MIN_VERSION])
 
-    if test x"$PKG_CONFIG" = x"no"; then
+      if test x"$PKG_CONFIG" = x""; then
+        echo
+        echo "*** Your version of pkg-config is too old. You need atleast"
+        echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
+        echo "*** from the freedesktop.org software repository at"
+        echo "***"
+        echo "***    http://www.freedesktop.org/software/pkgconfig"
+        echo "***"
+        exit 1;
+      fi
+    ],
+    [
+      echo
       echo "*** The pkg-config utility could not be found on your system."
       echo "*** Make sure it is in your path, or set the PKG_CONFIG"
       echo "*** environment variable to the full path to pkg-config."
@@ -9741,25 +10802,7 @@
       echo "***    http://www.freedesktop.org/software/pkgconfig"
       echo "***"
       exit 1
-    fi
-
-    # check pkg-config version
-    AC_MSG_CHECKING([for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION])
-    if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then
-      xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
-      AC_MSG_RESULT([$xdt_cv_PKG_CONFIG_VERSION])
-    else
-      xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
-      AC_MSG_RESULT([$xdt_cv_PKG_CONFIG_VERSION])
-      echo "*** Your version of pkg-config is too old. You need atleast"
-      echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config "
-      echo "*** from the freedesktop.org software repository at"
-      echo "***"
-      echo "***    http://www.freedesktop.org/software/pkgconfig"
-      echo "***"
-      exit 1
-    fi
-  fi
+    ])
 ])
 
 
@@ -9892,30 +10935,6 @@
 
 
 
-dnl BM_DEPEND(varname, package, version)
-dnl
-dnl Simple wrapper for XDT_CHECK_PACKAGE("varname", "package", "version"). Kept
-dnl for backward compatibility. Will be removed in the future.
-dnl
-AC_DEFUN([BM_DEPEND],
-[
-  XDT_CHECK_PACKAGE([$1], [$2], [$3])
-])
-
-
-
-dnl BM_DEPEND_CHECK(var, pkg, version, name, helpstring, default)
-dnl
-dnl Simple wrapper for XDT_CHECK_OPTIONAL_PACKAGE(). Kept for backward
-dnl compatibility. Will be removed in the future.
-dnl
-AC_DEFUN([BM_DEPEND_CHECK],
-[
-  XDT_CHECK_OPTIONAL_PACKAGE([$1], [$2], [$3], [$4], [$5], [$6])
-])
-
-
-
 dnl XDT_CHECK_LIBX11()
 dnl
 dnl Executes various checks for X11. Sets LIBX11_CFLAGS, LIBX11_LDFLAGS
@@ -10052,86 +11071,26 @@
 ])
 
 
-
-dnl BM_LIBX11()
-dnl
-dnl Simple wrapper for XDT_CHECK_LIBX11. Kept for backward
-dnl compatibility. Will be removed in the future.
-dnl
-AC_DEFUN([BM_LIBX11],
-[
-  AC_REQUIRE([XDT_CHECK_LIBX11])
-])
-
-
-
-dnl BM_LIBX11_REQUIRE()
-dnl
-dnl Simple wrapper for XDT_CHECK_LIBX11_REQUIRE. Kept for backward
-dnl compatibility. Will be removed in the future.
-dnl
-AC_DEFUN([BM_LIBX11_REQUIRE],
-[
-  AC_REQUIRE([XDT_CHECK_LIBX11_REQUIRE])
-])
-
-
-
-dnl BM_LIBSM()
-dnl
-dnl Simple wrapper for XDT_CHECK_LIBSM. Kept for backward
-dnl compatibility. Will be removed in the future.
-dnl
-AC_DEFUN([BM_LIBSM],
-[
-  AC_REQUIRE([XDT_CHECK_LIBSM])
-])
-
-
-
-dnl BM_LIBXPM
-dnl
-dnl Simple wrapper for XDT_CHECK_LIBXPM. Kept for backward
-dnl compatibility. Will be removed in the future.
-dnl
-AC_DEFUN([BM_LIBXPM],
-[
-  AC_REQUIRE([XDT_CHECK_LIBXPM])
-])
-
-
-
-dnl BM_LIBXPM_REQUIRE
-dnl
-dnl Simple wrapper for XDT_CHECK_LIBXPM_REQUIRE. Kept for
-dnl backward compatibility. Will be removed in the future.
-dnl
-AC_DEFUN([BM_LIBXPM_REQUIRE],
-[
-  AC_REQUIRE([XDT_CHECK_LIBXPM_REQUIRE])
-])
-
-
-dnl $Id: xdt-features.m4 22990 2006-09-02 11:33:28Z benny $
+dnl $Id$
 dnl
 dnl Copyright (c) 2002-2006
 dnl         The Xfce development team. All rights reserved.
 dnl
 dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>.
 dnl
-dnl This program is free software; you can redistribute it and/or modify it
-dnl under the terms of the GNU General Public License as published by the Free
-dnl Software Foundation; either version 2 of the License, or (at your option)
-dnl any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful, but WITHOUT
-dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-dnl FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-dnl more details.
-dnl
-dnl You should have received a copy of the GNU General Public License along with
-dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-dnl Place, Suite 330, Boston, MA  02111-1307  USA
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License along
+dnl with this program; if not, write to the Free Software Foundation, Inc.,
+dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 dnl
 dnl xdt-depends
 dnl -----------
@@ -10145,145 +11104,215 @@
 AC_PREREQ([2.53])
 
 
+dnl XDT_SUPPORTED_FLAGS(VAR, FLAGS)
+dnl
+dnl For each token in FLAGS, checks to be sure the compiler supports
+dnl the flag, and if so, adds each one to VAR.
+dnl
+AC_DEFUN([XDT_SUPPORTED_FLAGS],
+[
+  for flag in $2; do
+    AC_MSG_CHECKING([if $CC supports $flag])
+    saved_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $flag"
+    AC_COMPILE_IFELSE([ ], [flag_supported=yes], [flag_supported=no])
+    CFLAGS="$saved_CFLAGS"
+    AC_MSG_RESULT([$flag_supported])
+
+    if test "x$flag_supported" = "xyes"; then
+      $1="$$1 $flag"
+    fi
+  done
+])
+
+
 
-dnl XDT_FEATURE_DEBUG()
+dnl XDT_FEATURE_DEBUG(default_level=minimum)
 dnl
 AC_DEFUN([XDT_FEATURE_DEBUG],
 [
+  dnl weird indentation to keep output indentation correct
   AC_ARG_ENABLE([debug],
-AC_HELP_STRING([--enable-debug[=yes|no|full]], [Build with debugging support])
-AC_HELP_STRING([--disable-debug], [Include no debugging support [default]]),
-  [], [enable_debug=no])
+                AC_HELP_STRING([--enable-debug@<:@=no|minimum|yes|full@:>@],
+                               [Build with debugging support @<:@default=m4_default([$1], [minimum])@:>@])
+AC_HELP_STRING([--disable-debug], [Include no debugging support]),
+                [enable_debug=$enableval], [enable_debug=m4_default([$1], [minimum])])
 
   AC_MSG_CHECKING([whether to build with debugging support])
-  if test x"$enable_debug" != x"no"; then
+  if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then
     AC_DEFINE([DEBUG], [1], [Define for debugging support])
 
-    if test x"$GCC" = x"yes"; then
-      xdt_cv_additional_CFLAGS="-Wall"
+    xdt_cv_additional_CFLAGS="-DXFCE_DISABLE_DEPRECATED \
+                              -Wall -Wextra \
+                              -Wno-missing-field-initializers \
+                              -Wno-unused-parameter -Wold-style-definition \
+                              -Wdeclaration-after-statement \
+                              -Wmissing-declarations \
+                              -Wmissing-noreturn -Wshadow -Wpointer-arith \
+                              -Wcast-align -Wformat-security \
+                              -Winit-self -Wmissing-include-dirs -Wundef \
+                              -Wmissing-format-attribute -Wnested-externs"
+    CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+
+    if test x`uname` = x"Linux"; then
+      xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector"
+    fi
+
+    dnl # signal.h inline is crapy on openbsd
+    if test x`uname` != x"OpenBSD"; then
+      xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wredundant-decls"
     fi
-    xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -DXFCE_DISABLE_DEPRECATED"
-    
+
     if test x"$enable_debug" = x"full"; then
       AC_DEFINE([DEBUG_TRACE], [1], [Define for tracing support])
-      if test x"$GCC" = x"yes"; then
-        xdt_cv_additional_CFLAGS="-g3 -Werror $xdt_cv_additional_CFLAGS"
-      fi
+      xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g -Werror"
+      CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG"
       AC_MSG_RESULT([full])
     else
-      if test x"$GCC" = x"yes"; then
-        xdt_cv_additional_CFLAGS="-g $xdt_cv_additional_CFLAGS"
-      fi
+      xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -g"
       AC_MSG_RESULT([yes])
     fi
 
-    CFLAGS="$CFLAGS $xdt_cv_additional_CFLAGS"
-    CXXFLAGS="$CXXFLAGS $xdt_cv_additional_CFLAGS"
+    XDT_SUPPORTED_FLAGS([supported_CFLAGS], [$xdt_cv_additional_CFLAGS])
+
+    ifelse([$CXX], , , [
+      dnl FIXME: should test on c++ compiler, but the following line causes
+      dnl        autoconf errors for projects that don't check for a
+      dnl        c++ compiler at all.
+      dnl AC_LANG_PUSH([C++])
+      dnl XDT_SUPPORTED_FLAGS([supported_CXXFLAGS], [$xdt_cv_additional_CFLAGS])
+      dnl AC_LANG_POP()
+      dnl        instead, just use supported_CFLAGS...
+      supported_CXXFLAGS="$supported_CFLAGS"
+    ])
+
+    CFLAGS="$CFLAGS $supported_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $supported_CXXFLAGS"
   else
-    AC_MSG_RESULT([no])
+    CPPFLAGS="$CPPFLAGS -DNDEBUG"
+
+    if test x"$enable_debug" = x"no"; then
+      CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT"
+      AC_MSG_RESULT([no])
+    else
+      AC_MSG_RESULT([minimum])
+    fi
   fi
 ])
 
 
-
-dnl BM_DEBUG_SUPPORT()
+dnl XDT_FEATURE_VISIBILITY()
 dnl
-AC_DEFUN([BM_DEBUG_SUPPORT],
+dnl Checks to see if the compiler supports the 'visibility' attribute
+dnl If so, adds -DHAVE_GNUC_VISIBILTY to CPPFLAGS.  Also sets the
+dnl automake conditional HAVE_GNUC_VISIBILITY.
+dnl
+AC_DEFUN([XDT_FEATURE_VISIBILITY],
 [
-dnl # --enable-debug
-  AC_REQUIRE([XDT_FEATURE_DEBUG])
+  AC_ARG_ENABLE([visibility],
+                AC_HELP_STRING([--disable-visibility],
+                               [Don't use ELF visibility attributes]),
+                [enable_visibility=$enableval], [enable_visibility=yes])
+  have_gnuc_visibility=no
+  if test "x$enable_visibility" != "xno"; then
+    XDT_SUPPORTED_FLAGS([xdt_vis_test_cflags], [-Wall -Werror -Wno-unused-parameter])
+    saved_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $xdt_vis_test_cflags"
+    AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute])
+    AC_COMPILE_IFELSE(AC_LANG_SOURCE(
+    [
+      void test_default (void);
+      void test_hidden (void);
 
-dnl # --enable-profiling
-  AC_ARG_ENABLE([profiling],
-AC_HELP_STRING([--enable-profiling],
-    [Generate extra code to write profile information])
-AC_HELP_STRING([--disable-profiling],
-    [No extra code for profiling (default)]),
-    [], [enable_profiling=no])
-
-  AC_MSG_CHECKING([whether to build with profiling support])
-  if test x"$enable_profiling" != x"no"; then
-    CFLAGS="$CFLAGS -pg"
-    LDFLAGS="$LDFLAGS -pg"
-    AC_MSG_RESULT([yes])
-  else
-    AC_MSG_RESULT([no])
-  fi
+      void __attribute__ ((visibility("default"))) test_default (void) {}
+      void __attribute__ ((visibility("hidden"))) test_hidden (void) {}
 
-dnl # --enable-gcov
-  AC_ARG_ENABLE([gcov],
-AC_HELP_STRING([--enable-gcov],
-    [compile with coverage profiling instrumentation (gcc only)])
-AC_HELP_STRING([--disable-gcov],
-    [do not generate coverage profiling instrumentation (default)]),
-    [], [enable_gcov=no])
-
-  AC_MSG_CHECKING([whether to compile with coverage profiling instrumentation])
-  if test x"$enable_gcov" != x"no"; then
-    CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
-    AC_MSG_RESULT([yes])
-  else
-    AC_MSG_RESULT([no])
+      int main (int argc, char **argv) {
+        test_default ();
+        test_hidden ();
+        return 0;
+      }
+    ]),
+    [
+      have_gnuc_visibility=yes
+      AC_MSG_RESULT([yes])
+    ],
+    [
+      AC_MSG_RESULT([no])
+    ])
+    CFLAGS="$saved_CFLAGS"
   fi
 
-dnl # --disable-asserts
-  AC_ARG_ENABLE([asserts],
-AC_HELP_STRING([--disable-asserts], [Disable assertions [DANGEROUS]]),
-    [], [enable_asserts=yes])
-
-  AC_MSG_CHECKING([whether to disable assertions])
-  if test x"$enable_asserts" = x"no"; then
-    AC_MSG_RESULT([yes])
-    CPPFLAGS="$CPPFLAGS -DG_DISABLE_CHECKS -DG_DISABLE_ASSERT"
-    CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS"
-  else
-    AC_MSG_RESULT([no])
+  if test "x$have_gnuc_visibility" = "xyes"; then
+    CPPFLAGS="$CPPFLAGS -DHAVE_GNUC_VISIBILITY"
+    xdt_vis_hidden_cflags=""
+    XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-xldscope=hidden])
+    if test "x$xdt_vis_hidden_cflags" = "x"; then
+      XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-fvisibility=hidden])
+    fi
+    CFLAGS="$CFLAGS $xdt_vis_hidden_cflags"
   fi
 
-dnl # --enable-final
-  AC_REQUIRE([AC_PROG_LD])
-  AC_ARG_ENABLE([final],
-AC_HELP_STRING([--enable-final], [Build final version]),
-    [], [enable_final=yes])
-
-  AC_MSG_CHECKING([whether to build final version])
-  if test x"$enable_final" = x"yes"; then
-    AC_MSG_RESULT([yes])
+  AM_CONDITIONAL([HAVE_GNUC_VISIBILITY], [test "x$have_gnuc_visibility" = "xyes"])
+])
+
+dnl XDT_FEATURE_LINKER_OPTS
+dnl
+dnl Checks for and enables any special linker optimizations.
+dnl
+AC_DEFUN([XDT_FEATURE_LINKER_OPTS],
+[
+  AC_ARG_ENABLE([linker-opts],
+                AC_HELP_STRING([--disable-linker-opts],
+                               [Disable linker optimizations]),
+                [enable_linker_opts=$enableval], [enable_linker_opts=yes])
+
+  if test "x$enable_linker_opts" != "xno"; then
+    if test x`uname` != x"OpenBSD"; then
+      AC_MSG_CHECKING([whether $LD accepts --as-needed])
+      case `$LD --as-needed -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+        LDFLAGS="$LDFLAGS -Wl,--as-needed"
+        AC_MSG_RESULT([yes])
+        ;;
+      *)
+        AC_MSG_RESULT([no])
+        ;;
+      esac
+    fi
     AC_MSG_CHECKING([whether $LD accepts -O1])
     case `$LD -O1 -v 2>&1 </dev/null` in
     *GNU* | *'with BFD'*)
       LDFLAGS="$LDFLAGS -Wl,-O1"
       AC_MSG_RESULT([yes])
-    	;;
+      ;;
     *)
       AC_MSG_RESULT([no])
-    	;;
+      ;;
     esac
-  else
-    AC_MSG_RESULT([no])
   fi
 ])
 
-dnl $Id: xdt-i18n.m4 24486 2007-01-15 17:47:49Z benny $
+dnl $Id$
 dnl
 dnl Copyright (c) 2002-2006
 dnl         The Xfce development team. All rights reserved.
 dnl
 dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>.
 dnl
-dnl This program is free software; you can redistribute it and/or modify it
-dnl under the terms of the GNU General Public License as published by the Free
-dnl Software Foundation; either version 2 of the License, or (at your option)
-dnl any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful, but WITHOUT
-dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-dnl FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-dnl more details.
-dnl
-dnl You should have received a copy of the GNU General Public License along with
-dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-dnl Place, Suite 330, Boston, MA  02111-1307  USA
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License along
+dnl with this program; if not, write to the Free Software Foundation, Inc.,
+dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 dnl
 dnl xdt-i18n
 dnl --------
@@ -10342,16 +11371,3 @@
 ])
 
 
-
-dnl BM_I18N(PACKAGE, LINGUAS)
-dnl
-dnl Simple wrapper for XDT_I18N(LINGUAS, PACKAGE). Kept for
-dnl backward compatibility. Will be removed in the
-dnl future.
-dnl
-AC_DEFUN([BM_I18N],
-[
-  XDT_I18N([$2], [$1])
-])
-
-
diff -Nru orage-4.8.3/ChangeLog orage-4.12.1/ChangeLog
--- orage-4.8.3/ChangeLog	2012-01-04 12:51:18.000000000 +0000
+++ orage-4.12.1/ChangeLog	2015-04-10 10:26:26.000000000 +0000
@@ -1,3 +1,5042 @@
+commit df687eb2738bea3cbbd9765f3fc1fc563408a869
+Author: Juha Kautto <juha@xfce.org>
+Date:   Wed Apr 8 12:13:49 2015 +0300
+
+    4.11.2.22 fix bug 8719 build the panel plugin as module
+    
+    Big change from Landry Breuil to make Orage panel plugin configuration
+    and locations similar to other plugins.
+
+commit 52ad59b2a3cba280af1df96277c98879bdab92c2
+Author: Juha Kautto <juha@xfce.org>
+Date:   Wed Apr 1 15:27:33 2015 +0300
+
+    4.11.2.21 fixed distcheck failure
+    
+    removed mkinstalldirs as it causes distchekc to fail
+
+commit 02413d34ef0b1850337a7e193418fadcfba63c50
+Author: Anonymous <noreply@xfce.org>
+Date:   Fri Mar 27 18:30:56 2015 +0100
+
+    I18n: Update translation lt (80%).
+    
+    827 translated messages, 203 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit bfc0f82d1a87edaf689f193b175d2f46b9243b75
+Author: Anonymous <noreply@xfce.org>
+Date:   Fri Mar 27 12:31:00 2015 +0100
+
+    I18n: Update translation lt (79%).
+    
+    821 translated messages, 209 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 5379f42ce9ec4b27a18219fd7bff7c33a72c3d3f
+Author: Anonymous <noreply@xfce.org>
+Date:   Sat Mar 21 00:31:01 2015 +0100
+
+    I18n: Update translation lt (78%).
+    
+    811 translated messages, 219 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 15d5c7386dad58d72093d5d1d0a69a5c42e67018
+Author: Anonymous <noreply@xfce.org>
+Date:   Tue Mar 17 00:30:52 2015 +0100
+
+    I18n: Update translation lt (78%).
+    
+    805 translated messages, 225 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit ba8facf3c0db159ec0665fb98f1bf47d05484015
+Author: Manolo Díaz <diaz.manolo@gmail.com>
+Date:   Mon Mar 16 06:30:49 2015 +0100
+
+    I18n: Update translation es (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit a2086c4b006f8079ec01944e047bb94ee0f5cb73
+Author: Anonymous <noreply@xfce.org>
+Date:   Sat Mar 14 18:31:15 2015 +0100
+
+    I18n: Update translation lt (77%).
+    
+    798 translated messages, 232 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit ea3e50716a05a908a6068e7e90ef633bb39311e0
+Author: Efstathios Iosifidis <iefstathios@gmail.com>
+Date:   Sat Mar 14 18:31:15 2015 +0100
+
+    I18n: Update translation el (68%).
+    
+    708 translated messages, 322 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 757ad1948ccc367ce2ed734aaccb187d7fa681ea
+Author: Juha Kautto <juha@xfce.org>
+Date:   Thu Mar 12 13:48:44 2015 +0200
+
+    4.11.2.20 Fixed syntax error in fopen
+    
+    Moved closing ) to correct place
+
+commit d668b1f8f63195fd70929ff9ccd23fb6aeb3f30a
+Author: Anonymous <noreply@xfce.org>
+Date:   Thu Mar 12 12:31:31 2015 +0100
+
+    I18n: Update translation lt (77%).
+    
+    794 translated messages, 236 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 4b26a15be27392ae2974d92c1a707cff2a9867b7
+Author: Manolo Díaz <diaz.manolo@gmail.com>
+Date:   Wed Mar 11 12:31:00 2015 +0100
+
+    I18n: Update translation es (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit da0ea1ae432e15b75c4599a91e89a5a3e9b86041
+Author: Juha Kautto <juha@xfce.org>
+Date:   Wed Mar 11 13:13:34 2015 +0200
+
+    4.11.2.19 Coverity fix 31707 and 31700 copy into fixed size without count
+    
+    Added null check and changed strcpy tp strncpy
+
+commit ecf08f0348fd4490615be680fdc68a4bc1ecd88c
+Author: Juha Kautto <juha@xfce.org>
+Date:   Wed Mar 11 13:00:53 2015 +0200
+
+    4.11.2.17 Coverity fix 31722 copy into fixed size without count
+    
+    changed from strcpy to strncpy and added limit
+
+commit 4315450f35ca04109ca2f25887f6027c269073b7
+Author: Juha Kautto <juha@xfce.org>
+Date:   Wed Mar 11 12:55:28 2015 +0200
+
+    4.11.2.17 Coverity fix 31715 copy into fixed size without count
+    
+    added limiting count to strcpy to prevent potential overflow.
+
+commit f8218b1aa78c1e031e22a4b3f5d4344db24f61e5
+Author: Juha Kautto <juha@xfce.org>
+Date:   Wed Mar 11 12:46:25 2015 +0200
+
+    4.11.2.16 Coverity fix 41265 null check too late
+    
+    Added null check earlier before using the variable
+
+commit a3a749357c6b43ed4999a1729a22462a80e887e5
+Author: Juha Kautto <juha@xfce.org>
+Date:   Tue Mar 10 11:36:37 2015 +0200
+
+    4.11.2.15 Coverity fix 31696-31699 ignoring number of bytes read
+    
+    Added more checks to make sure there are no overflows.
+
+commit 93e3aa8adee64fbad8904967efd03789d481486d
+Author: Juha Kautto <juha@xfce.org>
+Date:   Fri Mar 6 15:46:21 2015 +0200
+
+    4.11.2.14 Coverity fix 31701, 31702 and 31703 ignoring number of bytes read
+    
+    Added better check for fread return count
+
+commit 53905ed03e354fbbc554ea9602fde19cbd89c9be
+Author: Juha Kautto <juha@xfce.org>
+Date:   Fri Mar 6 15:37:45 2015 +0200
+
+    4.11.2.13 Coverity fix 31704 31705 removed logically dead code
+    
+    removed code part which can not be reached.
+    processed also error code from xfical_file_open call
+
+commit 098764e42d842a176c358e771005d38a714f0cbb
+Author: Juha Kautto <juha@xfce.org>
+Date:   Fri Mar 6 15:18:38 2015 +0200
+
+    4.11.2.12 Coverity fix 31700 and 31707 fopen and fread issues
+    
+    Added more detailed error checking.
+
+commit 6af8c1f3256544c5aaa3333c493be9df12bfdafd
+Merge: e0e78ab 72e81ff
+Author: Juha Kautto <juha@xfce.org>
+Date:   Thu Mar 5 13:48:22 2015 +0200
+
+    Merge branch 'master' of ssh://git.xfce.org/apps/orage
+    
+    merge translation for pl
+
+commit e0e78ab3049ad0a14dcf7dad1e748e2c9c9f1fe8
+Author: Juha Kautto <juha@xfce.org>
+Date:   Thu Mar 5 13:46:30 2015 +0200
+
+    4.11.2.11 Coverity fix 31708 possible free of null pointer
+    
+    Free pointer only if it has value
+
+commit 72e81ff23d62db5f6584d117f072810f546d8aa5
+Author: Piotr Strębski <strebski@o2.pl>
+Date:   Thu Mar 5 12:31:21 2015 +0100
+
+    I18n: Update translation pl (97%).
+    
+    1000 translated messages, 30 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 5a61231c1b3db82942e0f67ed556560204776cdd
+Author: Juha Kautto <juha@xfce.org>
+Date:   Thu Mar 5 12:46:35 2015 +0200
+
+    4.11.2.10 Coverity fix 31711 leak of resource not closed file
+    
+    Closed file before leaving function
+
+commit e0b27a6b692664e863d5275b8ad59ee26be1bf7a
+Author: Juha Kautto <juha@xfce.org>
+Date:   Thu Mar 5 12:38:50 2015 +0200
+
+    4.11.2.8 Coverity fix 31715-31717 leak of memory
+    
+    Freed the empty string before using it.
+
+commit 57caa36425a744b5f08deb580325dbf389bf4bf3
+Author: Juha Kautto <juha@xfce.org>
+Date:   Thu Mar 5 11:59:11 2015 +0200
+
+    4.11.2.8 Coverity fix 31715-31717 strcpy without length check
+    
+    Added check for length to prevent overrun
+
+commit a19482ee7344bc2f83851c6136d6781c657e21c8
+Author: Juha Kautto <juha@xfce.org>
+Date:   Thu Mar 5 11:10:38 2015 +0200
+
+    4.11.2.7 Coverity fix 31719 strcpy without length check
+    
+    Added check for length to prevent overrun
+
+commit 14f80d55f73ba61cc5319632939464e9f67584b8
+Author: Juha Kautto <juha@xfce.org>
+Date:   Thu Mar 5 11:07:33 2015 +0200
+
+    4.11.2.r64 Coverity fix 31720 strcpy without length check
+    
+    Added check for length to prevent overrun
+
+commit 47da1f9cd73df38fada5bd7c3b550f363616cdd2
+Author: Juha Kautto <juha@xfce.org>
+Date:   Thu Mar 5 11:04:44 2015 +0200
+
+    4.11.2.5 Coverity fix 31721 strcpy without length check
+    
+    Added check for length to prevent overrun
+
+commit d71aebfce7d2ec4b86017606631808f73bb2cfd6
+Author: Juha Kautto <juha@xfce.org>
+Date:   Thu Mar 5 10:57:32 2015 +0200
+
+    4.11.2.4 Coverity fix 31722 strcpy without length check
+    
+    Added check for length to prevent overrun
+
+commit e454f30bca01cef209074574f3004e1c5076b378
+Author: Yannick Le Guen <leguen.yannick@gmail.com>
+Date:   Fri Feb 27 12:31:02 2015 +0100
+
+    I18n: Update translation fr (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 663aa679406b6968c5f780495cc170f9185a63c7
+Author: Georg Eckert <eckert.georg@gmx.de>
+Date:   Fri Feb 27 00:30:50 2015 +0100
+
+    I18n: Update translation de (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 00fa15dbc6c21ca4f262ea332e85e2d70f17f31c
+Author: Slavko <linux@slavino.sk>
+Date:   Thu Feb 26 18:31:48 2015 +0100
+
+    I18n: Update translation sk (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 96b85ccc8e39f01de6cadc2901d29b24404ae533
+Author: Yannick Le Guen <leguen.yannick@gmail.com>
+Date:   Thu Feb 26 18:31:48 2015 +0100
+
+    I18n: Update translation fr (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 9d1fc1165f220bdd00b5f0f4b50ae413757bcea2
+Author: Pasi Lallinaho <pasi@shimmerproject.org>
+Date:   Thu Feb 26 06:31:01 2015 +0100
+
+    I18n: Update translation fi (99%).
+    
+    1028 translated messages, 2 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit cfd4283ece3ae86d6aa760ca3595a25a58155319
+Author: Pasi Lallinaho <pasi@shimmerproject.org>
+Date:   Thu Feb 26 00:31:24 2015 +0100
+
+    I18n: Update translation fi (99%).
+    
+    1027 translated messages, 3 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 2a4709327dcf9957e7e3900119e4b81be7cdae6e
+Author: Саша Петровић <salepetronije@gmail.com>
+Date:   Tue Feb 24 18:30:57 2015 +0100
+
+    I18n: Update translation sr (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit e5e6986335b0698df14a2c332afb89716e342010
+Author: Juha Kautto <juha@xfce.org>
+Date:   Tue Feb 24 14:45:58 2015 +0200
+
+    4.11.2.3 Coverity fix 31725 uninitialized variable used
+    
+    Variable initialization added just in case.
+
+commit dac070ff2ce3ba66fc7bb7755fe0d6aa34646c2d
+Author: Juha Kautto <juha@xfce.org>
+Date:   Tue Feb 24 14:28:22 2015 +0200
+
+    4.11.2.1 Coverity fix 31726
+    
+    Removing debug variables, which are not needed.
+
+commit 3aaf95211fc54465d6530201ee2e5da986ddee2e
+Author: Juha Kautto <juha@xfce.org>
+Date:   Tue Feb 24 14:05:11 2015 +0200
+
+    4.11.2.1 Coverity fix 31727
+    
+    Unused value was left over from previous updates.
+
+commit d793d4252ca5a5be4303013c71d731a3e35924fe
+Author: Anonymous <noreply@xfce.org>
+Date:   Mon Feb 23 18:31:09 2015 +0100
+
+    I18n: Update translation bg (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 648f8588ffe2ec01acf34208d5e2fa88667dbe0c
+Author: Manolo Díaz <diaz.manolo@gmail.com>
+Date:   Mon Feb 23 00:31:28 2015 +0100
+
+    I18n: Update translation es (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d5adf26733d93126cba8f3d1857d556622b1b071
+Author: Georg Eckert <eckert.georg@gmx.de>
+Date:   Sun Feb 22 18:31:15 2015 +0100
+
+    I18n: Update translation de (89%).
+    
+    923 translated messages, 107 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 370581dae8f53aa69ac4411741665994dfe2fc40
+Author: Georg Eckert <eckert.georg@gmx.de>
+Date:   Sun Feb 22 00:31:22 2015 +0100
+
+    I18n: Update translation de (89%).
+    
+    923 translated messages, 107 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 159f394b57c782f41def2f588a9943106a34af3c
+Author: Allan Nordhøy <comradekingu@gmail.com>
+Date:   Sat Feb 21 18:31:32 2015 +0100
+
+    I18n: Update translation nb (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit ed15c61a5e42c5486208e3ec91897355358d056d
+Author: Саша Петровић <salepetronije@gmail.com>
+Date:   Sat Feb 14 18:31:08 2015 +0100
+
+    I18n: Update translation sr (96%).
+    
+    995 translated messages, 35 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit cf469a0f41f6ad676a419b72e9ace8a53df6b925
+Author: Dawid <hoek@hoek.pl>
+Date:   Sat Feb 14 18:31:07 2015 +0100
+
+    I18n: Update translation pl (96%).
+    
+    999 translated messages, 31 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 11f0337f6783f764ee93b1eda82558d7e8e98bd1
+Author: Adam Stachowicz <saibamenppl@gmail.com>
+Date:   Thu Jan 15 18:30:56 2015 +0100
+
+    I18n: Update translation pl (91%).
+    
+    939 translated messages, 91 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 129c45605fc91d65d5704c229613606e10266741
+Author: Pablo Roberto Francisco Lezaeta Reyes <prflr88@gmail.com>
+Date:   Tue Jan 6 00:31:02 2015 +0100
+
+    I18n: Update translation es (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 48cb8c759a31d052b3b3a9aa9f5f4c6119ab9a82
+Author: Yannick Le Guen <leguen.yannick@gmail.com>
+Date:   Sun Dec 28 00:30:53 2014 +0100
+
+    I18n: Update translation fr (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 5630af0eecd43a8383b8378351fd1e28763d1e94
+Author: Pablo Roberto Francisco Lezaeta Reyes <prflr88@gmail.com>
+Date:   Sat Dec 27 00:31:37 2014 +0100
+
+    I18n: Update translation es (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit b412c6bea948b8f612ab7ce395af24af99d0959d
+Author: Nuno Miguel <nunomgue@gmail.com>
+Date:   Sat Dec 20 18:31:03 2014 +0100
+
+    I18n: Update translation pt (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 54382cbb00c6e3cf03c86790e1954f795db22385
+Author: عبدالله رضوان <abbodmar@gmail.com>
+Date:   Mon Dec 8 18:31:04 2014 +0100
+
+    I18n: Update translation ar (80%).
+    
+    826 translated messages, 204 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 1fa1e9edb21a137dd782f6d1990d85e6d2d84f7f
+Author: Ḷḷumex03 <tornes@opmbx.org>
+Date:   Sun Dec 7 06:31:14 2014 +0100
+
+    I18n: Update translation ast (93%).
+    
+    965 translated messages, 65 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 49b963a21107f7930d9a794cf8694a23394d25e4
+Author: Sergey Alyoshin <alyoshin.s@gmail.com>
+Date:   Thu Dec 4 00:31:10 2014 +0100
+
+    I18n: Update translation ru (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 6eb6f43c056505a815441160f8ce12767cde4518
+Author: Necdet Yücel <necdetyucel@gmail.com>
+Date:   Wed Dec 3 00:30:49 2014 +0100
+
+    I18n: Update translation tr (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 980194cfb07408aff7ae9b32ca223d29738f9b2c
+Author: Slavko <linux@slavino.sk>
+Date:   Fri Nov 28 18:30:56 2014 +0100
+
+    I18n: Update translation sk (80%).
+    
+    825 translated messages, 205 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 07578d571bdb40f5a47bf8906fa55db71f3b3cba
+Author: Ḷḷumex03 <tornes@opmbx.org>
+Date:   Tue Nov 25 00:30:59 2014 +0100
+
+    I18n: Update translation ast (93%).
+    
+    964 translated messages, 66 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 800b72dcefba23d8af21eaf9d98b5ce3f77d0bc1
+Author: 玉堂白鹤 <yjwork@qq.com>
+Date:   Tue Nov 18 06:30:49 2014 +0100
+
+    I18n: Update translation zh_CN (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 1267d4708d53bf1ee6655ff54cdb6ea8d071e259
+Author: Anonymous <noreply@xfce.org>
+Date:   Fri Nov 14 18:30:52 2014 +0100
+
+    I18n: Update translation de (80%).
+    
+    824 translated messages, 206 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit db71eb773272c4a4e1a50ec7ab79f4956b0394a6
+Author: Piotr Strębski <strebski@o2.pl>
+Date:   Mon Nov 3 18:30:56 2014 +0100
+
+    I18n: Update translation pl (86%).
+    
+    891 translated messages, 139 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 96530e223748eab23dc6fff33e8f4439c3601fa0
+Author: Michal Várady <miko.vaji@gmail.com>
+Date:   Wed Oct 29 00:30:55 2014 +0100
+
+    I18n: Update translation cs (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 2cd00715ff23a76ff2a33aa92ea0f863d4a69865
+Author: Johannes Lips <johannes.lips@gmail.com>
+Date:   Sat Oct 25 12:30:50 2014 +0200
+
+    I18n: Update translation de (79%).
+    
+    821 translated messages, 209 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit af37c899420e59cb1f186d7b19be3ae5d0d8e350
+Author: Masato HASHIMOTO <cabezon.hashimoto@gmail.com>
+Date:   Fri Oct 24 18:30:49 2014 +0200
+
+    I18n: Update translation ja (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 13c08c14cc394d50a32ac3b1f9570e98912cc4d8
+Author: Ivica  Kolić <ikoli@yahoo.com>
+Date:   Sun Oct 19 12:31:16 2014 +0200
+
+    I18n: Update translation hr (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit fbd4919c4e68110cdb9f9b1b489f0319eef1d803
+Author: jc1 <jc1.quebecos@gmail.com>
+Date:   Sat Oct 18 18:31:08 2014 +0200
+
+    I18n: Update translation fr (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 14c00ac8733ee3a5eafc4326a32d8baf8659c2f7
+Author: Ivica  Kolić <ikoli@yahoo.com>
+Date:   Thu Oct 16 12:31:21 2014 +0200
+
+    I18n: Update translation hr (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 43bb5851a9d5ee0d0c69119509e7eaffa3352c5e
+Author: AlexanderFilev <ifillrok@gmail.com>
+Date:   Tue Oct 14 18:30:56 2014 +0200
+
+    I18n: Update translation ru (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit dbc806a20b6b65de927bd042729406bd695f34a8
+Author: Ivica  Kolić <ikoli@yahoo.com>
+Date:   Sun Oct 12 06:31:00 2014 +0200
+
+    I18n: Update translation hr (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 68fc4533be45a6683036571ff974e177b17380bd
+Author: Cristian Marchi <cri.penta@gmail.com>
+Date:   Thu Oct 9 00:30:49 2014 +0200
+
+    I18n: Update translation it (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 0875db825d8ed77d7335fdec764c8a6dab59a902
+Author: Anonymous <noreply@xfce.org>
+Date:   Tue Oct 7 18:30:52 2014 +0200
+
+    I18n: Update translation de (77%).
+    
+    803 translated messages, 227 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 90b947b50f20db8569a21bb1f77eaaeb4e18d008
+Author: 玉堂白鹤 <yjwork@qq.com>
+Date:   Tue Oct 7 12:30:50 2014 +0200
+
+    I18n: Update translation zh_CN (93%).
+    
+    959 translated messages, 71 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit fe6e42a6e75ee05bcac79233fca47d6d6ac200cc
+Author: Sungjin Kang <potopro@gmail.com>
+Date:   Sun Oct 5 00:30:49 2014 +0200
+
+    I18n: Update translation ko (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit c8ca5875512e546467a14967935cf16de21cc4bc
+Author: Michal Várady <miko.vaji@gmail.com>
+Date:   Sat Oct 4 00:30:52 2014 +0200
+
+    I18n: Update translation cs (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 75f3c56486869afeff1f8d5c9836389fa50c7f08
+Author: Michael Findlay <keltoiboy@gmail.com>
+Date:   Thu Oct 2 12:30:54 2014 +0200
+
+    I18n: Update translation en_AU (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit f68fac87875c32fc9594f45beb7def4361595ef7
+Author: Yarema aka Knedlyk <yupadmin@gmail.com>
+Date:   Thu Oct 2 00:30:50 2014 +0200
+
+    I18n: Update translation uk (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 540e632b589728f7942b85031e471087b4e04a4d
+Author: Juha Kautto <juha@xfce.org>
+Date:   Wed Oct 1 17:51:18 2014 +0300
+
+    4.11.2.0 Possible to set delayed file close time
+    
+    Added parameter to control delayed file close timing: File close delay.
+    Default is 10 minutes like before, but it can now be tuned. It does not exist
+    in parameter screen so needs to be done manually.
+    
+    Also fixed month screen scroll timer handling.
+
+commit 1afed89aa25b89e269e7f0da7a23faeaad3eb082
+Author: Pjotr <pjotrvertaalt@gmail.com>
+Date:   Mon Sep 29 00:30:49 2014 +0200
+
+    I18n: Update translation nl (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit b375ed808d986ca990d7188999e6ccdba5f88540
+Author: André Miranda <andreldm1989@gmail.com>
+Date:   Fri Sep 26 06:30:50 2014 +0200
+
+    I18n: Update translation pt_BR (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 3e3722292eaec8decce2c56e954d40ce9758f8b3
+Author: Yannick Le Guen <leguen.yannick@gmail.com>
+Date:   Thu Sep 25 00:30:49 2014 +0200
+
+    I18n: Update translation fr (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 0a656b0a12d7fde1b681415057f2f12ec6c59548
+Author: abuyop <abuyop@gmail.com>
+Date:   Wed Sep 24 18:31:35 2014 +0200
+
+    I18n: Update translation ms (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 265a829000642187347796a5e1627be7168eb69a
+Author: Sungjin Kang <potopro@gmail.com>
+Date:   Wed Sep 24 18:31:35 2014 +0200
+
+    I18n: Update translation ko (99%).
+    
+    1029 translated messages, 1 untranslated message.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 88db8803fd1fb0ca902d691f599ab436cffca787
+Author: Cristian Marchi <cri.penta@gmail.com>
+Date:   Wed Sep 24 18:31:35 2014 +0200
+
+    I18n: Update translation it (99%).
+    
+    1025 translated messages, 5 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 44c57e09a52cb863bf9637d31153833a03d3b699
+Author: Jeff Huang <s8321414@gmail.com>
+Date:   Wed Sep 24 12:31:27 2014 +0200
+
+    I18n: Update translation zh_TW (100%).
+    
+    1030 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 5378658f62080923f7503fba418aee59db597dea
+Author: Yannick Le Guen <leguen.yannick@gmail.com>
+Date:   Tue Sep 23 12:30:50 2014 +0200
+
+    I18n: Update translation fr (99%).
+    
+    1025 translated messages, 1 untranslated message.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 36ba1dc18558d86e38b8bce9fc336cc5210ee4b8
+Merge: c5c0100 6b6650b
+Author: Juha Kautto <juha@xfce.org>
+Date:   Tue Sep 23 10:36:10 2014 +0300
+
+    Add zh_TW to local  repository
+
+commit c5c0100f2649943edd1ed358891862c266c9c242
+Author: Juha Kautto <juha@xfce.org>
+Date:   Tue Sep 23 10:31:39 2014 +0300
+
+    4.11.1.2 Fixed bug 10647: missing translations in globaltime
+    
+    Added drop down translations and fixed some bad texts.
+
+commit 6b6650b0b2877c0a4403c5d92462d45ad8d5bcb7
+Author: Jeff Huang <s8321414@gmail.com>
+Date:   Tue Sep 23 06:30:49 2014 +0200
+
+    I18n: Update translation zh_TW (100%).
+    
+    1026 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 914676c8a2cd311bf96251ed51b207814506d239
+Author: Juha Kautto <juha@xfce.org>
+Date:   Mon Sep 22 14:28:56 2014 +0300
+
+    4.11.1.1 Fixed bug 10648: missing window title translation from globaltime
+    
+    Made window title translatable string. Also removed version info as
+    it should not be there.
+
+commit 30413ccdd5906a49a785666d310ca2a4b72ebe37
+Author: Juha Kautto <juha@xfce.org>
+Date:   Mon Sep 22 13:27:37 2014 +0300
+
+    4.11.1 Implemented enhacement 10947: Orage vertical panel clock
+    
+    It is now possible to rotate lines, which is usefull for vertical panels.
+    Also added configuration option to put rows below each other or side by side.
+
+commit 63e8289d5b35f0ee539e02218078072fec4d9229
+Author: yjwork <yjwork@qq.com>
+Date:   Thu Aug 28 18:30:56 2014 +0200
+
+    I18n: Update translation zh_CN (92%).
+    
+    949 translated messages, 72 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit cce522f62d2f45b4e7982d8278f6fddcdd86e7e2
+Author: Pasi Lallinaho <pasi@shimmerproject.org>
+Date:   Sat Aug 23 12:30:56 2014 +0200
+
+    I18n: Update translation fi (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 4dccfa0fdbf9598a3e456f902c5a724abf59d2d5
+Author: Pasi Lallinaho <pasi@shimmerproject.org>
+Date:   Sat Aug 23 00:31:04 2014 +0200
+
+    I18n: Add new translation fi (90%).
+    
+    927 translated messages, 94 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit b6488ce1d2cb3faf1ceaaf152f8f7de81c67a603
+Author: abuyop <abuyop@gmail.com>
+Date:   Sun Aug 10 18:30:50 2014 +0200
+
+    I18n: Add new translation ms (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 1b859d2eca3c8a0e342a384522e2dc9ca0490df0
+Author: Pablo Roberto Francisco Lezaeta Reyes <prflr88@gmail.com>
+Date:   Sat Aug 2 06:30:55 2014 +0200
+
+    I18n: Update translation es (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit a92bc7eb70fa03ba94be300978909a565e9f7dd3
+Author: Pablo Roberto Francisco Lezaeta Reyes <prflr88@gmail.com>
+Date:   Tue Jul 15 12:30:50 2014 +0200
+
+    I18n: Update translation es (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit a5d9b62badaaa0704339cb85dc10b4f1320d5a76
+Author: Anonymous <noreply@xfce.org>
+Date:   Mon Jul 14 00:30:59 2014 +0200
+
+    I18n: Update translation pl (86%).
+    
+    880 translated messages, 141 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit c1ba36fae0dd756c55a420d06188f7bd7a9f7b08
+Author: Pablo Roberto Francisco Lezaeta Reyes <prflr88@gmail.com>
+Date:   Sun Jul 13 12:30:55 2014 +0200
+
+    I18n: Update translation es (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit b11e243b00eb3cddc69385a974c6cbc2b5a22e03
+Author: Allan Nordhøy <comradekingu@gmail.com>
+Date:   Mon Jun 16 00:30:52 2014 +0200
+
+    I18n: Update translation nb (99%).
+    
+    1019 translated messages, 2 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit be4790d4d7238c82d4724f5ec43537522e0cf9c5
+Author: Tornes Llume <l.lumex03.tornes@gmail.com>
+Date:   Fri May 30 18:30:53 2014 +0200
+
+    I18n: Update translation ast (94%).
+    
+    964 translated messages, 57 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit af76f4affe47af2dd75249d2278e77164bcfe399
+Author: haarek <haarektrans@gmail.com>
+Date:   Thu May 29 18:30:56 2014 +0200
+
+    I18n: Update translation nb (99%).
+    
+    1014 translated messages, 7 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit b9d326821032ebb6cecb71d846744cbff6ecef3a
+Author: Tornes Llume <l.lumex03.tornes@gmail.com>
+Date:   Wed May 28 12:30:54 2014 +0200
+
+    I18n: Update translation ast (91%).
+    
+    933 translated messages, 88 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit c2ffc7ecb62dec5468614ac34988cb329237285d
+Author: Tornes Llume <l.lumex03.tornes@gmail.com>
+Date:   Mon May 26 18:31:03 2014 +0200
+
+    I18n: Update translation ast (83%).
+    
+    850 translated messages, 171 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 24ea492004467be6d719842b8567722a1ee476c9
+Author: haarek <haarektrans@gmail.com>
+Date:   Sun May 25 00:30:55 2014 +0200
+
+    I18n: Update translation nb (98%).
+    
+    1007 translated messages, 14 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit b582176af2ab109d2524ca1dea6a563b65c8b4f6
+Author: gem <eckert.georg@gmx.de>
+Date:   Sat May 24 12:30:54 2014 +0200
+
+    I18n: Add new translation de (78%).
+    
+    803 translated messages, 218 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 9b80fa70600c2d73931e9cb84f2366701b1aba5f
+Author: asvl <alyoshin.s@gmail.com>
+Date:   Thu May 22 00:30:55 2014 +0200
+
+    I18n: Update translation ru (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 8f50d0cc41f0eebe3da1f67fb6ef16b179af25cf
+Author: haarek <haarektrans@gmail.com>
+Date:   Sun May 18 12:30:51 2014 +0200
+
+    I18n: Update translation nb (82%).
+    
+    842 translated messages, 179 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 1357ed04292242e2ad0f9b921772aa7382d88c6e
+Author: kingu <comradekingu@gmail.com>
+Date:   Sun May 18 06:30:57 2014 +0200
+
+    I18n: Update translation nb (82%).
+    
+    840 translated messages, 181 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit fbf2a2e2b171bf5fd1fb62b1e8f3077aa578f7dc
+Author: kingu <comradekingu@gmail.com>
+Date:   Sun May 18 00:30:49 2014 +0200
+
+    I18n: Update translation nb (80%).
+    
+    818 translated messages, 203 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 3a95036bc98083e4e47756683bb2ab6b9a41f53c
+Author: schizo <eveskovic@gmail.com>
+Date:   Sat May 17 18:30:57 2014 +0200
+
+    I18n: Update translation hr (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit f0504fa07a15b48acf191ce3ecbe2b685e1d6d3b
+Author: Darkcircle <darkcircle.0426@gmail.com>
+Date:   Fri May 16 18:30:51 2014 +0200
+
+    I18n: Update translation ko (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 57c10dc026e4ddd561daa2e98d81571761a33ceb
+Author: kingu <comradekingu@gmail.com>
+Date:   Mon May 12 18:30:55 2014 +0200
+
+    I18n: Update translation nb (78%).
+    
+    804 translated messages, 217 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 9b3330163d4068015bdc1d888dc5fdea442e6e20
+Author: Anonymous <noreply@xfce.org>
+Date:   Sat May 10 18:31:18 2014 +0200
+
+    I18n: Update translation ru (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 1776f5814f541e1c7324ec66a88587ca7fc8e601
+Author: Tornes Llume <l.lumex03.tornes@gmail.com>
+Date:   Thu May 8 12:30:48 2014 +0200
+
+    I18n: Update translation ast (80%).
+    
+    823 translated messages, 198 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d8700b5d48210a7429495157c5f63d2d958b7ff1
+Author: haarek <haarektrans@gmail.com>
+Date:   Mon Apr 28 18:30:52 2014 +0200
+
+    I18n: Update translation nb (77%).
+    
+    793 translated messages, 228 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 46f958321eda4c68b265fa6529ddf157860ac300
+Author: Tornes Llume <l.lumex03.tornes@gmail.com>
+Date:   Wed Apr 23 18:30:51 2014 +0200
+
+    I18n: Update translation ast (71%).
+    
+    726 translated messages, 295 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 31c1b4c1f85b6e2881d67932ea54cb598a975114
+Author: 柏諺 黃 <s8321414@gmail.com>
+Date:   Mon Apr 21 18:31:03 2014 +0200
+
+    I18n: Update translation zh_TW (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 04cf88bc3de403290fa8f148a10999fe8a8cd585
+Author: 柏諺 黃 <s8321414@gmail.com>
+Date:   Sun Apr 20 18:30:53 2014 +0200
+
+    I18n: Update translation zh_TW (96%).
+    
+    981 translated messages, 40 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 203baf13b6f7a14630a2d83a99fa872b37fa3888
+Author: 柏諺 黃 <s8321414@gmail.com>
+Date:   Thu Apr 17 18:30:56 2014 +0200
+
+    I18n: Update translation zh_TW (95%).
+    
+    977 translated messages, 44 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 64671629a66c24f9ecc479449785aba344ec6ffd
+Author: theppitak <theppitak@gmail.com>
+Date:   Wed Apr 16 18:30:53 2014 +0200
+
+    I18n: Add new translation th (92%).
+    
+    948 translated messages, 73 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 9067bd1bae717e7268ac93d2a7d5feeda98a4cb0
+Author: xiaobo zhou <zhouxiaobo.500@gmail.com>
+Date:   Sat Apr 12 00:30:59 2014 +0200
+
+    I18n: Update translation zh_CN (82%).
+    
+    846 translated messages, 175 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 8f4de92138cb2f4bc1790a7aa7acd313a65c172b
+Author: PavelNicklasson <pavelnicklasson@bahnhof.se>
+Date:   Wed Apr 9 18:31:17 2014 +0200
+
+    I18n: Update translation sv (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 376c29018ea5c0f0af98762724514803874eda5a
+Author: truongap <truongap.ars@gmail.com>
+Date:   Tue Apr 8 12:31:11 2014 +0200
+
+    I18n: Update translation vi (50%).
+    
+    512 translated messages, 509 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 5760ccaf5f475910c04f84b81f0943de9f53f0f2
+Author: Pablo Lezaeta <prflr88@gmail.com>
+Date:   Sat Apr 5 06:31:02 2014 +0200
+
+    I18n: Update translation es (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 6a80815c315d86ead1dde732c3c50d3804c45a7d
+Author: Pablo Lezaeta <prflr88@gmail.com>
+Date:   Thu Mar 27 00:30:59 2014 +0100
+
+    I18n: Update translation es (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit b4521b84683fb2e8133577972650be42ad864d28
+Author: Ivica  Kolić <ikoli@yahoo.com>
+Date:   Mon Mar 24 18:31:30 2014 +0100
+
+    I18n: Update translation hr (99%).
+    
+    1014 translated messages, 7 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 03e26b1bee2a83ed977fd861eb5c04f06521bc5a
+Author: Anonymous <noreply@xfce.org>
+Date:   Mon Mar 24 00:31:05 2014 +0100
+
+    I18n: Update translation pl (85%).
+    
+    877 translated messages, 144 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 987479fecb1367be75ca6e44482c0bed3fd3e84e
+Author: asvl <alyoshin.s@gmail.com>
+Date:   Sat Mar 22 12:31:00 2014 +0100
+
+    I18n: Update translation ru (99%).
+    
+    1018 translated messages, 3 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit be0d5192baf38873f0d3dd07e24e0ddc55ba784b
+Author: schizo <eveskovic@gmail.com>
+Date:   Fri Mar 14 00:30:54 2014 +0100
+
+    I18n: Update translation hr (99%).
+    
+    1016 translated messages, 5 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 19ee3b257e5987514d0c5f5f1ca7c63566d2ea0e
+Author: schizo <eveskovic@gmail.com>
+Date:   Thu Mar 13 00:30:54 2014 +0100
+
+    I18n: Update translation hr (87%).
+    
+    894 translated messages, 127 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 1ccb22d112e0c35987fdbcedbb9bee5e8ce9b437
+Author: Anonymous <noreply@xfce.org>
+Date:   Tue Mar 11 18:30:57 2014 +0100
+
+    I18n: Update translation ru (99%).
+    
+    1018 translated messages, 3 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit b2e1afd9987739a7c734960b5ef0c610dfdf9b0a
+Author: schizo <eveskovic@gmail.com>
+Date:   Mon Mar 10 00:30:59 2014 +0100
+
+    I18n: Update translation hr (87%).
+    
+    890 translated messages, 131 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit c53c15d4454c69998be65032faa3d74cb0a95da7
+Author: salepetronije <salepetronije@gmail.com>
+Date:   Fri Feb 28 18:30:58 2014 +0100
+
+    I18n: Update translation sr (94%).
+    
+    961 translated messages, 60 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 3626d3c890b0302eec293bb519c33a2cd0f842b1
+Author: pawel10 <pawelklimek102@gmail.com>
+Date:   Wed Feb 12 18:30:58 2014 +0100
+
+    I18n: Update translation pl (84%).
+    
+    862 translated messages, 159 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 10cc9547c9592393d8d8192aa2987b22057090a1
+Author: Piotr Strębski <strebski@o2.pl>
+Date:   Wed Jan 29 18:30:56 2014 +0100
+
+    I18n: Update translation pl (82%).
+    
+    844 translated messages, 177 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 812157833b0d718cc340a53f482606121316d0f4
+Author: k3lt01 <keltoiboy@gmail.com>
+Date:   Mon Jan 27 12:30:57 2014 +0100
+
+    I18n: Update translation en_AU (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 78c21dc542f85697d4c60693970e64ea1531eff3
+Author: padmawan <andhika.padmawan@gmail.com>
+Date:   Sat Jan 25 12:30:54 2014 +0100
+
+    I18n: Update translation id (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 556993115e784d41b895a6eadd02571ec5a80a80
+Author: Michal Várady <miko.vaji@gmail.com>
+Date:   Sun Jan 19 06:31:01 2014 +0100
+
+    I18n: Update translation cs (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 94b2620ca9d43280369bd0ae6a4a636c53b0b0e9
+Author: volkangezer <volkangezer@gmail.com>
+Date:   Sat Jan 11 18:30:50 2014 +0100
+
+    I18n: Update translation tr (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 30d4e03ab3d3bf0ab42a61dccad96ae41f1eb94e
+Author: Walter Cheuk <wwycheuk@gmail.com>
+Date:   Tue Dec 31 12:30:49 2013 +0100
+
+    I18n: Update translation zh_TW (94%).
+    
+    960 translated messages, 61 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit a765e3e59a1ef6eef93dd58c3631f463638e86f3
+Author: Walter Cheuk <wwycheuk@gmail.com>
+Date:   Tue Dec 31 06:31:01 2013 +0100
+
+    I18n: Update translation zh_TW (84%).
+    
+    863 translated messages, 158 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 1cd461139249ebdcacb2497adfd95acbc9aa881e
+Author: Walter Cheuk <wwycheuk@gmail.com>
+Date:   Sun Dec 29 06:30:54 2013 +0100
+
+    I18n: Update translation zh_TW (79%).
+    
+    809 translated messages, 212 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 61e6d7a5828e1ccfc08af72fdc86e2101f774c7c
+Author: yakup <mutouk@yandex.ru>
+Date:   Sun Dec 29 00:30:50 2013 +0100
+
+    I18n: Update translation tr (99%).
+    
+    1018 translated messages, 3 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 89bc55e131be64e86935713461b2513f28a48051
+Author: Walter Cheuk <wwycheuk@gmail.com>
+Date:   Sat Dec 28 12:30:51 2013 +0100
+
+    I18n: Update translation zh_TW (79%).
+    
+    807 translated messages, 214 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d116140feb3a1214ac70036ab5814cf781712cde
+Author: Walter Cheuk <wwycheuk@gmail.com>
+Date:   Fri Dec 27 06:30:52 2013 +0100
+
+    I18n: Update translation zh_TW (70%).
+    
+    720 translated messages, 301 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 45656d567649a6fcfc7cc9c1592cb58729ff9257
+Author: cri <cri.penta@gmail.com>
+Date:   Sun Dec 15 00:30:49 2013 +0100
+
+    I18n: Update translation it (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit f01bd8620efb4a6bb6eac4e70178d01da4933412
+Author: nunom <nunomgue@gmail.com>
+Date:   Sat Dec 14 18:30:55 2013 +0100
+
+    I18n: Update translation pt (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 64884d51767c262f7f621d845af5697f419a8711
+Author: cri <cri.penta@gmail.com>
+Date:   Sat Dec 14 18:30:55 2013 +0100
+
+    I18n: Update translation it (98%).
+    
+    1010 translated messages, 11 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit fc38f72456a7b9f6cace6310757bbf912c67a711
+Author: asvl <alyoshin.s@gmail.com>
+Date:   Sat Dec 14 00:30:53 2013 +0100
+
+    I18n: Update translation ru (99%).
+    
+    1017 translated messages, 4 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 64d5d4fe1a73629b7aafe546344ca10d28eb55b6
+Author: Chipong <chipong.luo@yahoo.com>
+Date:   Thu Dec 12 06:30:50 2013 +0100
+
+    I18n: Update translation zh_CN (79%).
+    
+    816 translated messages, 205 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit e9d05c742ce7c117d7d237fbac9337a4fb6060dc
+Author: Darkcircle <darkcircle.0426@gmail.com>
+Date:   Tue Dec 10 12:30:50 2013 +0100
+
+    I18n: Update translation ko (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d78f9132fabe2ca754a67e82e6446205c00fce3d
+Author: cri <cri.penta@gmail.com>
+Date:   Tue Dec 10 00:30:47 2013 +0100
+
+    I18n: Update translation it (91%).
+    
+    937 translated messages, 84 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit e73a8dfbb58286c4917b3809e2b55eafc5c880a5
+Author: Sérgio Marques <smarquespt@gmail.com>
+Date:   Mon Dec 9 18:30:51 2013 +0100
+
+    I18n: Update translation pt (92%).
+    
+    941 translated messages, 80 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 6a5b35133d891d95bc2facbd1e0970bdc76f2eb3
+Author: Juha Kautto <juha@xfce.org>
+Date:   Mon Dec 9 14:36:16 2013 +0200
+
+    4.11.0 After release version.
+
+commit b1e5dda09624406e1b555e87b89c86041164afdf
+Author: Juha Kautto <juha@xfce.org>
+Date:   Mon Dec 9 13:55:08 2013 +0200
+
+    Release 4.10.0!
+
+commit 2298340330aee91dfe8ca860b55d4f00fa7ec317
+Author: Aleksandr P <davian818@gmail.com>
+Date:   Sun Dec 8 06:30:53 2013 +0100
+
+    I18n: Update translation ru (80%).
+    
+    827 translated messages, 194 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 6ac2b1d5bf2e67a4cd95de96c0dab3b680f2464e
+Author: Aleksandr P <davian818@gmail.com>
+Date:   Sun Dec 8 00:30:48 2013 +0100
+
+    I18n: Update translation ru (80%).
+    
+    824 translated messages, 197 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit bef96a8036e95f4d9c98404d048718c5a0c4fd11
+Author: Cedric31 <cvalmary@yahoo.fr>
+Date:   Sat Dec 7 18:30:49 2013 +0100
+
+    I18n: Update translation oc (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit f8825b6fccbdaf6a7c7d0eea73f8547cc0caad67
+Author: cri <cri.penta@gmail.com>
+Date:   Sat Dec 7 00:30:47 2013 +0100
+
+    I18n: Update translation it (81%).
+    
+    835 translated messages, 186 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 3f2657847696d8a9934cd4489fd0a31ea043909b
+Author: asvl <alyoshin.s@gmail.com>
+Date:   Thu Dec 5 00:30:49 2013 +0100
+
+    I18n: Update translation ru (80%).
+    
+    820 translated messages, 201 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit c72336027c9edf172188f5eab41ad4aa27d1839e
+Author: Rafael Ferreira <rafael.f.f1@gmail.com>
+Date:   Tue Dec 3 18:30:52 2013 +0100
+
+    I18n: Update translation pt_BR (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 425b55774b27673825a95cf5696e15e24745dcde
+Author: Pjotr123 <pjotrvertaalt@gmail.com>
+Date:   Tue Dec 3 18:30:52 2013 +0100
+
+    I18n: Update translation nl (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit bd6dd6b61424fbb7d535e67c25c9921693b1bac4
+Author: Pingax <pingax@frugalware.org>
+Date:   Tue Dec 3 18:30:52 2013 +0100
+
+    I18n: Update translation fr (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit a514b32c42cfeace378e72cf1c20b0156d14ba9e
+Author: Yarema aka Knedlyk <yupadmin@gmail.com>
+Date:   Tue Dec 3 12:30:53 2013 +0100
+
+    I18n: Update translation uk (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 848d403ec8b2f1cefb76fa7082fce3a8075183de
+Author: Masato HASHIMOTO <cabezon.hashimoto@gmail.com>
+Date:   Tue Dec 3 12:30:53 2013 +0100
+
+    I18n: Update translation ja (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit bf14ecade213b547f7423e40b3b7a7000e69fb79
+Author: Juha Kautto <juha@xfce.org>
+Date:   Tue Dec 3 12:06:21 2013 +0200
+
+    4.9.10.8 Fixed timezone bugs also for events using length instead of endtime
+    
+    There is not always endtime, so needed to patch also that.
+
+commit 5c02ddee5f103c0e790065afeee8407ac984cee5
+Author: Pablo Lezaeta <prflr88@gmail.com>
+Date:   Tue Dec 3 06:30:47 2013 +0100
+
+    I18n: Update translation es (100%).
+    
+    1021 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 72eba2d036c6bc9b5d8e5f065a746d0e6a3103ce
+Author: Masato HASHIMOTO <cabezon.hashimoto@gmail.com>
+Date:   Mon Dec 2 18:30:55 2013 +0100
+
+    I18n: Update translation ja (99%).
+    
+    1017 translated messages, 2 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 27a2162acf09b7a486f0b59c487b25d24bb4e0d4
+Author: Anonymous <noreply@xfce.org>
+Date:   Mon Dec 2 18:30:55 2013 +0100
+
+    I18n: Update translation bg (96%).
+    
+    987 translated messages, 32 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 5f3901d102cf70f6b7477ca65fc835279ce6f96a
+Author: Juha Kautto <juha@xfce.org>
+Date:   Mon Dec 2 17:14:40 2013 +0200
+
+    errors in timezone names.
+    
+    2 missing added and 1 error fixed.
+
+commit 00e81c60102a5a0d733e050af2168c4c8ca73991
+Author: Juha Kautto <juha@xfce.org>
+Date:   Mon Dec 2 16:42:32 2013 +0200
+
+    fixing typo in timezone name
+    
+    Argentina La_Rioja instead of La_Tioja
+
+commit 56b86c31888b1efe0026df7e011bc4c03032c682
+Author: Nucleo <nucleo@indamail.hu>
+Date:   Mon Dec 2 06:30:46 2013 +0100
+
+    I18n: Update translation hu (79%).
+    
+    810 translated messages, 209 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit da291cdd241542879cc13f0e7ff74c51687c9494
+Author: cybercop <cybercop_montana@abv.bg>
+Date:   Sun Dec 1 18:30:48 2013 +0100
+
+    I18n: Update translation bg (95%).
+    
+    971 translated messages, 48 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 777528059a65039295bcb277f904235de443d9c2
+Author: Pablo Lezaeta <prflr88@gmail.com>
+Date:   Sun Dec 1 12:30:52 2013 +0100
+
+    I18n: Update translation es (100%).
+    
+    1019 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 3753a1b28dc31425228aa27b92eb7455a1d2189a
+Author: salepetronije <salepetronije@gmail.com>
+Date:   Sun Dec 1 06:30:54 2013 +0100
+
+    I18n: Update translation sr (94%).
+    
+    959 translated messages, 60 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 5e602933a489c7c0a466caf71c3fc0871841157b
+Author: Pablo Lezaeta <prflr88@gmail.com>
+Date:   Sun Dec 1 06:30:54 2013 +0100
+
+    I18n: Update translation es (98%).
+    
+    1007 translated messages, 12 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit bc51ab652343f3ee9bd47724153d65284909911d
+Author: jc1 <jc1.quebecos@gmail.com>
+Date:   Sat Nov 30 18:30:48 2013 +0100
+
+    I18n: Update translation fr (100%).
+    
+    1019 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 12198a8a9ca7bfe623a7d6620b4a41573bf6fd5e
+Author: Pjotr123 <pjotrvertaalt@gmail.com>
+Date:   Sat Nov 30 12:30:47 2013 +0100
+
+    I18n: Update translation nl (100%).
+    
+    1019 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 1261a1ed4a123e130d843950ed27718ca50f6f5c
+Author: cri <cri.penta@gmail.com>
+Date:   Sat Nov 30 12:30:47 2013 +0100
+
+    I18n: Update translation it (78%).
+    
+    805 translated messages, 214 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d5fd4a521fa58d1e0a2b759b74df9991c51c2814
+Author: Pablo Lezaeta <prflr88@gmail.com>
+Date:   Sat Nov 30 06:30:47 2013 +0100
+
+    I18n: Update translation es (94%).
+    
+    962 translated messages, 57 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 46cf9fe980d6bf3799d43d60e637842351f8ad4e
+Author: cybercop <cybercop_montana@abv.bg>
+Date:   Fri Nov 29 12:30:47 2013 +0100
+
+    I18n: Update translation bg (92%).
+    
+    945 translated messages, 73 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit a0f80941a43e8d835a01323219bde08051650c3d
+Author: Juha Kautto <juha@xfce.org>
+Date:   Fri Nov 29 10:40:03 2013 +0200
+
+    4.9.10.7 Fix for bug 9028 Orage shows events to +0000 with certain iCal files
+    
+    This was hopefully the last of these bugs related to existence of calendar
+    timezone file within calendar itself.
+    Also added a tooltip to explain priority setting effect on what is shown
+    on list windws.
+
+commit 00a7be19d18a48a8a448e609d979964ef6e8ccca
+Author: Yarema aka Knedlyk <yupadmin@gmail.com>
+Date:   Fri Nov 29 00:30:47 2013 +0100
+
+    I18n: Update translation uk (100%).
+    
+    1018 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit cf9fc5fbd535b26c0d91788d36e55ddf0ab01849
+Author: Pjotr123 <pjotrvertaalt@gmail.com>
+Date:   Thu Nov 28 12:30:51 2013 +0100
+
+    I18n: Update translation nl (100%).
+    
+    1018 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 2cd18e5c541a2e3097afd7640beb2191bd1e238d
+Author: Pablo Lezaeta <prflr88@gmail.com>
+Date:   Thu Nov 28 12:30:51 2013 +0100
+
+    I18n: Update translation es (88%).
+    
+    899 translated messages, 119 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 9be1af6ae4e65fd5d8fb14caece3b39d5b4c5c7b
+Author: cybercop <cybercop_montana@abv.bg>
+Date:   Thu Nov 28 12:30:51 2013 +0100
+
+    I18n: Update translation bg (84%).
+    
+    857 translated messages, 161 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 769a01a8077cefce856424108e8493069080417c
+Author: k3lt01 <keltoiboy@gmail.com>
+Date:   Thu Nov 28 06:30:45 2013 +0100
+
+    I18n: Update translation en_AU (90%).
+    
+    918 translated messages, 100 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 1a69a48735c01fbe01f8de0700d9f838af3dd05d
+Author: Juha Kautto <juha@xfce.org>
+Date:   Wed Nov 27 14:20:06 2013 +0200
+
+    4.9.10.6 Fix for bug 8426 Not translatable strings in globaltime time zone
+    
+    Added missing zones. Note that this fix is actually in Orage since globaltime
+    uses the same code. But Orage also checks that those time zones exists in
+    ical, so this has less ivisible effect in Orage. Increased globaltime version
+    so that the change is clearer.
+
+commit 9483df87f46d7171c63c3b35030d5e66b857b738
+Author: Yarema aka Knedlyk <yupadmin@gmail.com>
+Date:   Tue Nov 26 18:30:51 2013 +0100
+
+    I18n: Update translation uk (100%).
+    
+    847 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 173a598a469ff249a49df918540516fd5aebc54e
+Author: Juha Kautto <juha@xfce.org>
+Date:   Tue Nov 26 17:10:00 2013 +0200
+
+    4.9.10.5 Fix for bug 8508 Orage shows event which ended at previous midnight
+    
+    Now it is only showed on the real day instead of the extra day.
+
+commit 7e026453a8c13ea6ea6dbeb3c3173bcecf3b1e30
+Author: Necdet Yücel <necdetyucel@gmail.com>
+Date:   Tue Nov 26 12:30:51 2013 +0100
+
+    I18n: Update translation tr (99%).
+    
+    845 translated messages, 2 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 70ac2112f762586a1cdd6ebf313c52af7db039b8
+Author: salepetronije <salepetronije@gmail.com>
+Date:   Tue Nov 26 12:30:51 2013 +0100
+
+    I18n: Update translation sr (100%).
+    
+    847 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 13cdbc5baad4fd90367e2871ce61810e6cc52a6b
+Author: cybercop <cybercop_montana@abv.bg>
+Date:   Tue Nov 26 12:30:50 2013 +0100
+
+    I18n: Update translation bg (100%).
+    
+    847 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 661507ca187e420e069bf7a6106952d063b01fdd
+Author: Juha Kautto <juha@xfce.org>
+Date:   Mon Nov 25 15:38:01 2013 +0200
+
+    4.9.10.4 Fix for bug 8382 Orage shows events without considering time zone
+    
+    List views showed events on wrong day if the real date in the event was
+    actually on another day in local time due to timezone conversion.
+
+commit 5f666dfff22daca24c031f0498b8962027d1ce6b
+Author: Cedric31 <cvalmary@yahoo.fr>
+Date:   Mon Nov 25 00:30:47 2013 +0100
+
+    I18n: Update translation oc (100%).
+    
+    847 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit dd896ea96af8da9f4e7b62b32e0988f8899f57cf
+Author: Juha Kautto <juha@xfce.org>
+Date:   Sun Nov 24 15:52:15 2013 +0200
+
+    4.9.10.3 Fix for bug 7929 Some foreign files show time offset in event view
+    
+    This bug happens when the ics file includes the same timezone, which is used
+    in the times. It very much looks like libical bug. Workaround now in place.
+
+commit c55bcebbb3848cdb2d62e2db92750e52866c2ee3
+Author: Pjotr123 <pjotrvertaalt@gmail.com>
+Date:   Sat Nov 23 12:30:53 2013 +0100
+
+    I18n: Update translation nl (100%).
+    
+    847 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 385023e0ac33aab842fdf7708c6c9fb3ffccc7c3
+Author: jc1 <jc1.quebecos@gmail.com>
+Date:   Sat Nov 23 12:30:53 2013 +0100
+
+    I18n: Update translation fr (100%).
+    
+    847 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 9916ec04c038f598b020fccc500fa8a5f25a2a50
+Author: k3lt01 <keltoiboy@gmail.com>
+Date:   Sat Nov 23 06:30:45 2013 +0100
+
+    I18n: Update translation en_AU (100%).
+    
+    847 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit abb99de2292e3387ea1381537e48b55757a9c96d
+Author: Pablo Lezaeta <prflr88@gmail.com>
+Date:   Sat Nov 23 00:30:48 2013 +0100
+
+    I18n: Update translation es (100%).
+    
+    847 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 88eae9b642d8b15d7de86e1484e75fa77b0e25ab
+Author: Pjotr123 <pjotrvertaalt@gmail.com>
+Date:   Fri Nov 22 12:30:51 2013 +0100
+
+    I18n: Update translation nl (100%).
+    
+    846 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 2309cb9cac55d09d2ee551991625f79ae4c7c1f0
+Author: k3lt01 <keltoiboy@gmail.com>
+Date:   Fri Nov 22 12:30:50 2013 +0100
+
+    I18n: Update translation en_AU (100%).
+    
+    846 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d4794cd593816d595fcd78a8cb4c02f07c8f08d0
+Author: cybercop <cybercop_montana@abv.bg>
+Date:   Fri Nov 22 12:30:50 2013 +0100
+
+    I18n: Update translation bg (100%).
+    
+    846 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit f5d0d8ee8c7ab2c9ec7ee4c7347fbfbb669f0443
+Author: Juha Kautto <juha@xfce.org>
+Date:   Fri Nov 22 12:27:39 2013 +0200
+
+    4.9.10.2 Improvements to bugs 9250 and 9507
+    
+    Fixed problem with excluded dates. Changed the way list of old event
+    selection works. Hopefully clearer now.
+
+commit 419881c48ab799322940ebc6866ea598f9f38165
+Author: Pablo Lezaeta <prflr88@gmail.com>
+Date:   Fri Nov 22 06:30:45 2013 +0100
+
+    I18n: Update translation es (100%).
+    
+    846 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d1cd17f233b2a025f4072a75703c6000aaa11dd4
+Author: Juha Kautto <juha@xfce.org>
+Date:   Thu Nov 21 15:49:58 2013 +0200
+
+    4.9.10.0 Enhancement 9250 list of all events
+    
+    Added the feature as described in the bug. It is now possible to see all
+    EVENTS without repeating cases.
+
+commit 76c13a72d10aea4d0ddaf1f4e9d51fed275f9a8e
+Author: Cedric31 <cvalmary@yahoo.fr>
+Date:   Wed Nov 20 18:38:04 2013 +0100
+
+    I18n: Add new translation oc (100%).
+    
+    842 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit cb3aab4410403477b1050d8a6395f30d30b1c9ae
+Author: Juha Kautto <juha@xfce.org>
+Date:   Wed Nov 20 14:43:39 2013 +0200
+
+    4.9.9.2 Fix for bug 9507 Older than 1970 periodic events do not work properly
+    
+    This looks like libical bug as it works with the old local Orage libical
+    version. But as it was not easy to find, I worked it around.
+
+commit f91d2ceaca679e9b40d4ee638c11a3ddea343acc
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:40 2013 +0100
+
+    I18n: Update translation zh_TW (82%).
+    
+    698 translated messages, 144 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit a94b85131ebc088bbde6d774ecdaf0a24b8b9091
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:40 2013 +0100
+
+    I18n: Update translation zh_CN (97%).
+    
+    817 translated messages, 25 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit c0112d5a2b6b553b529acccfe51007f0ebee6cd6
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:39 2013 +0100
+
+    I18n: Update translation ur (84%).
+    
+    715 translated messages, 127 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 6de23e149fdd4e26f181852e95282967b922f82a
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:32 2013 +0100
+
+    I18n: Update translation ur_PK (84%).
+    
+    715 translated messages, 127 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 72112413db0019242b8aa02fd1f76087bdeb383a
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:31 2013 +0100
+
+    I18n: Update translation uk (98%).
+    
+    826 translated messages, 16 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 0644d600e3d7dab81c873ff25e1cebfbea946c4e
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:29 2013 +0100
+
+    I18n: Update translation ug (89%).
+    
+    755 translated messages, 87 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 7af0772e353ef9a6cd90e576846891ee4fafd90c
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:25 2013 +0100
+
+    I18n: Update translation sv (89%).
+    
+    754 translated messages, 88 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit fb0d3b784f9e7063058b1011c1d21aa6e8a83850
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:25 2013 +0100
+
+    I18n: Update translation sr (98%).
+    
+    826 translated messages, 16 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 7ead1231c3e87d71ff46451389be6e99fe676c69
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:25 2013 +0100
+
+    I18n: Update translation sq (83%).
+    
+    701 translated messages, 141 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 0c816018f9c2e5f97b6b0309686a013497c6fcc4
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:24 2013 +0100
+
+    I18n: Update translation sk (93%).
+    
+    784 translated messages, 58 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d5e9d60a483ed5c2d94be6c2f5773abeebfcb453
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:24 2013 +0100
+
+    I18n: Update translation ru (96%).
+    
+    815 translated messages, 27 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 51c2e1e55a05905e42f864fe9491d9e6ba440387
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:24 2013 +0100
+
+    I18n: Update translation ro (73%).
+    
+    619 translated messages, 223 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit a3049ca79623ddf90f17fdb8ed217b6d173307da
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:24 2013 +0100
+
+    I18n: Update translation pt (97%).
+    
+    817 translated messages, 25 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit cd313aefa9879c6d29c402791b934f9f8df33c34
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:24 2013 +0100
+
+    I18n: Update translation pt_BR (98%).
+    
+    826 translated messages, 16 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit ca192111ef357879006e7d333bcdc9c0507393fe
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:24 2013 +0100
+
+    I18n: Update translation pl (93%).
+    
+    788 translated messages, 54 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 1898fdc51be03a397f13f83fbc6ccdeb034edc29
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:24 2013 +0100
+
+    I18n: Update translation nn (78%).
+    
+    665 translated messages, 177 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 688039bd84d319e55f5f1049029f8608d602d0c6
+Author: Pjotr123 <pjotrvertaalt@gmail.com>
+Date:   Tue Nov 19 18:53:23 2013 +0100
+
+    I18n: Update translation nl (100%).
+    
+    842 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit b83855ce4c4fecbaf0d21db1e5ec46741f1297f4
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:23 2013 +0100
+
+    I18n: Update translation nb (94%).
+    
+    793 translated messages, 49 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 587e29f980d325fd4dac2411107abde2aaac33df
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:23 2013 +0100
+
+    I18n: Update translation lv (91%).
+    
+    772 translated messages, 70 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit ae9ae7746cefa31ddf0a753edd844975ddf326f2
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:22 2013 +0100
+
+    I18n: Update translation lt (93%).
+    
+    784 translated messages, 58 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 76fb578beb81b853d2fda25c99350358eefdc433
+Author: Darkcircle <darkcircle.0426@gmail.com>
+Date:   Tue Nov 19 18:53:22 2013 +0100
+
+    I18n: Update translation ko (100%).
+    
+    842 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 2a6f5ba62ed1263129be3c329a2b95550f935a0a
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:22 2013 +0100
+
+    I18n: Update translation kk (59%).
+    
+    501 translated messages, 341 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 4b5e11300dba98d074a23050d71a072e34a384b5
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:22 2013 +0100
+
+    I18n: Update translation ja (96%).
+    
+    815 translated messages, 27 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit ea02f1a2c9a3d03c47691e372ffd7d6bd880e010
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:22 2013 +0100
+
+    I18n: Update translation it (95%).
+    
+    806 translated messages, 36 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d8a174c8825ef63dfdcf5caf19053897efd48d59
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:21 2013 +0100
+
+    I18n: Update translation id (96%).
+    
+    815 translated messages, 27 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 66d05eafe21d13e17f6843251165774e9f185f1c
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:21 2013 +0100
+
+    I18n: Update translation hu (95%).
+    
+    803 translated messages, 39 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 3b9aa982dd71e4d6466b5a9af66523398beac4df
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:21 2013 +0100
+
+    I18n: Update translation hr (82%).
+    
+    694 translated messages, 148 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit b9db283430e379db26e383a5aa0b323c46c00951
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:21 2013 +0100
+
+    I18n: Update translation he (56%).
+    
+    473 translated messages, 369 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 516951922628f67975d68822a4b56c7147bd001a
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:21 2013 +0100
+
+    I18n: Update translation gl (65%).
+    
+    549 translated messages, 293 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d96287178f4e0bcc31aee4a6ce5cd062fa947bd0
+Author: jc1 <jc1.quebecos@gmail.com>
+Date:   Tue Nov 19 18:53:21 2013 +0100
+
+    I18n: Update translation fr (100%).
+    
+    842 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit e6ee4af8acebffef6fabe85596b6df33837baebe
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:21 2013 +0100
+
+    I18n: Update translation eu (92%).
+    
+    781 translated messages, 61 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d85fec325e0ee0697f97dc67c24a82a7957df22f
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:21 2013 +0100
+
+    I18n: Update translation et (84%).
+    
+    708 translated messages, 134 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit a849d54c275d32e3e336e57475b9397c06aa23be
+Author: Pablo Lezaeta <prflr88@gmail.com>
+Date:   Tue Nov 19 18:53:20 2013 +0100
+
+    I18n: Update translation es (100%).
+    
+    842 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 1c6d93634ab5f543be2a1a3b2ccecd1609517358
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:20 2013 +0100
+
+    I18n: Update translation eo (56%).
+    
+    473 translated messages, 369 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 535caeccccf1666ff50ae2b46a049e04c2e3235c
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:20 2013 +0100
+
+    I18n: Update translation en_GB (96%).
+    
+    815 translated messages, 27 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 13384c7d48c220a79ed3ba7685492146d817d811
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:20 2013 +0100
+
+    I18n: Update translation el (76%).
+    
+    641 translated messages, 201 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit f8b6348e96328513e9c1fb9999f91028128d0762
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:19 2013 +0100
+
+    I18n: Update translation cs (96%).
+    
+    816 translated messages, 26 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 8cc5ea720c705129cb9899dbdd04d5e64e16e91c
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:19 2013 +0100
+
+    I18n: Update translation ca (93%).
+    
+    784 translated messages, 58 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 12c63559bc7437df23d6c395225a3505812aab06
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:19 2013 +0100
+
+    I18n: Update translation be (84%).
+    
+    709 translated messages, 133 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 959dfccd114f22d446fc5acc6077673e0f71bef5
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:19 2013 +0100
+
+    I18n: Update translation ast (84%).
+    
+    715 translated messages, 127 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit e579b8b92871db62b6be5717e7ec2cb7ca02dc41
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:19 2013 +0100
+
+    I18n: Update translation ar (96%).
+    
+    815 translated messages, 27 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 839055f2ac1f06fa96ba0707da866aced3f13566
+Author: Xfce <transifex@xfce.org>
+Date:   Tue Nov 19 18:53:18 2013 +0100
+
+    I18n: Update translation am (59%).
+    
+    497 translated messages, 345 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 60891022de8ead67dcad21bd30f854aeff6ed003
+Author: Necdet Yücel <necdetyucel@gmail.com>
+Date:   Tue Nov 19 12:31:41 2013 +0100
+
+    I18n: Update translation tr (100%).
+    
+    842 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 0b414699ce384f5de55323f2b7f1d43d4fc87333
+Author: k3lt01 <keltoiboy@gmail.com>
+Date:   Tue Nov 19 12:31:41 2013 +0100
+
+    I18n: Update translation en_AU (100%).
+    
+    842 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit ccb32d331f989b816ac8d9556ee3dbcc56ff3bf1
+Author: cybercop <cybercop_montana@abv.bg>
+Date:   Tue Nov 19 12:31:41 2013 +0100
+
+    I18n: Update translation bg (100%).
+    
+    842 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 1f8a35beacfd3a12d21e7244a85f366126852209
+Author: Juha Kautto <juha@xfce.org>
+Date:   Mon Nov 18 22:58:56 2013 +0200
+
+    4.9.9.1 Fix for appointment add ito Orage file in 4.9.9.0 version
+    
+    Previous version was not able to add to base Orage file at all.
+    Fixed that.
+
+commit f90a64fbafab6040801e71475f5e7096321efff6
+Author: Rafael Ferreira <rafael.f.f1@gmail.com>
+Date:   Mon Nov 18 18:30:54 2013 +0100
+
+    I18n: Update translation pt_BR (100%).
+    
+    832 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit a628748d466cb13babdb29903c08e52ef522740e
+Author: Juha Kautto <juha@xfce.org>
+Date:   Mon Nov 18 14:53:49 2013 +0200
+
+    4.9.9.0 Enhancement 7873 add an option to save event into a different ICS file
+    
+    It is now possible to add appointments to foreign files. Added also option
+    to name foreign files so that long filesystem names are not mandoatory.
+    Also did some minor code cleaning.
+
+commit 59cb2c131784dcf973956dbf3641beb1c68088b4
+Author: salepetronije <salepetronije@gmail.com>
+Date:   Sun Nov 17 06:30:51 2013 +0100
+
+    I18n: Update translation sr (100%).
+    
+    832 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit cea77291627950116367616f972d43d6d778cf17
+Author: Yarema aka Knedlyk <yupadmin@gmail.com>
+Date:   Sat Nov 16 12:30:49 2013 +0100
+
+    I18n: Update translation uk (100%).
+    
+    832 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 36dcebee81e0db11ae32c9602b49b7bb9e6b8afa
+Author: k3lt01 <keltoiboy@gmail.com>
+Date:   Sat Nov 16 12:30:49 2013 +0100
+
+    I18n: Update translation en_AU (100%).
+    
+    832 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit ad43f4b9091aba83541a683af61b1e5fa2514bf5
+Author: Pablo Lezaeta <prflr88@gmail.com>
+Date:   Sat Nov 16 00:30:48 2013 +0100
+
+    I18n: Update translation es (100%).
+    
+    832 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 9b7810a634d51752f53e03826e4d157137511248
+Author: salepetronije <salepetronije@gmail.com>
+Date:   Fri Nov 15 12:30:50 2013 +0100
+
+    I18n: Update translation sr (100%).
+    
+    824 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit e44ced79d33ca0293bbec14094b1ebcd86e57eee
+Author: Pablo Lezaeta <prflr88@gmail.com>
+Date:   Fri Nov 15 12:30:50 2013 +0100
+
+    I18n: Update translation es (100%).
+    
+    824 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit f0cbd5803f2337ccde785bf361418dbf95cb157e
+Author: Juha Kautto <juha@xfce.org>
+Date:   Fri Nov 15 10:04:58 2013 +0200
+
+    4.9.8.0 Enhancement 9291 detect external changes orage file
+    
+    Orage now accepts external changes to all calendar files. Previously
+    only foreign files could be refreshed externally.
+
+commit ad5e9499b3a7b0b9a3cfc42d8c3b2c99ba39e19f
+Author: Henrique P. Machado <zehrique@gmail.com>
+Date:   Wed Nov 13 06:30:45 2013 +0100
+
+    I18n: Update translation pt_BR (100%).
+    
+    824 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit a292413c0e2b0dbbf6ccbf01950b699ed0587805
+Author: jc1 <jc1.quebecos@gmail.com>
+Date:   Tue Nov 12 18:30:53 2013 +0100
+
+    I18n: Update translation fr (100%).
+    
+    824 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit b63600e29a5e73f51c280e599258eff92f6758c6
+Author: Yarema aka Knedlyk <yupadmin@gmail.com>
+Date:   Tue Nov 12 12:30:49 2013 +0100
+
+    I18n: Update translation uk (100%).
+    
+    824 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit fc6c6026007628f71e21fafba7ef90df6f039b22
+Author: Necdet Yücel <necdetyucel@gmail.com>
+Date:   Tue Nov 12 12:30:49 2013 +0100
+
+    I18n: Update translation tr (100%).
+    
+    824 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 13bdeb89c2f88a9f33800c865b498830bf2201f9
+Author: Pjotr123 <pjotrvertaalt@gmail.com>
+Date:   Tue Nov 12 12:30:49 2013 +0100
+
+    I18n: Update translation nl (100%).
+    
+    824 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 406784dbf3f7ebf81c2c388b2ea17b420b9cffc8
+Author: Juha Kautto <juha@xfce.org>
+Date:   Tue Nov 12 11:18:02 2013 +0200
+
+    4.9.7.3 Fixed bug 10401 orage launches help in firefox and not via exo-open
+    
+    Orage now uses exo-open for help and only if that failsr, it calls firefox
+    directly.
+
+commit 2af0cd48e5d4781be7c6dd0166eb2525c234144f
+Author: papparonny <ronny@olufsen.org>
+Date:   Tue Nov 12 06:30:47 2013 +0100
+
+    I18n: Update translation nb (96%).
+    
+    799 translated messages, 25 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 000d87bd37673e44940fc36d01066cf8d64e0b54
+Author: k3lt01 <keltoiboy@gmail.com>
+Date:   Tue Nov 12 06:30:46 2013 +0100
+
+    I18n: Update translation en_AU (100%).
+    
+    824 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 2cb530466d3e296be0da09214bbf5c1c1d8555fa
+Author: Juha Kautto <juha@xfce.org>
+Date:   Mon Nov 11 15:39:01 2013 +0200
+
+    Minor typing error fix.
+
+commit 0b05898e9d73dda201edb433351674005f80d462
+Author: k3lt01 <keltoiboy@gmail.com>
+Date:   Mon Nov 11 00:30:48 2013 +0100
+
+    I18n: Update translation en_AU (100%).
+    
+    824 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 783b4242a691861caf455f95fd16b62d3b04f32c
+Author: xiaobo zhou <zhouxiaobo.500@gmail.com>
+Date:   Sun Nov 10 18:30:52 2013 +0100
+
+    I18n: Update translation zh_CN (100%).
+    
+    824 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 2834d33767a3ffad12ee94265c33451ce2d847a2
+Author: salepetronije <salepetronije@gmail.com>
+Date:   Sun Nov 10 18:30:52 2013 +0100
+
+    I18n: Update translation sr (100%).
+    
+    824 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d3302adee97e9e956d6d9e1178f237d10d3c76fa
+Author: nunom <nunomgue@gmail.com>
+Date:   Sun Nov 10 18:30:52 2013 +0100
+
+    I18n: Update translation pt (100%).
+    
+    824 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 819f160cd7cafe22ce3756bfc06ce289d495026f
+Author: Alois Nešpor <info@aloisnespor.info>
+Date:   Sun Nov 10 12:30:51 2013 +0100
+
+    I18n: Update translation cs (99%).
+    
+    823 translated messages, 1 untranslated message.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit f7fa75d8fa90786f772f1fbbac831ea5c43b7a07
+Author: jc1 <jc1.quebecos@gmail.com>
+Date:   Sat Nov 9 18:30:48 2013 +0100
+
+    I18n: Update translation fr (100%).
+    
+    824 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 616efbf0312e0dd2f7c5960e51843ad5a66e140f
+Author: Juha Kautto <juha@xfce.org>
+Date:   Fri Nov 8 12:30:16 2013 +0200
+
+    4.9.7.2 Fixed bug 10473 SIGABRT in orage_copy_file
+    
+    Did not check return code from file open. This may also fix bug 10261.
+    Thanks to Steven from the patch.
+
+commit 43f67230e5a5313cc17607441755f2d30149164c
+Author: Pablo Lezaeta <prflr88@gmail.com>
+Date:   Fri Nov 8 00:30:48 2013 +0100
+
+    I18n: Update translation es (100%).
+    
+    824 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 88ac0b573c76178acf827641ce8b2a6d517c893b
+Author: cybercop <cybercop_montana@abv.bg>
+Date:   Fri Nov 8 00:30:48 2013 +0100
+
+    I18n: Update translation bg (100%).
+    
+    824 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 18fd9af66a983d9163ebb9b0f177a7b7ca6eb6bb
+Author: Juha Kautto <juha@xfce.org>
+Date:   Thu Nov 7 10:44:31 2013 +0200
+
+    4.9.7.1 Fixed bug 10107 Potential file handle leak in read_ical_timezones
+    
+    Added missing close before returning from error. Thanks to Steven for this fix.
+
+commit fbdeb827dea0eeac0147cc25811623bcd4571450
+Author: Juha Kautto <juha@xfce.org>
+Date:   Thu Nov 7 10:15:22 2013 +0200
+
+    4.9.7.0 enhancement 10432 option to set Orage to quit when it is asked to close
+    
+    Added parameter to extra screen to quit Orage instead of hide. This is usefull
+    when Orage is used in distributed environments in many machines.
+
+commit a54bd7ab56e5174d45f21421845b897e11605503
+Author: Baurzhan Muftakhidinov <baurthefirst@gmail.com>
+Date:   Mon Nov 4 18:30:51 2013 +0100
+
+    I18n: Update translation kk (61%).
+    
+    503 translated messages, 318 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 865c6187ff4cd723127af76210988a9311068c8a
+Author: Masato HASHIMOTO <cabezon.hashimoto@gmail.com>
+Date:   Mon Nov 4 18:30:50 2013 +0100
+
+    I18n: Update translation ja (100%).
+    
+    821 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit e65e3637822a24f60fe79858035278f6b711a7e2
+Author: Juha Kautto <juha@xfce.org>
+Date:   Mon Nov 4 15:38:33 2013 +0200
+
+    4.6.9.3 Fixed bug 10108 g_free is called on two strdup allocations
+    
+    Replaced strdup with g_strdup for consistency if nothing else.
+    Thanks to the patch from  Steven Jackson
+
+commit f4f185f94a200dc0cb460271baba044c1f237553
+Author: Juha Kautto <juha@xfce.org>
+Date:   Mon Nov 4 14:51:29 2013 +0200
+
+    4.6.9.2 Fixed bug 10325 orage_tm_date_to_i18_date too long string in strftime
+    
+    Too short temporary conversion string buffers were used in orage_tm_date_to_i18_date
+    and tray icon handling.
+
+commit d4118b6846a41316bf47a23b24d395245d9d0b34
+Author: Juha Kautto <juha@xfce.org>
+Date:   Mon Nov 4 14:27:53 2013 +0200
+
+    4.9.6.1 Fixed error in handling orage_localtime() returned tm data
+    
+    Wrong times was used because of direct modification of tm value
+    returned from orage_localtime(). Local variable needs to be
+    used if that value is modified.
+
+commit 7b79f626d9fe6fe7d0cf9ce7b1590d0b852bd8ca
+Author: Baurzhan Muftakhidinov <baurthefirst@gmail.com>
+Date:   Mon Nov 4 06:30:45 2013 +0100
+
+    I18n: Update translation kk (60%).
+    
+    494 translated messages, 327 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit c89106f0e42db0b950db4ea0a04a6e9669b438c7
+Author: Piotr Strębski <strebski@o2.pl>
+Date:   Thu Oct 24 12:30:49 2013 +0200
+
+    I18n: Update translation pl (96%).
+    
+    794 translated messages, 27 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 67286ba831f26031b7195a766c9a63ab1618a76c
+Author: Ivica  Kolić <ikoli@yahoo.com>
+Date:   Tue Oct 22 00:30:50 2013 +0200
+
+    I18n: Update translation hr (85%).
+    
+    698 translated messages, 123 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit c6a3b0cb963ecc28fdbad307517fb4323c133f2f
+Author: Chipong <chipong.luo@yahoo.com>
+Date:   Thu Oct 17 18:30:47 2013 +0200
+
+    I18n: Update translation zh_CN (100%).
+    
+    821 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 8b39c7a7e8005cec9758df8bc1945cdd3eedeed9
+Author: Walter Cheuk <wwycheuk@gmail.com>
+Date:   Sun Oct 13 06:30:54 2013 +0200
+
+    I18n: Update translation zh_TW (85%).
+    
+    702 translated messages, 119 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 9da3f41dd7b1af390d82288e41e76147c80f3746
+Author: cri <cri.penta@gmail.com>
+Date:   Mon Oct 7 18:30:46 2013 +0200
+
+    I18n: Update translation it (98%).
+    
+    812 translated messages, 9 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 984736f883b87a8ea678ac770a7442933037260b
+Author: readmanr <robert_readman@hotmail.com>
+Date:   Sat Oct 5 06:30:52 2013 +0200
+
+    I18n: Add new translation en_GB (100%).
+    
+    821 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d300e65331aac20b4e28021c4efc1733f77d0d23
+Author: mohammad alhargan <malham1@hotmail.com>
+Date:   Sun Sep 29 12:30:44 2013 +0200
+
+    I18n: Update translation ar (100%).
+    
+    821 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit b6dd7c7078b1cb9d7a1fa5c37a328828abfec7a7
+Author: 玉堂白鹤 <yjwork@qq.com>
+Date:   Mon Sep 9 12:31:01 2013 +0200
+
+    I18n: Update translation zh_CN (96%).
+    
+    794 translated messages, 27 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 241e4025d35ac1ec9fcbb0ef4930a6286ba9ade5
+Author: Yarema aka Knedlyk <yupadmin@gmail.com>
+Date:   Sat Sep 7 18:30:58 2013 +0200
+
+    I18n: Update translation uk (100%).
+    
+    821 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit b74b0740a297a76e52625b6ecceb9e9353189bf3
+Author: Yarema aka Knedlyk <yupadmin@gmail.com>
+Date:   Sat Sep 7 12:30:58 2013 +0200
+
+    I18n: Update translation uk (98%).
+    
+    810 translated messages, 11 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 5151a79946d491ae46cbde048733b916275afbcb
+Author: nunom <nunomgue@gmail.com>
+Date:   Mon Sep 2 18:30:59 2013 +0200
+
+    I18n: Update translation pt (100%).
+    
+    821 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 70a40106c57ef7561b0621e94e0e7e1f60ba8042
+Author: Yarema aka Knedlyk <yupadmin@gmail.com>
+Date:   Mon Sep 2 06:31:03 2013 +0200
+
+    I18n: Add new translation uk (97%).
+    
+    803 translated messages, 18 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 53d3ca82f919d9b486544c9d8023e1e355fbfd83
+Author: Anonymous <noreply@xfce.org>
+Date:   Mon Sep 2 00:31:01 2013 +0200
+
+    I18n: Update translation it (97%).
+    
+    798 translated messages, 23 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit b8d7667539005a10518455e3e5be5651e7d91c4c
+Author: Nucleo <nucleo@indamail.hu>
+Date:   Sat Aug 31 06:30:57 2013 +0200
+
+    I18n: Update translation hu (98%).
+    
+    809 translated messages, 12 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit a62805580b0e845178102d6c870f6d84ae6cc480
+Author: Abduqadir Abliz <sahran.ug@gmail.com>
+Date:   Sun Aug 25 06:31:04 2013 +0200
+
+    I18n: Update translation ug (92%).
+    
+    761 translated messages, 60 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d09e7e9ce56f78a8cceb628d435488c2db72a286
+Author: Piotr Strębski <strebski@o2.pl>
+Date:   Mon Aug 19 18:31:03 2013 +0200
+
+    I18n: Update translation pl (96%).
+    
+    791 translated messages, 30 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d7cb420f93e225a1da61152ac0553c6a5010d40a
+Author: Michal Várady <miko.vaji@gmail.com>
+Date:   Sun Aug 18 18:31:00 2013 +0200
+
+    I18n: Update translation cs (100%).
+    
+    821 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit e1361f3c53afd55c26daea0ca851047b3d3791e1
+Author: Radim Kolář <kolar.radim@gmail.com>
+Date:   Fri Aug 16 00:31:02 2013 +0200
+
+    I18n: Update translation cs (99%).
+    
+    818 translated messages, 3 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 501c08320d8b5af356692355ae7a89c77fce7029
+Author: Radim Kolář <kolar.radim@gmail.com>
+Date:   Thu Aug 15 18:30:59 2013 +0200
+
+    I18n: Update translation cs (98%).
+    
+    810 translated messages, 11 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit af741a33bf2f441b89d4910cc9480d1bd4c4fdf2
+Author: Alois Nešpor <info@aloisnespor.info>
+Date:   Mon Aug 12 12:31:10 2013 +0200
+
+    I18n: Update translation cs (97%).
+    
+    800 translated messages, 21 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 0b6b044e412d6764479e5574e0989d2ea0df5ec7
+Author: Anonymous <noreply@xfce.org>
+Date:   Mon Aug 5 18:31:04 2013 +0200
+
+    I18n: Update translation id (100%).
+    
+    821 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 20e655760a992e4ea516eb1e9d59b879e6884e17
+Author: volkangezer <volkangezer@gmail.com>
+Date:   Tue Jul 30 18:31:06 2013 +0200
+
+    I18n: Update translation tr (100%).
+    
+    821 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit cf291f918bd2fbd0f63e249c4478850410ecbf90
+Author: Pablo Lezaeta <prflr88@gmail.com>
+Date:   Tue Jul 30 12:31:05 2013 +0200
+
+    I18n: Update translation es (100%).
+    
+    821 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit bf425f5f63bc1118c969b22ea75389c923a30a0d
+Author: k3lt01 <keltoiboy@gmail.com>
+Date:   Mon Jul 29 12:31:20 2013 +0200
+
+    I18n: Add new translation en_AU (100%).
+    
+    821 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 6499dfdb379cac1c93d432b084129c74d7afd4dc
+Author: Darkcircle <darkcircle.0426@gmail.com>
+Date:   Sat Jul 27 06:30:53 2013 +0200
+
+    I18n: Update translation ko (100%).
+    
+    821 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 461315275d55d41fb670e43daf9e956b1415124f
+Author: Sungjin Gang <potopro@gmail.com>
+Date:   Thu Jul 25 12:31:06 2013 +0200
+
+    I18n: Update translation ko (98%).
+    
+    811 translated messages, 10 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 251b920d9ebb901658ddf1349106f1f7b1aaab89
+Author: Darkcircle <darkcircle.0426@gmail.com>
+Date:   Sun Jul 21 18:30:52 2013 +0200
+
+    I18n: Update translation ko (98%).
+    
+    810 translated messages, 11 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit b1948fcdd3835879f7047f5a78a625db3903f228
+Author: asvl <alyoshin.s@gmail.com>
+Date:   Fri Jul 19 00:30:54 2013 +0200
+
+    I18n: Update translation ru (100%).
+    
+    821 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d199581f4c5506cb4058bf7e20199f17a01d0473
+Author: Adolfo Jayme Barrientos <fitoschido@ubuntu.com>
+Date:   Thu Jul 18 18:30:55 2013 +0200
+
+    I18n: Update translation es (99%).
+    
+    820 translated messages, 1 untranslated message.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d5d2ce9d285e31791fea83c3bbe73f5827943ff6
+Author: salepetronije <salepetronije@gmail.com>
+Date:   Thu Jul 18 12:30:54 2013 +0200
+
+    I18n: Update translation sr (100%).
+    
+    821 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d61e931b2f89d5bccd872b6cb2d839f147d8c40c
+Author: Pablo Lezaeta <prflr88@gmail.com>
+Date:   Thu Jul 18 06:30:55 2013 +0200
+
+    I18n: Update translation es (99%).
+    
+    815 translated messages, 6 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 7f4cb79c59d8487e615cf76aafec35bd7eaf7347
+Author: Anonymous <noreply@xfce.org>
+Date:   Wed Jul 17 12:31:02 2013 +0200
+
+    I18n: Update translation ug (92%).
+    
+    758 translated messages, 63 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit bf828d600050db2dd3246363d25464995fd037a0
+Author: Aleksandr P <davian818@gmail.com>
+Date:   Tue Jul 16 18:30:54 2013 +0200
+
+    I18n: Add new translation ru (97%).
+    
+    800 translated messages, 21 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 97bc2a4a64b5edab1901499eff870dadde51f3f2
+Author: MC <correomc2000-ing@yahoo.es>
+Date:   Tue Jul 16 18:30:54 2013 +0200
+
+    I18n: Update translation es (96%).
+    
+    795 translated messages, 26 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 0fa041aaa87785ff38d0fe4b805cfd6881d2c637
+Author: Rafael Ferreira <rafael.f.f1@gmail.com>
+Date:   Tue Jul 16 06:30:53 2013 +0200
+
+    I18n: Update translation pt_BR (100%).
+    
+    821 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 9fb10250d9d0eafe26c796395346587c998b741e
+Author: MC <correomc2000-ing@yahoo.es>
+Date:   Mon Jul 15 12:30:56 2013 +0200
+
+    I18n: Update translation es (96%).
+    
+    791 translated messages, 30 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 688a35e379e63176bbbbdd040f3c9d6ba8053113
+Author: Alex Nordlund <deep.alexander@gmail.com>
+Date:   Mon Jul 15 00:30:55 2013 +0200
+
+    I18n: Update translation sv (92%).
+    
+    760 translated messages, 61 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 2e3f3714eec8add3b9d8f9cee11c6be04600d998
+Author: jc1 <jc1.quebecos@gmail.com>
+Date:   Mon Jul 15 00:30:55 2013 +0200
+
+    I18n: Update translation fr (100%).
+    
+    821 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 073c82c1a3b68c8519c69cb0f836ba63faebefc5
+Author: Pjotr123 <pjotrvertaalt@gmail.com>
+Date:   Sun Jul 14 18:30:53 2013 +0200
+
+    I18n: Update translation nl (100%).
+    
+    821 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 792bb7e0a19558bb5bbc0d67de9d0e9bb5543d8a
+Author: Ardjuna <Asyura.x@gmail.com>
+Date:   Sun Jul 14 18:30:53 2013 +0200
+
+    I18n: Update translation id (99%).
+    
+    819 translated messages, 2 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 13515ba1e985b525035068963ed9a9edb8d5f9bd
+Author: edmael <edoardo.elidoro@gmail.com>
+Date:   Sun Jul 14 12:30:56 2013 +0200
+
+    I18n: Update translation it (96%).
+    
+    796 translated messages, 25 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit fd5e5ab39dc09d46b3137668074d71b880b77656
+Author: Ardjuna <Asyura.x@gmail.com>
+Date:   Sun Jul 14 12:30:56 2013 +0200
+
+    I18n: Update translation id (96%).
+    
+    792 translated messages, 29 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit cdcb927b40a3e1f127aba8826f2ebd21789c9b13
+Author: cybercop <cybercop_montana@abv.bg>
+Date:   Sun Jul 14 12:30:55 2013 +0200
+
+    I18n: Update translation bg (100%).
+    
+    821 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 62504dc40ce9a6a13d6c4919b2a6c62757c6d87d
+Author: Nick Schermer <nick@xfce.org>
+Date:   Sat Jul 13 22:09:21 2013 +0200
+
+    Remove unneeded files.
+
+commit 113f0ceca237733b7d532625bbfec0da20ec4c20
+Author: Nick Schermer <nick@xfce.org>
+Date:   Sat Jul 13 20:07:09 2013 +0200
+
+    Autoparse LINGUAS and drop pot file.
+    
+    Transifex script auto-generates the pot file to make sure
+    its always up2date.
+
+commit 0a047f71a7acff4c6f08573352fa7e830fb1c78d
+Author: kelemeng <kelemeng@gnome.hu>
+Date:   Wed Jul 10 00:31:08 2013 +0200
+
+    I18n: Add new translation hu (100%).
+    
+    801 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 411854530e263a469af37ee49808e1bef3a4f648
+Author: carlesmu <carlesmu@internautas.org>
+Date:   Tue Jul 9 00:30:59 2013 +0200
+
+    I18n: Add new translation ca (100%).
+    
+    801 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 1c6420c7b61dfe60f53dbaadd537499331a2b140
+Author: Ardjuna <Asyura.x@gmail.com>
+Date:   Sun Jul 7 12:10:58 2013 +0200
+
+    I18n: Add new translation id (100%).
+    
+    801 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 164863c27a690b2ddf09481bbadb101537dace13
+Author: Sérgio Marques <smarquespt@gmail.com>
+Date:   Fri Jul 5 22:59:55 2013 +0200
+
+    I18n: Add new translation pt (97%).
+    
+    801 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit c9514ce0c5a43477c86b905e16d0cffac4a48897
+Author: elder <elderlinx@riseup.net>
+Date:   Fri Jul 5 22:59:55 2013 +0200
+
+    I18n: Add new translation pl (97%).
+    
+    783 translated messages, 18 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 8c0fe4075847ace8b7d40d47e0edd2895d988fff
+Author: Pjotr123 <pjotrvertaalt@gmail.com>
+Date:   Fri Jul 5 22:59:55 2013 +0200
+
+    I18n: Add new translation nl (99%).
+    
+    801 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 10c21a5687dc3215d192928bc0c251210ad8aa20
+Author: cri <cri.penta@gmail.com>
+Date:   Fri Jul 5 22:59:55 2013 +0200
+
+    I18n: Add new translation it (99%).
+    
+    801 translated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 026af4e5ef8eb1c9ad8a181f27dfcf58ec0d62a0
+Author: Piarres Beobide <pi@beobide.net>
+Date:   Fri Jul 5 22:59:55 2013 +0200
+
+    I18n: Add new translation eu (99%).
+    
+    798 translated messages, 3 untranslated messages.
+    
+    Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit dc6b9be1fcd19f085cc30bb32faed6bcbd393ee1
+Author: Nick Schermer <nick@xfce.org>
+Date:   Wed Jul 3 20:26:13 2013 +0200
+
+    I18n: Remove broken / unsupported translations.
+    
+    See http://users.xfce.org/~nick/broken-i18n/ for files and logs.
+    
+    Use https://www.transifex.com/projects/p/xfce/ to upload fixed versions or request a translation team.
+
+commit 318fcb9263dbe824595d33b316f4da79351de87c
+Author: Rafael Ferreira <rafael.f.f1@gmail.com>
+Date:   Fri Jun 28 21:25:37 2013 +0200
+
+    l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 1baf588abb199ab30d0edd719fd55a191ec8a683
+Author: Piotr Sokół <psokol@jabster.pl>
+Date:   Tue Jun 11 16:40:27 2013 +0200
+
+    l10n: Updated Polish (pl) translation to 97%
+    
+    New status: 782 messages complete with 2 fuzzies and 17 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit dfa78d708ef0adce309cfe0240ae4a8ae9852e67
+Author: Pjotr vertaalt <pjotrvertaalt@gmail.com>
+Date:   Fri Apr 26 13:01:16 2013 +0200
+
+    l10n: Updated Dutch (Flemish) (nl) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit a5a6a867f5a8725b91d7bfade5843abb56d71f95
+Author: Francisco Javier Serrador <fserrador@gmail.com>
+Date:   Thu Mar 28 19:42:40 2013 +0100
+
+    l10n: Updated Spanish (Castilian) (es) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 56a2e0c9fdcc80a25966bb0d67473d67246a1d5e
+Author: Baurzhan Muftakhidinov <baurthefirst@gmail.com>
+Date:   Wed Mar 20 17:38:11 2013 +0100
+
+    l10n: Updated Kazakh (kk) translation to 60%
+    
+    New status: 484 messages complete with 20 fuzzies and 297 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit dab0126bc65701f353a4b27aee7e1a6ec04c4dc7
+Author: Rickard Larsson <larsson@odus.se>
+Date:   Sun Mar 17 22:45:09 2013 +0100
+
+    l10n: Updated Swedish (sv) translation to 94%
+    
+    New status: 760 messages complete with 12 fuzzies and 29 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit a8463fe41a3862721c0d4980503853d23791f649
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Sun Mar 17 16:55:26 2013 +0100
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 553a0f017e18488ab2dd6a92f6812dd7428e4d30
+Author: Саша Петровић <salepetronije@gmail.com>
+Date:   Wed Mar 6 16:26:05 2013 +0100
+
+    l10n: Updated Serbian (sr) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit fe44905a798c74d70901d20f10e431be6184ed3f
+Author: Саша Петровић <salepetronije@gmail.com>
+Date:   Wed Mar 6 16:23:58 2013 +0100
+
+    l10n: Updated Serbian (sr) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 7edbd569e0fcbdb69ed3ea12ef57971b25a60237
+Author: Juha <juha@xfce.org>
+Date:   Wed Feb 13 14:54:02 2013 +0200
+
+    4.9.6.0 Fixed bug 9024 Removing Elements Does Not Reduce Window Size
+    
+    Fixed parameters so that that removing both event and todo box also
+    causes the space they take to vanish.
+    Also fixed a bug where adding todo box after start did not actually
+    add it.
+    Also added code to save main calendar window size and location always
+    when ending Orage (unless killed).
+    Also changed parameter order a little to be more consistent.
+
+commit bd4d460ed7ecf50362696ac9b723ad880a1d52cd
+Author: Juha <juha@xfce.org>
+Date:   Tue Feb 12 14:58:52 2013 +0200
+
+    4.9.5.0 Enhancement 9011 improve tooltip behaviour
+    
+    Limited note text tooltip size to fixed 50 x 10 chars (= 10 lines max
+    and each line max length is 50).
+    Also changed orage_message timestamp location. And added formatted
+    tooltip to day view.
+
+commit 88ed9186ea9a35a241ebf068ac953df5e5f8219b
+Author: Juha <juha@xfce.org>
+Date:   Mon Feb 11 12:45:20 2013 +0200
+
+    4.9.4.2 Enhancement 6597 Use GtkTooltip and allow for Pango markup
+    
+    Removed deprecated tooltip calls and replaced with new ones.
+    Tooltips are not configurable though and seldom use markups.
+
+commit 1dc76238cff26cd2d21804f906a9867e867dfa8d
+Author: Juha <juha@xfce.org>
+Date:   Sun Feb 10 13:02:43 2013 +0200
+
+    4.9.4.1 Internal changes to parameter window and c and h files
+    
+    Restructured parameter window. Put all main calendar settings to same
+    page and all the rest to the extra page. And also move sepections to
+    same line instead of top and below. Also added new internal parameter
+    h file.
+
+commit e9af2cb15ff2f02ea282e3df75148e515c6bc040
+Author: Juha <juha@xfce.org>
+Date:   Thu Feb 7 14:14:03 2013 +0200
+
+    4.9.4.0 Fixed bug 9017 improve 'delete' confirmation message
+    
+    Changed warning dialog to use customer buttons. Added more text to
+    buttons hoping that they are clearer now.
+
+commit 9cd5285a18a68edf68e76992fcb13fa8a8d67dbb
+Author: Juha <juha@xfce.org>
+Date:   Thu Feb 7 13:03:55 2013 +0200
+
+    4.9.3.0 Fixed bug 9014 rename 'Execute' to 'Postpone'
+    
+    Thanks to Øyvind Ingvaldsen for this fix.
+
+commit f452d76e6cbf4c378d74f3130be88323a26a5494
+Author: Juha <juha@xfce.org>
+Date:   Thu Feb 7 11:10:08 2013 +0200
+
+    4.9.2.0 Enhancement 8383 option to day view start on first day of week
+    
+    Added visible parameter to start day view on first day of week. Also
+    changed small arrows to move 7 days when weekmode is selected. Also
+    added week movement buttons.
+    
+    Now also remember day view size and location.
+    
+    Also fixed rare problem with start and end dates due to timezone
+    changing date.
+
+commit 881df443fc37b8371e08e4b8711eabf95b70a2e2
+Author: كريم أولاد الشلحة <herr.linux88@gmail.com>
+Date:   Tue Feb 5 20:55:54 2013 +0100
+
+    l10n: Updated Arabic (ar) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 9d38d9b574780e7aa6b8f869c62869b011040260
+Author: Juha <juha@xfce.org>
+Date:   Tue Feb 5 13:13:43 2013 +0200
+
+    4.9.1.2 version change
+
+commit 2e88ef13dafb15f49b55e6564872a5f2efbad2d0
+Author: Juha <juha@xfce.org>
+Date:   Tue Feb 5 13:11:32 2013 +0200
+
+    4.9.1.2 Enhancement 8231 alarm type selectable for foreign files
+    
+    Made the selection visible and user configurable from parameters menu.
+    Also fixed tooltip as note needs to be escaped.
+
+commit 93df404a27b1fe7e1ea8425d51f49d5c2f4f86dd
+Author: juha <juha@debian-testi.domain.invalid>
+Date:   Mon Feb 4 18:33:38 2013 +0200
+
+    4.9.1.1 Fixed bug 9530  Pick the date dialog isn't localized
+    
+    Moved localized strings from functionc.c to calling files.
+    Also fixed tooltip hint to NOT show note as bold.
+
+commit 8b2040d13bc85459f9ff13421325ff3a4abb3665
+Author: Masato Hashimoto <hashimo@xfce.org>
+Date:   Mon Feb 4 14:12:31 2013 +0100
+
+    l10n: Updated Japanese (ja) translation to 100%
+    
+    New status: 803 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit ed8e48c6e21cdaf8b0f78529563b73c1cd58f22d
+Author: Juha <juha@xfce.org>
+Date:   Mon Feb 4 13:55:15 2013 +0200
+
+    4.9.1.0 Enhancement 9810 tooltips should not display "Location: (null)"
+    
+    Removed location and note totally if they are null instead of showing
+    (null). Thanks to Lee Thomas for the patch!
+    Also removed gtk check 2.16 and changed gtk requirement to be 2.16.
+
+commit 63f351bc49a58dd3c18aa1399279a3db9690b889
+Author: Juha <juha@xfce.org>
+Date:   Fri Feb 1 15:36:58 2013 +0200
+
+    4.9.0.0: Fixed Bug 9249 1 Flag show wrong for hourly recurrence
+    
+    Added hourly recurrency to the flags and to the tooltip.
+    Also fixed alarm to correctly show if it is set and if it is persistent.
+
+commit bf7da8662252521f2dcd60dc7d9baa615379917d
+Author: Juha <juha@xfce.org>
+Date:   Fri Feb 1 12:14:48 2013 +0200
+
+    4.8.4.0 After release version reset
+    
+    Release done. Resetting version back to git type.
+
+commit 94cc6faf80df8e017567a2b67710d92dac9c4050
+Author: Juha <juha@xfce.org>
+Date:   Fri Feb 1 12:03:53 2013 +0200
+
+    Release 4.8.4!
+    
+    Orage production release 4.8.4.
+
+commit 2f3fa41eb3eb823e432c5bbb9a1e10112b5043e2
+Author: Juha <juha@xfce.org>
+Date:   Wed Jan 30 15:38:43 2013 +0200
+
+    4.8.3.9 Fixes for bold title
+    
+    Needed to escape strings because bold is using markups.
+
+commit e85ab252befb9897c6bbfb90f553bf241aa4ea63
+Author: Juha <juha@xfce.org>
+Date:   Tue Jan 29 14:48:16 2013 +0200
+
+    4.8.3.8 Enhancement 9598 use bold for 'title' and 'location' in tooltips
+    
+    Added bold to tooltip if gtk version is good enough to do it.
+
+commit 436c095d46dbcefd95f99a7e50cf7b155c3e2ac8
+Author: Juha <juha@xfce.org>
+Date:   Mon Jan 28 15:47:39 2013 +0200
+
+    4.8.3.7 Enhancement 9738 Main window should sort TODOs by due-date
+    
+    Changed main calendar to sort TODOs based on due-date (those without due
+    date come last).
+
+commit 9b157a7511f3007ba188bb576621f95729728c6c
+Author: Juha <juha@xfce.org>
+Date:   Mon Jan 28 13:56:10 2013 +0200
+
+    4.8.3.6 Fixed Bug 9739 TODOs should start not completed
+    
+    Thanks to patch for Lee Thomas!
+    Changed default to be not completed for new TODOs. Makes very much sense.
+
+commit 6b2bf978cb111b8702abf17c099d195afb13544a
+Author: Juha <juha@xfce.org>
+Date:   Mon Jan 28 13:46:10 2013 +0200
+
+    4.8.3.5 Fixed Bug 9248 provided libical bugs SSPM_UNKNOWN_MINOR_TYPE
+    
+    Should use SSPM_UNKNOWN_MAJOR_TYPE instead of SSPM_UNKNOWN_MINOR_TYPE.
+
+commit 02558f98881c8d526c92beedde466be7ba9aa25b
+Author: Juha <juha@xfce.org>
+Date:   Mon Jan 28 13:35:59 2013 +0200
+
+    4.8.3.4 Fixed bug 9243 missing files
+    
+    Forgot to add those files.
+
+commit e27bff4d26d8a60f8f415d0a96be581bbb816860
+Author: Juha <juha@xfce.org>
+Date:   Mon Jan 28 13:33:52 2013 +0200
+
+    4.8.3.4 Fixed Bug 9243 strptime() needs _XOPEN_SOURCE_EXTENDED to be defined
+    
+    Added the define to satisfy posix requirements.
+
+commit 0d1f8b80eea19934e0a5f10e51be2536683a9a21
+Author: Juha <juha@xfce.org>
+Date:   Mon Jan 28 12:34:24 2013 +0200
+
+    4.8.3.3 Fixed Bug 4817  Orage escapes anchor (#) in help links
+    
+    Need to use full names to keep # in the URL. Added file:// in the
+    beginning of the URL
+
+commit 543b1f2d13412bec26cbb1152624ba565aa3ddbe
+Merge: 1aac08d 7e3d01a
+Author: Juha <juha@xfce.org>
+Date:   Mon Jan 28 11:14:55 2013 +0200
+
+    Merge branch 'master' of ssh://git.xfce.org/apps/orage
+
+commit 1aac08d0c480ea3f2904c31c170f8184810f3133
+Author: juha <juha@t400.domain.invalid>
+Date:   Mon Jan 28 11:08:17 2013 +0200
+
+    4.8.3.2: Enhancement 8231: alarm type selectable for foreign ics files
+    
+    It is now possible to set default alarm type for foreign file alarms.
+    Note that this is done via parameter "Use notify foreign alarm" and it is
+    not documented and not available in menus and forms.
+
+commit 7e3d01abf824a7433c2b030cb489690c6094b07a
+Author: Kiril Kirilov <cybercop_montana@abv.bg>
+Date:   Wed Jan 23 12:13:08 2013 +0100
+
+    l10n: Updated Bulgarian (bg) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit f14c76d57342335786cdf2686b0942fb5a32915e
+Author: Kiril Kirilov <cybercop_montana@abv.bg>
+Date:   Wed Jan 23 10:47:41 2013 +0100
+
+    l10n: Updates to Bulgarian translation
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 989abdb15e3e06eee5876d702587ca24456779c7
+Author: Georgios Stefanakis <nonviotale@gmail.com>
+Date:   Fri Jan 18 13:49:43 2013 +0100
+
+    l10n: Updated Greek (el) translation to 81%
+    
+    New status: 649 messages complete with 49 fuzzies and 103 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit f2242e200ac5706270fd3a529bc2a1ace4155b0b
+Author: Michał Olber <michal.olber@osworld.pl>
+Date:   Thu Jan 17 09:48:59 2013 +0100
+
+    l10n: Updated Polish (pl) translation to 97%
+    
+    New status: 782 messages complete with 0 fuzzies and 19 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit baa0c75425648938be1fe37087941b6f2d262d05
+Author: jc jc1 <jc1.quebecos@gmail.com>
+Date:   Mon Dec 31 01:14:24 2012 +0100
+
+    l10n: Updated French (fr) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit b2e5e3fbc24bee79c86d1c543f8bb18cb1d3aef3
+Author: jc jc1 <jc1.quebecos@gmail.com>
+Date:   Mon Dec 31 01:00:13 2012 +0100
+
+    l10n: Updated French (fr) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit f43462834669c1874413d1785136a6a5af698821
+Author: jc jc1 <jc1.quebecos@gmail.com>
+Date:   Mon Dec 31 00:54:27 2012 +0100
+
+    l10n: Updated French (fr) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 354eb75f190fefe8d80a3c5281b1352490ca4e13
+Author: jc jc1 <jc1.quebecos@gmail.com>
+Date:   Mon Dec 31 00:48:13 2012 +0100
+
+    l10n: Updated French (fr) translation to 99%
+    
+    New status: 800 messages complete with 1 fuzzy and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 7685fc80488d4ecb5f142be44c6b087c564ce127
+Author: jc jc1 <jc1.quebecos@gmail.com>
+Date:   Mon Dec 31 00:44:33 2012 +0100
+
+    l10n: Updated French (fr) translation to 99%
+    
+    New status: 799 messages complete with 2 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit cbd11a86c0cb7506e8a048abcd4c695e1b8f2679
+Author: jc jc1 <jc1.quebecos@gmail.com>
+Date:   Mon Dec 31 00:40:31 2012 +0100
+
+    l10n: Updated French (fr) translation to 99%
+    
+    New status: 796 messages complete with 5 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 1c58373d153858457ab4a80d2855046954c59dd7
+Author: jc jc1 <jc1.quebecos@gmail.com>
+Date:   Mon Dec 31 00:36:50 2012 +0100
+
+    l10n: Updated French (fr) translation to 99%
+    
+    New status: 793 messages complete with 8 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit f8a0da3a34b9693ac19608c47cdff974b8e8da02
+Author: jc jc1 <jc1.quebecos@gmail.com>
+Date:   Sun Dec 30 21:03:20 2012 +0100
+
+    l10n: Updated French (fr) translation to 98%
+    
+    New status: 791 messages complete with 10 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit d738ffe231e62a06dfb12bd203d0fdc13c84454e
+Author: jc jc1 <jc1.quebecos@gmail.com>
+Date:   Sat Dec 15 16:38:29 2012 +0100
+
+    l10n: Updated French (fr) translation to 98%
+    
+    New status: 790 messages complete with 11 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit d90d4003a60e54765a6f7889880a31fd8101e2cd
+Author: Yaron Shahrabani <sh.yaron@gmail.com>
+Date:   Tue Dec 11 10:38:31 2012 +0100
+
+    l10n: Updated Hebrew (he) translation to 59%
+    
+    New status: 473 messages complete with 90 fuzzies and 238 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 899df0fc0c6798edce1c5f4c1fadb8637eacf411
+Author: Ivica  Kolić <ikoli@yahoo.com>
+Date:   Wed Nov 14 18:10:51 2012 +0100
+
+    l10n: Updated Croatian (hr) translation to 87%
+    
+    New status: 704 messages complete with 0 fuzzies and 97 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit d73a50857f420aa3749395e4a612f15f93ce9e6c
+Author: محمد الحرقان <malham1@gmail.com>
+Date:   Sun Nov 11 04:34:45 2012 +0100
+
+    l10n: Updated Arabic (ar) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 3ea6ca135801e9015290d11722c53d6ea49510c2
+Author: Marcin Romańczuk <abjsyn@gmail.com>
+Date:   Thu Nov 1 17:25:07 2012 +0100
+
+    l10n: Updated Polish (pl) translation to 96%
+    
+    New status: 774 messages complete with 0 fuzzies and 27 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit e5e83c0fb11971e6758047e0608296a1b12771ea
+Author: Anurag Garg <ang.astronomy@gmail.com>
+Date:   Mon Oct 29 16:53:09 2012 +0100
+
+    l10n: Updated Hindi (hi) translation to 32%
+    
+    New status: 262 messages complete with 26 fuzzies and 513 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 7ab55d777fe274ac419309479cb567b58955e17e
+Author: Gheyret Kenji <gheyret@yahoo.com>
+Date:   Wed Oct 24 06:25:24 2012 +0200
+
+    l10n: Updated Uyghur (ug) translation to 95%
+    
+    New status: 764 messages complete with 0 fuzzies and 37 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 8a0a3ddc35e539a57b7a2a7b6427f660620d47f4
+Author: Marcin Romańczuk <abjsyn@gmail.com>
+Date:   Sun Oct 7 15:47:09 2012 +0200
+
+    l10n: Updated Polish (pl) translation to 95%
+    
+    New status: 763 messages complete with 3 fuzzies and 35 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit a42f3f6ab27615ea53f4bc7a6a9c78c9f8a45bb3
+Author: Gheyret Kenji <gheyret@yahoo.com>
+Date:   Fri Sep 28 09:52:46 2012 +0200
+
+    l10n: Updated Uyghur (ug) translation to 94%
+    
+    New status: 758 messages complete with 0 fuzzies and 43 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 4fe7b1cb28ed0a1b65827714730793cab69f73ad
+Author: Gheyret Kenji <gheyret@yahoo.com>
+Date:   Fri Sep 28 09:35:47 2012 +0200
+
+    l10n: Updated Uyghur (ug) translation to None%
+    
+    New status: 0 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 054b6365438553d94cc0cdae3e023778bf592148
+Author: Piotr Strębski <strebski@o2.pl>
+Date:   Wed Sep 26 22:11:10 2012 +0200
+
+    l10n: Updated Polish (pl) translation to 94%
+    
+    New status: 760 messages complete with 3 fuzzies and 38 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 9449f94709aa9bac454565e5961e00baa718d064
+Author: Piotr Strębski <strebski@o2.pl>
+Date:   Wed Sep 26 22:09:33 2012 +0200
+
+    l10n: Updated Polish (pl) translation to 94%
+    
+    New status: 758 messages complete with 5 fuzzies and 38 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit dd43d9c1f6712413b3ed4b852dbb03009ad92545
+Author: Piotr Strębski <strebski@o2.pl>
+Date:   Mon Sep 24 15:12:09 2012 +0200
+
+    l10n: Updated Polish (pl) translation to 94%
+    
+    New status: 756 messages complete with 5 fuzzies and 40 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 178e55f1fc91109ffdf68eea09283b38c72c7be3
+Author: Adolfo Jayme Barrientos <fitoschido@gmail.com>
+Date:   Sun Sep 23 10:54:21 2012 +0200
+
+    l10n: Updated Spanish (Castilian) (es) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 66866db3beb76eedd3d80b4c801663c1d9114587
+Author: Mikalai Udodau <crom-a@tut.by>
+Date:   Sat Sep 8 10:34:51 2012 +0200
+
+    l10n: Updated Belarusian (be) translation to 90%
+    
+    New status: 721 messages complete with 2 fuzzies and 78 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit a8cf3a712a7c31a67fed51dafd287d55cb0ed8ac
+Author: Mikalai Udodau <crom-a@tut.by>
+Date:   Mon Sep 3 22:55:28 2012 +0200
+
+    l10n: Updated Belarusian (be) translation to 86%
+    
+    New status: 692 messages complete with 2 fuzzies and 107 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 3b872c8cb3f58101fb115e69057756a3a7653d5e
+Author: jc jc1 <jc1.quebecos@gmail.com>
+Date:   Wed Aug 29 17:04:47 2012 +0200
+
+    l10n: Updated French (fr) translation to 98%
+    
+    New status: 786 messages complete with 15 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit bdac954263feb6c56624dedfc8d0b6dcfa90fc22
+Author: Ivica  Kolić <ikoli@yahoo.com>
+Date:   Tue Aug 28 18:51:56 2012 +0200
+
+    l10n: Updated Croatian (hr) translation to 86%
+    
+    New status: 696 messages complete with 0 fuzzies and 105 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 17ace0ba46897912b90fff2ac02642b5c64a47b8
+Author: Gheyret Kenji <gheyret@yahoo.com>
+Date:   Fri Aug 24 10:03:14 2012 +0200
+
+    l10n: Updated Uyghur (ug) translation to 92%
+    
+    New status: 738 messages complete with 0 fuzzies and 63 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit aacda353561b707a52158583683f26803f779d23
+Author: Gheyret Kenji <gheyret@yahoo.com>
+Date:   Fri Aug 24 09:57:53 2012 +0200
+
+    l10n: Updated Uyghur (ug) translation to None%
+    
+    New status: 0 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 28605dd380789c9bfe5cae03d60132234f86f682
+Author: Efstathios Iosifidis <iefstathios@gmail.com>
+Date:   Fri Aug 24 00:02:24 2012 +0200
+
+    l10n: Updated Greek (el) translation to 80%
+    
+    New status: 648 messages complete with 50 fuzzies and 103 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit c3b05abc9f5682a26534d72f181634f2bdfe3955
+Author: Efstathios Iosifidis <iefstathios@gmail.com>
+Date:   Sun Aug 19 20:44:19 2012 +0200
+
+    l10n: Updated Greek (el) translation to 78%
+    
+    New status: 627 messages complete with 55 fuzzies and 119 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 11ae3aa95d0233d3fef53180dc14e2b4fbaf0d26
+Author: Mikalai Udodau <crom-a@tut.by>
+Date:   Sun Aug 19 19:01:56 2012 +0200
+
+    l10n: Updated Belarusian (be) translation to 83%
+    
+    New status: 665 messages complete with 3 fuzzies and 133 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit d43d5ab59f4a4b96da5d25bd8f176e33603adeff
+Author: Mikalai Udodau <crom-a@tut.by>
+Date:   Thu Aug 9 22:03:31 2012 +0200
+
+    l10n: Updated Belarusian (be) translation to 68%
+    
+    New status: 549 messages complete with 38 fuzzies and 214 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit aef682c8a399dcf3c75bdce48108c69e5ec841e5
+Author: Mikalai Udodau <crom-a@tut.by>
+Date:   Thu Aug 9 21:53:37 2012 +0200
+
+    l10n: Updated Belarusian (be) translation to 67%
+    
+    New status: 544 messages complete with 38 fuzzies and 219 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit e0db427bee9586c5a70bee62ca465a3d01ac146c
+Author: Walter cheuk <wwycheuk@gmail.com>
+Date:   Thu Aug 9 16:40:15 2012 +0200
+
+    l10n: Updated Chinese (Taiwan) (zh_TW) translation to 83%
+    
+    New status: 667 messages complete with 7 fuzzies and 127 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 213a47597b44524a407c0a8a9f18f8de6f466e5c
+Author: Mikalai Udodau <crom-a@tut.by>
+Date:   Wed Aug 8 20:38:35 2012 +0200
+
+    l10n: Updated Belarusian (be) translation to 65%
+    
+    New status: 526 messages complete with 49 fuzzies and 226 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit f594713f4b8d05bf886b18703102e3ab967b6f21
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Sun Aug 5 21:03:25 2012 +0200
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit a630504e6e6ca6a4855d7526f7f843bfed8a3153
+Author: Piarres Beobide <pi@beobide.net>
+Date:   Sun Jul 15 19:21:19 2012 +0200
+
+    l10n: Updated Basque (eu) translation to 99%
+    
+    New status: 798 messages complete with 0 fuzzies and 3 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 23a6f8136f070b26e4e4dff4e05639d7f75e3705
+Author: Gheyret Kenji <gheyret@yahoo.com>
+Date:   Fri Jul 6 08:01:45 2012 +0200
+
+    l10n: Updated Uyghur (ug) translation to 91%
+    
+    New status: 735 messages complete with 0 fuzzies and 66 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 71e8ae74b9ab038e60a17e3f4a2cd53a965db4f5
+Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
+Date:   Wed Jun 20 10:23:07 2012 +0200
+
+    l10n: Updated Serbian (sr) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit e8ac2739ef0652056c00a325246a62563e26135a
+Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
+Date:   Sat Jun 16 05:51:52 2012 +0200
+
+    l10n: New Serbian translation
+    
+    New status: 20 messages complete with 0 fuzzies and 781 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 95462531b2af79e8c85990abf270fea266e67587
+Author: Gheyret Kenji <gheyret@yahoo.com>
+Date:   Thu May 31 07:12:12 2012 +0200
+
+    l10n: Updated Uyghur (ug) translation to 91%
+    
+    New status: 729 messages complete with 0 fuzzies and 72 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit f1dfe4ab18497f62f1375d567549c32b2d2c08ff
+Author: محمد الحرقان <malham1@gmail.com>
+Date:   Mon May 21 22:14:01 2012 +0200
+
+    l10n: Updated Arabic (ar) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit e1b4118365876611d00c083638e852ac525a554f
+Author: Ivica  Kolić <ikoli@yahoo.com>
+Date:   Sat May 19 01:49:06 2012 +0200
+
+    l10n: Updated Croatian (hr) translation to 86%
+    
+    New status: 690 messages complete with 0 fuzzies and 111 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit af65fce7fce672dca6092d47512c141e99e0f731
+Author: Gheyret Kenji <gheyret@yahoo.com>
+Date:   Mon May 7 09:21:09 2012 +0200
+
+    l10n: Updated Uyghur (ug) translation to 91%
+    
+    New status: 729 messages complete with 0 fuzzies and 72 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 31fc518269fb39efa9c3c087bf54ffb48e6fa01b
+Author: Sergio García <oigres200@gmail.com>
+Date:   Sat Apr 28 09:31:32 2012 +0200
+
+    l10n: Updated Spanish (Castilian) (es) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 0e1125385ba9942473f9ee7d9f22f77bc21d0975
+Author: Sergio García <oigres200@gmail.com>
+Date:   Sat Apr 28 08:31:31 2012 +0200
+
+    l10n: Updated Spanish (Castilian) (es) translation to None%
+    
+    New status: 0 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 4ab1ab8e7c9a820fde62987341a5e5908734511e
+Author: Sergio García <oigres200@gmail.com>
+Date:   Sat Apr 28 08:28:48 2012 +0200
+
+    l10n: Updated Spanish (Castilian) (es) translation to None%
+    
+    New status: 0 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit b4a87027ae73e513b4e8e112dc2f7fbdf704af73
+Author: Chipong Luo <chipong.luo@yahoo.com>
+Date:   Thu Apr 26 12:23:38 2012 +0200
+
+    l10n: Updated Chinese (China) (zh_CN) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 223d05f0297c0f98b5bd92d700b1eaff7e6f5a61
+Author: Jakob Kramer <jakob.kramer@gmx.de>
+Date:   Wed Apr 25 16:38:42 2012 +0200
+
+    l10n: Updated German (de) translation to 99%
+    
+    New status: 798 messages complete with 3 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 0fd3ba17fde5482d613137409b8f46d703a43519
+Author: Michał Olber <michal.olber@osworld.pl>
+Date:   Wed Apr 25 13:36:13 2012 +0200
+
+    l10n: Updated Polish (pl) translation to 93%
+    
+    New status: 750 messages complete with 5 fuzzies and 46 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit f982f8d2b09fe0e0888254eb479ebe774eb7419f
+Author: Michał Olber <michal.olber@osworld.pl>
+Date:   Wed Apr 25 13:32:26 2012 +0200
+
+    l10n: Updated Polish (pl) translation to 92%
+    
+    New status: 742 messages complete with 6 fuzzies and 53 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit c71f3086771d1a79924c95bb05febabd06a92e70
+Author: Michał Olber <michal.olber@osworld.pl>
+Date:   Wed Apr 25 13:19:18 2012 +0200
+
+    l10n: Updated Polish (pl) translation to 92%
+    
+    New status: 739 messages complete with 9 fuzzies and 53 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit e1d94833e18b3a353feae57777aa87f42a78737b
+Author: Michał Olber <michal.olber@osworld.pl>
+Date:   Wed Apr 25 13:10:36 2012 +0200
+
+    l10n: Updated Polish (pl) translation to 90%
+    
+    New status: 727 messages complete with 17 fuzzies and 57 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit b7c56ee52c68ccc7690455f180f8231a3be6292a
+Author: Michał Olber <michal.olber@osworld.pl>
+Date:   Wed Apr 25 13:03:19 2012 +0200
+
+    l10n: Updated Polish (pl) translation to 89%
+    
+    New status: 719 messages complete with 19 fuzzies and 63 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit f1b0b142ff3ffb221d4e4bf36dfb471488c1fc89
+Author: Michał Olber <michal.olber@osworld.pl>
+Date:   Wed Apr 25 12:53:04 2012 +0200
+
+    l10n: Updated Polish (pl) translation to 88%
+    
+    New status: 707 messages complete with 22 fuzzies and 72 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit a50871deaa5ddba143779db495dc9e99962c01b4
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Sun Apr 22 22:00:47 2012 +0200
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 840fc0fa445b131df23edacb2b27f3a1fb043dd6
+Author: Chipong Luo <chipong.luo@yahoo.com>
+Date:   Fri Apr 20 18:06:23 2012 +0200
+
+    l10n: Updated Chinese (China) (zh_CN) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 155cfe2f06367b18d92ee8fabd1c3baa886800f5
+Author: Chipong Luo <chipong.luo@yahoo.com>
+Date:   Fri Apr 20 11:39:45 2012 +0200
+
+    l10n: Updated Chinese (China) (zh_CN) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit b7386880f13678e1cc4283db3fd7f75ff69dd5cf
+Author: Chipong Luo <chipong.luo@yahoo.com>
+Date:   Fri Apr 20 11:18:10 2012 +0200
+
+    l10n: Updated Chinese (China) (zh_CN) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit baead2a956c320574395a9572b0d7dd03bb4ce2a
+Author: Jeff Bailes <thepizzaking@gmail.com>
+Date:   Thu Apr 19 08:58:03 2012 +0200
+
+    l10n: Updated English (United Kingdom) (en_GB) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 750b65b0673b029ddebf64ee696704993aa65728
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Tue Apr 17 15:48:15 2012 +0200
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit ce46cf73506d2f559d3792b3a46f93a56e792ce4
+Author: Masato Hashimoto <hashimo@xfce.org>
+Date:   Sat Apr 14 08:34:31 2012 +0200
+
+    l10n: Updated Japanese (ja) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit dbe72bed7d7066f1da3efa565efe284fc5956b97
+Author: Iliyas Jorio <inv.jorio@gmail.com>
+Date:   Sat Apr 14 01:49:44 2012 +0200
+
+    l10n: Updated French (fr) translation to 95%
+    
+    New status: 767 messages complete with 8 fuzzies and 26 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 229d2406d5ff5ca7cb27074f6f5e84f7f3802b09
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Fri Apr 13 17:04:40 2012 +0200
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit ce9df777a64610e9e456f9817d650cf9788b5b3a
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Fri Apr 13 13:34:36 2012 +0200
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 7ad8b44917820bf58d6db9212f8caaddef5fc2a7
+Author: Eivind Ødegård <gingermig@yahoo.no>
+Date:   Thu Apr 12 18:10:07 2012 +0200
+
+    l10n: Updated Norwegian Nynorsk (nn) translation to 84%
+    
+    New status: 673 messages complete with 128 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 61c6a67a7ad2aeacbace9c8534960514a72622f4
+Author: André Miranda <andreldm1989@gmail.com>
+Date:   Thu Apr 12 03:53:29 2012 +0200
+
+    l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 67b0ef1bf89f87e46967b5f4b2d88d2d69bcef81
+Author: André Miranda <andreldm1989@gmail.com>
+Date:   Thu Apr 12 02:53:42 2012 +0200
+
+    l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 98%
+    
+    New status: 791 messages complete with 10 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit e786b4e51329718afe26dd46383ecfa389a15b3f
+Author: Sergio Marques <smarquespt@gmail.com>
+Date:   Wed Apr 11 16:31:03 2012 +0200
+
+    l10n: Updated Portuguese (pt) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 4b2ab74e0841a1c86e24a00c8c4d45c1cddb28b5
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Thu Apr 5 13:18:19 2012 +0200
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 7c766a86acb596f19ab8b9d431821990bb882d5f
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Thu Apr 5 11:25:50 2012 +0200
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit b5802a6c136a48e6d111079945ed8295f29167ce
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Thu Apr 5 10:03:08 2012 +0200
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 2bb38f3177da4d880ad5eec840e89505662b5924
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Wed Apr 4 23:05:46 2012 +0200
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit ca6432ac52a67f914ee5d3ef1028b9cb56e58e2e
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Sun Apr 1 12:57:31 2012 +0200
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 8e6c38855d21d3a79ef2b03e671e7e2f05aff5bd
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Sun Apr 1 11:56:48 2012 +0200
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 0f18a4bc6584f2987b67a7edae4986607c901755
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Thu Mar 29 12:40:48 2012 +0200
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit faddfd8bbab072c656ada023df434fd44c8fb8dc
+Author: Chipong Luo <chipong.luo@yahoo.com>
+Date:   Sun Mar 11 09:29:39 2012 +0100
+
+    l10n: Updated Chinese (China) (zh_CN) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 0f6ce51e95b401b6dfd749628092c39c784392f1
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Thu Mar 8 22:59:20 2012 +0100
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 36afc419517a5fc2a9e77bfcaae92bcc75f4e047
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Thu Mar 8 22:42:48 2012 +0100
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit dce633a67d30b88b731af19e47d4290db827d428
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Thu Mar 8 22:11:25 2012 +0100
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 930e7110165879af936d0fd43ba92d2cd7b6d911
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Thu Mar 8 21:51:39 2012 +0100
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 9759f4fdaf49ba03b916a2d93221794d9ff02917
+Author: Juha Kautto <juha@xfce.org>
+Date:   Sun Mar 4 14:11:49 2012 +0200
+
+    4.8.3.1: Fixed Bug 8525 Orage keeps notifying every second on "All day events"
+    
+    There was a bug in handling full day alarms.
+
+commit e9c671a6a9eed4a09d2724ac38390a17c4a9dbe1
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Thu Mar 1 21:47:02 2012 +0100
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit bf7beb5703de5f818a55c0a8792658bf473714cc
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Thu Mar 1 21:42:03 2012 +0100
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 6a8b388f77965140ce57f8c865db1e97e29bb311
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Tue Feb 28 18:20:10 2012 +0100
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 6febbd6b15b037bbf9b86e7c1f448eb212b86823
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Tue Feb 28 12:38:48 2012 +0100
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 3246ed409d2a980104221ebaad86e981c6ec1bbb
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Tue Feb 28 12:30:52 2012 +0100
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 9986a91739b83a212816c65b69498ad6c33fec31
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Mon Feb 27 14:12:00 2012 +0100
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 03eba7c83085f3a8810ed2e560e717a67e78428b
+Author: Seong-ho Cho <darkcircle.0426@gmail.com>
+Date:   Sun Feb 26 21:18:41 2012 +0100
+
+    l10n: Updated Korean (ko) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit f734a8711bbb467be7d4e58228f8a33ae3691b87
+Author: Thomas Schütz <xfce@thschuetz.de>
+Date:   Sat Feb 25 19:12:29 2012 +0100
+
+    l10n: Updated German (de) translation to 99%
+    
+    New status: 798 messages complete with 3 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 90b1dc35ecbe25baa3a1000174adddda8638df65
+Author: Thomas Schütz <xfce@thschuetz.de>
+Date:   Sat Feb 25 19:04:44 2012 +0100
+
+    l10n: Updated German (de) translation to 99%
+    
+    New status: 798 messages complete with 3 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit e23ec607eedd4992822b64d4fcf32e0d312577e0
+Author: Ruei-Yuan Lu <RueiYuan.Lu@gmail.com>
+Date:   Wed Feb 22 03:38:58 2012 +0100
+
+    l10n: Updated Chinese (Taiwan) (zh_TW) translation to 82%
+    
+    New status: 662 messages complete with 12 fuzzies and 127 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit ebde3e58f66ac407b32df37173249a387807ba60
+Author: Michal Várady <miko.vaji@gmail.com>
+Date:   Sun Feb 19 21:11:09 2012 +0100
+
+    l10n: Updated Czech (cs) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit b404cb57889397d04be7f0aa0899a5ff4c2a7155
+Author: Aleksandr Ponomarenko <davian818@gmail.com>
+Date:   Thu Feb 16 13:11:56 2012 +0100
+
+    l10n: Updated Russian (ru) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 8ad114f47658f81420ac4fe9545a27ce171039b5
+Author: Chipong Luo <chipong.luo@yahoo.com>
+Date:   Wed Feb 8 09:58:48 2012 +0100
+
+    l10n: Updated Chinese (China) (zh_CN) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 01310e6eaf5cdc045672f4e68a6335b4b22c99dd
+Author: Chipong Luo <chipong.luo@yahoo.com>
+Date:   Wed Feb 8 07:10:46 2012 +0100
+
+    l10n: Updated Chinese (China) (zh_CN) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 8db710587e11b88e5ec183338334ed288605c7fb
+Author: Kevin Brubeck Unhammer <p.ixiemotion@gmail.com>
+Date:   Sat Feb 4 22:20:21 2012 +0100
+
+    l10n: Updated Norwegian Nynorsk (nn) translation to 26%
+    
+    New status: 210 messages complete with 574 fuzzies and 17 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit a9ba310cbe2d19fc4de4718ab6c8615700755ba9
+Author: Kevin Brubeck Unhammer <p.ixiemotion@gmail.com>
+Date:   Sat Feb 4 21:36:30 2012 +0100
+
+    l10n: Updated Norwegian Bokmal (nb) translation to 97%
+    
+    New status: 783 messages complete with 11 fuzzies and 7 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 13049c1a03a7e99158ab236159f3542c9f8abdd7
+Author: Algimantas Margevičius <gymka@mail.ru>
+Date:   Sat Feb 4 16:46:42 2012 +0100
+
+    l10n: Updated Lithuanian (lt) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit cd8cb6747498475d6b815c61a15dfac5acdb6702
+Author: Algimantas Margevičius <gymka@mail.ru>
+Date:   Sat Feb 4 14:01:31 2012 +0100
+
+    l10n: Updated Lithuanian (lt) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 742ee282895dced32052a26d247fedbe90544df2
+Author: Algimantas Margevičius <gymka@mail.ru>
+Date:   Sat Feb 4 13:34:36 2012 +0100
+
+    l10n: Updated Lithuanian (lt) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit cbb9bbfc4a2a01f0c21ea970929517bf70ad56b5
+Author: Kevin Brubeck Unhammer <p.ixiemotion@gmail.com>
+Date:   Sat Feb 4 11:39:09 2012 +0100
+
+    l10n: Updated Norwegian Nynorsk (nn) translation to 19%
+    
+    New status: 154 messages complete with 629 fuzzies and 18 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit f8d275019f112951e343c620cc639bf04556a5b4
+Author: Kevin Brubeck Unhammer <p.ixiemotion@gmail.com>
+Date:   Sat Feb 4 11:26:09 2012 +0100
+
+    l10n: Updated Norwegian Nynorsk (nn) translation to 11%
+    
+    New status: 96 messages complete with 687 fuzzies and 18 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit f257126655cb959022d962544fe5222fbcc5cfdf
+Author: Algimantas Margevičius <gymka@mail.ru>
+Date:   Sat Feb 4 08:05:26 2012 +0100
+
+    l10n: Updated Lithuanian (lt) translation to 86%
+    
+    New status: 689 messages complete with 0 fuzzies and 112 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit dc10342fc7a4fc21fd9ce4dc55168d454833d296
+Author: Algimantas Margevičius <gymka@mail.ru>
+Date:   Sat Feb 4 07:49:34 2012 +0100
+
+    l10n: Updated Lithuanian (lt) translation to 86%
+    
+    New status: 689 messages complete with 0 fuzzies and 112 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit b73698dde493ac876b7d9c2dd5340e8b4f904e2d
+Author: Algimantas Margevičius <gymka@mail.ru>
+Date:   Sat Feb 4 07:44:14 2012 +0100
+
+    l10n: Updated Lithuanian (lt) translation to None%
+    
+    New status: 0 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit e1e081861b7c6d7b4af9f235a214ab595024dd2b
+Author: Algimantas Margevičius <gymka@mail.ru>
+Date:   Sat Feb 4 07:37:29 2012 +0100
+
+    l10n: Updated Lithuanian (lt) translation to 86%
+    
+    New status: 689 messages complete with 0 fuzzies and 112 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 015ba048cf22323406964aa71f2593b91d8309bd
+Author: Kevin Brubeck Unhammer <p.ixiemotion@gmail.com>
+Date:   Fri Feb 3 22:35:12 2012 +0100
+
+    l10n: does this work?
+    
+    New status: 0 messages complete with 0 fuzzies and 801 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit cc7c34cbc4af23326102458d3a7d411f28bc0b76
+Author: Algimantas Margevičius <gymka@mail.ru>
+Date:   Fri Feb 3 16:45:31 2012 +0100
+
+    l10n: Updated Lithuanian (lt) translation to 86%
+    
+    New status: 689 messages complete with 0 fuzzies and 112 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 2e6c0f656a3116548a18380a4704da2d1bf24691
+Author: Algimantas Margevičius <gymka@mail.ru>
+Date:   Fri Feb 3 14:59:13 2012 +0100
+
+    l10n: Updated Lithuanian (lt) translation to 77%
+    
+    New status: 617 messages complete with 0 fuzzies and 184 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 6bdba54fa375086f031804972cdc8d2222cc21a4
+Author: Algimantas Margevičius <gymka@mail.ru>
+Date:   Fri Feb 3 12:21:51 2012 +0100
+
+    l10n: Updated Lithuanian (lt) translation to 53%
+    
+    New status: 427 messages complete with 0 fuzzies and 374 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 49cf44e5f7a120b09ff482494fcfae54d4cab781
+Author: محمد الحرقان <malham1@gmail.com>
+Date:   Mon Jan 30 04:39:08 2012 +0100
+
+    l10n: Updated Arabic (ar) translation to 99%
+    
+    New status: 797 messages complete with 2 fuzzies and 2 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit b75cdd44f55df25ac3567a8a0ed065fc01741332
+Author: Andhika Padmawan <andhika.padmawan@gmail.com>
+Date:   Sun Jan 29 06:02:04 2012 +0100
+
+    l10n: Updated Indonesian (id) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 448a4b38da656ac557db05d6d2174a444792b0ac
+Author: Chipong Luo <chipong_l@yahoo.com>
+Date:   Sat Jan 28 03:22:39 2012 +0100
+
+    l10n: Updated Chinese (China) (zh_CN) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 77beb246afce7137b4c6992183b1591a1c457bff
+Author: Chipong Luo <chipong_l@yahoo.com>
+Date:   Fri Jan 27 15:01:25 2012 +0100
+
+    l10n: Updated Chinese (China) (zh_CN) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit cd4ce7f60f8135363618da51682373e702273fd9
+Author: Chipong Luo <chipong_l@yahoo.com>
+Date:   Fri Jan 27 13:56:55 2012 +0100
+
+    l10n: Updated Chinese (China) (zh_CN) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 6e67a8f5c50407414b39c0688e9ddea856e613fc
+Author: Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>
+Date:   Sat Jan 21 15:29:38 2012 +0100
+
+    l10n: Updated German (de) translation to 99%
+    
+    New status: 798 messages complete with 0 fuzzies and 3 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 0c5c06446ec6bb2bd496361b7e67a05c0e640092
+Author: Carles Muñoz Gorriz <carlesmu@internautas.org>
+Date:   Sun Jan 15 18:14:31 2012 +0100
+
+    l10n: Updated Catalan (Valencian) (ca) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 4fe797b44049524fcc837d2bb995bdffdfc6863c
+Author: Michał Olber <michal.olber@osworld.pl>
+Date:   Tue Jan 10 17:08:10 2012 +0100
+
+    l10n: Updated Polish (pl) translation to 86%
+    
+    New status: 695 messages complete with 26 fuzzies and 80 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 4cf811289739300903e490eb31f7f87ec7d7629f
+Author: Michał Olber <michal.olber@osworld.pl>
+Date:   Tue Jan 10 17:01:24 2012 +0100
+
+    l10n: Updated Polish (pl) translation to 85%
+    
+    New status: 683 messages complete with 27 fuzzies and 91 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit bbcbc7516c0e1ca08c8852e3e65935dd29b5b61f
+Author: Michał Olber <michal.olber@osworld.pl>
+Date:   Tue Jan 10 16:56:21 2012 +0100
+
+    l10n: Updated Polish (pl) translation to 83%
+    
+    New status: 668 messages complete with 33 fuzzies and 100 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 067a01fc48f715b229ce0358f7c9e09b82fad5a1
+Author: André Luiz Dias de Miranda <andreldm1989@gmail.com>
+Date:   Mon Jan 9 19:50:00 2012 +0100
+
+    l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 98%
+    
+    New status: 788 messages complete with 10 fuzzies and 3 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit c52a7953fd4ab607fd2406840358ee5afbe74003
+Author: Olexandr <olexn@ukr.net>
+Date:   Mon Jan 9 16:02:08 2012 +0100
+
+    l10n: Updated Ukrainian (uk) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit b11f148a05f9f8311d9bc96907c6cd1589ce3d1b
+Author: Tomáš Vadina <kyberdev@gmail.com>
+Date:   Mon Jan 9 10:56:29 2012 +0100
+
+    l10n: Updated Slovak (sk) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit d01618b86b935966f8eaa8beeefd6c455a829182
+Author: Gabor Kelemen <kelemeng@gnome.hu>
+Date:   Mon Jan 9 02:14:08 2012 +0100
+
+    l10n: Updated Hungarian (hu) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 3f5eecc55f26274b302099d36bd2e779bb9c2809
+Author: Michal Várady <miko.vaji@gmail.com>
+Date:   Mon Jan 9 00:54:00 2012 +0100
+
+    l10n: Updated Czech (cs) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 1dce2c11c0ac4c5dc012d7cf7aca1d61110d731a
+Author: Piarres Beobide <pi@beobide.net>
+Date:   Sun Jan 8 21:29:33 2012 +0100
+
+    l10n: Updated Basque (eu) translation to 99%
+    
+    New status: 797 messages complete with 1 fuzzy and 3 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit ad4a6de76b2a9743be3560d6fbdcb69bc214cd46
+Author: André Luiz Dias de Miranda <andreldm1989@gmail.com>
+Date:   Sun Jan 8 01:24:56 2012 +0100
+
+    l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 97%
+    
+    New status: 784 messages complete with 5 fuzzies and 12 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 19d4bd5a67e48b16dcdbf7bbe8a676e35cf813bf
+Author: Cristian Marchi <cri.penta@gmail.com>
+Date:   Fri Jan 6 20:37:11 2012 +0100
+
+    l10n: Updated Italian (it) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 41bc7cf7bcf59c9d96cb042d583052138def83ee
+Author: Per Kongstad <p_kongstad@op.pl>
+Date:   Thu Jan 5 18:21:46 2012 +0100
+
+    l10n: Updated Danish (da) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
+commit 225d77101abaade964d44715dd301ccc0927966a
+Author: Juha Kautto <juha@xfce.org>
+Date:   Thu Jan 5 09:21:23 2012 +0200
+
+    4.8.3.0 After release version reset
+    
+    Release done. Resetting version back to git type.
+
+commit fcf66c22f103d3c9fb5e44a789305ad4e35b242d
+Author: Juha Kautto <juha@xfce.org>
+Date:   Thu Jan 5 09:06:06 2012 +0200
+
+    Release 4.8.3
+    
+    Orage production release 4.8.3.
+
+commit 33c926fcaba17ae912b3427598584e1954a565e6
+Author: Pjotr Anon <pliniusminor@gmail.com>
+Date:   Wed Jan 4 19:12:04 2012 +0100
+
+    l10n: Updated Dutch (Flemish) (nl) translation to 100%
+    
+    New status: 801 messages complete with 0 fuzzies and 0 untranslated.
+    
+    Transmitted-via: Transifex (translations.xfce.org).
+
 commit 02899e07cd879b2760ee4c3b0a65895ed7ea2166
 Author: Chipong Luo <chipong_l@yahoo.com>
 Date:   Wed Jan 4 05:47:45 2012 +0100
diff -Nru orage-4.8.3/compile orage-4.12.1/compile
--- orage-4.8.3/compile	2012-01-04 12:52:47.000000000 +0000
+++ orage-4.12.1/compile	2015-04-10 10:26:52.000000000 +0000
@@ -1,10 +1,9 @@
 #! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
+# Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2009-10-06.20; # UTC
+scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -29,21 +28,224 @@
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
     cat <<\EOF
 Usage: compile [--help] [--version] PROGRAM [ARGS]
 
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
 arguments, and rename the output as expected.
 
 If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
+right script to run: please start by reading the file 'INSTALL'.
 
 Report bugs to <bug-automake@gnu.org>.
 EOF
@@ -53,11 +255,13 @@
     echo "compile $scriptversion"
     exit $?
     ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
 esac
 
 ofile=
 cfile=
-eat=
 
 for arg
 do
@@ -66,8 +270,8 @@
   else
     case $1 in
       -o)
-	# configure might choose to run compile as `compile cc -o foo foo.c'.
-	# So we strip `-o arg' only if arg is an object.
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
 	eat=1
 	case $2 in
 	  *.o | *.obj)
@@ -94,10 +298,10 @@
 done
 
 if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
+  # If no '-o' option was seen then we might have been invoked from a
   # pattern rule where we don't need one.  That is ok -- this is a
   # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
+  # '.c' file was seen then we are probably linking.  That is also
   # ok.
   exec "$@"
 fi
@@ -106,7 +310,7 @@
 cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
 
 # Create the lock directory.
-# Note: use `[/\\:.-]' here to ensure that we don't use the same name
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
 lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
diff -Nru orage-4.8.3/config.guess orage-4.12.1/config.guess
--- orage-4.8.3/config.guess	2012-01-04 12:52:47.000000000 +0000
+++ orage-4.12.1/config.guess	2015-04-10 10:26:52.000000000 +0000
@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2009-06-10'
+timestamp='2014-03-23'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -17,26 +15,22 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+#
+# Originally written by Per Bothner.
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -139,12 +132,33 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -180,7 +194,7 @@
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -201,6 +215,10 @@
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -223,7 +241,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +287,10 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,12 +316,12 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -333,6 +354,9 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -391,23 +415,23 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -477,8 +501,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -491,7 +515,7 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -548,7 +572,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -591,52 +615,52 @@
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -727,22 +751,22 @@
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -766,14 +790,14 @@
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -785,34 +809,39 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    *:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
-    	case ${UNAME_MACHINE} in
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd | genuineintel)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -845,45 +874,81 @@
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:Linux:*:*)
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -901,123 +966,65 @@
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
 	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-${LIBC}
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1025,11 +1032,11 @@
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1061,7 +1068,7 @@
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1089,13 +1096,13 @@
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1130,8 +1137,8 @@
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1174,10 +1181,10 @@
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1203,11 +1210,11 @@
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1220,6 +1227,9 @@
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1246,9 +1256,31 @@
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1262,7 +1294,10 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1307,13 +1342,13 @@
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1331,158 +1366,10 @@
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
-    esac
-fi
+esac
 
 cat >&2 <<EOF
 $0: unable to guess system type
diff -Nru orage-4.8.3/config.h.in orage-4.12.1/config.h.in
--- orage-4.8.3/config.h.in	2012-01-04 12:54:49.000000000 +0000
+++ orage-4.12.1/config.h.in	2015-04-10 10:26:50.000000000 +0000
@@ -115,9 +115,6 @@
    */
 #undef LT_OBJDIR
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
 /* Name of package */
 #undef PACKAGE
 
diff -Nru orage-4.8.3/config.sub orage-4.12.1/config.sub
--- orage-4.8.3/config.sub	2012-01-04 12:52:47.000000000 +0000
+++ orage-4.12.1/config.sub	2015-04-10 10:26:52.000000000 +0000
@@ -1,44 +1,40 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
-
-timestamp='2009-06-11'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+#   Copyright 1992-2014 Free Software Foundation, Inc.
+
+timestamp='2014-09-11'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -72,8 +68,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -120,13 +115,18 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -149,12 +149,12 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
-        -bluegene*)
-	        os=-cnk
+	-bluegene*)
+		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -170,10 +170,10 @@
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -218,6 +218,12 @@
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -242,20 +248,28 @@
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -269,36 +283,51 @@
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
-	| nios | nios2 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| or32 \
+	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
+	| riscv32 | riscv64 \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -308,6 +337,21 @@
 		basic_machine=mt-unknown
 		;;
 
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -322,25 +366,31 @@
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -354,32 +404,41 @@
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
-	| nios-* | nios2-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
 	| tron-* \
-	| v850-* | v850e-* | vax-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -404,7 +463,7 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -474,11 +533,20 @@
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -510,7 +578,7 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -668,7 +736,6 @@
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -726,8 +793,15 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+	microblaze*)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -755,6 +829,10 @@
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -762,10 +840,18 @@
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i686-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -830,6 +916,12 @@
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -912,9 +1004,10 @@
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -939,7 +1032,11 @@
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1008,6 +1105,9 @@
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1064,20 +1164,8 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1147,6 +1235,9 @@
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1244,9 +1335,12 @@
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1268,29 +1362,30 @@
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1329,7 +1424,7 @@
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1378,7 +1473,7 @@
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1414,15 +1509,14 @@
 	-aros*)
 		os=-aros
 		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
 	-dicos*)
 		os=-dicos
 		;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1445,10 +1539,10 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1460,8 +1554,23 @@
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	c8051-*)
+		os=-elf
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1481,14 +1590,11 @@
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1515,7 +1621,7 @@
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
diff -Nru orage-4.8.3/configure orage-4.12.1/configure
--- orage-4.8.3/configure	2012-01-04 12:52:50.000000000 +0000
+++ orage-4.12.1/configure	2015-04-10 10:26:56.000000000 +0000
@@ -1,19 +1,17 @@
 #! /bin/sh
 # From configure.in Id.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for orage 4.8.3.
+# Generated by GNU Autoconf 2.69 for orage 4.12.1.
 #
 # Report bugs to <xfce4-dev@xfce.org>.
 #
-# Copyright (c) 2003-2011
+# Copyright (c) 2003-2015
 #         The Xfce development team. All rights reserved.
 #
 # Written for Xfce by Juha Kautto <juha@xfce.org>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -97,6 +95,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -141,6 +140,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -174,12 +198,21 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
+test \$(( 1 + 1 )) = 2 || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
 else
@@ -219,14 +252,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -325,10 +369,18 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -365,19 +417,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -450,6 +502,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -484,16 +540,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -505,28 +561,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -534,161 +570,14 @@
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
-
-
-# Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-$*
-_LT_EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
-
-	  if test "$prev" != 'sed 50q "$0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -707,8 +596,8 @@
 # Identity of this package.
 PACKAGE_NAME='orage'
 PACKAGE_TARNAME='orage'
-PACKAGE_VERSION='4.8.3'
-PACKAGE_STRING='orage 4.8.3'
+PACKAGE_VERSION='4.12.1'
+PACKAGE_STRING='orage 4.12.1'
 PACKAGE_BUGREPORT='xfce4-dev@xfce.org'
 PACKAGE_URL=''
 
@@ -795,6 +684,8 @@
 LIBGTK_LIBS
 LIBGTK_CFLAGS
 LIBGTK_VERSION
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
 PKG_CONFIG
 XGETTEXT_ARGS
 MKINSTALLDIRS
@@ -809,21 +700,17 @@
 CATALOGS
 MSGFMT_OPTS
 GETTEXT_PACKAGE
-LEXLIB
-LEX_OUTPUT_ROOT
-LEX
-YFLAGS
-YACC
 OTOOL64
 OTOOL
 LIPO
 NMEDIT
 DSYMUTIL
-lt_ECHO
+MANIFEST_TOOL
 RANLIB
+ac_ct_AR
 AR
+DLLTOOL
 OBJDUMP
-LN_S
 NM
 ac_ct_DUMPBIN
 DUMPBIN
@@ -831,6 +718,12 @@
 FGREP
 SED
 LIBTOOL
+LEXLIB
+LEX_OUTPUT_ROOT
+LEX
+LN_S
+YFLAGS
+YACC
 DATADIRNAME
 ALL_LINGUAS
 INTLTOOL_PERL
@@ -857,6 +750,12 @@
 INTLTOOL_KEYS_RULE
 INTLTOOL_DIRECTORY_RULE
 INTLTOOL_DESKTOP_RULE
+intltool__v_merge_options_0
+intltool__v_merge_options_
+INTLTOOL_V_MERGE_OPTIONS
+INTLTOOL__v_MERGE_0
+INTLTOOL__v_MERGE_
+INTLTOOL_V_MERGE
 INTLTOOL_EXTRACT
 INTLTOOL_MERGE
 INTLTOOL_UPDATE
@@ -869,6 +768,7 @@
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -885,6 +785,10 @@
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -961,14 +865,16 @@
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_silent_rules
 enable_maintainer_mode
 enable_dependency_tracking
 enable_nls
-enable_shared
 enable_static
+enable_shared
 with_pic
 enable_fast_install
 with_gnu_ld
+with_sysroot
 enable_libtool_lock
 with_locales_dir
 enable_libxfce4panel
@@ -991,7 +897,10 @@
 CPPFLAGS
 CPP
 YACC
-YFLAGS'
+YFLAGS
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR'
 
 
 # Initialize some variables set by options.
@@ -1054,8 +963,9 @@
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1100,7 +1010,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1126,7 +1036,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1330,7 +1240,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1346,7 +1256,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1376,8 +1286,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1385,7 +1295,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1395,7 +1305,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1403,13 +1313,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1432,7 +1342,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1446,8 +1356,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1462,9 +1370,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1503,11 +1411,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1533,7 +1441,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures orage 4.8.3 to adapt to many kinds of systems.
+\`configure' configures orage 4.12.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1547,7 +1455,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1604,7 +1512,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of orage 4.8.3:";;
+     short | recursive ) echo "Configuration of orage 4.12.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1612,13 +1520,18 @@
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-maintainer-mode
+                          enable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
   --disable-nls           do not use Native Language Support
+  --enable-static[=PKGS]  build static libraries [default=no]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
-  --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
@@ -1637,16 +1550,18 @@
   --disable-libnotify     Disable checking for LIBNOTIFY support
   --enable-archive        use automatic archiving (defaut=yes)
   --disable-archive       do not use automatic archiving
-  --enable-debug=yes|no|full
-                          Build with debugging support
-  --disable-debug         Include no debugging support [default]
+  --enable-debug[=no|minimum|yes|full]
+                          Build with debugging support [default=[]]
+  --disable-debug         Include no debugging support
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot=DIR Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).
 
       --with-locales-dir=DIR  Install locales into DIR
 
@@ -1662,11 +1577,17 @@
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
-  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
-              the first program found out of: `bison -y', `byacc', `yacc'.
+  YACC        The `Yet Another Compiler Compiler' implementation to use.
+              Defaults to the first program found out of: `bison -y', `byacc',
+              `yacc'.
   YFLAGS      The list of arguments that will be passed by default to $YACC.
               This script will default YFLAGS to the empty string to avoid a
               default value of `-d' given by some make applications.
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1734,14 +1655,14 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-orage configure 4.8.3
-generated by GNU Autoconf 2.65
+orage configure 4.12.1
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright (c) 2003-2011
+Copyright (c) 2003-2015
         The Xfce development team. All rights reserved.
 
 Written for Xfce by Juha Kautto <juha@xfce.org>.
@@ -1786,7 +1707,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1812,7 +1733,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -1823,7 +1744,7 @@
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -1836,10 +1757,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1875,7 +1796,7 @@
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -1898,17 +1819,15 @@
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( cat <<\_ASBOX
-## --------------------------------- ##
+( $as_echo "## --------------------------------- ##
 ## Report this to xfce4-dev@xfce.org ##
-## --------------------------------- ##
-_ASBOX
+## --------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -1917,7 +1836,7 @@
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
@@ -1958,7 +1877,7 @@
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -1972,7 +1891,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1990,7 +1909,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
@@ -2021,7 +1940,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -2035,7 +1954,7 @@
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -2048,7 +1967,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2103,7 +2022,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
@@ -2116,7 +2035,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
@@ -2157,15 +2076,15 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by orage $as_me 4.8.3, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+It was created by orage $as_me 4.12.1, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2275,11 +2194,9 @@
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2313,11 +2230,9 @@
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2330,11 +2245,9 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -2348,11 +2261,9 @@
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -2407,7 +2318,12 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -2422,7 +2338,11 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -2498,7 +2418,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2513,16 +2433,22 @@
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2536,27 +2462,27 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -2574,14 +2500,14 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -2589,7 +2515,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -2607,14 +2533,14 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
 $as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then :
+if ${ac_cv_target+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$target_alias" = x; then
   ac_cv_target=$ac_cv_host
 else
   ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -2622,7 +2548,7 @@
 $as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
 esac
 target=$ac_cv_target
 ac_save_IFS=$IFS; IFS='-'
@@ -2648,8 +2574,8 @@
 
 
 
-ORAGE_VERSION=4.8.3
-am__api_version='1.11'
+ORAGE_VERSION=4.12.1
+am__api_version='1.14'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2668,7 +2594,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2688,7 +2614,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2746,56 +2672,71 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
 
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
    # Ok.
    :
 else
-   as_fn_error "newly created file is older than distributed files!
+   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -2806,8 +2747,8 @@
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
@@ -2818,12 +2759,12 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh}" != xset; then
@@ -2835,17 +2776,17 @@
   esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -2857,7 +2798,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2885,7 +2826,7 @@
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -2897,7 +2838,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2938,7 +2879,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
+  if ${ac_cv_path_mkdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2948,7 +2889,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -2977,19 +2918,13 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -3001,7 +2936,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3029,7 +2964,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -3037,7 +2972,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3065,13 +3000,52 @@
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -3086,6 +3060,7 @@
 
 
 # Define the identity of the package.
+
  PACKAGE=orage
  VERSION=$ORAGE_VERSION
 
@@ -3115,17 +3090,70 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+
+
 
-AMTAR=${AMTAR-"${am_missing_run}tar"}
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
 
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
 
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
 
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
 
 ac_config_headers="$ac_config_headers config.h"
 
@@ -3172,7 +3200,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -3205,6 +3233,7 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -3225,7 +3254,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3237,7 +3266,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3265,7 +3294,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3277,7 +3306,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3318,7 +3347,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3330,7 +3359,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3358,7 +3387,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3371,7 +3400,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3417,7 +3446,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3429,7 +3458,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3461,7 +3490,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3473,7 +3502,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3515,8 +3544,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3630,9 +3659,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3674,8 +3702,8 @@
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3732,9 +3760,9 @@
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -3745,7 +3773,7 @@
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3785,8 +3813,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -3796,7 +3824,7 @@
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3833,7 +3861,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -3911,7 +3939,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -3920,8 +3948,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4006,19 +4033,79 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4052,16 +4139,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -4070,16 +4157,16 @@
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -4146,7 +4233,7 @@
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -4176,7 +4263,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -4192,11 +4279,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -4235,7 +4322,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -4251,18 +4338,18 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -4274,7 +4361,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -4288,7 +4375,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4323,7 +4410,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -4337,7 +4424,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4354,7 +4441,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -4389,7 +4476,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -4404,7 +4491,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4521,8 +4608,7 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -4534,7 +4620,7 @@
 
 
   ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = x""yes; then :
+if test "x$ac_cv_header_minix_config_h" = xyes; then :
   MINIX=yes
 else
   MINIX=
@@ -4556,14 +4642,14 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
+if ${ac_cv_safe_to_define___extensions__+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#	  define __EXTENSIONS__ 1
-	  $ac_includes_default
+#         define __EXTENSIONS__ 1
+          $ac_includes_default
 int
 main ()
 {
@@ -4596,7 +4682,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
 $as_echo_n "checking for library containing strerror... " >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then :
+if ${ac_cv_search_strerror+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -4630,11 +4716,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_strerror+set}" = set; then :
+  if ${ac_cv_search_strerror+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_strerror+set}" = set; then :
+if ${ac_cv_search_strerror+:} false; then :
 
 else
   ac_cv_search_strerror=no
@@ -4670,7 +4756,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4682,7 +4768,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4710,7 +4796,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4722,7 +4808,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4763,7 +4849,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4775,7 +4861,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4803,7 +4889,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4816,7 +4902,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -4862,7 +4948,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4874,7 +4960,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4906,7 +4992,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4918,7 +5004,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4960,8 +5046,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4990,7 +5076,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5027,7 +5113,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -5105,7 +5191,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -5114,8 +5200,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -5200,19 +5285,79 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -5246,16 +5391,16 @@
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -5264,16 +5409,16 @@
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -5346,31 +5491,29 @@
 
 case "$am__api_version" in
     1.01234)
-	as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+	as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
     ;;
     *)
     ;;
 esac
 
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.31 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
 if test -n "0.31"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.31" >&5
 $as_echo_n "checking for intltool >= 0.31... " >&6; }
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.31 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	as_fn_error "Your intltool is too old.  You need intltool 0.31 or later." "$LINENO" 5
+	as_fn_error $? "Your intltool is too old.  You need intltool 0.31 or later." "$LINENO" 5
 fi
 
 # Extract the first word of "intltool-update", so it can be a program name with args.
 set dummy intltool-update; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_UPDATE in
@@ -5384,7 +5527,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5410,7 +5553,7 @@
 set dummy intltool-merge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_MERGE in
@@ -5424,7 +5567,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5450,7 +5593,7 @@
 set dummy intltool-extract; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_EXTRACT in
@@ -5464,7 +5607,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5487,28 +5630,51 @@
 
 
 if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+    as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+fi
+
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
 fi
 
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo "  ITMRG " $@;'
+
+
+
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+
+
+
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
+else
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
+fi
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
 
 
 
@@ -5611,7 +5777,7 @@
 set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+if ${ac_cv_path_XGETTEXT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $XGETTEXT in
@@ -5625,7 +5791,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5651,7 +5817,7 @@
 set dummy msgmerge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+if ${ac_cv_path_MSGMERGE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGMERGE in
@@ -5665,7 +5831,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5691,7 +5857,7 @@
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+if ${ac_cv_path_MSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGFMT in
@@ -5705,7 +5871,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5731,7 +5897,7 @@
 set dummy gmsgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+if ${ac_cv_path_GMSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -5745,7 +5911,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5769,20 +5935,20 @@
 
 
 if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
 fi
 xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
 mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
 mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
 if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
 fi
 
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_PERL in
@@ -5796,7 +5962,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5819,15 +5985,15 @@
 
 
 if test -z "$INTLTOOL_PERL"; then
-   as_fn_error "perl not found" "$LINENO" 5
+   as_fn_error $? "perl not found" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
 $as_echo_n "checking for perl >= 5.8.1... " >&6; }
 $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
 if test $? -ne 0; then
-   as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
+   as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
 else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
 $as_echo "$IT_PERL_VERSION" >&6; }
 fi
@@ -5838,7 +6004,7 @@
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
    else
-       as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
+       as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
    fi
 fi
 
@@ -5866,7 +6032,7 @@
   case $host in
     *-*-solaris*)
                         ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
   DATADIRNAME=share
 else
   DATADIRNAME=lib
@@ -5886,729 +6052,590 @@
 
 
 
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.2.6b'
-macro_revision='1.3017'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
+for ac_prog in 'bison -y' byacc
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_YACC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  if test -n "$YACC"; then
+  ac_cv_prog_YACC="$YACC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_YACC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
   done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
+fi
+YACC=$ac_cv_prog_YACC
+if test -n "$YACC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
+$as_echo "$YACC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
+  test -n "$YACC" && break
+done
+test -n "$YACC" || YACC="yacc"
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then :
+for ac_prog in flex lex
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LEX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+  if test -n "$LEX"; then
+  ac_cv_prog_LEX="$LEX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LEX="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
   done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_FGREP=$FGREP
-fi
 
-   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
+fi
+LEX=$ac_cv_prog_LEX
+if test -n "$LEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
+$as_echo "$LEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
+  test -n "$LEX" && break
+done
+test -n "$LEX" || LEX=":"
 
+if test "x$LEX" != "x:"; then
+  cat >conftest.l <<_ACEOF
+%%
+a { ECHO; }
+b { REJECT; }
+c { yymore (); }
+d { yyless (1); }
+e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument.  */
+    yyless ((input () != 0)); }
+f { unput (yytext[0]); }
+. { BEGIN INITIAL; }
+%%
+#ifdef YYTEXT_POINTER
+extern char *yytext;
+#endif
+int
+main (void)
+{
+  return ! yylex () + ! yywrap ();
+}
+_ACEOF
+{ { ac_try="$LEX conftest.l"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$LEX conftest.l") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
+$as_echo_n "checking lex output file root... " >&6; }
+if ${ac_cv_prog_lex_root+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
+if test -f lex.yy.c; then
+  ac_cv_prog_lex_root=lex.yy
+elif test -f lexyy.c; then
+  ac_cv_prog_lex_root=lexyy
+else
+  as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
+$as_echo "$ac_cv_prog_lex_root" >&6; }
+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
+if test -z "${LEXLIB+set}"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
+$as_echo_n "checking lex library... " >&6; }
+if ${ac_cv_lib_lex+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
+    ac_save_LIBS=$LIBS
+    ac_cv_lib_lex='none needed'
+    for ac_lib in '' -lfl -ll; do
+      LIBS="$ac_lib $ac_save_LIBS"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+`cat $LEX_OUTPUT_ROOT.c`
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_lex=$ac_lib
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+      test "$ac_cv_lib_lex" != 'none needed' && break
+    done
+    LIBS=$ac_save_LIBS
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
+$as_echo "$ac_cv_lib_lex" >&6; }
+  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
+fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
+$as_echo_n "checking whether yytext is a pointer... " >&6; }
+if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # POSIX says lex can declare yytext either as a pointer or an array; the
+# default is implementation-dependent.  Figure out which it is, since
+# not all implementations provide the %pointer and %array declarations.
+ac_cv_prog_lex_yytext_pointer=no
+ac_save_LIBS=$LIBS
+LIBS="$LEXLIB $ac_save_LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+  #define YYTEXT_POINTER 1
+`cat $LEX_OUTPUT_ROOT.c`
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_prog_lex_yytext_pointer=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_save_LIBS
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
+$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
+if test $ac_cv_prog_lex_yytext_pointer = yes; then
 
+$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
 
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
 fi
+rm -f conftest.l $LEX_OUTPUT_ROOT.c
 
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if test "${lt_cv_path_LD+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
+if test "$LEX" = :; then
+  LEX=${am_missing_run}flex
 fi
 
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
+
+
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
 else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case "$ECHO" in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
 
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  ac_cv_path_SED=$SED
 fi
 
-
-    test -n "$DUMPBIN" && break
-  done
 fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if ${ac_cv_path_FGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
+    for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_FGREP" || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
   done
-IFS=$as_save_IFS
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
 
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  ac_cv_path_FGREP=$FGREP
 fi
 
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
 
-  test -n "$ac_ct_DUMPBIN" && break
-done
 
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
-fi
+test -z "$GREP" && GREP=grep
 
 
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
 
 
 
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6368: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:6371: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:6374: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
 
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-    i=0
-  teststring="ABCD"
 
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
 
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
 
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
 
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
 
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
 
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
   *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
       done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
     ;;
   esac
-
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
 fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
 
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  lt_unset=false
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-
-
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
   ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
+*)
+  lt_cv_prog_gnu_ld=no
   ;;
 esac
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 
@@ -6618,56 +6645,76 @@
 
 
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
   fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+if ${ac_cv_prog_DUMPBIN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -6675,8 +6722,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -6686,17 +6733,65 @@
 
 fi
 fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -6704,228 +6799,251 @@
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    OBJDUMP=$ac_ct_OBJDUMP
+    DUMPBIN=$ac_ct_DUMPBIN
   fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
 fi
 
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
 
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
 
 
 
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if ${lt_cv_nm_interface+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then :
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+    i=0
+  teststring="ABCD"
 
-case $host_os in
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
 
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
 
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
 
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
 
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
 
-cegcc)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
 
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
 
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
 
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
     ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
     ;;
   *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
-  ;;
-
-interix[3-9]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-  ;;
 
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
+fi
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
+if test -n $lt_cv_sys_max_cmd_len ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
 
-netbsd* | netbsdelf*-gnu)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
 
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
 
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
 
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
 
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
 
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
 
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
+$as_echo "$xsi_shell" >&6; }
 
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
 
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
+$as_echo "$lt_shell_append" >&6; }
 
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
 
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
 
 
 
 
 
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
 
 
 
@@ -6933,204 +7051,112 @@
 
 
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
 
 fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
 
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
 esac
-    AR=$ac_ct_AR
-  fi
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-
-
-
-
 
+fi
 
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
 
 
 
 
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if ${lt_cv_ld_reload_flag+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
+  lt_cv_ld_reload_flag='-r'
 fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
 
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
 
-test -z "$STRIP" && STRIP=:
 
 
 
@@ -7138,15 +7164,15 @@
 
 
 if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_OBJDUMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7154,8 +7180,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7165,10 +7191,10 @@
 
 fi
 fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -7176,17 +7202,17 @@
 
 
 fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7194,8 +7220,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7205,17 +7231,17 @@
 
 fi
 fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -7223,308 +7249,355 @@
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    RANLIB=$ac_ct_RANLIB
+    OBJDUMP=$ac_ct_OBJDUMP
   fi
 else
-  RANLIB="$ac_cv_prog_RANLIB"
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
 fi
 
-test -z "$RANLIB" && RANLIB=:
-
+test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
 
 
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
 
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if ${lt_cv_deplibs_check_method+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
 
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
 
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
 
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
 
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
 
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
 
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
 
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
 
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+netbsd* | netbsdelf*-gnu)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
 
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
 
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
 
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
 
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
 
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
 
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
 
 
 
 
 
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
 
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 
-# Allow CC to be a program name with arguments.
-compiler=$CC
 
 
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
 
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
 
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
 
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
 
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
 
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
 
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
 
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
 
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK '"\
-"     {last_section=section; section=\$ 3};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
 
-  # Check to see that the pipe works correctly.
-  pipe_works=no
 
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-const struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
 
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
 done
+  done
+IFS=$as_save_IFS
 
 fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
 fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
 
+test -z "$DLLTOOL" && DLLTOOL=dlltool
 
 
 
@@ -7535,8 +7608,37 @@
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
 
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
 
 
@@ -7544,142 +7646,126 @@
 
 
 
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
-  enableval=$enable_libtool_lock;
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 7579 "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
-  rm -rf conftest*
-  ;;
+done
+  done
+IFS=$as_save_IFS
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
   fi
-  rm -rf conftest*
-  ;;
+fi
 
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then :
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -7690,67 +7776,57 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_cc_needs_belf=yes
-else
-  lt_cv_cc_needs_belf=no
+if ac_fn_c_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
 
-need_locks="$enable_libtool_lock"
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
 
 
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7758,8 +7834,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7769,10 +7845,10 @@
 
 fi
 fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -7780,17 +7856,17 @@
 
 
 fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7798,8 +7874,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7809,17 +7885,17 @@
 
 fi
 fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -7827,22 +7903,29 @@
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
+    STRIP=$ac_ct_STRIP
   fi
 else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+  STRIP="$ac_cv_prog_STRIP"
 fi
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+test -z "$STRIP" && STRIP=:
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7850,8 +7933,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7861,10 +7944,10 @@
 
 fi
 fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -7872,17 +7955,17 @@
 
 
 fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7890,8 +7973,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7901,17 +7984,17 @@
 
 fi
 fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -7919,287 +8002,52 @@
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    NMEDIT=$ac_ct_NMEDIT
+    RANLIB=$ac_ct_RANLIB
   fi
 else
-  NMEDIT="$ac_cv_prog_NMEDIT"
+  RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+test -z "$RANLIB" && RANLIB=:
 
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
 
-fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
 
-fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
 esac
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
-fi
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
 
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
 
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
 
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  OTOOL="$ac_cv_prog_OTOOL"
-fi
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
 
-fi
-fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
 
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL64=$ac_ct_OTOOL64
-  fi
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
 
 
 
@@ -8227,256 +8075,266 @@
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&5
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_ld_exported_symbols_list=yes
-else
-  lt_cv_ld_exported_symbols_list=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[012]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
-
-fi
 
-done
 
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 
-# Set options
+# Allow CC to be a program name with arguments.
+compiler=$CC
 
 
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-        enable_dlopen=no
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
 
-  enable_win32_dll=no
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
 
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
 
-            # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_shared=yes
-fi
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
 
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
 
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
 
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
 
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
+  # Check to see that the pipe works correctly.
+  pipe_works=no
 
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
 
-  # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=yes
-fi
-
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
 
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
 
+	  cat <<_LT_EOF >> conftest.$ac_ext
 
+/* The mapping between symbol names and symbols.  */
+LT_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
 
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
 
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
 
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
 
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
-else
-  pic_mode=default
 fi
 
-
-test -z "$pic_mode" && pic_mode=default
-
-
-
-
-
-
-
-  # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 else
-  enable_fast_install=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
 fi
 
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
 
 
 
@@ -8490,7 +8348,6 @@
 
 
 
-test -z "$LN_S" && LN_S="ln -s"
 
 
 
@@ -8505,83 +8362,1256 @@
 
 
 
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
 else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
+  with_sysroot=no
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-
-
-
 
 
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
+$as_echo "${with_sysroot}" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
 
 
 
 
 
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
 
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
   fi
+  rm -rf conftest*
   ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Global variables:
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_cc_needs_belf=yes
+else
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+
+
+
+
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if ${lt_cv_apple_cc_single_mod+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_ld_exported_symbols_list=yes
+else
+  lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[012]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+# Set options
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_static=no
+fi
+
+
+
+
+
+
+
+
+
+
+        enable_dlopen=no
+
+
+  enable_win32_dll=no
+
+
+            # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_shared=yes
+fi
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  pic_mode=default
+fi
+
+
+test -z "$pic_mode" && pic_mode=default
+
+
+
+
+
+
+
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+test -z "$LN_S" && LN_S="ln -s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
 ofile=libtool
 can_build_shared=yes
 
@@ -8609,7 +9639,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 
 
 # Only perform the check for file, if the check method requires it
@@ -8619,7 +9649,7 @@
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -8685,7 +9715,7 @@
   if test -n "$ac_tool_prefix"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 $as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -8814,11 +9844,16 @@
 lt_prog_compiler_no_builtin_flag=
 
 if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
@@ -8834,15 +9869,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8837: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8841: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
@@ -8871,8 +9906,6 @@
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -8920,6 +9953,12 @@
       lt_prog_compiler_pic='-fno-common'
       ;;
 
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -8962,6 +10001,15 @@
       lt_prog_compiler_pic='-fPIC'
       ;;
     esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
@@ -9003,7 +10051,7 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -9024,7 +10072,13 @@
 	lt_prog_compiler_pic='--shared'
 	lt_prog_compiler_static='--static'
 	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	lt_prog_compiler_wl='-Wl,'
@@ -9036,25 +10090,40 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-qpic'
 	lt_prog_compiler_static='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
 	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
 	  ;;
 	esac
 	;;
@@ -9086,7 +10155,7 @@
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95*)
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 	lt_prog_compiler_wl='-Qoption ld ';;
       *)
 	lt_prog_compiler_wl='-Wl,';;
@@ -9143,13 +10212,17 @@
     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
@@ -9157,7 +10230,7 @@
 if test -n "$lt_prog_compiler_pic"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works=no
@@ -9173,15 +10246,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9176: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9180: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
@@ -9210,13 +10283,18 @@
 
 
 
+
+
+
+
+
 #
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
+if ${lt_cv_prog_compiler_static_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
@@ -9229,7 +10307,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
@@ -9259,7 +10337,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -9278,16 +10356,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9281: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9285: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
@@ -9314,7 +10392,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -9333,16 +10411,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9336: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9340: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
@@ -9408,7 +10486,6 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -9452,13 +10529,39 @@
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu)
+  linux* | k*bsd*-gnu | gnu*)
     link_all_deplibs=no
     ;;
   esac
 
   ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
   if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
@@ -9492,11 +10595,12 @@
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
 
 _LT_EOF
       fi
@@ -9532,10 +10636,12 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='${wl}--export-all-symbols'
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -9553,6 +10659,11 @@
       fi
       ;;
 
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
     interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
@@ -9578,15 +10689,16 @@
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 	 && test "$tmp_diet" = no
       then
-	tmp_addflag=
+	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -9597,13 +10709,17 @@
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
 	  tmp_sharedflag='--shared' ;;
-	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  compiler_needs_object=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
@@ -9619,17 +10735,16 @@
         fi
 
 	case $cc_basename in
-	xlf*)
+	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
 	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
 	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -9643,8 +10758,8 @@
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -9662,8 +10777,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -9709,8 +10824,8 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -9750,8 +10865,10 @@
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	else
 	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	fi
@@ -9839,7 +10956,13 @@
 	allow_undefined_flag='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -9852,25 +10975,32 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
 
         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
@@ -9879,7 +11009,13 @@
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -9892,30 +11028,42 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
 
 	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
 	  no_undefined_flag=' ${wl}-bernotok'
 	  allow_undefined_flag=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec='$convenience'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
 	  archive_cmds_need_lc=yes
 	  # This is similar to how AIX traditionally builds its shared libraries.
 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -9947,20 +11095,64 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_from_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -9970,7 +11162,12 @@
   hardcode_direct=no
   hardcode_automatic=yes
   hardcode_shlibpath_var=unsupported
-  whole_archive_flag_spec=''
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec=''
+  fi
   link_all_deplibs=yes
   allow_undefined_flag="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -9978,7 +11175,7 @@
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
+    output_verbose_link_cmd=func_echo_all
     archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -9996,10 +11193,6 @@
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -10012,7 +11205,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -10021,7 +11214,7 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       hardcode_shlibpath_var=no
@@ -10029,7 +11222,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -10044,14 +11237,13 @@
       ;;
 
     hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -10063,16 +11255,16 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
 	hppa*64*)
 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
@@ -10084,7 +11276,46 @@
 	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test x"$lt_cv_prog_compiler__b" = xyes; then
+    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
 	  ;;
 	esac
       fi
@@ -10112,26 +11343,39 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-int foo(void) {}
+int foo (void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-        LDFLAGS="$save_LDFLAGS"
+           LDFLAGS="$save_LDFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
       else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
       fi
       archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -10193,17 +11437,17 @@
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
       fi
       archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -10213,13 +11457,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -10232,9 +11476,9 @@
       no_undefined_flag=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
@@ -10422,44 +11666,50 @@
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl
-	pic_flag=$lt_prog_compiler_pic
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag
-        allow_undefined_flag=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-        then
-	  archive_cmds_need_lc=no
-        else
-	  archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
   fi
@@ -10617,11 +11867,6 @@
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -10630,16 +11875,23 @@
     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
     *) lt_awk_arg="/^libraries:/" ;;
   esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
   # Ok, now we have the path, separated by spaces, we can step through it
   # and add multilib dir if necessary.
   lt_tmp_lt_search_path_spec=
@@ -10652,7 +11904,7 @@
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
 BEGIN {RS=" "; FS="/|\n";} {
   lt_foo="";
   lt_count=0;
@@ -10672,7 +11924,13 @@
   if (lt_foo != "") { lt_freq[lt_foo]++; }
   if (lt_freq[lt_foo] == 1) { print lt_foo; }
 }'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
@@ -10698,7 +11956,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -10707,7 +11965,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -10760,7 +12018,7 @@
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
@@ -10772,7 +12030,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -10791,8 +12049,9 @@
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -10813,36 +12072,83 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
+    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -10863,7 +12169,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -10871,10 +12177,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -10882,7 +12184,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -10900,7 +12202,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -10919,13 +12221,16 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
+  dynamic_linker="$host_os runtime_loader"
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -10971,12 +12276,14 @@
     soname_spec='${libname}${release}${shared_ext}$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -10992,7 +12299,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -11029,9 +12336,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11039,12 +12346,17 @@
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
   # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -11057,13 +12369,17 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  shlibpath_overrides_runpath=yes
+  lt_cv_shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
@@ -11072,7 +12388,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -11116,7 +12432,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -11185,7 +12501,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11210,7 +12526,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -11234,7 +12550,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -11265,7 +12581,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11275,7 +12591,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -11387,6 +12703,11 @@
 
 
 
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
@@ -11459,7 +12780,7 @@
   # if libdl is installed we need to link against it
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11493,7 +12814,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -11507,12 +12828,12 @@
 
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = x""yes; then :
+if test "x$ac_cv_func_shl_load" = xyes; then :
   lt_cv_dlopen="shl_load"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+if ${ac_cv_lib_dld_shl_load+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11546,16 +12867,16 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = x""yes; then :
+if test "x$ac_cv_func_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11589,12 +12910,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+if ${ac_cv_lib_svld_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11628,12 +12949,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 $as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
+if ${ac_cv_lib_dld_dld_link+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11667,7 +12988,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
@@ -11708,7 +13029,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 $as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then :
+if ${lt_cv_dlopen_self+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -11717,7 +13038,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11720 "configure"
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11758,7 +13079,13 @@
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -11767,7 +13094,11 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -11804,7 +13135,7 @@
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then :
+if ${lt_cv_dlopen_self_static+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -11813,7 +13144,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11816 "configure"
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11854,7 +13185,13 @@
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -11863,7 +13200,11 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -11983,407 +13324,69 @@
 
   # On AIX, shared libraries and static libraries use the same namespace, and
   # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[4-9]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-
-
-
-
-
-
-
-
-
-
-
-
-        ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
-
-
-for ac_prog in 'bison -y' byacc
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_YACC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$YACC"; then
-  ac_cv_prog_YACC="$YACC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_YACC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
 
-fi
-fi
-YACC=$ac_cv_prog_YACC
-if test -n "$YACC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
-$as_echo "$YACC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+  aix[4-9]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
-  test -n "$YACC" && break
-done
-test -n "$YACC" || YACC="yacc"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
 
-for ac_prog in flex lex
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LEX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LEX"; then
-  ac_cv_prog_LEX="$LEX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_LEX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
 
 fi
-fi
-LEX=$ac_cv_prog_LEX
-if test -n "$LEX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
-$as_echo "$LEX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+CC="$lt_save_CC"
 
-  test -n "$LEX" && break
-done
-test -n "$LEX" || LEX=":"
 
-if test "x$LEX" != "x:"; then
-  cat >conftest.l <<_ACEOF
-%%
-a { ECHO; }
-b { REJECT; }
-c { yymore (); }
-d { yyless (1); }
-e { yyless (input () != 0); }
-f { unput (yytext[0]); }
-. { BEGIN INITIAL; }
-%%
-#ifdef YYTEXT_POINTER
-extern char *yytext;
-#endif
-int
-main (void)
-{
-  return ! yylex () + ! yywrap ();
-}
-_ACEOF
-{ { ac_try="$LEX conftest.l"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$LEX conftest.l") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
-$as_echo_n "checking lex output file root... " >&6; }
-if test "${ac_cv_prog_lex_root+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
 
-if test -f lex.yy.c; then
-  ac_cv_prog_lex_root=lex.yy
-elif test -f lexyy.c; then
-  ac_cv_prog_lex_root=lexyy
-else
-  as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
-$as_echo "$ac_cv_prog_lex_root" >&6; }
-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
-if test -z "${LEXLIB+set}"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
-$as_echo_n "checking lex library... " >&6; }
-if test "${ac_cv_lib_lex+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
 
-    ac_save_LIBS=$LIBS
-    ac_cv_lib_lex='none needed'
-    for ac_lib in '' -lfl -ll; do
-      LIBS="$ac_lib $ac_save_LIBS"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-`cat $LEX_OUTPUT_ROOT.c`
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_lex=$ac_lib
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-      test "$ac_cv_lib_lex" != 'none needed' && break
-    done
-    LIBS=$ac_save_LIBS
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
-$as_echo "$ac_cv_lib_lex" >&6; }
-  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
-fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
-$as_echo_n "checking whether yytext is a pointer... " >&6; }
-if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  # POSIX says lex can declare yytext either as a pointer or an array; the
-# default is implementation-dependent.  Figure out which it is, since
-# not all implementations provide the %pointer and %array declarations.
-ac_cv_prog_lex_yytext_pointer=no
-ac_save_LIBS=$LIBS
-LIBS="$LEXLIB $ac_save_LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define YYTEXT_POINTER 1
-`cat $LEX_OUTPUT_ROOT.c`
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_prog_lex_yytext_pointer=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_save_LIBS
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
-$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
-if test $ac_cv_prog_lex_yytext_pointer = yes; then
 
-$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
 
-fi
-rm -f conftest.l $LEX_OUTPUT_ROOT.c
 
-fi
-if test "$LEX" = :; then
-  LEX=${am_missing_run}flex
-fi
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
 
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        ac_config_commands="$ac_config_commands libtool"
 
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
 
-fi
 
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
+
+# Only expand once:
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12497,8 +13500,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -12510,7 +13512,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then :
+if ${ac_cv_c_const+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12519,11 +13521,11 @@
 int
 main ()
 {
-/* FIXME: Include the comments suggested by Paul. */
+
 #ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
+  /* Ultrix mips cc rejects this sort of thing.  */
   typedef int charset[2];
-  const charset cs;
+  const charset cs = { 0, 0 };
   /* SunOS 4.1.1 cc rejects this.  */
   char const *const *pcpcc;
   char **ppc;
@@ -12540,8 +13542,9 @@
   ++pcpcc;
   ppc = (char**) pcpcc;
   pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
+  { /* SCO 3.2v4 cc rejects this sort of thing.  */
+    char tx;
+    char *t = &tx;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
 
     *t++ = 0;
@@ -12557,10 +13560,10 @@
     iptr p = 0;
     ++p;
   }
-  { /* AIX XL C 1.02.0.0 rejects this saying
+  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
+    struct s { int j; const int *ap[3]; } bx;
+    struct s *b = &bx; b->j = 5;
   }
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     const int foo = 10;
@@ -12589,7 +13592,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = x""yes; then :
+if test "x$ac_cv_type_size_t" = xyes; then :
 
 else
 
@@ -12600,7 +13603,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-if test "x$ac_cv_type_mode_t" = x""yes; then :
+if test "x$ac_cv_type_mode_t" = xyes; then :
 
 else
 
@@ -12612,7 +13615,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
 $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if test "${ac_cv_struct_tm+set}" = set; then :
+if ${ac_cv_struct_tm+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12650,8 +13653,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -12669,12 +13671,12 @@
 
 
 
-    ALL_LINGUAS="am ar ast az be bg bn_IN ca cs da de dz el en_AU en_GB eo es et eu fa fi fr gl gu he hi hr hu hy id it ja ka kk ko ku lt lv mk mr ms nb nl pa pl pt pt_BR ro ru si sk sq sv ta tr ug uk ur ur_PK vi zh_CN zh_TW"
+    ALL_LINGUAS="am ar ast be bg ca cs de el en_AU en_GB eo es et eu fi fr gl he hr hu id it ja kk ko lt lv ms nb nl nn oc pa pl pt_BR pt ro ru si sk sq sr sv th tr ug uk ur_PK ur vi zh_CN zh_TW "
 
    for ac_header in locale.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
-if test "x$ac_cv_header_locale_h" = x""yes; then :
+if test "x$ac_cv_header_locale_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LOCALE_H 1
 _ACEOF
@@ -12686,7 +13688,7 @@
     if test $ac_cv_header_locale_h = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
 $as_echo_n "checking for LC_MESSAGES... " >&6; }
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
+if ${am_cv_val_LC_MESSAGES+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12726,7 +13728,7 @@
     INTLLIBS=
 
     ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-if test "x$ac_cv_header_libintl_h" = x""yes; then :
+if test "x$ac_cv_header_libintl_h" = xyes; then :
   gt_cv_func_dgettext_libintl="no"
       libintl_extra_libs=""
 
@@ -12735,7 +13737,7 @@
       #
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
 $as_echo_n "checking for ngettext in libc... " >&6; }
-if test "${gt_cv_func_ngettext_libc+set}" = set; then :
+if ${gt_cv_func_ngettext_libc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12766,7 +13768,7 @@
       if test "$gt_cv_func_ngettext_libc" = "yes" ; then
 	      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
 $as_echo_n "checking for dgettext in libc... " >&6; }
-if test "${gt_cv_func_dgettext_libc+set}" = set; then :
+if ${gt_cv_func_dgettext_libc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12799,7 +13801,7 @@
         for ac_func in bind_textdomain_codeset
 do :
   ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
 _ACEOF
@@ -12818,7 +13820,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
 $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
+if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12852,10 +13854,10 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
 $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
+if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
 $as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+if ${ac_cv_lib_intl_ngettext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12889,10 +13891,10 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
 $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
 $as_echo_n "checking for dgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
+if ${ac_cv_lib_intl_dgettext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12926,7 +13928,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
 $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_dgettext" = xyes; then :
   gt_cv_func_dgettext_libintl=yes
 fi
 
@@ -12942,7 +13944,7 @@
 $as_echo "" >&6; }
   	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
 $as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+if ${ac_cv_lib_intl_ngettext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12976,10 +13978,10 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
 $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
 $as_echo_n "checking for dcgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
+if ${ac_cv_lib_intl_dcgettext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13013,7 +14015,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
 $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_dcgettext" = xyes; then :
   gt_cv_func_dgettext_libintl=yes
 			libintl_extra_libs=-liconv
 else
@@ -13038,7 +14040,7 @@
           for ac_func in bind_textdomain_codeset
 do :
   ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
 _ACEOF
@@ -13076,7 +14078,7 @@
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+if ${ac_cv_path_MSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
@@ -13113,7 +14115,7 @@
 	  for ac_func in dcgettext
 do :
   ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
-if test "x$ac_cv_func_dcgettext" = x""yes; then :
+if test "x$ac_cv_func_dcgettext" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DCGETTEXT 1
 _ACEOF
@@ -13154,7 +14156,7 @@
 set dummy gmsgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+if ${ac_cv_path_GMSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -13168,7 +14170,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13195,7 +14197,7 @@
 set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+if ${ac_cv_path_XGETTEXT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
@@ -13246,7 +14248,7 @@
   case $host in
 	    *-*-solaris*)
 	    	                	    	                ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
   CATOBJEXT=.gmo
                DATADIRNAME=share
 else
@@ -13255,6 +14257,10 @@
 fi
 
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -13376,7 +14382,7 @@
 
 
     ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
 
 fi
 
@@ -13419,13 +14425,21 @@
   # minimum supported version of pkg-config
   xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
 
-  # lookup pkg-config utility
-  if test x"$PKG_CONFIG" = x""; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -13439,7 +14453,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13448,7 +14462,6 @@
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
@@ -13462,44 +14475,94 @@
 fi
 
 
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-    if test x"$PKG_CONFIG" = x"no"; then
-      echo "*** The pkg-config utility could not be found on your system."
-      echo "*** Make sure it is in your path, or set the PKG_CONFIG"
-      echo "*** environment variable to the full path to pkg-config."
-      echo "*** You can download pkg-config from the freedesktop.org"
-      echo "*** software repository at"
-      echo "***"
-      echo "***    http://www.freedesktop.org/software/pkgconfig"
-      echo "***"
-      exit 1
-    fi
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    # check pkg-config version
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5
-$as_echo_n "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... " >&6; }
-    if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then
-      xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
-$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; }
-    else
-      xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
-$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; }
-      echo "*** Your version of pkg-config is too old. You need atleast"
-      echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config "
-      echo "*** from the freedesktop.org software repository at"
-      echo "***"
-      echo "***    http://www.freedesktop.org/software/pkgconfig"
-      echo "***"
-      exit 1
-    fi
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
   fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+      if test x"$PKG_CONFIG" = x""; then
+        echo
+        echo "*** Your version of pkg-config is too old. You need atleast"
+        echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
+        echo "*** from the freedesktop.org software repository at"
+        echo "***"
+        echo "***    http://www.freedesktop.org/software/pkgconfig"
+        echo "***"
+        exit 1;
+      fi
+
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.10.0" >&5
-$as_echo_n "checking for gtk+-2.0 >= 2.10.0... " >&6; }
-  if $PKG_CONFIG "--atleast-version=2.10.0" "gtk+-2.0" >/dev/null 2>&1; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.14.0" >&5
+$as_echo_n "checking for gtk+-2.0 >= 2.14.0... " >&6; }
+  if $PKG_CONFIG "--atleast-version=2.14.0" "gtk+-2.0" >/dev/null 2>&1; then
     LIBGTK_VERSION=`$PKG_CONFIG --modversion "gtk+-2.0"`
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGTK_VERSION" >&5
 $as_echo "$LIBGTK_VERSION" >&6; }
@@ -13516,7 +14579,7 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGTK_LIBS" >&5
 $as_echo "$LIBGTK_LIBS" >&6; }
 
-    LIBGTK_REQUIRED_VERSION=2.10.0
+    LIBGTK_REQUIRED_VERSION=2.14.0
 
 
 
@@ -13532,7 +14595,7 @@
 
       echo "*** The required package gtk+-2.0 was found on your system,"
       echo "*** but the installed version ($xdt_cv_version) is too old."
-      echo "*** Please upgrade gtk+-2.0 to atleast version 2.10.0, or adjust"
+      echo "*** Please upgrade gtk+-2.0 to atleast version 2.14.0, or adjust"
       echo "*** the PKG_CONFIG_PATH environment variable if you installed"
       echo "*** the new version of the package in a nonstandard prefix so"
       echo "*** pkg-config is able to find it."
@@ -13544,7 +14607,7 @@
 
 
       echo "*** The required package gtk+-2.0 was not found on your system."
-      echo "*** Please install gtk+-2.0 (atleast version 2.10.0) or adjust"
+      echo "*** Please install gtk+-2.0 (atleast version 2.14.0) or adjust"
       echo "*** the PKG_CONFIG_PATH environment variable if you"
       echo "*** installed the package in a nonstandard prefix so that"
       echo "*** pkg-config is able to find it."
@@ -13567,19 +14630,27 @@
 
 
   if test x"$xdt_cv_LIBXFCE4PANEL_check" = x"yes"; then
-    if $PKG_CONFIG --exists "libxfce4panel-1.0 >= 4.6.0" >/dev/null 2>&1; then
+    if $PKG_CONFIG --exists "libxfce4panel-1.0 >= 4.8.0" >/dev/null 2>&1; then
 
 
   # minimum supported version of pkg-config
   xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
 
-  # lookup pkg-config utility
-  if test x"$PKG_CONFIG" = x""; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -13593,7 +14664,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13602,7 +14673,6 @@
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
@@ -13616,44 +14686,94 @@
 fi
 
 
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-    if test x"$PKG_CONFIG" = x"no"; then
-      echo "*** The pkg-config utility could not be found on your system."
-      echo "*** Make sure it is in your path, or set the PKG_CONFIG"
-      echo "*** environment variable to the full path to pkg-config."
-      echo "*** You can download pkg-config from the freedesktop.org"
-      echo "*** software repository at"
-      echo "***"
-      echo "***    http://www.freedesktop.org/software/pkgconfig"
-      echo "***"
-      exit 1
-    fi
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    # check pkg-config version
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5
-$as_echo_n "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... " >&6; }
-    if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then
-      xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
-$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; }
-    else
-      xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
-$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; }
-      echo "*** Your version of pkg-config is too old. You need atleast"
-      echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config "
-      echo "*** from the freedesktop.org software repository at"
-      echo "***"
-      echo "***    http://www.freedesktop.org/software/pkgconfig"
-      echo "***"
-      exit 1
-    fi
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
   fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+      if test x"$PKG_CONFIG" = x""; then
+        echo
+        echo "*** Your version of pkg-config is too old. You need atleast"
+        echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
+        echo "*** from the freedesktop.org software repository at"
+        echo "***"
+        echo "***    http://www.freedesktop.org/software/pkgconfig"
+        echo "***"
+        exit 1;
+      fi
+
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4panel-1.0 >= 4.6.0" >&5
-$as_echo_n "checking for libxfce4panel-1.0 >= 4.6.0... " >&6; }
-  if $PKG_CONFIG "--atleast-version=4.6.0" "libxfce4panel-1.0" >/dev/null 2>&1; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4panel-1.0 >= 4.8.0" >&5
+$as_echo_n "checking for libxfce4panel-1.0 >= 4.8.0... " >&6; }
+  if $PKG_CONFIG "--atleast-version=4.8.0" "libxfce4panel-1.0" >/dev/null 2>&1; then
     LIBXFCE4PANEL_VERSION=`$PKG_CONFIG --modversion "libxfce4panel-1.0"`
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4PANEL_VERSION" >&5
 $as_echo "$LIBXFCE4PANEL_VERSION" >&6; }
@@ -13670,7 +14790,7 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4PANEL_LIBS" >&5
 $as_echo "$LIBXFCE4PANEL_LIBS" >&6; }
 
-    LIBXFCE4PANEL_REQUIRED_VERSION=4.6.0
+    LIBXFCE4PANEL_REQUIRED_VERSION=4.8.0
 
 
 
@@ -13691,7 +14811,7 @@
 
       echo "*** The required package libxfce4panel-1.0 was found on your system,"
       echo "*** but the installed version ($xdt_cv_version) is too old."
-      echo "*** Please upgrade libxfce4panel-1.0 to atleast version 4.6.0, or adjust"
+      echo "*** Please upgrade libxfce4panel-1.0 to atleast version 4.8.0, or adjust"
       echo "*** the PKG_CONFIG_PATH environment variable if you installed"
       echo "*** the new version of the package in a nonstandard prefix so"
       echo "*** pkg-config is able to find it."
@@ -13703,7 +14823,7 @@
 
 
       echo "*** The required package libxfce4panel-1.0 was not found on your system."
-      echo "*** Please install libxfce4panel-1.0 (atleast version 4.6.0) or adjust"
+      echo "*** Please install libxfce4panel-1.0 (atleast version 4.8.0) or adjust"
       echo "*** the PKG_CONFIG_PATH environment variable if you"
       echo "*** installed the package in a nonstandard prefix so that"
       echo "*** pkg-config is able to find it."
@@ -13712,8 +14832,8 @@
   fi
 
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package libxfce4panel-1.0 >= 4.6.0" >&5
-$as_echo_n "checking for optional package libxfce4panel-1.0 >= 4.6.0... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package libxfce4panel-1.0 >= 4.8.0" >&5
+$as_echo_n "checking for optional package libxfce4panel-1.0 >= 4.8.0... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 $as_echo "not found" >&6; }
     fi
@@ -13752,13 +14872,21 @@
   # minimum supported version of pkg-config
   xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
 
-  # lookup pkg-config utility
-  if test x"$PKG_CONFIG" = x""; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -13772,7 +14900,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13781,7 +14909,6 @@
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
@@ -13795,39 +14922,89 @@
 fi
 
 
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-    if test x"$PKG_CONFIG" = x"no"; then
-      echo "*** The pkg-config utility could not be found on your system."
-      echo "*** Make sure it is in your path, or set the PKG_CONFIG"
-      echo "*** environment variable to the full path to pkg-config."
-      echo "*** You can download pkg-config from the freedesktop.org"
-      echo "*** software repository at"
-      echo "***"
-      echo "***    http://www.freedesktop.org/software/pkgconfig"
-      echo "***"
-      exit 1
-    fi
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    # check pkg-config version
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5
-$as_echo_n "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... " >&6; }
-    if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then
-      xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
-$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; }
-    else
-      xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
-$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; }
-      echo "*** Your version of pkg-config is too old. You need atleast"
-      echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config "
-      echo "*** from the freedesktop.org software repository at"
-      echo "***"
-      echo "***    http://www.freedesktop.org/software/pkgconfig"
-      echo "***"
-      exit 1
-    fi
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
   fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+      if test x"$PKG_CONFIG" = x""; then
+        echo
+        echo "*** Your version of pkg-config is too old. You need atleast"
+        echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
+        echo "*** from the freedesktop.org software repository at"
+        echo "***"
+        echo "***    http://www.freedesktop.org/software/pkgconfig"
+        echo "***"
+        exit 1;
+      fi
+
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libical >= 0.43" >&5
@@ -13925,7 +15102,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+if ${ac_cv_prog_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
@@ -13937,7 +15114,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -13968,7 +15145,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -13980,7 +15157,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_PERL="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14126,7 +15303,7 @@
   *)
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
 $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
+if ${ac_cv_lib_pthread_pthread_create+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -14160,7 +15337,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
 $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
+if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
   have_pthread=yes
 fi
 
@@ -14252,19 +15429,27 @@
 
 
   if test x"$xdt_cv_DBUS_check" = x"yes"; then
-    if $PKG_CONFIG --exists "dbus-glib-1 >= 0.34" >/dev/null 2>&1; then
+    if $PKG_CONFIG --exists "dbus-glib-1 >= 0.1" >/dev/null 2>&1; then
 
 
   # minimum supported version of pkg-config
   xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
 
-  # lookup pkg-config utility
-  if test x"$PKG_CONFIG" = x""; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -14278,7 +15463,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14287,58 +15472,107 @@
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	_pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
 fi
 
+      if test x"$PKG_CONFIG" = x""; then
+        echo
+        echo "*** Your version of pkg-config is too old. You need atleast"
+        echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
+        echo "*** from the freedesktop.org software repository at"
+        echo "***"
+        echo "***    http://www.freedesktop.org/software/pkgconfig"
+        echo "***"
+        exit 1;
+      fi
 
 
-    if test x"$PKG_CONFIG" = x"no"; then
-      echo "*** The pkg-config utility could not be found on your system."
-      echo "*** Make sure it is in your path, or set the PKG_CONFIG"
-      echo "*** environment variable to the full path to pkg-config."
-      echo "*** You can download pkg-config from the freedesktop.org"
-      echo "*** software repository at"
-      echo "***"
-      echo "***    http://www.freedesktop.org/software/pkgconfig"
-      echo "***"
-      exit 1
-    fi
-
-    # check pkg-config version
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5
-$as_echo_n "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... " >&6; }
-    if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then
-      xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
-$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; }
-    else
-      xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
-$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; }
-      echo "*** Your version of pkg-config is too old. You need atleast"
-      echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config "
-      echo "*** from the freedesktop.org software repository at"
-      echo "***"
-      echo "***    http://www.freedesktop.org/software/pkgconfig"
-      echo "***"
-      exit 1
-    fi
-  fi
-
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-glib-1 >= 0.34" >&5
-$as_echo_n "checking for dbus-glib-1 >= 0.34... " >&6; }
-  if $PKG_CONFIG "--atleast-version=0.34" "dbus-glib-1" >/dev/null 2>&1; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-glib-1 >= 0.1" >&5
+$as_echo_n "checking for dbus-glib-1 >= 0.1... " >&6; }
+  if $PKG_CONFIG "--atleast-version=0.1" "dbus-glib-1" >/dev/null 2>&1; then
     DBUS_VERSION=`$PKG_CONFIG --modversion "dbus-glib-1"`
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_VERSION" >&5
 $as_echo "$DBUS_VERSION" >&6; }
@@ -14355,7 +15589,7 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_LIBS" >&5
 $as_echo "$DBUS_LIBS" >&6; }
 
-    DBUS_REQUIRED_VERSION=0.34
+    DBUS_REQUIRED_VERSION=0.1
 
 
 
@@ -14376,7 +15610,7 @@
 
       echo "*** The required package dbus-glib-1 was found on your system,"
       echo "*** but the installed version ($xdt_cv_version) is too old."
-      echo "*** Please upgrade dbus-glib-1 to atleast version 0.34, or adjust"
+      echo "*** Please upgrade dbus-glib-1 to atleast version 0.1, or adjust"
       echo "*** the PKG_CONFIG_PATH environment variable if you installed"
       echo "*** the new version of the package in a nonstandard prefix so"
       echo "*** pkg-config is able to find it."
@@ -14388,7 +15622,7 @@
 
 
       echo "*** The required package dbus-glib-1 was not found on your system."
-      echo "*** Please install dbus-glib-1 (atleast version 0.34) or adjust"
+      echo "*** Please install dbus-glib-1 (atleast version 0.1) or adjust"
       echo "*** the PKG_CONFIG_PATH environment variable if you"
       echo "*** installed the package in a nonstandard prefix so that"
       echo "*** pkg-config is able to find it."
@@ -14397,8 +15631,8 @@
   fi
 
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package dbus-glib-1 >= 0.34" >&5
-$as_echo_n "checking for optional package dbus-glib-1 >= 0.34... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package dbus-glib-1 >= 0.1" >&5
+$as_echo_n "checking for optional package dbus-glib-1 >= 0.1... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 $as_echo "not found" >&6; }
     fi
@@ -14437,13 +15671,21 @@
   # minimum supported version of pkg-config
   xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
 
-  # lookup pkg-config utility
-  if test x"$PKG_CONFIG" = x""; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -14457,7 +15699,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14466,7 +15708,6 @@
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
@@ -14480,39 +15721,89 @@
 fi
 
 
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-    if test x"$PKG_CONFIG" = x"no"; then
-      echo "*** The pkg-config utility could not be found on your system."
-      echo "*** Make sure it is in your path, or set the PKG_CONFIG"
-      echo "*** environment variable to the full path to pkg-config."
-      echo "*** You can download pkg-config from the freedesktop.org"
-      echo "*** software repository at"
-      echo "***"
-      echo "***    http://www.freedesktop.org/software/pkgconfig"
-      echo "***"
-      exit 1
-    fi
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    # check pkg-config version
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION" >&5
-$as_echo_n "checking for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION... " >&6; }
-    if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then
-      xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
-$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; }
-    else
-      xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xdt_cv_PKG_CONFIG_VERSION" >&5
-$as_echo "$xdt_cv_PKG_CONFIG_VERSION" >&6; }
-      echo "*** Your version of pkg-config is too old. You need atleast"
-      echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config "
-      echo "*** from the freedesktop.org software repository at"
-      echo "***"
-      echo "***    http://www.freedesktop.org/software/pkgconfig"
-      echo "***"
-      exit 1
-    fi
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
   fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+      if test x"$PKG_CONFIG" = x""; then
+        echo
+        echo "*** Your version of pkg-config is too old. You need atleast"
+        echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
+        echo "*** from the freedesktop.org software repository at"
+        echo "***"
+        echo "***    http://www.freedesktop.org/software/pkgconfig"
+        echo "***"
+        exit 1;
+      fi
+
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnotify >= 0.3.2" >&5
@@ -14600,7 +15891,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poptGetContext in -lpopt" >&5
 $as_echo_n "checking for poptGetContext in -lpopt... " >&6; }
-if test "${ac_cv_lib_popt_poptGetContext+set}" = set; then :
+if ${ac_cv_lib_popt_poptGetContext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -14634,7 +15925,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_popt_poptGetContext" >&5
 $as_echo "$ac_cv_lib_popt_poptGetContext" >&6; }
-if test "x$ac_cv_lib_popt_poptGetContext" = x""yes; then :
+if test "x$ac_cv_lib_popt_poptGetContext" = xyes; then :
   have_popt="yes"
 
 $as_echo "#define HAVE_LIBPOTPT 1" >>confdefs.h
@@ -14669,48 +15960,98 @@
 
 
 
-  # Check whether --enable-debug was given.
+    # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug;
+  enableval=$enable_debug; enable_debug=$enableval
 else
-  enable_debug=no
+  enable_debug=minimum
 fi
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with debugging support" >&5
 $as_echo_n "checking whether to build with debugging support... " >&6; }
-  if test x"$enable_debug" != x"no"; then
+  if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then
 
 $as_echo "#define DEBUG 1" >>confdefs.h
 
 
-    if test x"$GCC" = x"yes"; then
-      xdt_cv_additional_CFLAGS="-Wall"
+    xdt_cv_additional_CFLAGS="-DXFCE_DISABLE_DEPRECATED \
+                              -Wall -Wextra \
+                              -Wno-missing-field-initializers \
+                              -Wno-unused-parameter -Wold-style-definition \
+                              -Wdeclaration-after-statement \
+                              -Wmissing-declarations \
+                              -Wmissing-noreturn -Wshadow -Wpointer-arith \
+                              -Wcast-align -Wformat-security \
+                              -Winit-self -Wmissing-include-dirs -Wundef \
+                              -Wmissing-format-attribute -Wnested-externs"
+    CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+
+    if test x`uname` = x"Linux"; then
+      xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector"
+    fi
+
+        if test x`uname` != x"OpenBSD"; then
+      xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wredundant-decls"
     fi
-    xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -DXFCE_DISABLE_DEPRECATED"
 
     if test x"$enable_debug" = x"full"; then
 
 $as_echo "#define DEBUG_TRACE 1" >>confdefs.h
 
-      if test x"$GCC" = x"yes"; then
-        xdt_cv_additional_CFLAGS="-g3 -Werror $xdt_cv_additional_CFLAGS"
-      fi
+      xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g -Werror"
+      CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: full" >&5
 $as_echo "full" >&6; }
     else
-      if test x"$GCC" = x"yes"; then
-        xdt_cv_additional_CFLAGS="-g $xdt_cv_additional_CFLAGS"
-      fi
+      xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -g"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
     fi
 
-    CFLAGS="$CFLAGS $xdt_cv_additional_CFLAGS"
-    CXXFLAGS="$CXXFLAGS $xdt_cv_additional_CFLAGS"
+
+  for flag in $xdt_cv_additional_CFLAGS; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag" >&5
+$as_echo_n "checking if $CC supports $flag... " >&6; }
+    saved_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $flag"
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  flag_supported=yes
+else
+  flag_supported=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    CFLAGS="$saved_CFLAGS"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_supported" >&5
+$as_echo "$flag_supported" >&6; }
+
+    if test "x$flag_supported" = "xyes"; then
+      supported_CFLAGS="$supported_CFLAGS $flag"
+    fi
+  done
+
+
+
+                                                supported_CXXFLAGS="$supported_CFLAGS"
+
+
+    CFLAGS="$CFLAGS $supported_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $supported_CXXFLAGS"
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    CPPFLAGS="$CPPFLAGS -DNDEBUG"
+
+    if test x"$enable_debug" = x"no"; then
+      CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: minimum" >&5
+$as_echo "minimum" >&6; }
+    fi
   fi
 
 
@@ -14781,10 +16122,21 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -14814,6 +16166,14 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -14823,23 +16183,23 @@
 fi
 
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error "conditional \"AMDEP\" was never defined.
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_CYGWIN_TRUE}" && test -z "${HAVE_CYGWIN_FALSE}"; then
-  as_fn_error "conditional \"HAVE_CYGWIN\" was never defined.
+  as_fn_error $? "conditional \"HAVE_CYGWIN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -14847,39 +16207,39 @@
 
 
 if test -z "${HAVE_LIBXFCE4PANEL_TRUE}" && test -z "${HAVE_LIBXFCE4PANEL_FALSE}"; then
-  as_fn_error "conditional \"HAVE_LIBXFCE4PANEL\" was never defined.
+  as_fn_error $? "conditional \"HAVE_LIBXFCE4PANEL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_LIBICAL_TRUE}" && test -z "${HAVE_LIBICAL_FALSE}"; then
-  as_fn_error "conditional \"HAVE_LIBICAL\" was never defined.
+  as_fn_error $? "conditional \"HAVE_LIBICAL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${INCLUDED_LIBICAL_TRUE}" && test -z "${INCLUDED_LIBICAL_FALSE}"; then
-  as_fn_error "conditional \"INCLUDED_LIBICAL\" was never defined.
+  as_fn_error $? "conditional \"INCLUDED_LIBICAL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_PTHREAD_TRUE}" && test -z "${HAVE_PTHREAD_FALSE}"; then
-  as_fn_error "conditional \"HAVE_PTHREAD\" was never defined.
+  as_fn_error $? "conditional \"HAVE_PTHREAD\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${WITH_BDB4_TRUE}" && test -z "${WITH_BDB4_FALSE}"; then
-  as_fn_error "conditional \"WITH_BDB4\" was never defined.
+  as_fn_error $? "conditional \"WITH_BDB4\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_DBUS_TRUE}" && test -z "${HAVE_DBUS_FALSE}"; then
-  as_fn_error "conditional \"HAVE_DBUS\" was never defined.
+  as_fn_error $? "conditional \"HAVE_DBUS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_NOTIFY_TRUE}" && test -z "${HAVE_NOTIFY_FALSE}"; then
-  as_fn_error "conditional \"HAVE_NOTIFY\" was never defined.
+  as_fn_error $? "conditional \"HAVE_NOTIFY\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_LIBPOTPT_TRUE}" && test -z "${HAVE_LIBPOTPT_FALSE}"; then
-  as_fn_error "conditional \"HAVE_LIBPOTPT\" was never defined.
+  as_fn_error $? "conditional \"HAVE_LIBPOTPT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -14980,6 +16340,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -15025,19 +16386,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -15175,16 +16536,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -15233,7 +16594,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -15244,28 +16605,16 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -15286,8 +16635,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by orage $as_me 4.8.3, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+This file was extended by orage $as_me 4.12.1, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -15352,11 +16701,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-orage config.status 4.8.3
-configured by $0, generated by GNU Autoconf 2.65,
+orage config.status 4.12.1
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -15374,11 +16723,16 @@
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -15400,6 +16754,7 @@
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -15412,7 +16767,7 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
+    as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -15421,7 +16776,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -15441,7 +16796,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -15475,131 +16830,154 @@
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
 
 LTCC='$LTCC'
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
 # Quote evaled strings.
-for var in SED \
+for var in SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
 GREP \
 EGREP \
 FGREP \
@@ -15612,8 +16990,13 @@
 OBJDUMP \
 deplibs_check_method \
 file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
 AR \
 AR_FLAGS \
+archiver_list_spec \
 STRIP \
 RANLIB \
 CC \
@@ -15623,14 +17006,14 @@
 lt_cv_sys_global_symbol_to_cdecl \
 lt_cv_sys_global_symbol_to_c_name_address \
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-SHELL \
-ECHO \
+nm_file_list_spec \
 lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_wl \
 lt_prog_compiler_pic \
+lt_prog_compiler_wl \
 lt_prog_compiler_static \
 lt_cv_prog_compiler_c_o \
 need_locks \
+MANIFEST_TOOL \
 DSYMUTIL \
 NMEDIT \
 LIPO \
@@ -15644,9 +17027,7 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
-fix_srcfile_path \
 exclude_expsyms \
 include_expsyms \
 file_list_spec \
@@ -15654,12 +17035,13 @@
 libname_spec \
 library_names_spec \
 soname_spec \
+install_override_mode \
 finish_eval \
 old_striplib \
 striplib; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -15681,14 +17063,15 @@
 module_expsym_cmds \
 export_symbols_cmds \
 prelink_cmds \
+postlink_cmds \
 postinstall_cmds \
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
 sys_lib_dlsearch_path_spec; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -15696,12 +17079,6 @@
     esac
 done
 
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
-  ;;
-esac
-
 ac_aux_dir='$ac_aux_dir'
 xsi_shell='$xsi_shell'
 lt_shell_append='$lt_shell_append'
@@ -15762,7 +17139,7 @@
     "tz_convert/Makefile") CONFIG_FILES="$CONFIG_FILES tz_convert/Makefile" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -15785,9 +17162,10 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -15795,12 +17173,13 @@
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -15817,12 +17196,12 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -15831,18 +17210,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -15850,7 +17229,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -15898,7 +17277,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -15930,21 +17309,29 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -15956,7 +17343,7 @@
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -15968,11 +17355,11 @@
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -16057,7 +17444,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -16070,7 +17457,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -16089,7 +17476,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -16098,7 +17485,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -16124,8 +17511,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -16261,23 +17648,24 @@
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -16286,21 +17674,21 @@
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -16346,7 +17734,7 @@
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -16359,7 +17747,7 @@
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -16393,21 +17781,19 @@
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
@@ -16461,7 +17847,8 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -16497,18 +17884,27 @@
 macro_version=$macro_version
 macro_revision=$macro_revision
 
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
 # Whether or not to build static libraries.
 build_old_libs=$enable_static
 
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
 # What type of objects to build.
 pic_mode=$pic_mode
 
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -16558,9 +17954,11 @@
 # turn newlines into spaces.
 NL2SP=$lt_lt_NL2SP
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
 # An object symbol dumper.
 OBJDUMP=$lt_OBJDUMP
@@ -16568,13 +17966,30 @@
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
 
-# Command to use when deplibs_check_method == "file_magic".
+# Command to use when deplibs_check_method = "file_magic".
 file_magic_cmd=$lt_file_magic_cmd
 
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
 # The archiver.
 AR=$lt_AR
+
+# Flags to create an archive.
 AR_FLAGS=$lt_AR_FLAGS
 
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
 # A symbol stripping program.
 STRIP=$lt_STRIP
 
@@ -16583,6 +17998,9 @@
 old_postinstall_cmds=$lt_old_postinstall_cmds
 old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
 # A C compiler.
 LTCC=$lt_CC
 
@@ -16601,14 +18019,14 @@
 # Transform the output of nm in a C name address pair when lib prefix is needed.
 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
 
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
+# The root where to search for dependent libraries,and in which our libraries should be installed.
+lt_sysroot=$lt_sysroot
 
-# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
 
 # Used to examine libraries when file_magic_cmd begins with "file".
 MAGIC_CMD=$MAGIC_CMD
@@ -16616,6 +18034,9 @@
 # Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
 DSYMUTIL=$lt_DSYMUTIL
 
@@ -16672,6 +18093,9 @@
 # The coded name of the library, if different from the real name.
 soname_spec=$lt_soname_spec
 
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
 # Command to use after installation of a shared archive.
 postinstall_cmds=$lt_postinstall_cmds
 
@@ -16711,6 +18135,10 @@
 # The linker used to build libraries.
 LD=$lt_LD
 
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds
 
@@ -16723,12 +18151,12 @@
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
 
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
 # Additional compiler flags for building library objects.
 pic_flag=$lt_lt_prog_compiler_pic
 
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static
 
@@ -16778,10 +18206,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
@@ -16815,9 +18239,6 @@
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols
 
@@ -16833,6 +18254,9 @@
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds
 
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec
 
@@ -16865,212 +18289,169 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $* ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[^=]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$@"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1+=\$2"
-}
-_LT_EOF
-    ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1=\$$1\$2"
-}
-
-_LT_EOF
-    ;;
-  esac
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
 
+  if test x"$xsi_shell" = xyes; then
+  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
+func_dirname ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_basename ()$/,/^} # func_basename /c\
+func_basename ()\
+{\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
+func_dirname_and_basename ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
+func_stripname ()\
+{\
+\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
+\    # positional parameters, so assign one to ordinary parameter first.\
+\    func_stripname_result=${3}\
+\    func_stripname_result=${func_stripname_result#"${1}"}\
+\    func_stripname_result=${func_stripname_result%"${2}"}\
+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
+func_split_long_opt ()\
+{\
+\    func_split_long_opt_name=${1%%=*}\
+\    func_split_long_opt_arg=${1#*=}\
+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
+func_split_short_opt ()\
+{\
+\    func_split_short_opt_arg=${1#??}\
+\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
+func_lo2o ()\
+{\
+\    case ${1} in\
+\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
+\      *)    func_lo2o_result=${1} ;;\
+\    esac\
+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_xform ()$/,/^} # func_xform /c\
+func_xform ()\
+{\
+    func_xform_result=${1%.*}.lo\
+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_arith ()$/,/^} # func_arith /c\
+func_arith ()\
+{\
+    func_arith_result=$(( $* ))\
+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_len ()$/,/^} # func_len /c\
+func_len ()\
+{\
+    func_len_result=${#1}\
+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  sed -e '/^func_append ()$/,/^} # func_append /c\
+func_append ()\
+{\
+    eval "${1}+=\\${2}"\
+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
+func_append_quoted ()\
+{\
+\    func_quote_for_eval "${2}"\
+\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
+fi
 
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
 
-  mv -f "$cfgfile" "$ofile" ||
+   mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 
@@ -17080,7 +18461,7 @@
       esac ;;
     "po/stamp-it":C)
     if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
-       as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
+       as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
     fi
     rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
     >"po/stamp-it.tmp"
@@ -17108,7 +18489,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -17129,7 +18510,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff -Nru orage-4.8.3/configure.in orage-4.12.1/configure.in
--- orage-4.8.3/configure.in	2012-01-04 12:52:39.000000000 +0000
+++ orage-4.12.1/configure.in	2015-04-10 10:26:45.000000000 +0000
@@ -1,3 +1,8 @@
+dnl
+dnl This file was autogenerated from "configure.in.in".
+dnl Edit that file instead!
+dnl
+
 dnl $Id$
 dnl
 dnl Orage - Calendar application for Xfce
@@ -9,11 +14,11 @@
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.8.3])
+m4_define([orage_version], [4.12.1])
 
-m4_define([gtk_minimum_version], [2.10.0])
-m4_define([xfce_minimum_version], [4.6.0])
-m4_define([dbus_minimum_version], [0.34])
+m4_define([gtk_minimum_version], [2.14.0])
+m4_define([xfce_minimum_version], [4.8.0])
+m4_define([dbus_minimum_version], [0.1])
 m4_define([notify_minimum_version], [0.3.2])
 m4_define([intltool_minimum_version], [0.31])
 m4_define([libical_minimum_version], [0.43])
@@ -24,7 +29,7 @@
 
 
 dnl Initialize autoconf
-AC_COPYRIGHT([Copyright (c) 2003-2011
+AC_COPYRIGHT([Copyright (c) 2003-2015
         The Xfce development team. All rights reserved.
 
 Written for Xfce by Juha Kautto <juha@xfce.org>.])
@@ -49,11 +54,14 @@
 AC_PROG_CC()
 AC_PROG_INSTALL()
 AC_PROG_INTLTOOL([intltool_minimum_version], [no-xml])
-AC_PROG_LIBTOOL()
 AC_PROG_YACC()
 AC_PROG_LN_S()
 AM_PROG_LEX()
 AM_PROG_CC_C_O()
+
+dnl Initialize libtool
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
  
 dnl Check for standard header files
 AC_HEADER_STDC()
@@ -69,7 +77,7 @@
 AC_CHECK_FUNCS([gmtime_r iswspace strdup snprintf])
 
 dnl Check for i18n support
-XDT_I18N([am ar ast az be bg bn_IN ca cs da de dz el en_AU en_GB eo es et eu fa fi fr gl gu he hi hr hu hy id it ja ka kk ko ku lt lv mk mr ms nb nl pa pl pt pt_BR ro ru si sk sq sv ta tr ug uk ur ur_PK vi zh_CN zh_TW])
+XDT_I18N([am ar ast be bg ca cs de el en_AU en_GB eo es et eu fi fr gl he hr hu id it ja kk ko lt lv ms nb nl nn oc pa pl pt_BR pt ro ru si sk sq sr sv th tr ug uk ur_PK ur vi zh_CN zh_TW ])
 
 dnl Check for required packages
 #XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [xfce_minimum_version])
diff -Nru orage-4.8.3/debian/changelog orage-4.12.1/debian/changelog
--- orage-4.8.3/debian/changelog	2012-01-05 14:01:59.000000000 +0000
+++ orage-4.12.1/debian/changelog	2015-06-18 06:22:53.000000000 +0000
@@ -1,3 +1,87 @@
+orage (4.12.1-1~ubuntu12.04.1) precise; urgency=low
+
+  * No-change backport to precise
+
+ -- Pavel Sofishchenko <login.spv@gmail.com>  Thu, 18 Jun 2015 11:22:53 +0500
+
+orage (4.12.1-1) unstable; urgency=medium
+
+  [ Mateusz Łukasik ]
+  * New upstream release.
+    - fix typo in notification text.                            closes: #742278
+
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - remove .la files from the package.
+  * Upload to unstable.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Wed, 06 May 2015 18:08:11 +0200
+
+orage (4.10.0-2) experimental; urgency=medium
+
+  * Rebuild against Xfce 4.12 libraries.
+  * debian/control:
+    - update standards version to 3.9.6.
+  * debian/patches:
+    - 01_support-filename-desktop added, update Exec line to support passing
+    filenames, since we announce support for the calendar mimetype.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sat, 14 Mar 2015 14:53:45 +0100
+
+orage (4.10.0-1) unstable; urgency=medium
+
+  [ Evgeni Golov ]
+  * Correct Vcs-* URLs to point to anonscm.debian.org
+
+  [ Jackson Doak ]
+  * debian/rules: use autotools-dev
+  * debian/control: 
+    - Build-depend autotools-dev
+    - Remove duplicate entry libdbus-1-dev
+  * Creat debian/source/options
+
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Mon, 09 Dec 2013 21:44:06 +0100
+
+orage (4.8.4-2) unstable; urgency=low
+
+  * Rebuild against xfce4-panel 4.10.                           closes: #709423
+  * debian/control:
+    - remove dpkg-dev build-dep, stable has hardening support.
+    - remove version on xfce4-panel-dev build-dep, stable has Xfce 4.8.
+    - drop chrpath build-dep.
+    - drop xfce4-dev-tools and libtool build-dep, now useless.
+  * debian/rules:
+    - enable parallel build.
+    - drop chrpath call.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Fri, 24 May 2013 08:27:01 +0200
+
+orage (4.8.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches
+    - 0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s dropped,
+      included upstream.
+  * debian/rules:
+    - enable 'all' hardening flags.
+  * debian/control:
+    - update standards version to 3.9.4.
+    - update debhelper build-dep to 9.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sat, 02 Feb 2013 10:27:49 +0100
+
+orage (4.8.3-2) unstable; urgency=low
+
+  * debian/patches:
+    - 0001-4.8.3.1-Fixed-Bug-8525-Orage-keeps-notifying-every-s added, fix
+      alarm notification every second.                          closes: #666420
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sat, 21 Jul 2012 09:17:12 +0200
+
 orage (4.8.3-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru orage-4.8.3/debian/control orage-4.12.1/debian/control
--- orage-4.8.3/debian/control	2012-01-05 14:00:27.000000000 +0000
+++ orage-4.12.1/debian/control	2015-03-14 13:35:53.000000000 +0000
@@ -4,15 +4,13 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac@debian.org>,
  Lionel Le Folgoc <mrpouit@gmail.com>
-Build-Depends: debhelper (>= 8.9.4), libxml-parser-perl,
- libgtk2.0-dev (>= 2.10.1), xfce4-panel-dev (>= 4.8.0), chrpath,
- libxfcegui4-dev (>= 4.6.0), libnotify-dev, libdbus-1-dev, intltool, 
- libdbus-1-dev, libical-dev, libpopt-dev, xfce4-dev-tools, libtool,
- dpkg-dev (>= 1.16.1)
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), libxml-parser-perl,
+ libgtk2.0-dev (>= 2.10.1), xfce4-panel-dev, libxfcegui4-dev, libnotify-dev,
+ libdbus-1-dev, intltool, libical-dev, libpopt-dev, autotools-dev
+Standards-Version: 3.9.6
 Homepage: http://www.xfce.org/
-Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/orage/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/orage/
+Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/orage/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/desktop/trunk/orage/
 
 Package: orage
 Section: xfce
diff -Nru orage-4.8.3/debian/patches/01_support-filename-desktop.patch orage-4.12.1/debian/patches/01_support-filename-desktop.patch
--- orage-4.8.3/debian/patches/01_support-filename-desktop.patch	1970-01-01 00:00:00.000000000 +0000
+++ orage-4.12.1/debian/patches/01_support-filename-desktop.patch	2015-03-14 13:53:42.000000000 +0000
@@ -0,0 +1,11 @@
+--- a/xfcalendar.desktop.in
++++ b/xfcalendar.desktop.in
+@@ -2,7 +2,7 @@
+ Version=1.0
+ _Name=Orage Calendar
+ _Comment=Desktop calendar
+-Exec=orage
++Exec=orage %F
+ Icon=xfcalendar
+ StartupNotify=true
+ MimeType=text/calendar;
diff -Nru orage-4.8.3/debian/patches/series orage-4.12.1/debian/patches/series
--- orage-4.8.3/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ orage-4.12.1/debian/patches/series	2015-03-14 13:53:42.000000000 +0000
@@ -0,0 +1 @@
+01_support-filename-desktop.patch
diff -Nru orage-4.8.3/debian/rules orage-4.12.1/debian/rules
--- orage-4.8.3/debian/rules	2012-01-05 14:00:27.000000000 +0000
+++ orage-4.12.1/debian/rules	2015-05-06 16:08:01.000000000 +0000
@@ -1,16 +1,14 @@
 #!/usr/bin/make -f
 
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
-export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+override_dh_install:
+	find debian/orage/usr/lib -name '*.la' -delete
+	dh_install
 
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-dbus --enable-libical
 
-override_dh_install:
-	chrpath -d -k $(CURDIR)/debian/orage/usr/bin/* \
-		$(CURDIR)/debian/orage/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel-plugins/*
-	dh_install --fail-missing
-
 %:
-	dh $@
+	dh $@ --parallel --with autotools-dev
diff -Nru orage-4.8.3/debian/source/options orage-4.12.1/debian/source/options
--- orage-4.8.3/debian/source/options	1970-01-01 00:00:00.000000000 +0000
+++ orage-4.12.1/debian/source/options	2013-09-20 21:01:13.000000000 +0000
@@ -0,0 +1 @@
+extend-diff-ignore = "(^|/)(config\.sub|config\.guess|Makefile)$"
\ No newline at end of file
diff -Nru orage-4.8.3/depcomp orage-4.12.1/depcomp
--- orage-4.8.3/depcomp	2012-01-04 12:52:49.000000000 +0000
+++ orage-4.12.1/depcomp	2015-04-10 10:26:54.000000000 +0000
@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,9 +27,9 @@
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
   -h | --h*)
     cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -40,11 +39,11 @@
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -57,6 +56,66 @@
     ;;
 esac
 
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -69,6 +128,9 @@
 
 rm -f "$tmpdepfile"
 
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -80,18 +142,32 @@
 fi
 
 if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
 fi
 
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
-   # This is just like msvisualcpp but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
-   depmode=msvisualcpp
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
 fi
 
 case "$depmode" in
@@ -114,8 +190,7 @@
   done
   "$@"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -123,13 +198,17 @@
   ;;
 
 gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
   if test -z "$gccflag"; then
@@ -137,31 +216,31 @@
   fi
   "$@" -Wp,"$gccflag$tmpdepfile"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -179,8 +258,7 @@
     "$@" -MDupdate "$tmpdepfile"
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -188,43 +266,41 @@
 
   if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
     echo "$object : \\" > "$depfile"
-
     # Clip off the initial element (the dependent).  Don't try to be
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
-
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> "$depfile"
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
   else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.u
     tmpdepfile2=$base.u
@@ -237,9 +313,7 @@
     "$@" -M
   fi
   stat=$?
-
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
@@ -248,44 +322,100 @@
   do
     test -f "$tmpdepfile" && break
   done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
   fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\' :
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
 
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -297,8 +427,8 @@
   sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
   # Some versions of the HPUX 10.20 sed can't process this invocation
   # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -309,9 +439,8 @@
   # 'foo.d', which lands next to the object file, wherever that
   # happens to be.
   # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from  "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir.libs/$base.d
@@ -322,8 +451,7 @@
     "$@" +Maked
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
      rm -f "$tmpdepfile1" "$tmpdepfile2"
      exit $stat
   fi
@@ -333,77 +461,107 @@
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
     sed -ne '2,${
-	       s/^ *//
-	       s/ \\*$//
-	       s/$/:/
-	       p
-	     }' "$tmpdepfile" >> "$depfile"
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
   else
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile" "$tmpdepfile2"
   ;;
 
 tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
 
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
 
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
@@ -422,7 +580,7 @@
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -442,18 +600,18 @@
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
+  # Require at least two characters before searching for ':'
   # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -503,12 +661,15 @@
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile" "$tmpdepfile".bak
   ;;
 
@@ -525,7 +686,7 @@
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -544,10 +705,10 @@
     esac
   done
 
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
@@ -579,23 +740,23 @@
       shift
       ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
+        set fnord "$@"
+        shift
+        shift
+        ;;
     *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
     esac
   done
   "$@" -E 2>/dev/null |
   sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
diff -Nru orage-4.8.3/doc/C/images/Makefile.in orage-4.12.1/doc/C/images/Makefile.in
--- orage-4.8.3/doc/C/images/Makefile.in	2012-01-04 12:52:47.000000000 +0000
+++ orage-4.12.1/doc/C/images/Makefile.in	2015-04-10 10:26:52.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,17 +80,34 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = doc/C/images
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,12 +129,20 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(imagesdir)"
 DATA = $(images_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -99,6 +168,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -122,6 +192,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -147,6 +221,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -172,6 +247,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -192,6 +269,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -220,11 +298,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -306,8 +385,11 @@
 	-rm -rf .libs _libs
 install-imagesDATA: $(images_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(imagesdir)"
 	@list='$(images_DATA)'; test -n "$(imagesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(imagesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(imagesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -321,14 +403,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(images_DATA)'; test -n "$(imagesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(imagesdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(imagesdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(imagesdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -378,10 +458,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -462,16 +547,17 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-imagesDATA install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-imagesDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-imagesDATA install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-imagesDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Nru orage-4.8.3/doc/C/Makefile.in orage-4.12.1/doc/C/Makefile.in
--- orage-4.8.3/doc/C/Makefile.in	2012-01-04 12:52:47.000000000 +0000
+++ orage-4.12.1/doc/C/Makefile.in	2015-04-10 10:26:52.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,24 +80,42 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = doc/C
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,13 +137,39 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(docdir)"
 DATA = $(doc_DATA) $(noinst_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -114,6 +202,7 @@
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -139,6 +228,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -162,6 +252,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -187,6 +281,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -212,6 +307,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -232,6 +329,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -260,11 +358,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -335,8 +434,11 @@
 	-rm -rf .libs _libs
 install-docDATA: $(doc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
 	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -350,27 +452,28 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(docdir)" && rm -f $$files
+	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -385,57 +488,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -451,12 +509,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -468,15 +521,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -485,6 +534,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -521,13 +585,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -565,10 +626,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -644,22 +710,21 @@
 
 uninstall-am: uninstall-docDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-docDATA install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-docDATA
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-docDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-docDATA
 
 
 html: $(srcdir)/orage.xml
diff -Nru orage-4.8.3/doc/Makefile.in orage-4.12.1/doc/Makefile.in
--- orage-4.8.3/doc/Makefile.in	2012-01-04 12:52:47.000000000 +0000
+++ orage-4.12.1/doc/Makefile.in	2015-04-10 10:26:52.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,24 +80,42 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,6 +137,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)"
 NROFF = nroff
@@ -82,9 +150,29 @@
 DATA = $(noinst_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -117,6 +205,7 @@
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -142,6 +231,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -165,6 +255,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -190,6 +284,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -215,6 +310,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -235,6 +332,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -263,11 +361,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -342,11 +441,18 @@
 	-rm -rf .libs _libs
 install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -375,27 +481,28 @@
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -410,57 +517,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -476,12 +538,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -493,15 +550,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -510,24 +563,26 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -559,13 +614,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -603,10 +655,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -684,23 +741,21 @@
 
 uninstall-man: uninstall-man1
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man1 install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-man \
-	uninstall-man1
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-man uninstall-man1
 
 
 @MAINTAINER_MODE_TRUE@orage.1: orage.xml
diff -Nru orage-4.8.3/doc/orage.1 orage-4.12.1/doc/orage.1
--- orage-4.8.3/doc/orage.1	2011-11-29 10:47:16.000000000 +0000
+++ orage-4.12.1/doc/orage.1	2015-04-10 10:26:26.000000000 +0000
@@ -1,95 +1,108 @@
+'\" t
 .\"     Title: orage
-.\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
-.\"      Date: 03/10/2008
-.\"    Manual: 
-.\"    Source: 
+.\"    Author: [see the "Author" section]
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 04/10/2015
+.\"    Manual: [FIXME: manual]
+.\"    Source: [FIXME: source]
+.\"  Language: English
 .\"
-.TH "ORAGE" "1" "03/10/2008" "" ""
+.TH "ORAGE" "1" "04/10/2015" "[FIXME: source]" "[FIXME: manual]"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
 orage \- Calendar for the Xfce Desktop Environment
 .SH "SYNOPSIS"
-.HP 6
+.HP \w'\fBorage\fR\ 'u
 \fBorage\fR [options] [[FILE]...]
 .SH "DESCRIPTION"
 .PP
-
 \fBorage\fR
-is a fast and easy to use graphical calendar for the Xfce Desktop Environment. It uses portable ical format and includes common calendar features like repeating appointments and multiple alarming possibilities.
+is a fast and easy to use graphical calendar for the Xfce Desktop Environment\&. It uses portable ical format and includes common calendar features like repeating appointments and multiple alarming possibilities\&.
 \fBorage\fR
-does not have group calendar features, but can only be used for single user.
+does not have group calendar features, but can only be used for single user\&.
 .PP
-
 \fBorage\fR
 takes a list of
-\fIFILE\fRs for ical files that should be imported. Contents of those files are read and converted into
-\fBorage\fR, but those files are left untouched.
+\fIFILE\fRs for ical files that should be imported\&. Contents of those files are read and converted into
+\fBorage\fR, but those files are left untouched\&.
 .PP
 For a more detailed explanation of
-\fBorage\fR, please see the Help menu.
+\fBorage\fR, please see the Help menu\&.
 .SH "OPTIONS"
 .PP
 \fB\-v\fR, \fB\-\-version\fR
 .RS 4
-Print version information and exit.
+Print version information and exit\&.
 .RE
 .PP
 \fB\-?\fR, \fB\-\-help\fR
 .RS 4
-Print brief help and exit.
+Print brief help and exit\&.
 .RE
 .PP
-\fB\-p\fR, \fB\-\-\-\-preferences\fR
+\fB\-p\fR, \fB\-\-preferences\fR
 .RS 4
-Open the preferences setting window.
+Open the preferences setting window\&.
 .RE
 .PP
 \fB\-t\fR, \fB\-\-toggle\fR
 .RS 4
 Hide
 \fBorage\fR
-if it is visible and show it if it is hidden.
+if it is visible and show it if it is hidden\&.
 .RE
 .PP
-\fB\-a\fR, \fB\-\-\-\-add\-foreign file [RW]\fR
+\fB\-a\fR, \fB\-\-add\-foreign file [RW]\fR
 .RS 4
 Add a foreign file into
-\fBorage\fR. By default this file is read\-only but adding RW after the filename makes it writeable.
+\fBorage\fR\&. By default this file is read\-only but adding RW after the filename makes it writeable\&.
 .RE
 .PP
-\fB\-r\fR, \fB\-\-\-\-remove\-foreign file\fR
+\fB\-r\fR, \fB\-\-remove\-foreign file\fR
 .RS 4
 Remove foreign file from
-\fBorage\fR. The file itself is not removed or modified. If you want to remove it, you need to do that separately using proper operating system command.
+\fBorage\fR\&. The file itself is not removed or modified\&. If you want to remove it, you need to do that separately using proper operating system command\&.
 .RE
 .SH "FILES"
 .PP
 All
 \fBorage\fR
 datafiles are by default in
-\fI~/.local/share/orage\fR
+\fI~/\&.local/share/orage\fR
 and all configuration files are in
-\fI~/.config/orage\fR. (Note that you can change these locations, so if you do not find them, check from the UI.)
+\fI~/\&.config/orage\fR\&. (Note that you can change these locations, so if you do not find them, check from the UI\&.)
 .SH "BUGS"
 .PP
 Please report any bugs and enhancement requests to
-\fIhttp://bugzilla.xfce.org/\fR. Usage related questions can be sent to
-\fIxfce@xfce.org\fR
-email list.
+\fIhttp://bugzilla\&.xfce\&.org/\fR\&. Usage related questions can be sent to
+\fIxfce@xfce\&.org\fR
+email list\&.
 .SH "HOMEPAGE"
 .PP
-
-\fIhttp://www.xfce.org/projects/orage/\fR
+\fIhttp://www\&.xfce\&.org/projects/orage/\fR
 .SH "AUTHOR"
 .PP
-
 \fBorage\fR
 was originally written by Mickael Graf and is now being maintained by Juha Kautto
-<juha@xfce.org>.
+<juha@xfce\&.org>\&.
 .PP
 This manual page was written by Juha Kautto
-<juha@xfce.org>.
+<juha@xfce\&.org>\&.
diff -Nru orage-4.8.3/doc/orage.xml orage-4.12.1/doc/orage.xml
--- orage-4.8.3/doc/orage.xml	2011-01-13 10:20:12.000000000 +0000
+++ orage-4.12.1/doc/orage.xml	2015-04-10 10:26:26.000000000 +0000
@@ -1,7 +1,7 @@
 <!--
   $Id: orage.xml 22971 2008-03-06 23:14:10Z juha $
 
-  Copyright (c) 2008-2011 Juha Kautto <juha@xfce.org>
+  Copyright (c) 2008-2015 Juha Kautto <juha@xfce.org>
 -->
 
 <refentry id="Orage">
@@ -64,7 +64,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>-p</option>, <option>----preferences</option></term>
+        <term><option>-p</option>, <option>--preferences</option></term>
         <listitem>
           <para>
             Open the preferences setting window.
@@ -83,7 +83,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>-a</option>, <option>----add-foreign file [RW]</option></term>
+        <term><option>-a</option>, <option>--add-foreign file [RW]</option></term>
         <listitem>
           <para>
             Add a foreign file into <command>orage</command>. By default this
@@ -94,7 +94,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>-r</option>, <option>----remove-foreign file</option></term>
+        <term><option>-r</option>, <option>--remove-foreign file</option></term>
         <listitem>
           <para>
             Remove foreign file from <command>orage</command>. The file itself
diff -Nru orage-4.8.3/globaltime/globaltime.c orage-4.12.1/globaltime/globaltime.c
--- orage-4.8.3/globaltime/globaltime.c	2011-11-26 11:55:27.000000000 +0000
+++ orage-4.12.1/globaltime/globaltime.c	2015-04-10 10:26:26.000000000 +0000
@@ -49,13 +49,13 @@
 #include "../src/orage-i18n.h"
 
 
-#define NAME_VERSION "Global Time (2.1)"
+#define NAME_VERSION "Global Time (2.2)"
 
 
 global_times_struct clocks;
 
 char *attr_underline[] = 
-    { "no underline", "single", "double", "low", "END" } ;
+    { N_("no underline"), N_("single"), N_("double"), N_("low"), "END" } ;
 
 
 static struct tm *get_time(const gchar *tz)
@@ -545,11 +545,10 @@
 
     /* Standard window-creating stuff */
     clocks.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_title(GTK_WINDOW(clocks.window), NAME_VERSION);
+    gtk_window_set_title(GTK_WINDOW(clocks.window), _("Global Time"));
 
     clocks.main_hbox = gtk_hbox_new(FALSE, 1);
-    gtk_container_add(GTK_CONTAINER(clocks.window)
-                    , clocks.main_hbox);
+    gtk_container_add(GTK_CONTAINER(clocks.window), clocks.main_hbox);
     gtk_widget_show(clocks.main_hbox);
 
     init_hdr_button();
diff -Nru orage-4.8.3/globaltime/gt_prefs.c orage-4.12.1/globaltime/gt_prefs.c
--- orage-4.8.3/globaltime/gt_prefs.c	2011-01-13 10:23:54.000000000 +0000
+++ orage-4.12.1/globaltime/gt_prefs.c	2015-04-10 10:26:26.000000000 +0000
@@ -443,9 +443,9 @@
     gint i;
 
     for (i = 0; strcmp(source[i], "END"); i++) {
-        gtk_combo_box_append_text(combo_box, source[i]);
+        gtk_combo_box_append_text(combo_box, _(source[i]));
         if ((strcmp(cur_value, "NO VALUE") != 0)
-        &&  ((i == 0) || (strcmp(cur_value, source[i]) == 0)))
+        &&  ((i == 0) || (strcmp(_(cur_value), _(source[i])) == 0)))
             gtk_combo_box_set_active(combo_box, i);
     }
 }
@@ -1086,7 +1086,7 @@
 
     dec_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON (button));
     button = gtk_radio_button_new_with_label_from_widget(
-            GTK_RADIO_BUTTON(button), "None");
+            GTK_RADIO_BUTTON(button), _("None"));
     if (!clocks.decorations)
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
     gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
diff -Nru orage-4.8.3/globaltime/Makefile.in orage-4.12.1/globaltime/Makefile.in
--- orage-4.8.3/globaltime/Makefile.in	2012-01-04 12:52:48.000000000 +0000
+++ orage-4.12.1/globaltime/Makefile.in	2015-04-10 10:26:52.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,51 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -38,12 +82,13 @@
 target_triplet = @target@
 bin_PROGRAMS = globaltime$(EXEEXT)
 subdir = globaltime
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -58,24 +103,54 @@
 globaltime_OBJECTS = $(am_globaltime_OBJECTS)
 am__DEPENDENCIES_1 =
 globaltime_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-globaltime_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+globaltime_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(globaltime_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(globaltime_SOURCES)
 DIST_SOURCES = $(globaltime_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -97,16 +172,40 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
 DATA = $(desktop_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -132,6 +231,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -155,6 +255,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -180,6 +284,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -205,6 +310,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -225,6 +332,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -253,11 +361,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -349,14 +458,19 @@
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -377,7 +491,8 @@
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -390,9 +505,10 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-globaltime$(EXEEXT): $(globaltime_OBJECTS) $(globaltime_DEPENDENCIES) 
+
+globaltime$(EXEEXT): $(globaltime_OBJECTS) $(globaltime_DEPENDENCIES) $(EXTRA_globaltime_DEPENDENCIES) 
 	@rm -f globaltime$(EXEEXT)
-	$(globaltime_LINK) $(globaltime_OBJECTS) $(globaltime_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(globaltime_LINK) $(globaltime_OBJECTS) $(globaltime_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -408,109 +524,109 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/globaltime-tz_zoneinfo_read.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 globaltime-globaltime.o: globaltime.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-globaltime.o -MD -MP -MF $(DEPDIR)/globaltime-globaltime.Tpo -c -o globaltime-globaltime.o `test -f 'globaltime.c' || echo '$(srcdir)/'`globaltime.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/globaltime-globaltime.Tpo $(DEPDIR)/globaltime-globaltime.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='globaltime.c' object='globaltime-globaltime.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-globaltime.o -MD -MP -MF $(DEPDIR)/globaltime-globaltime.Tpo -c -o globaltime-globaltime.o `test -f 'globaltime.c' || echo '$(srcdir)/'`globaltime.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/globaltime-globaltime.Tpo $(DEPDIR)/globaltime-globaltime.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='globaltime.c' object='globaltime-globaltime.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-globaltime.o `test -f 'globaltime.c' || echo '$(srcdir)/'`globaltime.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-globaltime.o `test -f 'globaltime.c' || echo '$(srcdir)/'`globaltime.c
 
 globaltime-globaltime.obj: globaltime.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-globaltime.obj -MD -MP -MF $(DEPDIR)/globaltime-globaltime.Tpo -c -o globaltime-globaltime.obj `if test -f 'globaltime.c'; then $(CYGPATH_W) 'globaltime.c'; else $(CYGPATH_W) '$(srcdir)/globaltime.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/globaltime-globaltime.Tpo $(DEPDIR)/globaltime-globaltime.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='globaltime.c' object='globaltime-globaltime.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-globaltime.obj -MD -MP -MF $(DEPDIR)/globaltime-globaltime.Tpo -c -o globaltime-globaltime.obj `if test -f 'globaltime.c'; then $(CYGPATH_W) 'globaltime.c'; else $(CYGPATH_W) '$(srcdir)/globaltime.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/globaltime-globaltime.Tpo $(DEPDIR)/globaltime-globaltime.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='globaltime.c' object='globaltime-globaltime.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-globaltime.obj `if test -f 'globaltime.c'; then $(CYGPATH_W) 'globaltime.c'; else $(CYGPATH_W) '$(srcdir)/globaltime.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-globaltime.obj `if test -f 'globaltime.c'; then $(CYGPATH_W) 'globaltime.c'; else $(CYGPATH_W) '$(srcdir)/globaltime.c'; fi`
 
 globaltime-gt_parfile.o: gt_parfile.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-gt_parfile.o -MD -MP -MF $(DEPDIR)/globaltime-gt_parfile.Tpo -c -o globaltime-gt_parfile.o `test -f 'gt_parfile.c' || echo '$(srcdir)/'`gt_parfile.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/globaltime-gt_parfile.Tpo $(DEPDIR)/globaltime-gt_parfile.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gt_parfile.c' object='globaltime-gt_parfile.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-gt_parfile.o -MD -MP -MF $(DEPDIR)/globaltime-gt_parfile.Tpo -c -o globaltime-gt_parfile.o `test -f 'gt_parfile.c' || echo '$(srcdir)/'`gt_parfile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/globaltime-gt_parfile.Tpo $(DEPDIR)/globaltime-gt_parfile.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gt_parfile.c' object='globaltime-gt_parfile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-gt_parfile.o `test -f 'gt_parfile.c' || echo '$(srcdir)/'`gt_parfile.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-gt_parfile.o `test -f 'gt_parfile.c' || echo '$(srcdir)/'`gt_parfile.c
 
 globaltime-gt_parfile.obj: gt_parfile.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-gt_parfile.obj -MD -MP -MF $(DEPDIR)/globaltime-gt_parfile.Tpo -c -o globaltime-gt_parfile.obj `if test -f 'gt_parfile.c'; then $(CYGPATH_W) 'gt_parfile.c'; else $(CYGPATH_W) '$(srcdir)/gt_parfile.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/globaltime-gt_parfile.Tpo $(DEPDIR)/globaltime-gt_parfile.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gt_parfile.c' object='globaltime-gt_parfile.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-gt_parfile.obj -MD -MP -MF $(DEPDIR)/globaltime-gt_parfile.Tpo -c -o globaltime-gt_parfile.obj `if test -f 'gt_parfile.c'; then $(CYGPATH_W) 'gt_parfile.c'; else $(CYGPATH_W) '$(srcdir)/gt_parfile.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/globaltime-gt_parfile.Tpo $(DEPDIR)/globaltime-gt_parfile.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gt_parfile.c' object='globaltime-gt_parfile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-gt_parfile.obj `if test -f 'gt_parfile.c'; then $(CYGPATH_W) 'gt_parfile.c'; else $(CYGPATH_W) '$(srcdir)/gt_parfile.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-gt_parfile.obj `if test -f 'gt_parfile.c'; then $(CYGPATH_W) 'gt_parfile.c'; else $(CYGPATH_W) '$(srcdir)/gt_parfile.c'; fi`
 
 globaltime-gt_prefs.o: gt_prefs.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-gt_prefs.o -MD -MP -MF $(DEPDIR)/globaltime-gt_prefs.Tpo -c -o globaltime-gt_prefs.o `test -f 'gt_prefs.c' || echo '$(srcdir)/'`gt_prefs.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/globaltime-gt_prefs.Tpo $(DEPDIR)/globaltime-gt_prefs.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gt_prefs.c' object='globaltime-gt_prefs.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-gt_prefs.o -MD -MP -MF $(DEPDIR)/globaltime-gt_prefs.Tpo -c -o globaltime-gt_prefs.o `test -f 'gt_prefs.c' || echo '$(srcdir)/'`gt_prefs.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/globaltime-gt_prefs.Tpo $(DEPDIR)/globaltime-gt_prefs.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gt_prefs.c' object='globaltime-gt_prefs.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-gt_prefs.o `test -f 'gt_prefs.c' || echo '$(srcdir)/'`gt_prefs.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-gt_prefs.o `test -f 'gt_prefs.c' || echo '$(srcdir)/'`gt_prefs.c
 
 globaltime-gt_prefs.obj: gt_prefs.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-gt_prefs.obj -MD -MP -MF $(DEPDIR)/globaltime-gt_prefs.Tpo -c -o globaltime-gt_prefs.obj `if test -f 'gt_prefs.c'; then $(CYGPATH_W) 'gt_prefs.c'; else $(CYGPATH_W) '$(srcdir)/gt_prefs.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/globaltime-gt_prefs.Tpo $(DEPDIR)/globaltime-gt_prefs.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gt_prefs.c' object='globaltime-gt_prefs.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-gt_prefs.obj -MD -MP -MF $(DEPDIR)/globaltime-gt_prefs.Tpo -c -o globaltime-gt_prefs.obj `if test -f 'gt_prefs.c'; then $(CYGPATH_W) 'gt_prefs.c'; else $(CYGPATH_W) '$(srcdir)/gt_prefs.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/globaltime-gt_prefs.Tpo $(DEPDIR)/globaltime-gt_prefs.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gt_prefs.c' object='globaltime-gt_prefs.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-gt_prefs.obj `if test -f 'gt_prefs.c'; then $(CYGPATH_W) 'gt_prefs.c'; else $(CYGPATH_W) '$(srcdir)/gt_prefs.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-gt_prefs.obj `if test -f 'gt_prefs.c'; then $(CYGPATH_W) 'gt_prefs.c'; else $(CYGPATH_W) '$(srcdir)/gt_prefs.c'; fi`
 
 globaltime-timezone_selection.o: timezone_selection.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-timezone_selection.o -MD -MP -MF $(DEPDIR)/globaltime-timezone_selection.Tpo -c -o globaltime-timezone_selection.o `test -f 'timezone_selection.c' || echo '$(srcdir)/'`timezone_selection.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/globaltime-timezone_selection.Tpo $(DEPDIR)/globaltime-timezone_selection.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='timezone_selection.c' object='globaltime-timezone_selection.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-timezone_selection.o -MD -MP -MF $(DEPDIR)/globaltime-timezone_selection.Tpo -c -o globaltime-timezone_selection.o `test -f 'timezone_selection.c' || echo '$(srcdir)/'`timezone_selection.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/globaltime-timezone_selection.Tpo $(DEPDIR)/globaltime-timezone_selection.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='timezone_selection.c' object='globaltime-timezone_selection.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-timezone_selection.o `test -f 'timezone_selection.c' || echo '$(srcdir)/'`timezone_selection.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-timezone_selection.o `test -f 'timezone_selection.c' || echo '$(srcdir)/'`timezone_selection.c
 
 globaltime-timezone_selection.obj: timezone_selection.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-timezone_selection.obj -MD -MP -MF $(DEPDIR)/globaltime-timezone_selection.Tpo -c -o globaltime-timezone_selection.obj `if test -f 'timezone_selection.c'; then $(CYGPATH_W) 'timezone_selection.c'; else $(CYGPATH_W) '$(srcdir)/timezone_selection.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/globaltime-timezone_selection.Tpo $(DEPDIR)/globaltime-timezone_selection.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='timezone_selection.c' object='globaltime-timezone_selection.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-timezone_selection.obj -MD -MP -MF $(DEPDIR)/globaltime-timezone_selection.Tpo -c -o globaltime-timezone_selection.obj `if test -f 'timezone_selection.c'; then $(CYGPATH_W) 'timezone_selection.c'; else $(CYGPATH_W) '$(srcdir)/timezone_selection.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/globaltime-timezone_selection.Tpo $(DEPDIR)/globaltime-timezone_selection.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='timezone_selection.c' object='globaltime-timezone_selection.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-timezone_selection.obj `if test -f 'timezone_selection.c'; then $(CYGPATH_W) 'timezone_selection.c'; else $(CYGPATH_W) '$(srcdir)/timezone_selection.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-timezone_selection.obj `if test -f 'timezone_selection.c'; then $(CYGPATH_W) 'timezone_selection.c'; else $(CYGPATH_W) '$(srcdir)/timezone_selection.c'; fi`
 
 globaltime-tz_zoneinfo_read.o: ../src/tz_zoneinfo_read.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-tz_zoneinfo_read.o -MD -MP -MF $(DEPDIR)/globaltime-tz_zoneinfo_read.Tpo -c -o globaltime-tz_zoneinfo_read.o `test -f '../src/tz_zoneinfo_read.c' || echo '$(srcdir)/'`../src/tz_zoneinfo_read.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/globaltime-tz_zoneinfo_read.Tpo $(DEPDIR)/globaltime-tz_zoneinfo_read.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/tz_zoneinfo_read.c' object='globaltime-tz_zoneinfo_read.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-tz_zoneinfo_read.o -MD -MP -MF $(DEPDIR)/globaltime-tz_zoneinfo_read.Tpo -c -o globaltime-tz_zoneinfo_read.o `test -f '../src/tz_zoneinfo_read.c' || echo '$(srcdir)/'`../src/tz_zoneinfo_read.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/globaltime-tz_zoneinfo_read.Tpo $(DEPDIR)/globaltime-tz_zoneinfo_read.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../src/tz_zoneinfo_read.c' object='globaltime-tz_zoneinfo_read.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-tz_zoneinfo_read.o `test -f '../src/tz_zoneinfo_read.c' || echo '$(srcdir)/'`../src/tz_zoneinfo_read.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-tz_zoneinfo_read.o `test -f '../src/tz_zoneinfo_read.c' || echo '$(srcdir)/'`../src/tz_zoneinfo_read.c
 
 globaltime-tz_zoneinfo_read.obj: ../src/tz_zoneinfo_read.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-tz_zoneinfo_read.obj -MD -MP -MF $(DEPDIR)/globaltime-tz_zoneinfo_read.Tpo -c -o globaltime-tz_zoneinfo_read.obj `if test -f '../src/tz_zoneinfo_read.c'; then $(CYGPATH_W) '../src/tz_zoneinfo_read.c'; else $(CYGPATH_W) '$(srcdir)/../src/tz_zoneinfo_read.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/globaltime-tz_zoneinfo_read.Tpo $(DEPDIR)/globaltime-tz_zoneinfo_read.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/tz_zoneinfo_read.c' object='globaltime-tz_zoneinfo_read.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-tz_zoneinfo_read.obj -MD -MP -MF $(DEPDIR)/globaltime-tz_zoneinfo_read.Tpo -c -o globaltime-tz_zoneinfo_read.obj `if test -f '../src/tz_zoneinfo_read.c'; then $(CYGPATH_W) '../src/tz_zoneinfo_read.c'; else $(CYGPATH_W) '$(srcdir)/../src/tz_zoneinfo_read.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/globaltime-tz_zoneinfo_read.Tpo $(DEPDIR)/globaltime-tz_zoneinfo_read.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../src/tz_zoneinfo_read.c' object='globaltime-tz_zoneinfo_read.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-tz_zoneinfo_read.obj `if test -f '../src/tz_zoneinfo_read.c'; then $(CYGPATH_W) '../src/tz_zoneinfo_read.c'; else $(CYGPATH_W) '$(srcdir)/../src/tz_zoneinfo_read.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-tz_zoneinfo_read.obj `if test -f '../src/tz_zoneinfo_read.c'; then $(CYGPATH_W) '../src/tz_zoneinfo_read.c'; else $(CYGPATH_W) '$(srcdir)/../src/tz_zoneinfo_read.c'; fi`
 
 globaltime-functions.o: ../src/functions.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-functions.o -MD -MP -MF $(DEPDIR)/globaltime-functions.Tpo -c -o globaltime-functions.o `test -f '../src/functions.c' || echo '$(srcdir)/'`../src/functions.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/globaltime-functions.Tpo $(DEPDIR)/globaltime-functions.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/functions.c' object='globaltime-functions.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-functions.o -MD -MP -MF $(DEPDIR)/globaltime-functions.Tpo -c -o globaltime-functions.o `test -f '../src/functions.c' || echo '$(srcdir)/'`../src/functions.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/globaltime-functions.Tpo $(DEPDIR)/globaltime-functions.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../src/functions.c' object='globaltime-functions.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-functions.o `test -f '../src/functions.c' || echo '$(srcdir)/'`../src/functions.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-functions.o `test -f '../src/functions.c' || echo '$(srcdir)/'`../src/functions.c
 
 globaltime-functions.obj: ../src/functions.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-functions.obj -MD -MP -MF $(DEPDIR)/globaltime-functions.Tpo -c -o globaltime-functions.obj `if test -f '../src/functions.c'; then $(CYGPATH_W) '../src/functions.c'; else $(CYGPATH_W) '$(srcdir)/../src/functions.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/globaltime-functions.Tpo $(DEPDIR)/globaltime-functions.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/functions.c' object='globaltime-functions.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -MT globaltime-functions.obj -MD -MP -MF $(DEPDIR)/globaltime-functions.Tpo -c -o globaltime-functions.obj `if test -f '../src/functions.c'; then $(CYGPATH_W) '../src/functions.c'; else $(CYGPATH_W) '$(srcdir)/../src/functions.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/globaltime-functions.Tpo $(DEPDIR)/globaltime-functions.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../src/functions.c' object='globaltime-functions.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-functions.obj `if test -f '../src/functions.c'; then $(CYGPATH_W) '../src/functions.c'; else $(CYGPATH_W) '$(srcdir)/../src/functions.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(globaltime_CFLAGS) $(CFLAGS) -c -o globaltime-functions.obj `if test -f '../src/functions.c'; then $(CYGPATH_W) '../src/functions.c'; else $(CYGPATH_W) '$(srcdir)/../src/functions.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -519,11 +635,18 @@
 	-rm -rf .libs _libs
 install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -552,13 +675,14 @@
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-desktopDATA: $(desktop_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -572,30 +696,17 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -607,15 +718,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -624,24 +731,26 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -688,10 +797,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -779,20 +893,21 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am \
-	install-desktopDATA install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man1 install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-desktopDATA uninstall-man uninstall-man1
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-desktopDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-binPROGRAMS uninstall-desktopDATA \
+	uninstall-man uninstall-man1
 
 
 @MAINTAINER_MODE_TRUE@globaltime.1: globaltime.xml
diff -Nru orage-4.8.3/icons/160x160/Makefile.in orage-4.12.1/icons/160x160/Makefile.in
--- orage-4.8.3/icons/160x160/Makefile.in	2012-01-04 12:52:48.000000000 +0000
+++ orage-4.12.1/icons/160x160/Makefile.in	2015-04-10 10:26:53.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +17,51 @@
 # $Id$
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -38,17 +82,34 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = icons/160x160
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -70,12 +131,20 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(iconsdir)"
 DATA = $(icons_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -101,6 +170,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -124,6 +194,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -149,6 +223,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -174,6 +249,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -194,6 +271,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -222,11 +300,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -297,8 +376,11 @@
 	-rm -rf .libs _libs
 install-iconsDATA: $(icons_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -312,14 +394,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -369,10 +449,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -453,16 +538,16 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-iconsDATA install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-iconsDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-iconsDATA install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA
 
 
 # vi:set ts=8 sw=8 noet ai nocindent:
diff -Nru orage-4.8.3/icons/48x48/Makefile.in orage-4.12.1/icons/48x48/Makefile.in
--- orage-4.8.3/icons/48x48/Makefile.in	2012-01-04 12:52:48.000000000 +0000
+++ orage-4.12.1/icons/48x48/Makefile.in	2015-04-10 10:26:53.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +17,51 @@
 # $Id$
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -38,17 +82,34 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = icons/48x48
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -70,12 +131,20 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(iconsdir)"
 DATA = $(icons_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -101,6 +170,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -124,6 +194,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -149,6 +223,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -174,6 +249,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -194,6 +271,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -222,11 +300,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -295,8 +374,11 @@
 	-rm -rf .libs _libs
 install-iconsDATA: $(icons_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -310,14 +392,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -367,10 +447,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -451,16 +536,16 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-iconsDATA install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-iconsDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-iconsDATA install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA
 
 
 # vi:set ts=8 sw=8 noet ai nocindent:
diff -Nru orage-4.8.3/icons/Makefile.am orage-4.12.1/icons/Makefile.am
--- orage-4.8.3/icons/Makefile.am	2011-07-24 13:29:54.000000000 +0000
+++ orage-4.12.1/icons/Makefile.am	2015-04-10 10:26:26.000000000 +0000
@@ -18,4 +18,15 @@
 		echo "***";						\
         fi
 
+uninstall-hook:
+	@-if test -z "$(DESTDIR)"; then					\
+                echo "Updating Gtk icon cache.";			\
+                $(gtk_update_icon_cache);				\
+        else								\
+                echo "*** Icon cache not updated. Remember to run:";	\
+		echo "***";						\
+                echo "***   $(gtk_update_icon_cache)";			\
+		echo "***";						\
+        fi
+
 # vi:set ts=8 sw=8 noet ai nocindent:
diff -Nru orage-4.8.3/icons/Makefile.in orage-4.12.1/icons/Makefile.in
--- orage-4.8.3/icons/Makefile.in	2012-01-04 12:52:48.000000000 +0000
+++ orage-4.12.1/icons/Makefile.in	2015-04-10 10:26:53.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,51 @@
 
 # $Id$
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,29 +81,67 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = icons
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -92,6 +174,7 @@
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -117,6 +200,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -140,6 +224,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -165,6 +253,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -190,6 +279,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -210,6 +301,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -238,11 +330,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -309,22 +402,25 @@
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -339,57 +435,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -405,12 +456,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -422,15 +468,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -439,6 +481,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -475,13 +532,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -516,10 +570,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -597,29 +656,41 @@
 ps-am:
 
 uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-data-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-hook install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: $(am__recursive_targets) install-am install-data-am \
+	install-strip uninstall-am
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-hook install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-hook
 
 
 install-data-hook:
 	@-if test -z "$(DESTDIR)"; then					\
                 echo "Updating Gtk icon cache.";			\
                 $(gtk_update_icon_cache);				\
+        else								\
+                echo "*** Icon cache not updated. Remember to run:";	\
+		echo "***";						\
+                echo "***   $(gtk_update_icon_cache)";			\
+		echo "***";						\
+        fi
+
+uninstall-hook:
+	@-if test -z "$(DESTDIR)"; then					\
+                echo "Updating Gtk icon cache.";			\
+                $(gtk_update_icon_cache);				\
         else								\
                 echo "*** Icon cache not updated. Remember to run:";	\
 		echo "***";						\
diff -Nru orage-4.8.3/icons/scalable/Makefile.in orage-4.12.1/icons/scalable/Makefile.in
--- orage-4.8.3/icons/scalable/Makefile.in	2012-01-04 12:52:48.000000000 +0000
+++ orage-4.12.1/icons/scalable/Makefile.in	2015-04-10 10:26:53.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +17,51 @@
 # $Id$
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -38,17 +82,34 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = icons/scalable
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -70,12 +131,20 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(iconsdir)"
 DATA = $(icons_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -101,6 +170,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -124,6 +194,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -149,6 +223,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -174,6 +249,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -194,6 +271,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -222,11 +300,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -295,8 +374,11 @@
 	-rm -rf .libs _libs
 install-iconsDATA: $(icons_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -310,14 +392,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -367,10 +447,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -451,16 +536,16 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-iconsDATA install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-iconsDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-iconsDATA install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA
 
 
 # vi:set ts=8 sw=8 noet ai nocindent:
diff -Nru orage-4.8.3/INSTALL orage-4.12.1/INSTALL
--- orage-4.8.3/INSTALL	2012-01-04 12:52:49.000000000 +0000
+++ orage-4.12.1/INSTALL	2015-04-10 10:26:52.000000000 +0000
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -12,8 +12,8 @@
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented
@@ -226,6 +226,11 @@
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -304,9 +309,10 @@
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -362,4 +368,3 @@
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-
diff -Nru orage-4.8.3/install-sh orage-4.12.1/install-sh
--- orage-4.8.3/install-sh	2012-01-04 12:52:47.000000000 +0000
+++ orage-4.12.1/install-sh	2015-04-10 10:26:52.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for 'test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -194,13 +202,17 @@
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -347,7 +354,7 @@
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
+		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=\(\)!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then
diff -Nru orage-4.8.3/libical/design-data/Makefile.in orage-4.12.1/libical/design-data/Makefile.in
--- orage-4.8.3/libical/design-data/Makefile.in	2012-01-04 12:52:48.000000000 +0000
+++ orage-4.12.1/libical/design-data/Makefile.in	2015-04-10 10:26:53.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,21 +79,40 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = libical/design-data
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -75,6 +138,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -98,6 +162,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -123,6 +191,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -148,6 +217,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -168,6 +239,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -196,11 +268,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -266,11 +339,11 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -317,10 +390,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -401,15 +479,16 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Nru orage-4.8.3/libical/doc/Makefile.in orage-4.12.1/libical/doc/Makefile.in
--- orage-4.8.3/libical/doc/Makefile.in	2012-01-04 12:52:48.000000000 +0000
+++ orage-4.12.1/libical/doc/Makefile.in	2015-04-10 10:26:53.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,21 +79,40 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = libical/doc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -75,6 +138,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -98,6 +162,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -123,6 +191,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -148,6 +217,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -168,6 +239,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -196,11 +268,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -260,11 +333,11 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -311,10 +384,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -395,15 +473,16 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Nru orage-4.8.3/libical/Makefile.in orage-4.12.1/libical/Makefile.in
--- orage-4.8.3/libical/Makefile.in	2012-01-04 12:52:48.000000000 +0000
+++ orage-4.12.1/libical/Makefile.in	2015-04-10 10:26:53.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,30 +79,68 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = libical
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	AUTHORS COPYING ChangeLog INSTALL NEWS THANKS
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am AUTHORS \
+	COPYING ChangeLog INSTALL NEWS README THANKS
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -91,6 +173,7 @@
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -116,6 +199,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -139,6 +223,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -164,6 +252,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -189,6 +278,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -209,6 +300,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -237,11 +329,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -307,22 +400,25 @@
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -337,57 +433,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -403,12 +454,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -420,15 +466,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -437,6 +479,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -473,13 +530,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -514,10 +568,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -595,22 +654,20 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Nru orage-4.8.3/libical/scripts/Makefile.in orage-4.12.1/libical/scripts/Makefile.in
--- orage-4.8.3/libical/scripts/Makefile.in	2012-01-04 12:52:48.000000000 +0000
+++ orage-4.12.1/libical/scripts/Makefile.in	2015-04-10 10:26:53.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,21 +79,40 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = libical/scripts
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -75,6 +138,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -98,6 +162,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -123,6 +191,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -148,6 +217,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -168,6 +239,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -196,11 +268,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -269,11 +342,11 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -320,10 +393,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -404,15 +482,16 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Nru orage-4.8.3/libical/src/libical/Makefile.in orage-4.12.1/libical/src/libical/Makefile.in
--- orage-4.8.3/libical/src/libical/Makefile.in	2012-01-04 12:52:48.000000000 +0000
+++ orage-4.12.1/libical/src/libical/Makefile.in	2015-04-10 10:26:53.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -41,6 +40,51 @@
 # modified for xfce by Juha Kautto 04.03.2005
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -61,13 +105,13 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = libical/src/libical
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/icalversion.h.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/icalversion.h.in $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
@@ -82,30 +126,78 @@
 	icalperiod.lo icaltypes.lo icalvalue.lo pvl.lo sspm.lo \
 	vsnprintf.lo icallangbind.lo caldate.lo
 libical_la_OBJECTS = $(am_libical_la_OBJECTS)
-libical_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libical_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libical_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libical_la_SOURCES)
 DIST_SOURCES = $(libical_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -131,6 +223,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -154,6 +247,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -179,6 +276,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -204,6 +302,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -224,6 +324,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -252,11 +353,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -468,14 +570,17 @@
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libical.la: $(libical_la_OBJECTS) $(libical_la_DEPENDENCIES) 
-	$(libical_la_LINK)  $(libical_la_OBJECTS) $(libical_la_LIBADD) $(LIBS)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libical.la: $(libical_la_OBJECTS) $(libical_la_DEPENDENCIES) $(EXTRA_libical_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libical_la_LINK)  $(libical_la_OBJECTS) $(libical_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -511,25 +616,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vsnprintf.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -537,26 +642,15 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -568,15 +662,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -585,6 +675,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -638,10 +743,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -728,19 +838,19 @@
 
 .MAKE: all check install install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags dist-hook \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am dist-hook distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am
+	tags tags-am uninstall uninstall-am
 
 
 # CFLAGS = -g
diff -Nru orage-4.8.3/libical/src/libical/sspm.c orage-4.12.1/libical/src/libical/sspm.c
--- orage-4.8.3/libical/src/libical/sspm.c	2009-11-20 15:39:12.000000000 +0000
+++ orage-4.12.1/libical/src/libical/sspm.c	2015-04-10 10:26:26.000000000 +0000
@@ -443,7 +443,7 @@
 
     char* ltype = sspm_lowercase(type);
 
-    for (i=0; major_content_type_map[i].type !=  SSPM_UNKNOWN_MINOR_TYPE; i++){
+    for (i=0; major_content_type_map[i].type !=  SSPM_UNKNOWN_MAJOR_TYPE; i++){
 	if(strncmp(ltype, major_content_type_map[i].str,
 		   strlen(major_content_type_map[i].str))==0){
 	    free(ltype);
@@ -451,7 +451,7 @@
 	}
     }
     free(ltype);
-    return major_content_type_map[i].type; /* Should return SSPM_UNKNOWN_MINOR_TYPE */
+    return major_content_type_map[i].type; /* Should return SSPM_UNKNOWN_MAJOR_TYPE */
 }
 
 enum sspm_minor_type sspm_find_minor_content_type(char* type)
@@ -483,7 +483,7 @@
 {
     int i;
 
-    for (i=0; major_content_type_map[i].type !=  SSPM_UNKNOWN_MINOR_TYPE; 
+    for (i=0; major_content_type_map[i].type !=  SSPM_UNKNOWN_MAJOR_TYPE; 
 	 i++){
 
 	if(type == major_content_type_map[i].type){
@@ -491,7 +491,7 @@
 	}
     }
     
-    return major_content_type_map[i].str; /* Should return SSPM_UNKNOWN_MINOR_TYPE */
+    return major_content_type_map[i].str; /* Should return SSPM_UNKNOWN_MAJOR_TYPE */
 }
 
 char* sspm_minor_type_string(enum sspm_minor_type type)
diff -Nru orage-4.8.3/libical/src/libicalss/icalss.h orage-4.12.1/libical/src/libicalss/icalss.h
--- orage-4.8.3/libical/src/libicalss/icalss.h	2011-12-21 10:07:37.000000000 +0000
+++ orage-4.12.1/libical/src/libicalss/icalss.h	2015-04-10 10:26:26.000000000 +0000
@@ -10,7 +10,6 @@
  CREATOR: eric 23 December 1999
 
 
- $Id$
  $Locker$
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -81,7 +80,6 @@
 **/
 
 /*
- $Id$
  $Locker$
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -182,10 +180,9 @@
 icalset* icalset_new_file_reader(const char* path);
 icalset* icalset_new_file_writer(const char* path);
 
-/* fixed by Juha on 16.12.2010 */
 icalset* icalset_new_dir(const char* path);
-icalset* icalset_new_dir_reader(const char* path);
-icalset* icalset_new_dir_writer(const char* path);
+icalset* icalset_new_file_reader(const char* path);
+icalset* icalset_new_file_writer(const char* path);
 
 void icalset_free(icalset* set);
 
@@ -254,7 +251,6 @@
  CREATOR: eric 23 December 1999
 
 
- $Id$
  $Locker$
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -313,7 +309,6 @@
  CREATOR: eric 23 December 1999
 
 
- $Id$
  $Locker$
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -443,7 +438,6 @@
  CREATOR: eric 28 November 1999
 
 
- $Id$
  $Locker$
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -537,7 +531,6 @@
  CREATOR: eric 23 December 1999
 
 
- $Id$
  $Locker$
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -602,7 +595,6 @@
  CREATOR: eric 21 Aug 2000
 
 
- $Id$
  $Locker$
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -645,7 +637,6 @@
  CREATOR: eric 21 Aug 2000
 
 
- $Id$
  $Locker$
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -720,7 +711,6 @@
  CREATOR: eric 07 Nov 2000
 
 
- $Id$
  $Locker$
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
diff -Nru orage-4.8.3/libical/src/libicalss/Makefile.in orage-4.12.1/libical/src/libicalss/Makefile.in
--- orage-4.8.3/libical/src/libicalss/Makefile.in	2012-01-04 12:52:49.000000000 +0000
+++ orage-4.12.1/libical/src/libicalss/Makefile.in	2015-04-10 10:26:54.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -41,6 +40,51 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -61,13 +105,13 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = libical/src/libicalss
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp $(noinst_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
@@ -77,31 +121,79 @@
 	icalcluster.lo icalgauge.lo icaldirset.lo icalfileset.lo \
 	icalset.lo icalspanlist.lo icalmessage.lo $(am__objects_1)
 libicalss_la_OBJECTS = $(am_libicalss_la_OBJECTS)
-libicalss_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libicalss_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libicalss_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libicalss_la_SOURCES)
 DIST_SOURCES = $(libicalss_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -127,6 +219,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -150,6 +243,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -175,6 +272,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -200,6 +298,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -220,6 +320,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -248,11 +349,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -359,14 +461,17 @@
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libicalss.la: $(libicalss_la_OBJECTS) $(libicalss_la_DEPENDENCIES) 
-	$(libicalss_la_LINK)  $(libicalss_la_OBJECTS) $(libicalss_la_LIBADD) $(LIBS)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libicalss.la: $(libicalss_la_OBJECTS) $(libicalss_la_DEPENDENCIES) $(EXTRA_libicalss_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libicalss_la_LINK)  $(libicalss_la_OBJECTS) $(libicalss_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -387,25 +492,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icalssyacc.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -413,26 +518,15 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -444,15 +538,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -461,6 +551,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -509,10 +614,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -597,18 +707,19 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 
 all: icalss.h
diff -Nru orage-4.8.3/libical/src/Makefile.in orage-4.12.1/libical/src/Makefile.in
--- orage-4.8.3/libical/src/Makefile.in	2012-01-04 12:52:48.000000000 +0000
+++ orage-4.12.1/libical/src/Makefile.in	2015-04-10 10:26:53.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,29 +79,67 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = libical/src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -90,6 +172,7 @@
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -115,6 +198,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -138,6 +222,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -163,6 +251,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -188,6 +277,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -208,6 +299,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -236,11 +328,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -302,22 +395,25 @@
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -332,57 +428,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -398,12 +449,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -415,15 +461,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -432,6 +474,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -468,13 +525,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -509,10 +563,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -590,22 +649,20 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Nru orage-4.8.3/libical/zoneinfo/Makefile.in orage-4.12.1/libical/zoneinfo/Makefile.in
--- orage-4.8.3/libical/zoneinfo/Makefile.in	2012-01-04 12:52:49.000000000 +0000
+++ orage-4.12.1/libical/zoneinfo/Makefile.in	2015-04-10 10:26:54.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,17 +80,34 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = libical/zoneinfo
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,12 +129,20 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(zoneinfodatadir)"
 DATA = $(zoneinfodata_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -99,6 +168,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -122,6 +192,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -147,6 +221,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -172,6 +247,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -192,6 +269,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -220,11 +298,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -315,8 +394,11 @@
 	-rm -rf .libs _libs
 install-zoneinfodataDATA: $(zoneinfodata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(zoneinfodatadir)" || $(MKDIR_P) "$(DESTDIR)$(zoneinfodatadir)"
 	@list='$(zoneinfodata_DATA)'; test -n "$(zoneinfodatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(zoneinfodatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(zoneinfodatadir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -330,14 +412,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(zoneinfodata_DATA)'; test -n "$(zoneinfodatadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(zoneinfodatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(zoneinfodatadir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(zoneinfodatadir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -390,10 +470,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -474,17 +559,18 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	dist-hook distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-data-local \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip install-zoneinfodataDATA \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-local uninstall-zoneinfodataDATA
+	cscopelist-am ctags-am dist-hook distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip \
+	install-zoneinfodataDATA installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-local \
+	uninstall-zoneinfodataDATA
 
 
 install-data-local:
diff -Nru orage-4.8.3/ltmain.sh orage-4.12.1/ltmain.sh
--- orage-4.8.3/ltmain.sh	2012-01-04 12:52:41.000000000 +0000
+++ orage-4.12.1/ltmain.sh	2015-04-10 10:26:46.000000000 +0000
@@ -1,9 +1,9 @@
-# Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.6b
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -32,50 +32,57 @@
 #
 # Provide generalized library-building support services.
 #
-#     --config             show all configuration variables
-#     --debug              enable verbose shell tracing
-# -n, --dry-run            display commands without modifying any files
-#     --features           display basic configuration information and exit
-#     --mode=MODE          use operation mode MODE
-#     --preserve-dup-deps  don't remove duplicate dependency libraries
-#     --quiet, --silent    don't print informational messages
-#     --tag=TAG            use configuration variables from tag TAG
-# -v, --verbose            print informational messages (default)
-#     --version            print version information
-# -h, --help               print short or long help message
+#       --config             show all configuration variables
+#       --debug              enable verbose shell tracing
+#   -n, --dry-run            display commands without modifying any files
+#       --features           display basic configuration information and exit
+#       --mode=MODE          use operation mode MODE
+#       --preserve-dup-deps  don't remove duplicate dependency libraries
+#       --quiet, --silent    don't print informational messages
+#       --no-quiet, --no-silent
+#                            print informational messages (default)
+#       --no-warn            don't display warning messages
+#       --tag=TAG            use configuration variables from tag TAG
+#   -v, --verbose            print more informational messages than default
+#       --no-verbose         don't print the extra informational messages
+#       --version            print version information
+#   -h, --help, --help-all   print short, long, or detailed help message
 #
 # MODE must be one of the following:
 #
-#       clean              remove files from the build directory
-#       compile            compile a source file into a libtool object
-#       execute            automatically set library path, then run a program
-#       finish             complete the installation of libtool libraries
-#       install            install libraries or executables
-#       link               create a library or an executable
-#       uninstall          remove libraries from an installed directory
+#         clean              remove files from the build directory
+#         compile            compile a source file into a libtool object
+#         execute            automatically set library path, then run a program
+#         finish             complete the installation of libtool libraries
+#         install            install libraries or executables
+#         link               create a library or an executable
+#         uninstall          remove libraries from an installed directory
 #
-# MODE-ARGS vary depending on the MODE.
+# MODE-ARGS vary depending on the MODE.  When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
 # Try `$progname --help --mode=MODE' for a more detailed description of MODE.
 #
 # When reporting a bug, please describe a test case to reproduce it and
 # include the following information:
 #
-#       host-triplet:	$host
-#       shell:		$SHELL
-#       compiler:		$LTCC
-#       compiler flags:		$LTCFLAGS
-#       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
-#       automake:		$automake_version
-#       autoconf:		$autoconf_version
+#         host-triplet:	$host
+#         shell:		$SHELL
+#         compiler:		$LTCC
+#         compiler flags:		$LTCFLAGS
+#         linker:		$LD (gnu? $with_gnu_ld)
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.11
+#         automake:	$automake_version
+#         autoconf:	$autoconf_version
 #
 # Report bugs to <bug-libtool@gnu.org>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
 
-PROGRAM=ltmain.sh
+PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
+VERSION="2.4.2 Debian-2.4.2-1.11"
 TIMESTAMP=""
-package_revision=1.3017
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -91,10 +98,15 @@
 BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
 # NLS nuisances: We save the old values to restore during execute mode.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
 lt_user_locale=
 lt_safe_locale=
 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -107,24 +119,28 @@
 	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
 	fi"
 done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
 
 $lt_unset CDPATH
 
 
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
 
 
 
 : ${CP="cp -f"}
-: ${ECHO="echo"}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -144,6 +160,27 @@
 dirname="s,/[^/]*$,,"
 basename="s,^.*/,,"
 
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
 # func_dirname_and_basename file append nondir_replacement
 # perform func_basename and func_dirname in a single function
 # call:
@@ -158,33 +195,183 @@
 # those functions but instead duplicate the functionality here.
 func_dirname_and_basename ()
 {
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+} # func_dirname_and_basename may be replaced by extended shell implementation
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+    case ${2} in
+      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+    esac
+} # func_stripname may be replaced by extended shell implementation
+
+
+# These SED scripts presuppose an absolute path with a trailing slash.
+pathcar='s,^/\([^/]*\).*$,\1,'
+pathcdr='s,^/[^/]*,,'
+removedotparts=':dotsl
+		s@/\./@/@g
+		t dotsl
+		s,/\.$,/,'
+collapseslashes='s@/\{1,\}@/@g'
+finalslash='s,/*$,/,'
+
+# func_normal_abspath PATH
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+#             value returned in "$func_normal_abspath_result"
+func_normal_abspath ()
+{
+  # Start from root dir and reassemble the path.
+  func_normal_abspath_result=
+  func_normal_abspath_tpath=$1
+  func_normal_abspath_altnamespace=
+  case $func_normal_abspath_tpath in
+    "")
+      # Empty path, that just means $cwd.
+      func_stripname '' '/' "`pwd`"
+      func_normal_abspath_result=$func_stripname_result
+      return
+    ;;
+    # The next three entries are used to spot a run of precisely
+    # two leading slashes without using negated character classes;
+    # we take advantage of case's first-match behaviour.
+    ///*)
+      # Unusual form of absolute path, do nothing.
+    ;;
+    //*)
+      # Not necessarily an ordinary path; POSIX reserves leading '//'
+      # and for example Cygwin uses it to access remote file shares
+      # over CIFS/SMB, so we conserve a leading double slash if found.
+      func_normal_abspath_altnamespace=/
+    ;;
+    /*)
+      # Absolute path, do nothing.
+    ;;
+    *)
+      # Relative path, prepend $cwd.
+      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+    ;;
+  esac
+  # Cancel out all the simple stuff to save iterations.  We also want
+  # the path to end with a slash for ease of parsing, so make sure
+  # there is one (and only one) here.
+  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
+  while :; do
+    # Processed it all yet?
+    if test "$func_normal_abspath_tpath" = / ; then
+      # If we ascended to the root using ".." the result may be empty now.
+      if test -z "$func_normal_abspath_result" ; then
+        func_normal_abspath_result=/
+      fi
+      break
+    fi
+    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcar"`
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcdr"`
+    # Figure out what to do with it
+    case $func_normal_abspath_tcomponent in
+      "")
+        # Trailing empty path component, ignore it.
+      ;;
+      ..)
+        # Parent dir; strip last assembled component from result.
+        func_dirname "$func_normal_abspath_result"
+        func_normal_abspath_result=$func_dirname_result
+      ;;
+      *)
+        # Actual path component, append it.
+        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
+      ;;
+    esac
+  done
+  # Restore leading double-slash if one was found on entry.
+  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
 }
 
-# Generated shell functions inserted here.
+# func_relative_path SRCDIR DSTDIR
+# generates a relative path from SRCDIR to DSTDIR, with a trailing
+# slash if non-empty, suitable for immediately appending a filename
+# without needing to append a separator.
+#             value returned in "$func_relative_path_result"
+func_relative_path ()
+{
+  func_relative_path_result=
+  func_normal_abspath "$1"
+  func_relative_path_tlibdir=$func_normal_abspath_result
+  func_normal_abspath "$2"
+  func_relative_path_tbindir=$func_normal_abspath_result
+
+  # Ascend the tree starting from libdir
+  while :; do
+    # check if we have found a prefix of bindir
+    case $func_relative_path_tbindir in
+      $func_relative_path_tlibdir)
+        # found an exact match
+        func_relative_path_tcancelled=
+        break
+        ;;
+      $func_relative_path_tlibdir*)
+        # found a matching prefix
+        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+        func_relative_path_tcancelled=$func_stripname_result
+        if test -z "$func_relative_path_result"; then
+          func_relative_path_result=.
+        fi
+        break
+        ;;
+      *)
+        func_dirname $func_relative_path_tlibdir
+        func_relative_path_tlibdir=${func_dirname_result}
+        if test "x$func_relative_path_tlibdir" = x ; then
+          # Have to descend all the way to the root!
+          func_relative_path_result=../$func_relative_path_result
+          func_relative_path_tcancelled=$func_relative_path_tbindir
+          break
+        fi
+        func_relative_path_result=../$func_relative_path_result
+        ;;
+    esac
+  done
 
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
+  # Now calculate path; take care to avoid doubling-up slashes.
+  func_stripname '' '/' "$func_relative_path_result"
+  func_relative_path_result=$func_stripname_result
+  func_stripname '/' '/' "$func_relative_path_tcancelled"
+  if test "x$func_stripname_result" != x ; then
+    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
+  fi
+
+  # Normalisation. If bindir is libdir, return empty string,
+  # else relative path ending with a slash; either way, target
+  # file name can be directly appended.
+  if test ! -z "$func_relative_path_result"; then
+    func_stripname './' '' "$func_relative_path_result/"
+    func_relative_path_result=$func_stripname_result
+  fi
+}
 
 # The name of this program:
-# In the unlikely event $progname began with a '-', it would play havoc with
-# func_echo (imagine progname=-n), so we prepend ./ in that case:
 func_dirname_and_basename "$progpath"
 progname=$func_basename_result
-case $progname in
-  -*) progname=./$progname ;;
-esac
 
 # Make sure we have an absolute path for reexecution:
 case $progpath in
@@ -196,7 +383,7 @@
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -215,6 +402,15 @@
 # Same as above, but do not quote variable references.
 double_quote_subst='s/\(["`\\]\)/\\\1/g'
 
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+
+# Sed substitution that converts a w32 file name or path
+# which contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
 # Re-`\' parameter expansions in output of double_quote_subst that were
 # `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
 # in input to double_quote_subst, that '$' was protected from expansion.
@@ -243,7 +439,7 @@
 # name if it has been set yet.
 func_echo ()
 {
-    $ECHO "$progname${mode+: }$mode: $*"
+    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
 }
 
 # func_verbose arg...
@@ -258,18 +454,25 @@
     :
 }
 
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
 # func_error arg...
 # Echo program name prefixed message to standard error.
 func_error ()
 {
-    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
 }
 
 # func_warning arg...
 # Echo program name prefixed warning message to standard error.
 func_warning ()
 {
-    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
 
     # bash bug again:
     :
@@ -326,9 +529,9 @@
         case $my_directory_path in */*) ;; *) break ;; esac
 
         # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
       done
-      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
 
       save_mkdir_p_IFS="$IFS"; IFS=':'
       for my_dir in $my_dir_list; do
@@ -378,7 +581,7 @@
         func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
     fi
 
-    $ECHO "X$my_tmpdir" | $Xsed
+    $ECHO "$my_tmpdir"
 }
 
 
@@ -392,7 +595,7 @@
 {
     case $1 in
       *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
       *)
         func_quote_for_eval_unquoted_result="$1" ;;
     esac
@@ -419,7 +622,7 @@
 {
     case $1 in
       *[\\\`\"]*)
-	my_arg=`$ECHO "X$1" | $Xsed \
+	my_arg=`$ECHO "$1" | $SED \
 	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
       *)
         my_arg="$1" ;;
@@ -488,15 +691,39 @@
     fi
 }
 
-
-
+# func_tr_sh
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+  case $1 in
+  [0-9]* | *[!a-zA-Z0-9_]*)
+    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
+    ;;
+  * )
+    func_tr_sh_result=$1
+    ;;
+  esac
+}
 
 
 # func_version
 # Echo version message to standard output and exit.
 func_version ()
 {
-    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+    $opt_debug
+
+    $SED -n '/(C)/!b go
+	:more
+	/\./!{
+	  N
+	  s/\n# / /
+	  b more
+	}
+	:go
+	/^# '$PROGRAM' (GNU /,/# warranty; / {
         s/^# //
 	s/^# *$//
         s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@ -509,22 +736,28 @@
 # Echo short help message to standard output and exit.
 func_usage ()
 {
-    $SED -n '/^# Usage:/,/# -h/ {
+    $opt_debug
+
+    $SED -n '/^# Usage:/,/^#  *.*--help/ {
         s/^# //
 	s/^# *$//
 	s/\$progname/'$progname'/
 	p
     }' < "$progpath"
-    $ECHO
+    echo
     $ECHO "run \`$progname --help | more' for full usage"
     exit $?
 }
 
-# func_help
-# Echo long help message to standard output and exit.
+# func_help [NOEXIT]
+# Echo long help message to standard output and exit,
+# unless 'noexit' is passed as argument.
 func_help ()
 {
+    $opt_debug
+
     $SED -n '/^# Usage:/,/# Report bugs to/ {
+	:print
         s/^# //
 	s/^# *$//
 	s*\$progname*'$progname'*
@@ -534,11 +767,18 @@
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
-     }' < "$progpath"
-    exit $?
+	d
+     }
+     /^# .* home page:/b print
+     /^# General help using/b print
+     ' < "$progpath"
+    ret=$?
+    if test -z "$1"; then
+      exit $ret
+    fi
 }
 
 # func_missing_arg argname
@@ -546,63 +786,106 @@
 # exit_cmd.
 func_missing_arg ()
 {
-    func_error "missing argument for $1"
+    $opt_debug
+
+    func_error "missing argument for $1."
     exit_cmd=exit
 }
 
-exit_cmd=:
 
+# func_split_short_opt shortopt
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+func_split_short_opt ()
+{
+    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
+    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+
+    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
+} # func_split_short_opt may be replaced by extended shell implementation
+
+
+# func_split_long_opt longopt
+# Set func_split_long_opt_name and func_split_long_opt_arg shell
+# variables after splitting LONGOPT at the `=' sign.
+func_split_long_opt ()
+{
+    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+    my_sed_long_arg='1s/^--[^=]*=//'
+
+    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+} # func_split_long_opt may be replaced by extended shell implementation
 
+exit_cmd=:
 
 
 
-# Check that we have a working $ECHO.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell, and then maybe $ECHO will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
 
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
 
 magic="%%%MAGIC variable%%%"
 magic_exe="%%%MAGIC EXE variable%%%"
 
 # Global variables.
-# $mode is unset
 nonopt=
-execute_dlfiles=
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
 extracted_archives=
 extracted_serial=0
 
-opt_dry_run=false
-opt_duplicate_deps=false
-opt_silent=false
-opt_debug=:
-
 # If this variable is set in any of the actions, the command in it
 # will be execed at the end.  This prevents here-documents from being
 # left over by shells.
 exec_cmd=
 
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+    eval "${1}=\$${1}\${2}"
+} # func_append may be replaced by extended shell implementation
+
+# func_append_quoted var value
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+func_append_quoted ()
+{
+    func_quote_for_eval "${2}"
+    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
+} # func_append_quoted may be replaced by extended shell implementation
+
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+    func_arith_result=`expr "${@}"`
+} # func_arith may be replaced by extended shell implementation
+
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
+} # func_len may be replaced by extended shell implementation
+
+
+# func_lo2o object
+func_lo2o ()
+{
+    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+} # func_lo2o may be replaced by extended shell implementation
+
+
+# func_xform libobj-or-source
+func_xform ()
+{
+    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+} # func_xform may be replaced by extended shell implementation
+
+
 # func_fatal_configuration arg...
 # Echo program name prefixed message to standard error, followed by
 # a configuration failure hint, and exit.
@@ -636,16 +919,16 @@
 # Display the features supported by this script.
 func_features ()
 {
-    $ECHO "host: $host"
+    echo "host: $host"
     if test "$build_libtool_libs" = yes; then
-      $ECHO "enable shared libraries"
+      echo "enable shared libraries"
     else
-      $ECHO "disable shared libraries"
+      echo "disable shared libraries"
     fi
     if test "$build_old_libs" = yes; then
-      $ECHO "enable static libraries"
+      echo "enable static libraries"
     else
-      $ECHO "disable static libraries"
+      echo "disable static libraries"
     fi
 
     exit $?
@@ -692,117 +975,209 @@
   esac
 }
 
-# Parse options once, thoroughly.  This comes as soon as possible in
-# the script to make things like `libtool --version' happen quickly.
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
 {
+  if test "$package_revision" != "$macro_revision"; then
+    if test "$VERSION" != "$macro_version"; then
+      if test -z "$macro_version"; then
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      fi
+    else
+      cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+    fi
 
-  # Shorthand for --mode=foo, only valid as the first argument
-  case $1 in
-  clean|clea|cle|cl)
-    shift; set dummy --mode clean ${1+"$@"}; shift
-    ;;
-  compile|compil|compi|comp|com|co|c)
-    shift; set dummy --mode compile ${1+"$@"}; shift
-    ;;
-  execute|execut|execu|exec|exe|ex|e)
-    shift; set dummy --mode execute ${1+"$@"}; shift
-    ;;
-  finish|finis|fini|fin|fi|f)
-    shift; set dummy --mode finish ${1+"$@"}; shift
-    ;;
-  install|instal|insta|inst|ins|in|i)
-    shift; set dummy --mode install ${1+"$@"}; shift
-    ;;
-  link|lin|li|l)
-    shift; set dummy --mode link ${1+"$@"}; shift
-    ;;
-  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-    shift; set dummy --mode uninstall ${1+"$@"}; shift
-    ;;
-  esac
+    exit $EXIT_MISMATCH
+  fi
+}
+
+
+# Shorthand for --mode=foo, only valid as the first argument
+case $1 in
+clean|clea|cle|cl)
+  shift; set dummy --mode clean ${1+"$@"}; shift
+  ;;
+compile|compil|compi|comp|com|co|c)
+  shift; set dummy --mode compile ${1+"$@"}; shift
+  ;;
+execute|execut|execu|exec|exe|ex|e)
+  shift; set dummy --mode execute ${1+"$@"}; shift
+  ;;
+finish|finis|fini|fin|fi|f)
+  shift; set dummy --mode finish ${1+"$@"}; shift
+  ;;
+install|instal|insta|inst|ins|in|i)
+  shift; set dummy --mode install ${1+"$@"}; shift
+  ;;
+link|lin|li|l)
+  shift; set dummy --mode link ${1+"$@"}; shift
+  ;;
+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+  shift; set dummy --mode uninstall ${1+"$@"}; shift
+  ;;
+esac
 
-  # Parse non-mode specific arguments:
-  while test "$#" -gt 0; do
+
+
+# Option defaults:
+opt_debug=:
+opt_dry_run=false
+opt_config=false
+opt_preserve_dup_deps=false
+opt_features=false
+opt_finish=false
+opt_help=false
+opt_help_all=false
+opt_silent=:
+opt_warning=:
+opt_verbose=:
+opt_silent=false
+opt_verbose=false
+
+
+# Parse options once, thoroughly.  This comes as soon as possible in the
+# script to make things like `--version' happen as quickly as we can.
+{
+  # this just eases exit handling
+  while test $# -gt 0; do
     opt="$1"
     shift
-
     case $opt in
-      --config)		func_config					;;
-
-      --debug)		preserve_args="$preserve_args $opt"
+      --debug|-x)	opt_debug='set -x'
 			func_echo "enabling shell trace mode"
-			opt_debug='set -x'
 			$opt_debug
 			;;
-
-      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			execute_dlfiles="$execute_dlfiles $1"
-			shift
+      --dry-run|--dryrun|-n)
+			opt_dry_run=:
 			;;
-
-      --dry-run | -n)	opt_dry_run=:					;;
-      --features)       func_features					;;
-      --finish)		mode="finish"					;;
-
-      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			case $1 in
-			  # Valid mode arguments:
-			  clean)	;;
-			  compile)	;;
-			  execute)	;;
-			  finish)	;;
-			  install)	;;
-			  link)		;;
-			  relink)	;;
-			  uninstall)	;;
-
-			  # Catch anything else as an error
-			  *) func_error "invalid argument for $opt"
-			     exit_cmd=exit
-			     break
-			     ;;
-		        esac
-
-			mode="$1"
+      --config)
+			opt_config=:
+func_config
+			;;
+      --dlopen|-dlopen)
+			optarg="$1"
+			opt_dlopen="${opt_dlopen+$opt_dlopen
+}$optarg"
 			shift
 			;;
-
       --preserve-dup-deps)
-			opt_duplicate_deps=:				;;
-
-      --quiet|--silent)	preserve_args="$preserve_args $opt"
-			opt_silent=:
+			opt_preserve_dup_deps=:
 			;;
-
-      --verbose| -v)	preserve_args="$preserve_args $opt"
+      --features)
+			opt_features=:
+func_features
+			;;
+      --finish)
+			opt_finish=:
+set dummy --mode finish ${1+"$@"}; shift
+			;;
+      --help)
+			opt_help=:
+			;;
+      --help-all)
+			opt_help_all=:
+opt_help=': help-all'
+			;;
+      --mode)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_mode="$optarg"
+case $optarg in
+  # Valid mode arguments:
+  clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+  # Catch anything else as an error
+  *) func_error "invalid argument for $opt"
+     exit_cmd=exit
+     break
+     ;;
+esac
+			shift
+			;;
+      --no-silent|--no-quiet)
 			opt_silent=false
+func_append preserve_args " $opt"
 			;;
-
-      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			preserve_args="$preserve_args $opt $1"
-			func_enable_tag "$1"	# tagname is set here
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
+      --no-verbose)
+			opt_verbose=false
+func_append preserve_args " $opt"
+			;;
+      --silent|--quiet)
+			opt_silent=:
+func_append preserve_args " $opt"
+        opt_verbose=false
+			;;
+      --verbose|-v)
+			opt_verbose=:
+func_append preserve_args " $opt"
+opt_silent=false
+			;;
+      --tag)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_tag="$optarg"
+func_append preserve_args " $opt $optarg"
+func_enable_tag "$optarg"
 			shift
 			;;
 
+      -\?|-h)		func_usage				;;
+      --help)		func_help				;;
+      --version)	func_version				;;
+
       # Separate optargs to long options:
-      -dlopen=*|--mode=*|--tag=*)
-			func_opt_split "$opt"
-			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+      --*=*)
+			func_split_long_opt "$opt"
+			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
 			shift
 			;;
 
-      -\?|-h)		func_usage					;;
-      --help)		opt_help=:					;;
-      --version)	func_version					;;
-
-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-
-      *)		nonopt="$opt"
-			break
+      # Separate non-argument short options:
+      -\?*|-h*|-n*|-v*)
+			func_split_short_opt "$opt"
+			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
+			shift
 			;;
+
+      --)		break					;;
+      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
+      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
     esac
   done
 
+  # Validate options:
+
+  # save first non-option argument
+  if test "$#" -gt 0; then
+    nonopt="$opt"
+    shift
+  fi
+
+  # preserve --debug
+  test "$opt_debug" = : || func_append preserve_args " --debug"
 
   case $host in
     *cygwin* | *mingw* | *pw32* | *cegcc*)
@@ -810,82 +1185,44 @@
       opt_duplicate_compiler_generated_deps=:
       ;;
     *)
-      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
       ;;
   esac
 
-  # Having warned about all mis-specified options, bail out if
-  # anything was wrong.
-  $exit_cmd $EXIT_FAILURE
-}
+  $opt_help || {
+    # Sanity checks first:
+    func_check_version_match
 
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      else
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
+    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+      func_fatal_configuration "not configured to build any kind of library"
     fi
 
-    exit $EXIT_MISMATCH
-  fi
-}
-
+    # Darwin sucks
+    eval std_shrext=\"$shrext_cmds\"
 
-## ----------- ##
-##    Main.    ##
-## ----------- ##
-
-$opt_help || {
-  # Sanity checks first:
-  func_check_version_match
-
-  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-    func_fatal_configuration "not configured to build any kind of library"
-  fi
+    # Only execute mode is allowed to have -dlopen flags.
+    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
+      func_error "unrecognized option \`-dlopen'"
+      $ECHO "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
 
-  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+    # Change the help message to a mode-specific one.
+    generic_help="$help"
+    help="Try \`$progname --help --mode=$opt_mode' for more information."
+  }
 
 
-  # Darwin sucks
-  eval std_shrext=\"$shrext_cmds\"
+  # Bail if the options were screwed
+  $exit_cmd $EXIT_FAILURE
+}
 
 
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    func_error "unrecognized option \`-dlopen'"
-    $ECHO "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
 
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$progname --help --mode=$mode' for more information."
-}
 
+## ----------- ##
+##    Main.    ##
+## ----------- ##
 
 # func_lalib_p file
 # True iff FILE is a libtool `.la' library or `.lo' object file.
@@ -950,12 +1287,9 @@
 # temporary ltwrapper_script.
 func_ltwrapper_scriptname ()
 {
-    func_ltwrapper_scriptname_result=""
-    if func_ltwrapper_executable_p "$1"; then
-	func_dirname_and_basename "$1" "" "."
-	func_stripname '' '.exe' "$func_basename_result"
-	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-    fi
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
 }
 
 # func_ltwrapper_p file
@@ -1001,6 +1335,37 @@
 }
 
 
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case "$lt_sysroot:$1" in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result="=$func_stripname_result"
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
 # func_infer_tag arg
 # Infer tagged configuration to use if any are available and
 # if one wasn't chosen via the "--tag" command line option.
@@ -1013,13 +1378,15 @@
     if test -n "$available_tags" && test -z "$tagname"; then
       CC_quoted=
       for arg in $CC; do
-        func_quote_for_eval "$arg"
-	CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	func_append_quoted CC_quoted "$arg"
       done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
       case $@ in
       # Blanks in the command may have been stripped by the calling shell,
       # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
       # Blanks at the start of $base_compile will cause this to fail
       # if we don't check for them as well.
       *)
@@ -1030,11 +1397,13 @@
 	    CC_quoted=
 	    for arg in $CC; do
 	      # Double-quote args containing other shell metacharacters.
-	      func_quote_for_eval "$arg"
-	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	      func_append_quoted CC_quoted "$arg"
 	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
 	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
 	      # The compiler in the base compile command matches
 	      # the one in the tagged configuration.
 	      # Assume this is the tagged configuration we want.
@@ -1097,6 +1466,486 @@
     }
 }
 
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $opt_debug
+  func_convert_core_file_wine_to_w32_result="$1"
+  if test -n "$1"; then
+    # Unfortunately, winepath does not exit with a non-zero error code, so we
+    # are forced to check the contents of stdout. On the other hand, if the
+    # command is not found, the shell will set an exit code of 127 and print
+    # *an error message* to stdout. So we must check for both error code of
+    # zero AND non-empty stdout, which explains the odd construction:
+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$lt_sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $opt_debug
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=""
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $opt_debug
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $opt_debug
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $opt_debug
+  if test -z "$2" && test -n "$1" ; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  \`$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result="$1"
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $opt_debug
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  \`$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result="$3"
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $opt_debug
+  case $4 in
+  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via `$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $opt_debug
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $opt_debug
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result="$1"
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via `$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $opt_debug
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd="func_convert_path_${func_stripname_result}"
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $opt_debug
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result="$1"
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from
+    # ARG. msys behavior is inconsistent here, cygpath turns them
+    # into '.;' and ';.', and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
 # func_mode_compile arg...
 func_mode_compile ()
 {
@@ -1137,12 +1986,12 @@
 	  ;;
 
 	-pie | -fpie | -fPIE)
-          pie_flag="$pie_flag $arg"
+          func_append pie_flag " $arg"
 	  continue
 	  ;;
 
 	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
+	  func_append later " $arg"
 	  continue
 	  ;;
 
@@ -1163,15 +2012,14 @@
 	  save_ifs="$IFS"; IFS=','
 	  for arg in $args; do
 	    IFS="$save_ifs"
-	    func_quote_for_eval "$arg"
-	    lastarg="$lastarg $func_quote_for_eval_result"
+	    func_append_quoted lastarg "$arg"
 	  done
 	  IFS="$save_ifs"
 	  func_stripname ' ' '' "$lastarg"
 	  lastarg=$func_stripname_result
 
 	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
+	  func_append base_compile " $lastarg"
 	  continue
 	  ;;
 
@@ -1187,8 +2035,7 @@
       esac    #  case $arg_mode
 
       # Aesthetically quote the previous argument.
-      func_quote_for_eval "$lastarg"
-      base_compile="$base_compile $func_quote_for_eval_result"
+      func_append_quoted base_compile "$lastarg"
     done # for arg
 
     case $arg_mode in
@@ -1213,7 +2060,7 @@
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -1288,7 +2135,7 @@
     # Calculate the filename of the output object if compiler does
     # not support -o with -c
     if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
       lockfile="$output_obj.lock"
     else
       output_obj=
@@ -1319,17 +2166,16 @@
 	$opt_dry_run || $RM $removelist
 	exit $EXIT_FAILURE
       fi
-      removelist="$removelist $output_obj"
+      func_append removelist " $output_obj"
       $ECHO "$srcfile" > "$lockfile"
     fi
 
     $opt_dry_run || $RM $removelist
-    removelist="$removelist $lockfile"
+    func_append removelist " $lockfile"
     trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
 
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
     func_quote_for_eval "$srcfile"
     qsrcfile=$func_quote_for_eval_result
 
@@ -1349,7 +2195,7 @@
 
       if test -z "$output_obj"; then
 	# Place PIC objects in $objdir
-	command="$command -o $lobj"
+	func_append command " -o $lobj"
       fi
 
       func_show_eval_locale "$command"	\
@@ -1396,11 +2242,11 @@
 	command="$base_compile $qsrcfile $pic_flag"
       fi
       if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
+	func_append command " -o $obj"
       fi
 
       # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
+      func_append command "$suppress_output"
       func_show_eval_locale "$command" \
         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
@@ -1445,13 +2291,13 @@
 }
 
 $opt_help || {
-test "$mode" = compile && func_mode_compile ${1+"$@"}
+  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
 }
 
 func_mode_help ()
 {
     # We need to display help for each of the modes.
-    case $mode in
+    case $opt_mode in
       "")
         # Generic help is extracted from the usage comments
         # at the start of this file.
@@ -1482,10 +2328,11 @@
 
   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
   -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
+  -prefer-pic       try to build PIC objects only
+  -prefer-non-pic   try to build non-PIC objects only
   -shared           do not build a \`.o' file suitable for static linking
   -static           only build a \`.o' file suitable for static linking
+  -Wc,FLAG          pass FLAG directly to the compiler
 
 COMPILE-COMMAND is a command to be used in creating a \`standard' object file
 from the given SOURCEFILE.
@@ -1538,7 +2385,7 @@
 
 The following components of INSTALL-COMMAND are treated specially:
 
-  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
 
 The rest of the components are interpreted as arguments to that command (only
 BSD-compatible install options are recognized)."
@@ -1558,6 +2405,8 @@
 
   -all-static       do not do any dynamic linking at all
   -avoid-version    do not add a version suffix if possible
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
   -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
@@ -1586,6 +2435,11 @@
   -version-info CURRENT[:REVISION[:AGE]]
                     specify library version info [each variable defaults to 0]
   -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
 
 All other options (arguments beginning with \`-') are ignored.
 
@@ -1619,18 +2473,44 @@
         ;;
 
       *)
-        func_fatal_help "invalid operation mode \`$mode'"
+        func_fatal_help "invalid operation mode \`$opt_mode'"
         ;;
     esac
 
-    $ECHO
+    echo
     $ECHO "Try \`$progname --help' for more information about other modes."
-
-    exit $?
 }
 
-  # Now that we've collected a possible --mode arg, show help if necessary
-  $opt_help && func_mode_help
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test "$opt_help" = :; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    sed '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
 
 
 # func_mode_execute arg...
@@ -1643,13 +2523,16 @@
       func_fatal_help "you must specify a COMMAND"
 
     # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
+    for file in $opt_dlopen; do
       test -f "$file" \
 	|| func_fatal_help "\`$file' is not a file"
 
       dir=
       case $file in
       *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
 	  || func_fatal_help "\`$lib' is not a valid libtool archive"
@@ -1671,7 +2554,7 @@
 	dir="$func_dirname_result"
 
 	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
+	  func_append dir "/$objdir"
 	else
 	  if test ! -f "$dir/$dlname"; then
 	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
@@ -1712,7 +2595,7 @@
     for file
     do
       case $file in
-      -*) ;;
+      -* | *.la | *.lo ) ;;
       *)
 	# Do a test to see if this is really a libtool program.
 	if func_ltwrapper_script_p "$file"; then
@@ -1728,8 +2611,7 @@
 	;;
       esac
       # Quote arguments (to preserve shell metacharacters).
-      func_quote_for_eval "$file"
-      args="$args $func_quote_for_eval_result"
+      func_append_quoted args "$file"
     done
 
     if test "X$opt_dry_run" = Xfalse; then
@@ -1754,29 +2636,66 @@
       # Display what would be done.
       if test -n "$shlibpath_var"; then
 	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	$ECHO "export $shlibpath_var"
+	echo "export $shlibpath_var"
       fi
       $ECHO "$cmd$args"
       exit $EXIT_SUCCESS
     fi
 }
 
-test "$mode" = execute && func_mode_execute ${1+"$@"}
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $opt_debug
+    libs=
+    libdirs=
+    admincmds=
+
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "\`$opt' is not a valid libtool archive"
+	fi
+
+      else
+	func_fatal_error "invalid argument \`$opt'"
+      fi
+    done
 
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
 
-# func_mode_finish arg...
-func_mode_finish ()
-{
-    $opt_debug
-    libdirs="$nonopt"
-    admincmds=
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
 
     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
       for libdir in $libdirs; do
 	if test -n "$finish_cmds"; then
 	  # Do each command in the finish commands.
@@ -1786,7 +2705,7 @@
 	if test -n "$finish_eval"; then
 	  # Do the single finish_eval.
 	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
        $cmds"
 	fi
       done
@@ -1795,53 +2714,55 @@
     # Exit here if they wanted silent mode.
     $opt_silent && exit $EXIT_SUCCESS
 
-    $ECHO "X----------------------------------------------------------------------" | $Xsed
-    $ECHO "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $ECHO "   $libdir"
-    done
-    $ECHO
-    $ECHO "If you ever happen to want to link against installed libraries"
-    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
-    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $ECHO "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $ECHO "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $ECHO "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
 
-      $ECHO "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $ECHO "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $ECHO
+	$ECHO "   - use the \`$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+	$ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+      fi
+      echo
 
-    $ECHO "See any operating system documentation about shared libraries for"
-    case $host in
-      solaris2.[6789]|solaris2.1[0-9])
-        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	$ECHO "pages."
-	;;
-      *)
-        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
-        ;;
-    esac
-    $ECHO "X----------------------------------------------------------------------" | $Xsed
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.[6789]|solaris2.1[0-9])
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
     exit $EXIT_SUCCESS
 }
 
-test "$mode" = finish && func_mode_finish ${1+"$@"}
+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
 
 
 # func_mode_install arg...
@@ -1852,7 +2773,7 @@
     # install_prog (especially on Windows NT).
     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
        # Allow the use of GNU shtool's install command.
-       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+       case $nonopt in *shtool*) :;; *) false;; esac; then
       # Aesthetically quote it.
       func_quote_for_eval "$nonopt"
       install_prog="$func_quote_for_eval_result "
@@ -1866,7 +2787,12 @@
     # The real first argument should be the name of the installation program.
     # Aesthetically quote it.
     func_quote_for_eval "$arg"
-    install_prog="$install_prog$func_quote_for_eval_result"
+    func_append install_prog "$func_quote_for_eval_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
 
     # We need to accept at least all the BSD install flags.
     dest=
@@ -1876,10 +2802,12 @@
     install_type=
     isdir=no
     stripme=
+    no_mode=:
     for arg
     do
+      arg2=
       if test -n "$dest"; then
-	files="$files $dest"
+	func_append files " $dest"
 	dest=$arg
 	continue
       fi
@@ -1887,10 +2815,9 @@
       case $arg in
       -d) isdir=yes ;;
       -f)
-	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
 	;;
       -g | -m | -o)
 	prev=$arg
@@ -1904,6 +2831,10 @@
       *)
 	# If the previous option needed an argument, then skip it.
 	if test -n "$prev"; then
+	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
 	  prev=
 	else
 	  dest=$arg
@@ -1914,7 +2845,11 @@
 
       # Aesthetically quote the argument.
       func_quote_for_eval "$arg"
-      install_prog="$install_prog $func_quote_for_eval_result"
+      func_append install_prog " $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+	func_quote_for_eval "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_for_eval_result"
     done
 
     test -z "$install_prog" && \
@@ -1923,6 +2858,13 @@
     test -n "$prev" && \
       func_fatal_help "the \`$prev' option requires an argument"
 
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_for_eval "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
+      fi
+    fi
+
     if test -z "$files"; then
       if test -z "$dest"; then
 	func_fatal_help "no file or destination specified"
@@ -1977,10 +2919,13 @@
       case $file in
       *.$libext)
 	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
+	func_append staticlibs " $file"
 	;;
 
       *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
 	  || func_fatal_help "\`$file' is not a valid libtool archive"
@@ -1994,23 +2939,23 @@
 	if test "X$destdir" = "X$libdir"; then
 	  case "$current_libdirs " in
 	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  *) func_append current_libdirs " $libdir" ;;
 	  esac
 	else
 	  # Note the libdir as a future libdir.
 	  case "$future_libdirs " in
 	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  *) func_append future_libdirs " $libdir" ;;
 	  esac
 	fi
 
 	func_dirname "$file" "/" ""
 	dir="$func_dirname_result"
-	dir="$dir$objdir"
+	func_append dir "$objdir"
 
 	if test -n "$relink_command"; then
 	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
 
 	  # Don't allow the user to place us outside of our expected
 	  # location b/c this prevents finding dependent libraries that
@@ -2023,9 +2968,9 @@
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
 	  else
-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
 	  fi
 
 	  func_warning "relinking \`$file'"
@@ -2043,7 +2988,7 @@
 	  test -n "$relink_command" && srcname="$realname"T
 
 	  # Install the shared library and build the symlinks.
-	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
 	      'exit $?'
 	  tstripme="$stripme"
 	  case $host_os in
@@ -2083,7 +3028,7 @@
 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
 
 	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
 	;;
 
       *.lo)
@@ -2183,7 +3128,7 @@
 	    if test -f "$lib"; then
 	      func_source "$lib"
 	    fi
-	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
 	    if test -n "$libdir" && test ! -f "$libfile"; then
 	      func_warning "\`$lib' has not been installed in \`$libdir'"
 	      finalize=no
@@ -2202,7 +3147,7 @@
 		file="$func_basename_result"
 	        outputname="$tmpdir/$file"
 	        # Replace the output file specification.
-	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
 
 	        $opt_silent || {
 	          func_quote_for_expand "$relink_command"
@@ -2221,7 +3166,7 @@
 	    }
 	  else
 	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
 	  fi
 	fi
 
@@ -2257,11 +3202,13 @@
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -2280,7 +3227,7 @@
     fi
 }
 
-test "$mode" = install && func_mode_install ${1+"$@"}
+test "$opt_mode" = install && func_mode_install ${1+"$@"}
 
 
 # func_generate_dlsyms outputname originator pic_p
@@ -2323,6 +3270,22 @@
 extern \"C\" {
 #endif
 
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
 /* External symbol declarations for the compiler. */\
 "
 
@@ -2332,10 +3295,11 @@
 	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
 
 	  # Add our own program objects to the symbol list.
-	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
 	  for progfile in $progfiles; do
-	    func_verbose "extracting global C symbols from \`$progfile'"
-	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
 	  done
 
 	  if test -n "$exclude_expsyms"; then
@@ -2371,7 +3335,7 @@
 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 	      eval '$MV "$nlist"T "$nlist"'
 	      case $host in
-	        *cygwin | *mingw* | *cegcc* )
+	        *cygwin* | *mingw* | *cegcc* )
 	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
 	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
 	          ;;
@@ -2384,10 +3348,52 @@
 	  func_verbose "extracting global C symbols from \`$dlprefile'"
 	  func_basename "$dlprefile"
 	  name="$func_basename_result"
-	  $opt_dry_run || {
-	    eval '$ECHO ": $name " >> "$nlist"'
-	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	  }
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=""
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname" ; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename="$func_basename_result"
+	          else
+	            # no lafile. user explicitly requested -dlpreopen <import library>.
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename" ; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
 	done
 
 	$opt_dry_run || {
@@ -2415,36 +3421,19 @@
 	  if test -f "$nlist"S; then
 	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
 	  else
-	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
 	  fi
 
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+	  echo >> "$output_objdir/$my_dlsyms" "\
 
 /* The mapping between symbol names and symbols.  */
 typedef struct {
   const char *name;
   void *address;
 } lt_dlsymlist;
-"
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc* )
-	    $ECHO >> "$output_objdir/$my_dlsyms" "\
-/* DATA imports from DLLs on WIN32 con't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs.  */"
-	    lt_dlsym_const= ;;
-	  *osf5*)
-	    echo >> "$output_objdir/$my_dlsyms" "\
-/* This system does not cope well with relocations in const data */"
-	    lt_dlsym_const= ;;
-	  *)
-	    lt_dlsym_const=const ;;
-	  esac
-
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-extern $lt_dlsym_const lt_dlsymlist
+extern LT_DLSYM_CONST lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols[];
-$lt_dlsym_const lt_dlsymlist
+LT_DLSYM_CONST lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols[] =
 {\
   { \"$my_originator\", (void *) 0 },"
@@ -2457,7 +3446,7 @@
 	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
 	    ;;
 	  esac
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+	  echo >> "$output_objdir/$my_dlsyms" "\
   {0, (void *) 0}
 };
 
@@ -2484,7 +3473,7 @@
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -2500,7 +3489,7 @@
 	for arg in $LTCFLAGS; do
 	  case $arg in
 	  -pie | -fpie | -fPIE) ;;
-	  *) symtab_cflags="$symtab_cflags $arg" ;;
+	  *) func_append symtab_cflags " $arg" ;;
 	  esac
 	done
 
@@ -2515,16 +3504,16 @@
 	case $host in
 	*cygwin* | *mingw* | *cegcc* )
 	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
 	  else
-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
 	  fi
 	  ;;
 	*)
-	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
 	  ;;
 	esac
 	;;
@@ -2538,8 +3527,8 @@
       # really was required.
 
       # Nullify the symbol file.
-      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
     fi
 }
 
@@ -2549,6 +3538,7 @@
 # Need a lot of goo to handle *both* DLLs and import libs
 # Has to be a shell function in order to 'eat' the argument
 # that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
 func_win32_libid ()
 {
   $opt_debug
@@ -2559,9 +3549,11 @@
     win32_libid_type="x86 archive import"
     ;;
   *ar\ archive*) # could be an import, or static
+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 |
+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+      func_to_tool_file "$1" func_convert_file_msys_to_w32
+      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
 	$SED -n -e '
 	    1,100{
 		/ I /{
@@ -2590,6 +3582,131 @@
   $ECHO "$win32_libid_type"
 }
 
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $opt_debug
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $opt_debug
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive which possess that section. Heuristic: eliminate
+    # all those which have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $opt_debug
+  if func_cygming_gnu_implib_p "$1" ; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1" ; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=""
+  fi
+}
 
 
 # func_extract_an_archive dir oldlib
@@ -2598,7 +3715,18 @@
     $opt_debug
     f_ex_an_ar_dir="$1"; shift
     f_ex_an_ar_oldlib="$1"
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+    if test "$lock_old_archive_extraction" = yes; then
+      lockfile=$f_ex_an_ar_oldlib.lock
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+		   'stat=$?; rm -f "$lockfile"; exit $stat'
+    if test "$lock_old_archive_extraction" = yes; then
+      $opt_dry_run || rm -f "$lockfile"
+    fi
     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
      :
     else
@@ -2669,7 +3797,7 @@
 	    darwin_file=
 	    darwin_files=
 	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
 	      $LIPO -create -output "$darwin_file" $darwin_files
 	    done # $darwin_filelist
 	    $RM -rf unfat-$$
@@ -2684,25 +3812,30 @@
         func_extract_an_archive "$my_xdir" "$my_xabs"
 	;;
       esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
     done
 
     func_extract_archives_result="$my_oldobjs"
 }
 
 
-
-# func_emit_wrapper_part1 [arg=no]
+# func_emit_wrapper [arg=no]
 #
-# Emit the first part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part1 ()
-{
-	func_emit_wrapper_part1_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_part1_arg1=$1
-	fi
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=${1-no}
 
 	$ECHO "\
 #! $SHELL
@@ -2718,7 +3851,6 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
 # Be Bourne compatible
@@ -2749,31 +3881,135 @@
 else
   # When we are sourced in execute mode, \$file and \$ECHO are already set.
   if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    ECHO=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$ECHO works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$ECHO will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
+    file=\"\$0\""
+
+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=\"$qECHO\"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ which is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options which match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=\$0
+  shift
+  for lt_opt
+  do
+    case \"\$lt_opt\" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+        cat \"\$lt_dump_D/\$lt_dump_F\"
+        exit 0
+      ;;
+    --lt-*)
+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n \"\$lt_option_debug\"; then
+    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
 "
-	$ECHO "\
+  case $host in
+  # Backslashes separate directories on plain windows
+  *-*-mingw | *-*-os2* | *-cegcc*)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+    ;;
+
+  *)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+    ;;
+  esac
+  $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core \${1+\"\$@\"}
+}
+
+  # Parse options
+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
 
   # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
 
   # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
   while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
 
     # If there was a directory component, then change thisdir.
     if test \"x\$destdir\" != \"x\$file\"; then
@@ -2783,30 +4019,13 @@
       esac
     fi
 
-    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
   done
-"
-}
-# end: func_emit_wrapper_part1
-
-# func_emit_wrapper_part2 [arg=no]
-#
-# Emit the second part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part2 ()
-{
-	func_emit_wrapper_part2_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_part2_arg1=$1
-	fi
-
-	$ECHO "\
 
   # Usually 'no', except on cygwin/mingw when embedded into
   # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
   if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
     # special case for '.'
     if test \"\$thisdir\" = \".\"; then
@@ -2814,7 +4033,7 @@
     fi
     # remove .libs from thisdir
     case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
     $objdir )   thisdir=. ;;
     esac
   fi
@@ -2869,6 +4088,18 @@
 
   if test -f \"\$progdir/\$program\"; then"
 
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
 	# Export our shlibpath_var if we have one.
 	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
 	  $ECHO "\
@@ -2877,253 +4108,28 @@
 
     # Some systems cannot cope with colon-terminated $shlibpath_var
     # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
 
     export $shlibpath_var
 "
 	fi
 
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
 	$ECHO "\
     if test \"\$libtool_execute_magic\" != \"$magic\"; then
       # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2* | *-cegcc*)
-	  $ECHO "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $ECHO "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
+      func_exec_program \${1+\"\$@\"}
     fi
   else
     # The program doesn't exist.
     \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
     \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
     exit 1
   fi
 fi\
 "
 }
-# end: func_emit_wrapper_part2
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_arg1=$1
-	fi
-
-	# split this up so that func_emit_cwrapperexe_src
-	# can call each part independently.
-	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
-	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
-}
-
-
-# func_to_host_path arg
-#
-# Convert paths to host format when used with build tools.
-# Intended for use with "native" mingw (where libtool itself
-# is running under the msys shell), or in the following cross-
-# build environments:
-#    $build          $host
-#    mingw (msys)    mingw  [e.g. native]
-#    cygwin          mingw
-#    *nix + wine     mingw
-# where wine is equipped with the `winepath' executable.
-# In the native mingw case, the (msys) shell automatically
-# converts paths for any non-msys applications it launches,
-# but that facility isn't available from inside the cwrapper.
-# Similar accommodations are necessary for $host mingw and
-# $build cygwin.  Calling this function does no harm for other
-# $host/$build combinations not listed above.
-#
-# ARG is the path (on $build) that should be converted to
-# the proper representation for $host. The result is stored
-# in $func_to_host_path_result.
-func_to_host_path ()
-{
-  func_to_host_path_result="$1"
-  if test -n "$1" ; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        case $build in
-          *mingw* ) # actually, msys
-            # awkward: cmd appends spaces to result
-            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
-              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_path_tmp1=`cygpath -w "$1"`
-            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # Unfortunately, winepath does not exit with a non-zero
-            # error code, so we are forced to check the contents of
-            # stdout. On the other hand, if the command is not
-            # found, the shell will set an exit code of 127 and print
-            # *an error message* to stdout. So we must check for both
-            # error code of zero AND non-empty stdout, which explains
-            # the odd construction:
-            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
-            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
-              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-                $SED -e "$lt_sed_naive_backslashify"`
-            else
-              # Allow warning below.
-              func_to_host_path_result=""
-            fi
-            ;;
-        esac
-        if test -z "$func_to_host_path_result" ; then
-          func_error "Could not determine host path corresponding to"
-          func_error "  '$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback:
-          func_to_host_path_result="$1"
-        fi
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_path
-
-# func_to_host_pathlist arg
-#
-# Convert pathlists to host format when used with build tools.
-# See func_to_host_path(), above. This function supports the
-# following $build/$host combinations (but does no harm for
-# combinations not listed here):
-#    $build          $host
-#    mingw (msys)    mingw  [e.g. native]
-#    cygwin          mingw
-#    *nix + wine     mingw
-#
-# Path separators are also converted from $build format to
-# $host format. If ARG begins or ends with a path separator
-# character, it is preserved (but converted to $host format)
-# on output.
-#
-# ARG is a pathlist (on $build) that should be converted to
-# the proper representation on $host. The result is stored
-# in $func_to_host_pathlist_result.
-func_to_host_pathlist ()
-{
-  func_to_host_pathlist_result="$1"
-  if test -n "$1" ; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        # Remove leading and trailing path separator characters from
-        # ARG. msys behavior is inconsistent here, cygpath turns them
-        # into '.;' and ';.', and winepath ignores them completely.
-        func_to_host_pathlist_tmp2="$1"
-        # Once set for this call, this variable should not be
-        # reassigned. It is used in tha fallback case.
-        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
-          $SED -e 's|^:*||' -e 's|:*$||'`
-        case $build in
-          *mingw* ) # Actually, msys.
-            # Awkward: cmd appends spaces to result.
-            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
-              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
-            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # unfortunately, winepath doesn't convert pathlists
-            func_to_host_pathlist_result=""
-            func_to_host_pathlist_oldIFS=$IFS
-            IFS=:
-            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
-              IFS=$func_to_host_pathlist_oldIFS
-              if test -n "$func_to_host_pathlist_f" ; then
-                func_to_host_path "$func_to_host_pathlist_f"
-                if test -n "$func_to_host_path_result" ; then
-                  if test -z "$func_to_host_pathlist_result" ; then
-                    func_to_host_pathlist_result="$func_to_host_path_result"
-                  else
-                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
-                  fi
-                fi
-              fi
-              IFS=:
-            done
-            IFS=$func_to_host_pathlist_oldIFS
-            ;;
-        esac
-        if test -z "$func_to_host_pathlist_result" ; then
-          func_error "Could not determine the host path(s) corresponding to"
-          func_error "  '$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback. This may break if $1 contains DOS-style drive
-          # specifications. The fix is not to complicate the expression
-          # below, but for the user to provide a working wine installation
-          # with winepath so that path translation in the cross-to-mingw
-          # case works properly.
-          lt_replace_pathsep_nix_to_dos="s|:|;|g"
-          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
-            $SED -e "$lt_replace_pathsep_nix_to_dos"`
-        fi
-        # Now, add the leading and trailing path separators back
-        case "$1" in
-          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
-            ;;
-        esac
-        case "$1" in
-          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
-            ;;
-        esac
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_pathlist
+
 
 # func_emit_cwrapperexe_src
 # emit the source code for a wrapper executable on stdout
@@ -3141,31 +4147,23 @@
 
    This wrapper executable should never be moved out of the build directory.
    If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "$SHELL $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
 */
 EOF
 	    cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef _MSC_VER
 # include <direct.h>
 # include <process.h>
 # include <io.h>
-# define setmode _setmode
 #else
 # include <unistd.h>
 # include <stdint.h>
 # ifdef __CYGWIN__
 #  include <io.h>
-#  define HAVE_SETENV
-#  ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-#  endif
 # endif
 #endif
 #include <malloc.h>
@@ -3177,6 +4175,44 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
+/* declarations of non-ANSI functions */
+#if defined(__MINGW32__)
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined(__CYGWIN__)
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined (other platforms) ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined(_MSC_VER)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+# ifndef _INTPTR_T_DEFINED
+#  define _INTPTR_T_DEFINED
+#  define intptr_t int
+# endif
+#elif defined(__MINGW32__)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined(__CYGWIN__)
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined (other platforms) ... */
+#endif
+
 #if defined(PATH_MAX)
 # define LT_PATHMAX PATH_MAX
 #elif defined(MAXPATHLEN)
@@ -3192,14 +4228,7 @@
 # define S_IXGRP 0
 #endif
 
-#ifdef _MSC_VER
-# define S_IXUSR _S_IEXEC
-# define stat _stat
-# ifndef _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#endif
-
+/* path handling portability macros */
 #ifndef DIR_SEPARATOR
 # define DIR_SEPARATOR '/'
 # define PATH_SEPARATOR ':'
@@ -3230,10 +4259,6 @@
 # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
 #endif /* PATH_SEPARATOR_2 */
 
-#ifdef __CYGWIN__
-# define FOPEN_WB "wb"
-#endif
-
 #ifndef FOPEN_WB
 # define FOPEN_WB "w"
 #endif
@@ -3246,22 +4271,13 @@
   if (stale) { free ((void *) stale); stale = 0; } \
 } while (0)
 
-#undef LTWRAPPER_DEBUGPRINTF
-#if defined DEBUGWRAPPER
-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
-static void
-ltwrapper_debugprintf (const char *fmt, ...)
-{
-    va_list args;
-    va_start (args, fmt);
-    (void) vfprintf (stderr, fmt, args);
-    va_end (args);
-}
+#if defined(LT_DEBUGWRAPPER)
+static int lt_debug = 1;
 #else
-# define LTWRAPPER_DEBUGPRINTF(args)
+static int lt_debug = 0;
 #endif
 
-const char *program_name = NULL;
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
 
 void *xmalloc (size_t num);
 char *xstrdup (const char *string);
@@ -3271,41 +4287,27 @@
 int make_executable (const char *path);
 int check_executable (const char *path);
 char *strendzap (char *str, const char *pat);
-void lt_fatal (const char *message, ...);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
 void lt_setenv (const char *name, const char *value);
 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_opt_process_env_set (const char *arg);
-void lt_opt_process_env_prepend (const char *arg);
-void lt_opt_process_env_append (const char *arg);
-int lt_split_name_value (const char *arg, char** name, char** value);
 void lt_update_exe_path (const char *name, const char *value);
 void lt_update_lib_path (const char *name, const char *value);
-
-static const char *script_text_part1 =
-EOF
-
-	    func_emit_wrapper_part1 yes |
-	        $SED -e 's/\([\\"]\)/\\\1/g' \
-	             -e 's/^/  "/' -e 's/$/\\n"/'
-	    echo ";"
-	    cat <<EOF
-
-static const char *script_text_part2 =
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
 EOF
-	    func_emit_wrapper_part2 yes |
-	        $SED -e 's/\([\\"]\)/\\\1/g' \
-	             -e 's/^/  "/' -e 's/$/\\n"/'
-	    echo ";"
 
 	    cat <<EOF
-const char * MAGIC_EXE = "$magic_exe";
+volatile const char * MAGIC_EXE = "$magic_exe";
 const char * LIB_PATH_VARNAME = "$shlibpath_var";
 EOF
 
 	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-              func_to_host_pathlist "$temp_rpath"
+              func_to_host_path "$temp_rpath"
 	      cat <<EOF
-const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
 EOF
 	    else
 	      cat <<"EOF"
@@ -3314,10 +4316,10 @@
 	    fi
 
 	    if test -n "$dllsearchpath"; then
-              func_to_host_pathlist "$dllsearchpath:"
+              func_to_host_path "$dllsearchpath:"
 	      cat <<EOF
 const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
 EOF
 	    else
 	      cat <<"EOF"
@@ -3340,24 +4342,10 @@
 	    cat <<"EOF"
 
 #define LTWRAPPER_OPTION_PREFIX         "--lt-"
-#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
 
-static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-
 static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-
-static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
-static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
-  /* argument is putenv-style "foo=bar", value of foo is set to bar */
-
-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
-static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
-  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
-
-static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
-static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
-  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
 
 int
 main (int argc, char *argv[])
@@ -3374,10 +4362,13 @@
   int i;
 
   program_name = (char *) xstrdup (base_name (argv[0]));
-  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
-  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+  newargz = XMALLOC (char *, argc + 1);
 
-  /* very simple arg parsing; don't want to rely on getopt */
+  /* very simple arg parsing; don't want to rely on getopt
+   * also, copy all non cwrapper options to newargz, except
+   * argz[0], which is handled differently
+   */
+  newargc=0;
   for (i = 1; i < argc; i++)
     {
       if (strcmp (argv[i], dumpscript_opt) == 0)
@@ -3391,25 +4382,57 @@
 	      esac
 
 	    cat <<"EOF"
-	  printf ("%s", script_text_part1);
-	  printf ("%s", script_text_part2);
+	  lt_dump_script (stdout);
 	  return 0;
 	}
+      if (strcmp (argv[i], debug_opt) == 0)
+	{
+          lt_debug = 1;
+          continue;
+	}
+      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal (__FILE__, __LINE__,
+		    "unrecognized %s option: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
     }
+  newargz[++newargc] = NULL;
+
+EOF
+	    cat <<EOF
+  /* The GNU banner must be the first non-error debug message */
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+EOF
+	    cat <<"EOF"
+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
 
-  newargz = XMALLOC (char *, argc + 1);
   tmp_pathspec = find_executable (argv[0]);
   if (tmp_pathspec == NULL)
-    lt_fatal ("Couldn't find %s", argv[0]);
-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
-			  tmp_pathspec));
+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (before symlink chase) at: %s\n",
+		  tmp_pathspec);
 
   actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
-			  actual_cwrapper_path));
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (after symlink chase) at: %s\n",
+		  actual_cwrapper_path);
   XFREE (tmp_pathspec);
 
-  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
   strendzap (actual_cwrapper_path, actual_cwrapper_name);
 
   /* wrapper name transforms */
@@ -3427,8 +4450,9 @@
   target_name = tmp_pathspec;
   tmp_pathspec = 0;
 
-  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
-			  target_name));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(main) libtool target name: %s\n",
+		  target_name);
 EOF
 
 	    cat <<EOF
@@ -3478,80 +4502,19 @@
 
   lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
   lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
   lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
 
-  newargc=0;
-  for (i = 1; i < argc; i++)
-    {
-      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
-        {
-          if (argv[i][env_set_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_set_opt_len + 1;
-              lt_opt_process_env_set (p);
-            }
-          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_set (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_set_opt);
-          continue;
-        }
-      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
-        {
-          if (argv[i][env_prepend_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_prepend_opt_len + 1;
-              lt_opt_process_env_prepend (p);
-            }
-          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_prepend_opt);
-          continue;
-        }
-      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
-        {
-          if (argv[i][env_append_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_append_opt_len + 1;
-              lt_opt_process_env_append (p);
-            }
-          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_append (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_append_opt);
-          continue;
-        }
-      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
-        {
-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-             namespace, but it is not one of the ones we know about and
-             have already dealt with, above (inluding dump-script), then
-             report an error. Otherwise, targets might begin to believe
-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-             namespace. The first time any user complains about this, we'll
-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-             or a configure.ac-settable value.
-           */
-          lt_fatal ("Unrecognized option in %s namespace: '%s'",
-                    ltwrapper_option_prefix, argv[i]);
-        }
-      /* otherwise ... */
-      newargz[++newargc] = xstrdup (argv[i]);
-    }
-  newargz[++newargc] = NULL;
-
-  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+		  nonnull (lt_argv_zero));
   for (i = 0; i < newargc; i++)
     {
-      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+		      i, nonnull (newargz[i]));
     }
 
 EOF
@@ -3560,11 +4523,14 @@
 	      mingw*)
 		cat <<"EOF"
   /* execv doesn't actually work on mingw as expected on unix */
+  newargz = prepare_spawn (newargz);
   rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
   if (rval == -1)
     {
       /* failed to start process */
-      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+      lt_debugprintf (__FILE__, __LINE__,
+		      "(main) failed to launch target \"%s\": %s\n",
+		      lt_argv_zero, nonnull (strerror (errno)));
       return 127;
     }
   return rval;
@@ -3586,7 +4552,7 @@
 {
   void *p = (void *) malloc (num);
   if (!p)
-    lt_fatal ("Memory exhausted");
+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
 
   return p;
 }
@@ -3620,8 +4586,8 @@
 {
   struct stat st;
 
-  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+                  nonempty (path));
   if ((!path) || (!*path))
     return 0;
 
@@ -3638,8 +4604,8 @@
   int rval = 0;
   struct stat st;
 
-  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+                  nonempty (path));
   if ((!path) || (!*path))
     return 0;
 
@@ -3665,8 +4631,8 @@
   int tmp_len;
   char *concat_name;
 
-  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
-			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+                  nonempty (wrapper));
 
   if ((wrapper == NULL) || (*wrapper == '\0'))
     return NULL;
@@ -3719,7 +4685,8 @@
 		{
 		  /* empty path: current directory */
 		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal ("getcwd failed");
+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+                              nonnull (strerror (errno)));
 		  tmp_len = strlen (tmp);
 		  concat_name =
 		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
@@ -3744,7 +4711,8 @@
     }
   /* Relative path | not found in path: prepend cwd */
   if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+              nonnull (strerror (errno)));
   tmp_len = strlen (tmp);
   concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
   memcpy (concat_name, tmp, tmp_len);
@@ -3770,8 +4738,9 @@
   int has_symlinks = 0;
   while (strlen (tmp_pathspec) && !has_symlinks)
     {
-      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
-			      tmp_pathspec));
+      lt_debugprintf (__FILE__, __LINE__,
+		      "checking path component for symlinks: %s\n",
+		      tmp_pathspec);
       if (lstat (tmp_pathspec, &s) == 0)
 	{
 	  if (S_ISLNK (s.st_mode) != 0)
@@ -3793,8 +4762,9 @@
 	}
       else
 	{
-	  char *errstr = strerror (errno);
-	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+	  lt_fatal (__FILE__, __LINE__,
+		    "error accessing file \"%s\": %s",
+		    tmp_pathspec, nonnull (strerror (errno)));
 	}
     }
   XFREE (tmp_pathspec);
@@ -3807,7 +4777,8 @@
   tmp_pathspec = realpath (pathspec, buf);
   if (tmp_pathspec == 0)
     {
-      lt_fatal ("Could not follow symlinks for %s", pathspec);
+      lt_fatal (__FILE__, __LINE__,
+		"could not follow symlinks for %s", pathspec);
     }
   return xstrdup (tmp_pathspec);
 #endif
@@ -3833,11 +4804,25 @@
   return str;
 }
 
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  if (lt_debug)
+    {
+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+      va_start (args, fmt);
+      (void) vfprintf (stderr, fmt, args);
+      va_end (args);
+    }
+}
+
 static void
-lt_error_core (int exit_status, const char *mode,
+lt_error_core (int exit_status, const char *file,
+	       int line, const char *mode,
 	       const char *message, va_list ap)
 {
-  fprintf (stderr, "%s: %s: ", program_name, mode);
+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
   vfprintf (stderr, message, ap);
   fprintf (stderr, ".\n");
 
@@ -3846,20 +4831,32 @@
 }
 
 void
-lt_fatal (const char *message, ...)
+lt_fatal (const char *file, int line, const char *message, ...)
 {
   va_list ap;
   va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
   va_end (ap);
 }
 
+static const char *
+nonnull (const char *s)
+{
+  return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+  return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
 void
 lt_setenv (const char *name, const char *value)
 {
-  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_setenv) setting '%s' to '%s'\n",
+                  nonnull (name), nonnull (value));
   {
 #ifdef HAVE_SETENV
     /* always make a copy, for consistency with !HAVE_SETENV */
@@ -3904,95 +4901,12 @@
   return new_value;
 }
 
-int
-lt_split_name_value (const char *arg, char** name, char** value)
-{
-  const char *p;
-  int len;
-  if (!arg || !*arg)
-    return 1;
-
-  p = strchr (arg, (int)'=');
-
-  if (!p)
-    return 1;
-
-  *value = xstrdup (++p);
-
-  len = strlen (arg) - strlen (*value);
-  *name = XMALLOC (char, len);
-  strncpy (*name, arg, len-1);
-  (*name)[len - 1] = '\0';
-
-  return 0;
-}
-
-void
-lt_opt_process_env_set (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
-    }
-
-  lt_setenv (name, value);
-  XFREE (name);
-  XFREE (value);
-}
-
-void
-lt_opt_process_env_prepend (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-  char *new_value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
-    }
-
-  new_value = lt_extend_str (getenv (name), value, 0);
-  lt_setenv (name, new_value);
-  XFREE (new_value);
-  XFREE (name);
-  XFREE (value);
-}
-
-void
-lt_opt_process_env_append (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-  char *new_value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
-    }
-
-  new_value = lt_extend_str (getenv (name), value, 1);
-  lt_setenv (name, new_value);
-  XFREE (new_value);
-  XFREE (name);
-  XFREE (value);
-}
-
 void
 lt_update_exe_path (const char *name, const char *value)
 {
-  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
 
   if (name && *name && value && *value)
     {
@@ -4011,9 +4925,9 @@
 void
 lt_update_lib_path (const char *name, const char *value)
 {
-  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
 
   if (name && *name && value && *value)
     {
@@ -4023,11 +4937,158 @@
     }
 }
 
+EOF
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argv[i];
+
+      if (string[0] == '\0')
+	new_argv[i] = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+	{
+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+	  size_t length;
+	  unsigned int backslashes;
+	  const char *s;
+	  char *quoted_string;
+	  char *p;
+
+	  length = 0;
+	  backslashes = 0;
+	  if (quote_around)
+	    length++;
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		length += backslashes + 1;
+	      length++;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    length += backslashes + 1;
+
+	  quoted_string = XMALLOC (char, length + 1);
+
+	  p = quoted_string;
+	  backslashes = 0;
+	  if (quote_around)
+	    *p++ = '"';
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		{
+		  unsigned int j;
+		  for (j = backslashes + 1; j > 0; j--)
+		    *p++ = '\\';
+		}
+	      *p++ = c;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    {
+	      unsigned int j;
+	      for (j = backslashes; j > 0; j--)
+		*p++ = '\\';
+	      *p++ = '"';
+	    }
+	  *p = '\0';
+
+	  new_argv[i] = quoted_string;
+	}
+      else
+	new_argv[i] = (char *) string;
+    }
+  new_argv[argc] = NULL;
+
+  return new_argv;
+}
+EOF
+		;;
+	    esac
 
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+	    func_emit_wrapper yes |
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
+            cat <<"EOF"
+}
 EOF
 }
 # end: func_emit_cwrapperexe_src
 
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $opt_debug
+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+    *import*) : ;;
+    *) false ;;
+    esac
+}
+
 # func_mode_link arg...
 func_mode_link ()
 {
@@ -4072,6 +5133,7 @@
     new_inherited_linker_flags=
 
     avoid_version=no
+    bindir=
     dlfiles=
     dlprefiles=
     dlself=no
@@ -4164,6 +5226,11 @@
 	esac
 
 	case $prev in
+	bindir)
+	  bindir="$arg"
+	  prev=
+	  continue
+	  ;;
 	dlfiles|dlprefiles)
 	  if test "$preload" = no; then
 	    # Add the symbol object into the linking commands.
@@ -4195,9 +5262,9 @@
 	    ;;
 	  *)
 	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
+	      func_append dlfiles " $arg"
 	    else
-	      dlprefiles="$dlprefiles $arg"
+	      func_append dlprefiles " $arg"
 	    fi
 	    prev=
 	    continue
@@ -4221,7 +5288,7 @@
 	    *-*-darwin*)
 	      case "$deplibs " in
 		*" $qarg.ltframework "*) ;;
-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
 		   ;;
 	      esac
 	      ;;
@@ -4240,7 +5307,7 @@
 	    moreargs=
 	    for fil in `cat "$save_arg"`
 	    do
-#	      moreargs="$moreargs $fil"
+#	      func_append moreargs " $fil"
 	      arg=$fil
 	      # A libtool-controlled object.
 
@@ -4269,7 +5336,7 @@
 
 		  if test "$prev" = dlfiles; then
 		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
+		      func_append dlfiles " $pic_object"
 		      prev=
 		      continue
 		    else
@@ -4281,7 +5348,7 @@
 		  # CHECK ME:  I think I busted this.  -Ossama
 		  if test "$prev" = dlprefiles; then
 		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
+		    func_append dlprefiles " $pic_object"
 		    prev=
 		  fi
 
@@ -4351,12 +5418,12 @@
 	  if test "$prev" = rpath; then
 	    case "$rpath " in
 	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
+	    *) func_append rpath " $arg" ;;
 	    esac
 	  else
 	    case "$xrpath " in
 	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
+	    *) func_append xrpath " $arg" ;;
 	    esac
 	  fi
 	  prev=
@@ -4368,28 +5435,28 @@
 	  continue
 	  ;;
 	weak)
-	  weak_libs="$weak_libs $arg"
+	  func_append weak_libs " $arg"
 	  prev=
 	  continue
 	  ;;
 	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
 	  prev=
 	  func_append compile_command " $qarg"
 	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
 	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
+	  func_append compiler_flags " $qarg"
 	  prev=
 	  func_append compile_command " $qarg"
 	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
 	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $wl$qarg"
 	  prev=
 	  func_append compile_command " $wl$qarg"
 	  func_append finalize_command " $wl$qarg"
@@ -4425,6 +5492,11 @@
 	continue
 	;;
 
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
       -dlopen)
 	prev=dlfiles
 	continue
@@ -4475,15 +5547,16 @@
 	;;
 
       -L*)
-	func_stripname '-L' '' "$arg"
-	dir=$func_stripname_result
-	if test -z "$dir"; then
+	func_stripname "-L" '' "$arg"
+	if test -z "$func_stripname_result"; then
 	  if test "$#" -gt 0; then
 	    func_fatal_error "require no space between \`-L' and \`$1'"
 	  else
 	    func_fatal_error "need path for \`-L' option"
 	  fi
 	fi
+	func_resolve_sysroot "$func_stripname_result"
+	dir=$func_resolve_sysroot_result
 	# We need an absolute path.
 	case $dir in
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -4495,24 +5568,30 @@
 	  ;;
 	esac
 	case "$deplibs " in
-	*" -L$dir "*) ;;
+	*" -L$dir "* | *" $arg "*)
+	  # Will only happen for absolute or sysroot arguments
+	  ;;
 	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
+	  # Preserve sysroot, but never include relative directories
+	  case $dir in
+	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+	    *) func_append deplibs " -L$dir" ;;
+	  esac
+	  func_append lib_search_path " $dir"
 	  ;;
 	esac
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
 	  ::) dllsearchpath=$dir;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
+	  *) func_append dllsearchpath ":$dir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
 	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  *) func_append dllsearchpath ":$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -4522,7 +5601,7 @@
       -l*)
 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
 	    # These systems don't actually have a C or math library (as such)
 	    continue
 	    ;;
@@ -4536,7 +5615,7 @@
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs System.ltframework"
+	    func_append deplibs " System.ltframework"
 	    continue
 	    ;;
 	  *-*-sco3.2v5* | *-*-sco5v6*)
@@ -4556,7 +5635,7 @@
 	   ;;
 	 esac
 	fi
-	deplibs="$deplibs $arg"
+	func_append deplibs " $arg"
 	continue
 	;;
 
@@ -4568,21 +5647,22 @@
       # Tru64 UNIX uses -model [arg] to determine the layout of C++
       # classes, name mangling, and exception handling.
       # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot)
-	compiler_flags="$compiler_flags $arg"
+      -model|-arch|-isysroot|--sysroot)
+	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
 	prev=xcompiler
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	compiler_flags="$compiler_flags $arg"
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
 	case "$new_inherited_linker_flags " in
 	    *" $arg "*) ;;
-	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+	    * ) func_append new_inherited_linker_flags " $arg" ;;
 	esac
 	continue
 	;;
@@ -4649,13 +5729,17 @@
 	# We need an absolute path.
 	case $dir in
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	=*)
+	  func_stripname '=' '' "$dir"
+	  dir=$lt_sysroot$func_stripname_result
+	  ;;
 	*)
 	  func_fatal_error "only absolute run-paths are allowed"
 	  ;;
 	esac
 	case "$xrpath " in
 	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
+	*) func_append xrpath " $dir" ;;
 	esac
 	continue
 	;;
@@ -4708,8 +5792,8 @@
 	for flag in $args; do
 	  IFS="$save_ifs"
           func_quote_for_eval "$flag"
-	  arg="$arg $wl$func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
+	  func_append arg " $func_quote_for_eval_result"
+	  func_append compiler_flags " $func_quote_for_eval_result"
 	done
 	IFS="$save_ifs"
 	func_stripname ' ' '' "$arg"
@@ -4724,9 +5808,9 @@
 	for flag in $args; do
 	  IFS="$save_ifs"
           func_quote_for_eval "$flag"
-	  arg="$arg $wl$func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
-	  linker_flags="$linker_flags $func_quote_for_eval_result"
+	  func_append arg " $wl$func_quote_for_eval_result"
+	  func_append compiler_flags " $wl$func_quote_for_eval_result"
+	  func_append linker_flags " $func_quote_for_eval_result"
 	done
 	IFS="$save_ifs"
 	func_stripname ' ' '' "$arg"
@@ -4754,23 +5838,27 @@
 	arg="$func_quote_for_eval_result"
 	;;
 
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m*, -t[45]*, -txscale* pass through architecture-specific
-      # compiler args for GCC
-      # -F/path gives path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-      # @file GCC response files
+      # Flags to be passed through unchanged, with rationale:
+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
+      # -r[0-9][0-9]*        specify processor for the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
+      # -q*                  compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+      # -F/path              path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # @file                GCC response files
+      # -tp=*                Portland pgcc target processor selection
+      # --sysroot=*          for sysroot support
+      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
         func_quote_for_eval "$arg"
 	arg="$func_quote_for_eval_result"
         func_append compile_command " $arg"
         func_append finalize_command " $arg"
-        compiler_flags="$compiler_flags $arg"
+        func_append compiler_flags " $arg"
         continue
         ;;
 
@@ -4782,7 +5870,7 @@
 
       *.$objext)
 	# A standard object.
-	objs="$objs $arg"
+	func_append objs " $arg"
 	;;
 
       *.lo)
@@ -4813,7 +5901,7 @@
 
 	    if test "$prev" = dlfiles; then
 	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
+		func_append dlfiles " $pic_object"
 		prev=
 		continue
 	      else
@@ -4825,7 +5913,7 @@
 	    # CHECK ME:  I think I busted this.  -Ossama
 	    if test "$prev" = dlprefiles; then
 	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
+	      func_append dlprefiles " $pic_object"
 	      prev=
 	    fi
 
@@ -4870,24 +5958,25 @@
 
       *.$libext)
 	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
+	func_append deplibs " $arg"
+	func_append old_deplibs " $arg"
 	continue
 	;;
 
       *.la)
 	# A libtool-controlled library.
 
+	func_resolve_sysroot "$arg"
 	if test "$prev" = dlfiles; then
 	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
+	  func_append dlfiles " $func_resolve_sysroot_result"
 	  prev=
 	elif test "$prev" = dlprefiles; then
 	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
+	  func_append dlprefiles " $func_resolve_sysroot_result"
 	  prev=
 	else
-	  deplibs="$deplibs $arg"
+	  func_append deplibs " $func_resolve_sysroot_result"
 	fi
 	continue
 	;;
@@ -4925,7 +6014,7 @@
 
     if test -n "$shlibpath_var"; then
       # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
     else
       shlib_search_path=
     fi
@@ -4934,6 +6023,8 @@
 
     func_dirname "$output" "/" ""
     output_objdir="$func_dirname_result$objdir"
+    func_to_tool_file "$output_objdir/"
+    tool_output_objdir=$func_to_tool_file_result
     # Create the object directory.
     func_mkdir_p "$output_objdir"
 
@@ -4954,12 +6045,12 @@
     # Find all interdependent deplibs by searching for libraries
     # that are linked more than once (e.g. -la -lb -la)
     for deplib in $deplibs; do
-      if $opt_duplicate_deps ; then
+      if $opt_preserve_dup_deps ; then
 	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	esac
       fi
-      libs="$libs $deplib"
+      func_append libs " $deplib"
     done
 
     if test "$linkmode" = lib; then
@@ -4972,9 +6063,9 @@
       if $opt_duplicate_compiler_generated_deps; then
 	for pre_post_dep in $predeps $postdeps; do
 	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
 	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
+	  func_append pre_post_deps " $pre_post_dep"
 	done
       fi
       pre_post_deps=
@@ -5044,17 +6135,19 @@
 	for lib in $dlprefiles; do
 	  # Ignore non-libtool-libs
 	  dependency_libs=
+	  func_resolve_sysroot "$lib"
 	  case $lib in
-	  *.la)	func_source "$lib" ;;
+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
 	  esac
 
 	  # Collect preopened libtool deplibs, except any this library
 	  # has declared as weak libs
 	  for deplib in $dependency_libs; do
-            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+	    func_basename "$deplib"
+            deplib_base=$func_basename_result
 	    case " $weak_libs " in
 	    *" $deplib_base "*) ;;
-	    *) deplibs="$deplibs $deplib" ;;
+	    *) func_append deplibs " $deplib" ;;
 	    esac
 	  done
 	done
@@ -5070,16 +6163,17 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
-	    compiler_flags="$compiler_flags $deplib"
+	    func_append compiler_flags " $deplib"
 	    if test "$linkmode" = lib ; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
 		esac
 	    fi
 	  fi
@@ -5164,7 +6258,7 @@
 	    if test "$linkmode" = lib ; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
 		esac
 	    fi
 	  fi
@@ -5177,7 +6271,8 @@
 	    test "$pass" = conv && continue
 	    newdependency_libs="$deplib $newdependency_libs"
 	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  prog)
 	    if test "$pass" = conv; then
@@ -5191,7 +6286,8 @@
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    fi
 	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  *)
 	    func_warning "\`-L' is ignored for archives/objects"
@@ -5202,17 +6298,21 @@
 	-R*)
 	  if test "$pass" = link; then
 	    func_stripname '-R' '' "$deplib"
-	    dir=$func_stripname_result
+	    func_resolve_sysroot "$func_stripname_result"
+	    dir=$func_resolve_sysroot_result
 	    # Make sure the xrpath contains only unique directories.
 	    case "$xrpath " in
 	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
+	    *) func_append xrpath " $dir" ;;
 	    esac
 	  fi
 	  deplibs="$deplib $deplibs"
 	  continue
 	  ;;
-	*.la) lib="$deplib" ;;
+	*.la)
+	  func_resolve_sysroot "$deplib"
+	  lib=$func_resolve_sysroot_result
+	  ;;
 	*.$libext)
 	  if test "$pass" = conv; then
 	    deplibs="$deplib $deplibs"
@@ -5230,7 +6330,7 @@
 		match_pattern*)
 		  set dummy $deplibs_check_method; shift
 		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
 		    | $EGREP "$match_pattern_regex" > /dev/null; then
 		    valid_a_lib=yes
 		  fi
@@ -5240,15 +6340,15 @@
 		;;
 	      esac
 	      if test "$valid_a_lib" != yes; then
-		$ECHO
+		echo
 		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
-		$ECHO "*** that it is just a static archive that I should not use here."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because the file extensions .$libext of this argument makes me believe"
+		echo "*** that it is just a static archive that I should not use here."
 	      else
-		$ECHO
+		echo
 		$ECHO "*** Warning: Linking the shared library $output against the"
 		$ECHO "*** static library $deplib is not portable!"
 		deplibs="$deplib $deplibs"
@@ -5275,11 +6375,11 @@
 	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
 	      # If there is no dlopen support or we're linking statically,
 	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
+	      func_append newdlprefiles " $deplib"
 	      compile_deplibs="$deplib $compile_deplibs"
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    else
-	      newdlfiles="$newdlfiles $deplib"
+	      func_append newdlfiles " $deplib"
 	    fi
 	  fi
 	  continue
@@ -5321,20 +6421,20 @@
 
 	# Convert "-framework foo" to "foo.ltframework"
 	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
 	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
 	    case " $new_inherited_linker_flags " in
 	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
 	    esac
 	  done
 	fi
-	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	if test "$linkmode,$pass" = "lib,link" ||
 	   test "$linkmode,$pass" = "prog,scan" ||
 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
 	fi
 
 	if test "$pass" = conv; then
@@ -5345,17 +6445,17 @@
 	      func_fatal_error "cannot find name of link library for \`$lib'"
 	    fi
 	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
 	    tmp_libs=
 	    for deplib in $dependency_libs; do
 	      deplibs="$deplib $deplibs"
-	      if $opt_duplicate_deps ; then
+	      if $opt_preserve_dup_deps ; then
 		case "$tmp_libs " in
-		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 		esac
 	      fi
-	      tmp_libs="$tmp_libs $deplib"
+	      func_append tmp_libs " $deplib"
 	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
@@ -5366,9 +6466,15 @@
 
 	# Get the name of the library we link against.
 	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
+	if test -n "$old_library" &&
+	   { test "$prefer_static_libs" = yes ||
+	     test "$prefer_static_libs,$installed" = "built,no"; }; then
+	  linklib=$old_library
+	else
+	  for l in $old_library $library_names; do
+	    linklib="$l"
+	  done
+	fi
 	if test -z "$linklib"; then
 	  func_fatal_error "cannot find name of link library for \`$lib'"
 	fi
@@ -5385,9 +6491,9 @@
 	    # statically, we need to preload.  We also need to preload any
 	    # dependent libraries so libltdl's deplib preloader doesn't
 	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
+	    func_append dlprefiles " $lib $dependency_libs"
 	  else
-	    newdlfiles="$newdlfiles $lib"
+	    func_append newdlfiles " $lib"
 	  fi
 	  continue
 	fi # $pass = dlopen
@@ -5409,14 +6515,14 @@
 
 	# Find the relevant object directory and library name.
 	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
 	    func_warning "library \`$lib' was moved."
 	    dir="$ladir"
 	    absdir="$abs_ladir"
 	    libdir="$abs_ladir"
 	  else
-	    dir="$libdir"
-	    absdir="$libdir"
+	    dir="$lt_sysroot$libdir"
+	    absdir="$lt_sysroot$libdir"
 	  fi
 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
 	else
@@ -5424,12 +6530,12 @@
 	    dir="$ladir"
 	    absdir="$abs_ladir"
 	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
+	    func_append notinst_path " $abs_ladir"
 	  else
 	    dir="$ladir/$objdir"
 	    absdir="$abs_ladir/$objdir"
 	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
+	    func_append notinst_path " $abs_ladir"
 	  fi
 	fi # $installed = yes
 	func_stripname 'lib' '.la' "$laname"
@@ -5440,20 +6546,46 @@
 	  if test -z "$libdir" && test "$linkmode" = prog; then
 	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
 	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	    # Keep a list of preopened convenience libraries to check
-	    # that they are being used correctly in the link pass.
-	    test -z "$libdir" && \
-		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
+	  case "$host" in
+	    # special handling for platforms with PE-DLLs.
+	    *cygwin* | *mingw* | *cegcc* )
+	      # Linker will automatically link against shared library if both
+	      # static and shared are present.  Therefore, ensure we extract
+	      # symbols from the import library if a shared library is present
+	      # (otherwise, the dlopen module name will be incorrect).  We do
+	      # this by putting the import library name into $newdlprefiles.
+	      # We recover the dlopen module name by 'saving' the la file
+	      # name in a special purpose variable, and (later) extracting the
+	      # dlname from the la file.
+	      if test -n "$dlname"; then
+	        func_tr_sh "$dir/$linklib"
+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+	        func_append newdlprefiles " $dir/$linklib"
+	      else
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      fi
+	    ;;
+	    * )
+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
+	      # are required to link).
+	      if test -n "$old_library"; then
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
+	      elif test -n "$dlname"; then
+	        func_append newdlprefiles " $dir/$dlname"
+	      else
+	        func_append newdlprefiles " $dir/$linklib"
+	      fi
+	    ;;
+	  esac
 	fi # $pass = dlpreopen
 
 	if test -z "$libdir"; then
@@ -5471,7 +6603,7 @@
 
 
 	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
+	  func_append newlib_search_path " $ladir"
 	  deplibs="$lib $deplibs"
 
 	  linkalldeplibs=no
@@ -5484,7 +6616,8 @@
 	  for deplib in $dependency_libs; do
 	    case $deplib in
 	    -L*) func_stripname '-L' '' "$deplib"
-	         newlib_search_path="$newlib_search_path $func_stripname_result"
+	         func_resolve_sysroot "$func_stripname_result"
+	         func_append newlib_search_path " $func_resolve_sysroot_result"
 		 ;;
 	    esac
 	    # Need to link against all dependency_libs?
@@ -5495,12 +6628,12 @@
 	      # or/and link against static libraries
 	      newdependency_libs="$deplib $newdependency_libs"
 	    fi
-	    if $opt_duplicate_deps ; then
+	    if $opt_preserve_dup_deps ; then
 	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	      esac
 	    fi
-	    tmp_libs="$tmp_libs $deplib"
+	    func_append tmp_libs " $deplib"
 	  done # for deplib
 	  continue
 	fi # $linkmode = prog...
@@ -5515,7 +6648,7 @@
 	      # Make sure the rpath contains only unique directories.
 	      case "$temp_rpath:" in
 	      *"$absdir:"*) ;;
-	      *) temp_rpath="$temp_rpath$absdir:" ;;
+	      *) func_append temp_rpath "$absdir:" ;;
 	      esac
 	    fi
 
@@ -5527,7 +6660,7 @@
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
+	      *) func_append compile_rpath " $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5536,7 +6669,7 @@
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
+	      *) func_append finalize_rpath " $libdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5561,12 +6694,12 @@
 	  case $host in
 	  *cygwin* | *mingw* | *cegcc*)
 	      # No point in relinking DLLs because paths are not encoded
-	      notinst_deplibs="$notinst_deplibs $lib"
+	      func_append notinst_deplibs " $lib"
 	      need_relink=no
 	    ;;
 	  *)
 	    if test "$installed" = no; then
-	      notinst_deplibs="$notinst_deplibs $lib"
+	      func_append notinst_deplibs " $lib"
 	      need_relink=yes
 	    fi
 	    ;;
@@ -5583,7 +6716,7 @@
 	    fi
 	  done
 	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-	    $ECHO
+	    echo
 	    if test "$linkmode" = prog; then
 	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
 	    else
@@ -5601,7 +6734,7 @@
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
+	      *) func_append compile_rpath " $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5610,7 +6743,7 @@
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
+	      *) func_append finalize_rpath " $libdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5664,7 +6797,7 @@
 	    linklib=$newlib
 	  fi # test -n "$old_archive_from_expsyms_cmds"
 
-	  if test "$linkmode" = prog || test "$mode" != relink; then
+	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
@@ -5686,9 +6819,9 @@
 		      if test "X$dlopenmodule" != "X$lib"; then
 			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
 			if test -z "$old_library" ; then
-			  $ECHO
-			  $ECHO "*** And there doesn't seem to be a static archive available"
-			  $ECHO "*** The link will probably fail, sorry"
+			  echo
+			  echo "*** And there doesn't seem to be a static archive available"
+			  echo "*** The link will probably fail, sorry"
 			else
 			  add="$dir/$old_library"
 			fi
@@ -5715,12 +6848,12 @@
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
 		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
 		      ;;
 		  esac
 		fi
@@ -5742,7 +6875,7 @@
 	    if test -n "$add_shlibpath"; then
 	      case :$compile_shlibpath: in
 	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
 	      esac
 	    fi
 	    if test "$linkmode" = prog; then
@@ -5756,13 +6889,13 @@
 		 test "$hardcode_shlibpath_var" = yes; then
 		case :$finalize_shlibpath: in
 		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
 		esac
 	      fi
 	    fi
 	  fi
 
-	  if test "$linkmode" = prog || test "$mode" = relink; then
+	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
@@ -5776,7 +6909,7 @@
 	    elif test "$hardcode_shlibpath_var" = yes; then
 	      case :$finalize_shlibpath: in
 	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+	      *) func_append finalize_shlibpath "$libdir:" ;;
 	      esac
 	      add="-l$name"
 	    elif test "$hardcode_automatic" = yes; then
@@ -5793,7 +6926,7 @@
 	      if test -n "$inst_prefix_dir"; then
 		case $libdir in
 		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
 		    ;;
 		esac
 	      fi
@@ -5828,21 +6961,21 @@
 
 	    # Just print a warning and add the library to dependency_libs so
 	    # that the program can be linked against the static library.
-	    $ECHO
+	    echo
 	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
-	    $ECHO "*** I have the capability to make that library automatically link in when"
-	    $ECHO "*** you link to this library.  But I can only do this if you have a"
-	    $ECHO "*** shared version of the library, which you do not appear to have."
+	    echo "*** I have the capability to make that library automatically link in when"
+	    echo "*** you link to this library.  But I can only do this if you have a"
+	    echo "*** shared version of the library, which you do not appear to have."
 	    if test "$module" = yes; then
-	      $ECHO "*** But as you try to build a module library, libtool will still create "
-	      $ECHO "*** a static module, that should work as long as the dlopening application"
-	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      echo "*** But as you try to build a module library, libtool will still create "
+	      echo "*** a static module, that should work as long as the dlopening application"
+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
 	      if test -z "$global_symbol_pipe"; then
-		$ECHO
-		$ECHO "*** However, this would only work if libtool was able to extract symbol"
-		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$ECHO "*** not find such a program.  So, this module is probably useless."
-		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+		echo
+		echo "*** However, this would only work if libtool was able to extract symbol"
+		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		echo "*** not find such a program.  So, this module is probably useless."
+		echo "*** \`nm' from GNU binutils and a full rebuild may help."
 	      fi
 	      if test "$build_old_libs" = no; then
 		build_libtool_libs=module
@@ -5870,27 +7003,33 @@
 	           temp_xrpath=$func_stripname_result
 		   case " $xrpath " in
 		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
+		   *) func_append xrpath " $temp_xrpath";;
 		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
+	      *) func_append temp_deplibs " $libdir";;
 	      esac
 	    done
 	    dependency_libs="$temp_deplibs"
 	  fi
 
-	  newlib_search_path="$newlib_search_path $absdir"
+	  func_append newlib_search_path " $absdir"
 	  # Link against this library
 	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
 	  # ... and its dependency_libs
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    newdependency_libs="$deplib $newdependency_libs"
-	    if $opt_duplicate_deps ; then
+	    case $deplib in
+              -L*) func_stripname '-L' '' "$deplib"
+                   func_resolve_sysroot "$func_stripname_result";;
+              *) func_resolve_sysroot "$deplib" ;;
+            esac
+	    if $opt_preserve_dup_deps ; then
 	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
 	      esac
 	    fi
-	    tmp_libs="$tmp_libs $deplib"
+	    func_append tmp_libs " $func_resolve_sysroot_result"
 	  done
 
 	  if test "$link_all_deplibs" != no; then
@@ -5900,8 +7039,10 @@
 	      case $deplib in
 	      -L*) path="$deplib" ;;
 	      *.la)
+	        func_resolve_sysroot "$deplib"
+	        deplib=$func_resolve_sysroot_result
 	        func_dirname "$deplib" "" "."
-		dir="$func_dirname_result"
+		dir=$func_dirname_result
 		# We need an absolute path.
 		case $dir in
 		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
@@ -5928,8 +7069,8 @@
                       if test -z "$darwin_install_name"; then
                           darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
                       fi
-		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
 		      path=
 		    fi
 		  fi
@@ -5962,7 +7103,7 @@
 	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
 	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
 	else
-	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	fi
       fi
       dependency_libs="$newdependency_libs"
@@ -5979,7 +7120,7 @@
 	  for dir in $newlib_search_path; do
 	    case "$lib_search_path " in
 	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
+	    *) func_append lib_search_path " $dir" ;;
 	    esac
 	  done
 	  newlib_search_path=
@@ -6037,10 +7178,10 @@
 	    -L*)
 	      case " $tmp_libs " in
 	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
+	      *) func_append tmp_libs " $deplib" ;;
 	      esac
 	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
+	    *) func_append tmp_libs " $deplib" ;;
 	    esac
 	  done
 	  eval $var=\"$tmp_libs\"
@@ -6056,7 +7197,7 @@
 	  ;;
 	esac
 	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
+	  func_append tmp_libs " $i"
 	fi
       done
       dependency_libs=$tmp_libs
@@ -6097,7 +7238,7 @@
       # Now set the variables for building old libraries.
       build_libtool_libs=no
       oldlibs="$output"
-      objs="$objs$old_deplibs"
+      func_append objs "$old_deplibs"
       ;;
 
     lib)
@@ -6130,10 +7271,10 @@
 	if test "$deplibs_check_method" != pass_all; then
 	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
 	else
-	  $ECHO
+	  echo
 	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
 	  $ECHO "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
+	  func_append libobjs " $objs"
 	fi
       fi
 
@@ -6192,13 +7333,14 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
 	    age="$number_minor"
 	    revision="$number_revision"
 	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
+	  freebsd-aout|freebsd-elf|qnx|sunos)
 	    current="$number_major"
 	    revision="$number_minor"
 	    age="0"
@@ -6311,7 +7453,7 @@
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -6334,7 +7476,7 @@
 	  done
 
 	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
+	  func_append verstring ":${current}.0"
 	  ;;
 
 	qnx)
@@ -6402,10 +7544,10 @@
       fi
 
       func_generate_dlsyms "$libname" "$libname" "yes"
-      libobjs="$libobjs $symfileobj"
+      func_append libobjs " $symfileobj"
       test "X$libobjs" = "X " && libobjs=
 
-      if test "$mode" != relink; then
+      if test "$opt_mode" != relink; then
 	# Remove our outputs, but don't remove object files since they
 	# may have been created when compiling PIC objects.
 	removelist=
@@ -6421,7 +7563,7 @@
 		   continue
 		 fi
 	       fi
-	       removelist="$removelist $p"
+	       func_append removelist " $p"
 	       ;;
 	    *) ;;
 	  esac
@@ -6432,27 +7574,28 @@
 
       # Now set the variables for building old libraries.
       if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+	func_append oldlibs " $output_objdir/$libname.$libext"
 
 	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
       fi
 
       # Eliminate all temporary directories.
       #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
-      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
       #done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
 	temp_xrpath=
 	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
+	  func_replace_sysroot "$libdir"
+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
 	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
@@ -6466,7 +7609,7 @@
       for lib in $old_dlfiles; do
 	case " $dlprefiles $dlfiles " in
 	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
+	*) func_append dlfiles " $lib" ;;
 	esac
       done
 
@@ -6476,19 +7619,19 @@
       for lib in $old_dlprefiles; do
 	case "$dlprefiles " in
 	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
+	*) func_append dlprefiles " $lib" ;;
 	esac
       done
 
       if test "$build_libtool_libs" = yes; then
 	if test -n "$rpath"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
 	    # these systems don't actually have a c library (as such)!
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs System.ltframework"
+	    func_append deplibs " System.ltframework"
 	    ;;
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
@@ -6505,7 +7648,7 @@
 	  *)
 	    # Add libc to deplibs on all other systems if necessary.
 	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
+	      func_append deplibs " -lc"
 	    fi
 	    ;;
 	  esac
@@ -6554,7 +7697,7 @@
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
+		    func_append newdeplibs " $i"
 		    i=""
 		    ;;
 		  esac
@@ -6565,21 +7708,21 @@
 		  set dummy $deplib_matches; shift
 		  deplib_match=$1
 		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
+		    func_append newdeplibs " $i"
 		  else
 		    droppeddeps=yes
-		    $ECHO
+		    echo
 		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		    $ECHO "*** I have the capability to make that library automatically link in when"
-		    $ECHO "*** you link to this library.  But I can only do this if you have a"
-		    $ECHO "*** shared version of the library, which I believe you do not have"
-		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
-		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
+		    echo "*** I have the capability to make that library automatically link in when"
+		    echo "*** you link to this library.  But I can only do this if you have a"
+		    echo "*** shared version of the library, which I believe you do not have"
+		    echo "*** because a test_compile did reveal that the linker did not use it for"
+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
 		  fi
 		fi
 		;;
 	      *)
-		newdeplibs="$newdeplibs $i"
+		func_append newdeplibs " $i"
 		;;
 	      esac
 	    done
@@ -6597,7 +7740,7 @@
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
 		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
+		      func_append newdeplibs " $i"
 		      i=""
 		      ;;
 		    esac
@@ -6608,29 +7751,29 @@
 		    set dummy $deplib_matches; shift
 		    deplib_match=$1
 		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
+		      func_append newdeplibs " $i"
 		    else
 		      droppeddeps=yes
-		      $ECHO
+		      echo
 		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		      $ECHO "*** I have the capability to make that library automatically link in when"
-		      $ECHO "*** you link to this library.  But I can only do this if you have a"
-		      $ECHO "*** shared version of the library, which you do not appear to have"
-		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
-		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
+		      echo "*** I have the capability to make that library automatically link in when"
+		      echo "*** you link to this library.  But I can only do this if you have a"
+		      echo "*** shared version of the library, which you do not appear to have"
+		      echo "*** because a test_compile did reveal that the linker did not use this one"
+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
 		    fi
 		  fi
 		else
 		  droppeddeps=yes
-		  $ECHO
+		  echo
 		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $ECHO "*** make it link in!  You will probably need to install it or some"
-		  $ECHO "*** library that it depends on before this library will be fully"
-		  $ECHO "*** functional.  Installing it before continuing would be even better."
+		  echo "*** make it link in!  You will probably need to install it or some"
+		  echo "*** library that it depends on before this library will be fully"
+		  echo "*** functional.  Installing it before continuing would be even better."
 		fi
 		;;
 	      *)
-		newdeplibs="$newdeplibs $i"
+		func_append newdeplibs " $i"
 		;;
 	      esac
 	    done
@@ -6647,15 +7790,27 @@
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
+		  func_append newdeplibs " $a_deplib"
 		  a_deplib=""
 		  ;;
 		esac
 	      fi
 	      if test -n "$a_deplib" ; then
 		libname=`eval "\\$ECHO \"$libname_spec\""`
+		if test -n "$file_magic_glob"; then
+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+		else
+		  libnameglob=$libname
+		fi
+		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  if test "$want_nocaseglob" = yes; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
 		  for potent_lib in $potential_libs; do
 		      # Follow soft links.
 		      if ls -lLd "$potent_lib" 2>/dev/null |
@@ -6672,13 +7827,13 @@
 			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
 			case $potliblink in
 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
 			esac
 		      done
 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
 			 $SED -e 10q |
 			 $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
+			func_append newdeplibs " $a_deplib"
 			a_deplib=""
 			break 2
 		      fi
@@ -6687,12 +7842,12 @@
 	      fi
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
-		$ECHO
+		echo
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because I did check the linker path looking for a file starting"
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
 		if test -z "$potlib" ; then
 		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
 		else
@@ -6703,7 +7858,7 @@
 	      ;;
 	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
+	      func_append newdeplibs " $a_deplib"
 	      ;;
 	    esac
 	  done # Gone through all deplibs.
@@ -6719,7 +7874,7 @@
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
+		  func_append newdeplibs " $a_deplib"
 		  a_deplib=""
 		  ;;
 		esac
@@ -6730,9 +7885,9 @@
 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
 		  for potent_lib in $potential_libs; do
 		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
 		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
+		      func_append newdeplibs " $a_deplib"
 		      a_deplib=""
 		      break 2
 		    fi
@@ -6741,12 +7896,12 @@
 	      fi
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
-		$ECHO
+		echo
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because I did check the linker path looking for a file starting"
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
 		if test -z "$potlib" ; then
 		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
 		else
@@ -6757,32 +7912,32 @@
 	      ;;
 	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
+	      func_append newdeplibs " $a_deplib"
 	      ;;
 	    esac
 	  done # Gone through all deplibs.
 	  ;;
 	none | unknown | *)
 	  newdeplibs=""
-	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
-	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
 	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 	    for i in $predeps $postdeps ; do
 	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
 	    done
 	  fi
-	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
-	     $GREP . >/dev/null; then
-	    $ECHO
+	  case $tmp_deplibs in
+	  *[!\	\ ]*)
+	    echo
 	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
 	    else
-	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
+	      echo "*** Warning: inter-library dependencies are not known to be supported."
 	    fi
-	    $ECHO "*** All declared inter-library dependencies are being dropped."
+	    echo "*** All declared inter-library dependencies are being dropped."
 	    droppeddeps=yes
-	  fi
+	    ;;
+	  esac
 	  ;;
 	esac
 	versuffix=$versuffix_save
@@ -6794,23 +7949,23 @@
 	case $host in
 	*-*-rhapsody* | *-*-darwin1.[012])
 	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
 	  ;;
 	esac
 
 	if test "$droppeddeps" = yes; then
 	  if test "$module" = yes; then
-	    $ECHO
-	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
+	    echo
+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
 	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $ECHO "*** a static module, that should work as long as the dlopening"
-	    $ECHO "*** application is linked with the -dlopen flag."
+	    echo "*** a static module, that should work as long as the dlopening"
+	    echo "*** application is linked with the -dlopen flag."
 	    if test -z "$global_symbol_pipe"; then
-	      $ECHO
-	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
-	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $ECHO "*** not find such a program.  So, this module is probably useless."
-	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+	      echo
+	      echo "*** However, this would only work if libtool was able to extract symbol"
+	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      echo "*** not find such a program.  So, this module is probably useless."
+	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
 	    fi
 	    if test "$build_old_libs" = no; then
 	      oldlibs="$output_objdir/$libname.$libext"
@@ -6820,16 +7975,16 @@
 	      build_libtool_libs=no
 	    fi
 	  else
-	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
-	    $ECHO "*** automatically added whenever a program is linked with this library"
-	    $ECHO "*** or is declared to -dlopen it."
+	    echo "*** The inter-library dependencies that have been dropped here will be"
+	    echo "*** automatically added whenever a program is linked with this library"
+	    echo "*** or is declared to -dlopen it."
 
 	    if test "$allow_undefined" = no; then
-	      $ECHO
-	      $ECHO "*** Since this library must not contain undefined symbols,"
-	      $ECHO "*** because either the platform does not support them or"
-	      $ECHO "*** it was explicitly requested with -no-undefined,"
-	      $ECHO "*** libtool will only create a static version of it."
+	      echo
+	      echo "*** Since this library must not contain undefined symbols,"
+	      echo "*** because either the platform does not support them or"
+	      echo "*** it was explicitly requested with -no-undefined,"
+	      echo "*** libtool will only create a static version of it."
 	      if test "$build_old_libs" = no; then
 		oldlibs="$output_objdir/$libname.$libext"
 		build_libtool_libs=module
@@ -6846,9 +8001,9 @@
       # Time to change all our "foo.ltframework" stuff back to "-framework foo"
       case $host in
 	*-*-darwin*)
-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	  ;;
       esac
 
@@ -6861,7 +8016,7 @@
 	*)
 	  case " $deplibs " in
 	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
+	    func_append new_libs " -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -6871,10 +8026,10 @@
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
+	  *) func_append new_libs " $deplib" ;;
 	  esac
 	  ;;
-	*) new_libs="$new_libs $deplib" ;;
+	*) func_append new_libs " $deplib" ;;
 	esac
       done
       deplibs="$new_libs"
@@ -6886,15 +8041,22 @@
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
 	  dep_rpath=
 	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
 	  for libdir in $rpath; do
 	    if test -n "$hardcode_libdir_flag_spec"; then
 	      if test -n "$hardcode_libdir_separator"; then
+		func_replace_sysroot "$libdir"
+		libdir=$func_replace_sysroot_result
 		if test -z "$hardcode_libdirs"; then
 		  hardcode_libdirs="$libdir"
 		else
@@ -6903,18 +8065,18 @@
 		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		    ;;
 		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		    ;;
 		  esac
 		fi
 	      else
 		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
+		func_append dep_rpath " $flag"
 	      fi
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -6922,17 +8084,13 @@
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
 	    rpath=
 	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
+	      func_append rpath "$dir:"
 	    done
 	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
 	  fi
@@ -6940,7 +8098,7 @@
 	fi
 
 	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
 	if test -n "$shlibpath"; then
 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 	fi
@@ -6966,18 +8124,18 @@
 	linknames=
 	for link
 	do
-	  linknames="$linknames $link"
+	  func_append linknames " $link"
 	done
 
 	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
 	test "X$libobjs" = "X " && libobjs=
 
 	delfiles=
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
 	  export_symbols="$output_objdir/$libname.uexp"
-	  delfiles="$delfiles $export_symbols"
+	  func_append delfiles " $export_symbols"
 	fi
 
 	orig_export_symbols=
@@ -7008,13 +8166,45 @@
 	    $opt_dry_run || $RM $export_symbols
 	    cmds=$export_symbols_cmds
 	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
+	    for cmd1 in $cmds; do
 	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      func_len " $cmd"
-	      len=$func_len_result
-	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	      # Take the normal branch if the nm_file_list_spec branch
+	      # doesn't work or if tool conversion is not needed.
+	      case $nm_file_list_spec~$to_tool_file_cmd in
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test "$try_normal_branch" = yes \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		output=${output_objdir}/${output_la}.nm
+		func_to_tool_file "$output"
+		libobjs=$nm_file_list_spec$func_to_tool_file_result
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
 		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
 		skipped_export=false
 	      else
 		# The command line is too long to execute in one step.
@@ -7036,7 +8226,7 @@
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	  tmp_export_symbols="$export_symbols"
 	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 	fi
 
 	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
@@ -7048,7 +8238,7 @@
 	  # global variables. join(1) would be nice here, but unfortunately
 	  # isn't a blessed tool.
 	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
 	  export_symbols=$output_objdir/$libname.def
 	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	fi
@@ -7058,7 +8248,7 @@
 	  case " $convenience " in
 	  *" $test_deplib "*) ;;
 	  *)
-	    tmp_deplibs="$tmp_deplibs $test_deplib"
+	    func_append tmp_deplibs " $test_deplib"
 	    ;;
 	  esac
 	done
@@ -7078,21 +8268,21 @@
 	    test "X$libobjs" = "X " && libobjs=
 	  else
 	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
+	    func_append generated " $gentop"
 
 	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
+	    func_append libobjs " $func_extract_archives_result"
 	    test "X$libobjs" = "X " && libobjs=
 	  fi
 	fi
 
 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
+	  func_append linker_flags " $flag"
 	fi
 
 	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
+	if test "$opt_mode" = relink; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 	fi
 
@@ -7137,7 +8327,8 @@
 	    save_libobjs=$libobjs
 	  fi
 	  save_output=$output
-	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
+	  func_basename "$output"
+	  output_la=$func_basename_result
 
 	  # Clear the reloadable object creation command queue and
 	  # initialize k to one.
@@ -7150,13 +8341,16 @@
 	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
 	    output=${output_objdir}/${output_la}.lnkscript
 	    func_verbose "creating GNU ld script: $output"
-	    $ECHO 'INPUT (' > $output
+	    echo 'INPUT (' > $output
 	    for obj in $save_libobjs
 	    do
-	      $ECHO "$obj" >> $output
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
 	    done
-	    $ECHO ')' >> $output
-	    delfiles="$delfiles $output"
+	    echo ')' >> $output
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
 	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
 	    output=${output_objdir}/${output_la}.lnk
 	    func_verbose "creating linker input file list: $output"
@@ -7170,10 +8364,12 @@
 	    fi
 	    for obj
 	    do
-	      $ECHO "$obj" >> $output
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
 	    done
-	    delfiles="$delfiles $output"
-	    output=$firstobj\"$file_list_spec$output\"
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
 	  else
 	    if test -n "$save_libobjs"; then
 	      func_verbose "creating reloadable object files..."
@@ -7197,17 +8393,19 @@
 		  # command to the queue.
 		  if test "$k" -eq 1 ; then
 		    # The first file doesn't have a previous command to add.
-		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+		    reload_objs=$objlist
+		    eval concat_cmds=\"$reload_cmds\"
 		  else
 		    # All subsequent reloadable object files will link in
 		    # the last one created.
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+		    reload_objs="$objlist $last_robj"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
 		  fi
 		  last_robj=$output_objdir/$output_la-${k}.$objext
 		  func_arith $k + 1
 		  k=$func_arith_result
 		  output=$output_objdir/$output_la-${k}.$objext
-		  objlist=$obj
+		  objlist=" $obj"
 		  func_len " $last_robj"
 		  func_arith $len0 + $func_len_result
 		  len=$func_arith_result
@@ -7217,11 +8415,12 @@
 	      # reloadable object file.  All subsequent reloadable object
 	      # files will link in the last one created.
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+	      reload_objs="$objlist $last_robj"
+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
 	      if test -n "$last_robj"; then
 	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
 	      fi
-	      delfiles="$delfiles $output"
+	      func_append delfiles " $output"
 
 	    else
 	      output=
@@ -7255,7 +8454,7 @@
 		lt_exit=$?
 
 		# Restore the uninstalled library and exit
-		if test "$mode" = relink; then
+		if test "$opt_mode" = relink; then
 		  ( cd "$output_objdir" && \
 		    $RM "${realname}T" && \
 		    $MV "${realname}U" "$realname" )
@@ -7276,7 +8475,7 @@
 	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	      tmp_export_symbols="$export_symbols"
 	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 	    fi
 
 	    if test -n "$orig_export_symbols"; then
@@ -7288,7 +8487,7 @@
 	      # global variables. join(1) would be nice here, but unfortunately
 	      # isn't a blessed tool.
 	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
 	      export_symbols=$output_objdir/$libname.def
 	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	    fi
@@ -7329,10 +8528,10 @@
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
 	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
-	  libobjs="$libobjs $func_extract_archives_result"
+	  func_append libobjs " $func_extract_archives_result"
 	  test "X$libobjs" = "X " && libobjs=
 	fi
 
@@ -7348,7 +8547,7 @@
 	    lt_exit=$?
 
 	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
+	    if test "$opt_mode" = relink; then
 	      ( cd "$output_objdir" && \
 	        $RM "${realname}T" && \
 		$MV "${realname}U" "$realname" )
@@ -7360,7 +8559,7 @@
 	IFS="$save_ifs"
 
 	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
+	if test "$opt_mode" = relink; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
 
 	  if test -n "$convenience"; then
@@ -7441,18 +8640,21 @@
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $convenience
 	  reload_conv_objs="$reload_objs $func_extract_archives_result"
 	fi
       fi
 
+      # If we're not building shared, we need to use non_pic_objs
+      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
       # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
 
       output="$obj"
       func_execute_cmds "$reload_cmds" 'exit $?'
@@ -7512,8 +8714,8 @@
       case $host in
       *-*-rhapsody* | *-*-darwin1.[012])
 	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
 	;;
       esac
 
@@ -7524,14 +8726,14 @@
 	if test "$tagname" = CXX ; then
 	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
 	    10.[0123])
-	      compile_command="$compile_command ${wl}-bind_at_load"
-	      finalize_command="$finalize_command ${wl}-bind_at_load"
+	      func_append compile_command " ${wl}-bind_at_load"
+	      func_append finalize_command " ${wl}-bind_at_load"
 	    ;;
 	  esac
 	fi
 	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	;;
       esac
 
@@ -7545,7 +8747,7 @@
 	*)
 	  case " $compile_deplibs " in
 	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
+	    func_append new_libs " -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -7555,17 +8757,17 @@
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
+	  *) func_append new_libs " $deplib" ;;
 	  esac
 	  ;;
-	*) new_libs="$new_libs $deplib" ;;
+	*) func_append new_libs " $deplib" ;;
 	esac
       done
       compile_deplibs="$new_libs"
 
 
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
 
       if test -n "$rpath$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -7573,7 +8775,7 @@
 	  # This is the magic to use -rpath.
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
       fi
@@ -7592,18 +8794,18 @@
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  *) func_append perm_rpath " $libdir" ;;
 	  esac
 	fi
 	case $host in
@@ -7612,12 +8814,12 @@
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
 	  ::) dllsearchpath=$libdir;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  *) func_append dllsearchpath ":$libdir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
 	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  *) func_append dllsearchpath ":$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -7643,18 +8845,18 @@
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$finalize_perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
 	  esac
 	fi
       done
@@ -7668,8 +8870,8 @@
 
       if test -n "$libobjs" && test "$build_old_libs" = yes; then
 	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
       fi
 
       func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
@@ -7681,15 +8883,15 @@
 
       wrappers_required=yes
       case $host in
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
       *cygwin* | *mingw* )
         if test "$build_libtool_libs" != yes; then
           wrappers_required=no
         fi
         ;;
-      *cegcc)
-        # Disable wrappers for cegcc, we are cross compiling anyway.
-        wrappers_required=no
-        ;;
       *)
         if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
           wrappers_required=no
@@ -7698,13 +8900,19 @@
       esac
       if test "$wrappers_required" = no; then
 	# Replace the output file specification.
-	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
 	exit_status=0
 	func_show_eval "$link_command" 'exit_status=$?'
 
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
 	# Delete the generated files.
 	if test -f "$output_objdir/${outputname}S.${objext}"; then
 	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
@@ -7727,7 +8935,7 @@
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -7735,7 +8943,7 @@
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -7745,11 +8953,18 @@
 	# We don't need to create a wrapper script.
 	link_command="$compile_var$compile_command$compile_rpath"
 	# Replace the output file specification.
-	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
 	# Delete the old output file.
 	$opt_dry_run || $RM $output
 	# Link the executable and exit
 	func_show_eval "$link_command" 'exit $?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
 	exit $EXIT_SUCCESS
       fi
 
@@ -7764,7 +8979,7 @@
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -7776,13 +8991,19 @@
       fi
 
       # Replace the output file specification.
-      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
 
       # Delete the old output files.
       $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
 
       func_show_eval "$link_command" 'exit $?'
 
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
       # Now create the wrapper script.
       func_verbose "creating $output"
 
@@ -7800,18 +9021,7 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $ECHO for shipping.
-      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
       fi
 
       # Only actually do things if not in dry run mode.
@@ -7891,7 +9101,7 @@
 	else
 	  oldobjs="$old_deplibs $non_pic_objects"
 	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    oldobjs="$oldobjs $symfileobj"
+	    func_append oldobjs " $symfileobj"
 	  fi
 	fi
 	addlibs="$old_convenience"
@@ -7899,10 +9109,10 @@
 
       if test -n "$addlibs"; then
 	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
+	func_append generated " $gentop"
 
 	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
+	func_append oldobjs " $func_extract_archives_result"
       fi
 
       # Do each command in the archive commands.
@@ -7913,10 +9123,10 @@
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
 	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
-	  oldobjs="$oldobjs $func_extract_archives_result"
+	  func_append oldobjs " $func_extract_archives_result"
 	fi
 
 	# POSIX demands no paths to be encoded in archives.  We have
@@ -7932,9 +9142,9 @@
 	    done | sort | sort -uc >/dev/null 2>&1); then
 	  :
 	else
-	  $ECHO "copying selected object files to avoid basename conflicts..."
+	  echo "copying selected object files to avoid basename conflicts..."
 	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 	  func_mkdir_p "$gentop"
 	  save_oldobjs=$oldobjs
 	  oldobjs=
@@ -7958,18 +9168,30 @@
 		esac
 	      done
 	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
 	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
+	    *) func_append oldobjs " $obj" ;;
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
 	len=$func_len_result
 	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
 	else
 	  # the command line is too long to link in one step, link in parts
 	  func_verbose "using piecewise archive linking..."
@@ -8043,7 +9265,7 @@
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -8063,12 +9285,23 @@
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
-		newdependency_libs="$newdependency_libs $libdir/$name"
+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
 		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
+		;;
+	      *) func_append newdependency_libs " $deplib" ;;
 	      esac
 	    done
 	    dependency_libs="$newdependency_libs"
@@ -8082,9 +9315,9 @@
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlfiles="$newdlfiles $libdir/$name"
+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
-	      *) newdlfiles="$newdlfiles $lib" ;;
+	      *) func_append newdlfiles " $lib" ;;
 	      esac
 	    done
 	    dlfiles="$newdlfiles"
@@ -8101,7 +9334,7 @@
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlprefiles="$newdlprefiles $libdir/$name"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	      esac
 	    done
@@ -8113,7 +9346,7 @@
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      newdlfiles="$newdlfiles $abs"
+	      func_append newdlfiles " $abs"
 	    done
 	    dlfiles="$newdlfiles"
 	    newdlprefiles=
@@ -8122,15 +9355,33 @@
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      newdlprefiles="$newdlprefiles $abs"
+	      func_append newdlprefiles " $abs"
 	    done
 	    dlprefiles="$newdlprefiles"
 	  fi
 	  $RM $output
 	  # place dlname in correct position for cygwin
+	  # In fact, it would be nice if we could use this code for all target
+	  # systems that can't hard-code library paths into their executables
+	  # and that have no shared library path variable independent of PATH,
+	  # but it turns out we can't easily determine that from inspecting
+	  # libtool variables, so we have to hard-code the OSs to which it
+	  # applies here; at the moment, that means platforms that use the PE
+	  # object format with DLL files.  See the long comment at the top of
+	  # tests/bindir.at for full details.
 	  tdlname=$dlname
 	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+	      # If a -bindir argument was supplied, place the dll there.
+	      if test "x$bindir" != x ;
+	      then
+		func_relative_path "$install_libdir" "$bindir"
+		tdlname=$func_relative_path_result$dlname
+	      else
+		# Otherwise fall back on heuristic.
+		tdlname=../bin/$dlname
+	      fi
+	      ;;
 	  esac
 	  $ECHO > $output "\
 # $outputname - a libtool library file
@@ -8189,7 +9440,7 @@
     exit $EXIT_SUCCESS
 }
 
-{ test "$mode" = link || test "$mode" = relink; } &&
+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
     func_mode_link ${1+"$@"}
 
 
@@ -8209,9 +9460,9 @@
     for arg
     do
       case $arg in
-      -f) RM="$RM $arg"; rmforce=yes ;;
-      -*) RM="$RM $arg" ;;
-      *) files="$files $arg" ;;
+      -f) func_append RM " $arg"; rmforce=yes ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
       esac
     done
 
@@ -8220,24 +9471,23 @@
 
     rmdirs=
 
-    origobjdir="$objdir"
     for file in $files; do
       func_dirname "$file" "" "."
       dir="$func_dirname_result"
       if test "X$dir" = X.; then
-	objdir="$origobjdir"
+	odir="$objdir"
       else
-	objdir="$dir/$origobjdir"
+	odir="$dir/$objdir"
       fi
       func_basename "$file"
       name="$func_basename_result"
-      test "$mode" = uninstall && objdir="$dir"
+      test "$opt_mode" = uninstall && odir="$dir"
 
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test "$opt_mode" = clean; then
 	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
 	esac
       fi
 
@@ -8263,18 +9513,17 @@
 
 	  # Delete the libtool libraries and symlinks.
 	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
+	    func_append rmfiles " $odir/$n"
 	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
 
-	  case "$mode" in
+	  case "$opt_mode" in
 	  clean)
-	    case "  $library_names " in
-	    # "  " in the beginning catches empty $dlname
+	    case " $library_names " in
 	    *" $dlname "*) ;;
-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
 	    esac
-	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
 	    ;;
 	  uninstall)
 	    if test -n "$library_names"; then
@@ -8302,19 +9551,19 @@
 	  # Add PIC object to the list of files to remove.
 	  if test -n "$pic_object" &&
 	     test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
+	    func_append rmfiles " $dir/$pic_object"
 	  fi
 
 	  # Add non-PIC object to the list of files to remove.
 	  if test -n "$non_pic_object" &&
 	     test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
+	    func_append rmfiles " $dir/$non_pic_object"
 	  fi
 	fi
 	;;
 
       *)
-	if test "$mode" = clean ; then
+	if test "$opt_mode" = clean ; then
 	  noexename=$name
 	  case $file in
 	  *.exe)
@@ -8324,7 +9573,7 @@
 	    noexename=$func_stripname_result
 	    # $file with .exe has already been added to rmfiles,
 	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
+	    func_append rmfiles " $file"
 	    ;;
 	  esac
 	  # Do a test to see if this is a libtool program.
@@ -8333,7 +9582,7 @@
 	      func_ltwrapper_scriptname "$file"
 	      relink_command=
 	      func_source $func_ltwrapper_scriptname_result
-	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
 	    else
 	      relink_command=
 	      func_source $dir/$noexename
@@ -8341,12 +9590,12 @@
 
 	    # note $name still contains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
 	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
+	      func_append rmfiles " $odir/lt-$name"
 	    fi
 	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	      func_append rmfiles " $odir/lt-${noexename}.c"
 	    fi
 	  fi
 	fi
@@ -8354,7 +9603,6 @@
       esac
       func_show_eval "$RM $rmfiles" 'exit_status=1'
     done
-    objdir="$origobjdir"
 
     # Try to remove the ${objdir}s in the directories where we deleted files
     for dir in $rmdirs; do
@@ -8366,16 +9614,16 @@
     exit $exit_status
 }
 
-{ test "$mode" = uninstall || test "$mode" = clean; } &&
+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
     func_mode_uninstall ${1+"$@"}
 
-test -z "$mode" && {
+test -z "$opt_mode" && {
   help="$generic_help"
   func_fatal_help "you must specify a MODE"
 }
 
 test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$mode'"
+  func_fatal_help "invalid operation mode \`$opt_mode'"
 
 if test -n "$exec_cmd"; then
   eval exec "$exec_cmd"
diff -Nru orage-4.8.3/Makefile.am orage-4.12.1/Makefile.am
--- orage-4.8.3/Makefile.am	2010-12-07 22:51:12.000000000 +0000
+++ orage-4.12.1/Makefile.am	2015-04-10 10:26:26.000000000 +0000
@@ -31,7 +31,6 @@
 endif
 
 EXTRA_DIST =								\
-	mkinstalldirs  							\
 	intltool-extract.in						\
 	intltool-merge.in						\
 	intltool-update.in						\
diff -Nru orage-4.8.3/Makefile.in orage-4.12.1/Makefile.in
--- orage-4.8.3/Makefile.in	2012-01-04 12:52:49.000000000 +0000
+++ orage-4.12.1/Makefile.in	2015-04-10 10:26:52.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +17,51 @@
 # $Id$
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -38,30 +82,49 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/xfcalendar.spec.in $(top_srcdir)/configure AUTHORS \
-	COPYING ChangeLog INSTALL NEWS TODO compile config.guess \
-	config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.h.in $(srcdir)/xfcalendar.spec.in COPYING \
+	TODO compile config.guess config.sub install-sh missing \
+	ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = xfcalendar.spec
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -83,24 +146,55 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(servicedir)"
 DATA = $(desktop_DATA) $(service_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = libical doc icons po sounds src panel-plugin globaltime \
 	tz_convert plugin
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -128,11 +222,15 @@
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
+DIST_TARGETS = dist-bzip2 dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -158,6 +256,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -181,6 +280,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -206,6 +309,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -231,6 +335,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -251,6 +357,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -279,11 +386,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -325,7 +433,6 @@
 @HAVE_DBUS_TRUE@service_in_files = org.xfce.calendar.service.in org.xfce.orage.service.in
 @HAVE_DBUS_TRUE@service_DATA = $(service_in_files:.service.in=.service)
 EXTRA_DIST = \
-	mkinstalldirs  							\
 	intltool-extract.in						\
 	intltool-merge.in						\
 	intltool-update.in						\
@@ -348,7 +455,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -384,10 +491,8 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -412,8 +517,11 @@
 	-rm -f libtool config.lt
 install-desktopDATA: $(desktop_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -427,13 +535,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
+	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
 install-serviceDATA: $(service_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
 	@list='$(service_DATA)'; test -n "$(servicedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -447,27 +556,28 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(service_DATA)'; test -n "$(servicedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(servicedir)" && rm -f $$files
+	dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -482,57 +592,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -548,12 +613,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -565,15 +625,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -582,9 +638,31 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -620,13 +698,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -655,36 +730,41 @@
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
 
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -695,8 +775,8 @@
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -706,17 +786,19 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -739,13 +821,21 @@
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -779,10 +869,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -863,15 +958,14 @@
 
 uninstall-am: uninstall-desktopDATA uninstall-serviceDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	ctags-recursive install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) all install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-hdr \
-	distclean-libtool distclean-local distclean-tags \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+	dist-xz dist-zip distcheck distclean distclean-generic \
+	distclean-hdr distclean-libtool distclean-local distclean-tags \
 	distcleancheck distdir distuninstallcheck dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-desktopDATA install-dvi install-dvi-am \
@@ -881,7 +975,7 @@
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am \
+	ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-desktopDATA uninstall-serviceDATA
 
 @INTLTOOL_DESKTOP_RULE@
diff -Nru orage-4.8.3/missing orage-4.12.1/missing
--- orage-4.8.3/missing	2012-01-04 12:52:47.000000000 +0000
+++ orage-4.12.1/missing	2015-04-10 10:26:52.000000000 +0000
@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,69 +25,40 @@
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
+case $1 in
 
-msg="missing on your system"
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
 
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
@@ -100,272 +70,141 @@
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
 
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
 
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
 
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff -Nru orage-4.8.3/mkinstalldirs orage-4.12.1/mkinstalldirs
--- orage-4.8.3/mkinstalldirs	2012-01-04 12:52:49.000000000 +0000
+++ orage-4.12.1/mkinstalldirs	1970-01-01 00:00:00.000000000 +0000
@@ -1,162 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2009-04-28.21; # UTC
-
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-IFS=" ""	$nl"
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake@gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage"
-      exit $?
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --version)
-      echo "$0 $scriptversion"
-      exit $?
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error.  This is a problem when calling mkinstalldirs
-# from a parallel make.  We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
-  '')
-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    else
-      # On NextStep and OpenStep, the `mkdir' command does not
-      # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
-      # exists.
-      test -d ./-p && rmdir ./-p
-      test -d ./--version && rmdir ./--version
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-       test ! -d ./--version; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    else
-      # Clean up after NextStep and OpenStep mkdir.
-      for d in ./-m ./-p ./--version "./$dirmode";
-      do
-        test -d $d && rmdir $d
-      done
-    fi
-    ;;
-esac
-
-for file
-do
-  case $file in
-    /*) pathcomp=/ ;;
-    *)  pathcomp= ;;
-  esac
-  oIFS=$IFS
-  IFS=/
-  set fnord $file
-  shift
-  IFS=$oIFS
-
-  for d
-  do
-    test "x$d" = x && continue
-
-    pathcomp=$pathcomp$d
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
-      else
-	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-	  lasterr=
-	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	  if test ! -z "$lasterr"; then
-	    errstatus=$lasterr
-	  fi
-	fi
-      fi
-    fi
-
-    pathcomp=$pathcomp/
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff -Nru orage-4.8.3/NEWS orage-4.12.1/NEWS
--- orage-4.8.3/NEWS	2012-01-04 08:10:29.000000000 +0000
+++ orage-4.12.1/NEWS	2015-04-10 10:26:26.000000000 +0000
@@ -1,3 +1,19 @@
+20130201: Version 4.8.4
+---------
+        * Production fix release 
+        * new translations for ar, be, bg, ca, cs, da, de, el, en_GK, 
+                es, eu, fr, he, hi, hr, hu, id, it, ja, ko, lt, nn, pl, 
+                pt, pt_BR, ru, sk, sr, uk, ug, zh_CN, zh_TW
+            * Translated to 41 languages now (> 80% complete) (23 to 100%)
+        * fixed bug 8525: Orage keeps notifying every second on "All day events"
+        * fixed bug 4817: anchor('#') does not work in help links
+        * fixed bug 9243: strptime() needs _XOPEN_SOURCE_EXTENDED to be defined
+        * fixed bug 9248: internal libical fix SSPM_UNKNOWN_MINOR_TYPE
+        * enhancement bug 8231: alarm type is selectable for foreign files
+        * enhancement bug 9739: new TODOs start as NOT completed
+        * enhancement bug 9738: main window sorts TODOs by due-date
+        * enhancement bug 9598: tooltip shows title and location bold
+
 20120105: Version 4.8.3
 ---------
         * Production fix release 
diff -Nru orage-4.8.3/panel-plugin/Makefile.am orage-4.12.1/panel-plugin/Makefile.am
--- orage-4.8.3/panel-plugin/Makefile.am	2010-12-14 13:26:37.000000000 +0000
+++ orage-4.12.1/panel-plugin/Makefile.am	2015-04-10 10:26:26.000000000 +0000
@@ -1,57 +1,49 @@
 if HAVE_LIBXFCE4PANEL
-plugin_PROGRAMS = xfce4-orageclock-plugin
+plugin_LTLIBRARIES = liborageclock.la
 endif
 
-plugindir = $(libexecdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel/plugins
 
-xfce4_orageclock_plugin_CFLAGS =					\
+liborageclock_la_CFLAGS =					\
 	-DPACKAGE_DATA_DIR=\"$(datadir)\"				\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"			\
 	@LIBXFCE4PANEL_CFLAGS@
 
-xfce4_orageclock_plugin_LDFLAGS =					\
+liborageclock_la_LDFLAGS =					\
+	-avoid-version							\
+	-module									\
+	-no-undefined 							\
+	-export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \
+	$(PLATFORM_LDFLAGS)
+
+liborageclock_la_LIBADD =					\
 	@LIBXFCE4PANEL_LIBS@                            \
 	-lX11
 
-xfce4_orageclock_plugin_SOURCES = 					\
-	oc_config.c										\
-	timezone_selection.c							\
-	timezone_selection.h							\
-	../src/tz_zoneinfo_read.c						\
-	../src/tz_zoneinfo_read.h						\
-	xfce4-orageclock-plugin.c						\
-	xfce4-orageclock-plugin.h                       \
-    ../src/functions.c                              \
-    ../src/functions.h
+liborageclock_la_SOURCES = 				\
+	oc_config.c								\
+	timezone_selection.c					\
+	timezone_selection.h					\
+	../src/tz_zoneinfo_read.c				\
+	../src/tz_zoneinfo_read.h				\
+	xfce4-orageclock-plugin.c				\
+	xfce4-orageclock-plugin.h               \
+	../src/functions.c						\
+	../src/functions.h
 
 if HAVE_CYGWIN
-xfce4_orageclock_plugin_LDFLAGS +=                 \
+liborageclock_la_LDFLAGS +=                 \
 	-no-undefined
 endif
 
 # .desktop file
 #
-# Some automake trickery here. Because we cannot use $(libexecdir) in the
-# automake stage, we'll use sed to get the full path into the .desktop file.
-# We also need to let intltool merge the translated fields, so we add an
-# additional level of indirection: a <name>.desktop.in.in file.
-# 
-desktop_in_in_files = xfce4-orageclock-plugin.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+desktop_in_files = xfce4-orageclock-plugin.desktop.in
 	
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel/plugins
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST = 								\
-	$(desktop_in_in_files)
-
-DISTCLEANFILES =							\
-	$(desktop_DATA) $(desktop_in_files)
-	
-# get full path into .desktop file
-#%.desktop.in: %.desktop.in.in
-xfce4-orageclock-plugin.desktop.in: xfce4-orageclock-plugin.desktop.in.in
-	sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
-		$< > $@
+EXTRA_DIST = $(desktop_in_files)
 
+DISTCLEANFILES = $(desktop_DATA)
diff -Nru orage-4.8.3/panel-plugin/Makefile.in orage-4.12.1/panel-plugin/Makefile.in
--- orage-4.8.3/panel-plugin/Makefile.in	2012-01-04 12:52:49.000000000 +0000
+++ orage-4.12.1/panel-plugin/Makefile.in	2015-04-10 10:26:54.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,51 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,51 +80,20 @@
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-@HAVE_LIBXFCE4PANEL_TRUE@plugin_PROGRAMS =  \
-@HAVE_LIBXFCE4PANEL_TRUE@	xfce4-orageclock-plugin$(EXEEXT)
 @HAVE_CYGWIN_TRUE@am__append_1 = \
 @HAVE_CYGWIN_TRUE@	-no-undefined
 
 subdir = panel-plugin
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(desktopdir)"
-PROGRAMS = $(plugin_PROGRAMS)
-am_xfce4_orageclock_plugin_OBJECTS =  \
-	xfce4_orageclock_plugin-oc_config.$(OBJEXT) \
-	xfce4_orageclock_plugin-timezone_selection.$(OBJEXT) \
-	xfce4_orageclock_plugin-tz_zoneinfo_read.$(OBJEXT) \
-	xfce4_orageclock_plugin-xfce4-orageclock-plugin.$(OBJEXT) \
-	xfce4_orageclock_plugin-functions.$(OBJEXT)
-xfce4_orageclock_plugin_OBJECTS =  \
-	$(am_xfce4_orageclock_plugin_OBJECTS)
-xfce4_orageclock_plugin_LDADD = $(LDADD)
-xfce4_orageclock_plugin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) \
-	$(xfce4_orageclock_plugin_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(xfce4_orageclock_plugin_SOURCES)
-DIST_SOURCES = $(xfce4_orageclock_plugin_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -102,13 +115,97 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(desktopdir)"
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+liborageclock_la_DEPENDENCIES =
+am_liborageclock_la_OBJECTS = liborageclock_la-oc_config.lo \
+	liborageclock_la-timezone_selection.lo \
+	liborageclock_la-tz_zoneinfo_read.lo \
+	liborageclock_la-xfce4-orageclock-plugin.lo \
+	liborageclock_la-functions.lo
+liborageclock_la_OBJECTS = $(am_liborageclock_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+liborageclock_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(liborageclock_la_CFLAGS) $(CFLAGS) \
+	$(liborageclock_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_LIBXFCE4PANEL_TRUE@am_liborageclock_la_rpath = -rpath \
+@HAVE_LIBXFCE4PANEL_TRUE@	$(plugindir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(liborageclock_la_SOURCES)
+DIST_SOURCES = $(liborageclock_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(desktop_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -134,6 +231,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -157,6 +255,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -182,6 +284,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -207,6 +310,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -227,6 +332,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -255,11 +361,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -279,43 +386,40 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-plugindir = $(libexecdir)/xfce4/panel-plugins
-xfce4_orageclock_plugin_CFLAGS = \
+@HAVE_LIBXFCE4PANEL_TRUE@plugin_LTLIBRARIES = liborageclock.la
+plugindir = $(libdir)/xfce4/panel/plugins
+liborageclock_la_CFLAGS = \
 	-DPACKAGE_DATA_DIR=\"$(datadir)\"				\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"			\
 	@LIBXFCE4PANEL_CFLAGS@
 
-xfce4_orageclock_plugin_LDFLAGS = @LIBXFCE4PANEL_LIBS@ -lX11 \
-	$(am__append_1)
-xfce4_orageclock_plugin_SOURCES = \
-	oc_config.c										\
-	timezone_selection.c							\
-	timezone_selection.h							\
-	../src/tz_zoneinfo_read.c						\
-	../src/tz_zoneinfo_read.h						\
-	xfce4-orageclock-plugin.c						\
-	xfce4-orageclock-plugin.h                       \
-    ../src/functions.c                              \
-    ../src/functions.h
+liborageclock_la_LDFLAGS = -avoid-version -module -no-undefined \
+	-export-symbols-regex \
+	'^xfce_panel_module_(preinit|init|construct)' \
+	$(PLATFORM_LDFLAGS) $(am__append_1)
+liborageclock_la_LIBADD = \
+	@LIBXFCE4PANEL_LIBS@                            \
+	-lX11
+
+liborageclock_la_SOURCES = \
+	oc_config.c								\
+	timezone_selection.c					\
+	timezone_selection.h					\
+	../src/tz_zoneinfo_read.c				\
+	../src/tz_zoneinfo_read.h				\
+	xfce4-orageclock-plugin.c				\
+	xfce4-orageclock-plugin.h               \
+	../src/functions.c						\
+	../src/functions.h
 
 
 # .desktop file
 #
-# Some automake trickery here. Because we cannot use $(libexecdir) in the
-# automake stage, we'll use sed to get the full path into the .desktop file.
-# We also need to let intltool merge the translated fields, so we add an
-# additional level of indirection: a <name>.desktop.in.in file.
-# 
-desktop_in_in_files = xfce4-orageclock-plugin.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktop_in_files = xfce4-orageclock-plugin.desktop.in
+desktopdir = $(datadir)/xfce4/panel/plugins
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-EXTRA_DIST = \
-	$(desktop_in_in_files)
-
-DISTCLEANFILES = \
-	$(desktop_DATA) $(desktop_in_files)
-
+EXTRA_DIST = $(desktop_in_files)
+DISTCLEANFILES = $(desktop_DATA)
 all: all-am
 
 .SUFFIXES:
@@ -350,52 +454,44 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-pluginPROGRAMS: $(plugin_PROGRAMS)
+
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(plugindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(plugindir)$$dir" || exit $$?; \
-	    } \
-	; done
+	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
+	}
 
-uninstall-pluginPROGRAMS:
+uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_PROGRAMS)'; test -n "$(plugindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-
-clean-pluginPROGRAMS:
-	@list='$(plugin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-xfce4-orageclock-plugin$(EXEEXT): $(xfce4_orageclock_plugin_OBJECTS) $(xfce4_orageclock_plugin_DEPENDENCIES) 
-	@rm -f xfce4-orageclock-plugin$(EXEEXT)
-	$(xfce4_orageclock_plugin_LINK) $(xfce4_orageclock_plugin_OBJECTS) $(xfce4_orageclock_plugin_LDADD) $(LIBS)
+	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
+	done
+
+clean-pluginLTLIBRARIES:
+	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+liborageclock.la: $(liborageclock_la_OBJECTS) $(liborageclock_la_DEPENDENCIES) $(EXTRA_liborageclock_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(liborageclock_la_LINK) $(am_liborageclock_la_rpath) $(liborageclock_la_OBJECTS) $(liborageclock_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -403,102 +499,67 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_orageclock_plugin-functions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_orageclock_plugin-oc_config.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_orageclock_plugin-timezone_selection.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_orageclock_plugin-tz_zoneinfo_read.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_orageclock_plugin-xfce4-orageclock-plugin.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborageclock_la-functions.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborageclock_la-oc_config.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborageclock_la-timezone_selection.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborageclock_la-tz_zoneinfo_read.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborageclock_la-xfce4-orageclock-plugin.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-xfce4_orageclock_plugin-oc_config.o: oc_config.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -MT xfce4_orageclock_plugin-oc_config.o -MD -MP -MF $(DEPDIR)/xfce4_orageclock_plugin-oc_config.Tpo -c -o xfce4_orageclock_plugin-oc_config.o `test -f 'oc_config.c' || echo '$(srcdir)/'`oc_config.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xfce4_orageclock_plugin-oc_config.Tpo $(DEPDIR)/xfce4_orageclock_plugin-oc_config.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='oc_config.c' object='xfce4_orageclock_plugin-oc_config.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_orageclock_plugin-oc_config.o `test -f 'oc_config.c' || echo '$(srcdir)/'`oc_config.c
-
-xfce4_orageclock_plugin-oc_config.obj: oc_config.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -MT xfce4_orageclock_plugin-oc_config.obj -MD -MP -MF $(DEPDIR)/xfce4_orageclock_plugin-oc_config.Tpo -c -o xfce4_orageclock_plugin-oc_config.obj `if test -f 'oc_config.c'; then $(CYGPATH_W) 'oc_config.c'; else $(CYGPATH_W) '$(srcdir)/oc_config.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xfce4_orageclock_plugin-oc_config.Tpo $(DEPDIR)/xfce4_orageclock_plugin-oc_config.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='oc_config.c' object='xfce4_orageclock_plugin-oc_config.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_orageclock_plugin-oc_config.obj `if test -f 'oc_config.c'; then $(CYGPATH_W) 'oc_config.c'; else $(CYGPATH_W) '$(srcdir)/oc_config.c'; fi`
-
-xfce4_orageclock_plugin-timezone_selection.o: timezone_selection.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -MT xfce4_orageclock_plugin-timezone_selection.o -MD -MP -MF $(DEPDIR)/xfce4_orageclock_plugin-timezone_selection.Tpo -c -o xfce4_orageclock_plugin-timezone_selection.o `test -f 'timezone_selection.c' || echo '$(srcdir)/'`timezone_selection.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xfce4_orageclock_plugin-timezone_selection.Tpo $(DEPDIR)/xfce4_orageclock_plugin-timezone_selection.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='timezone_selection.c' object='xfce4_orageclock_plugin-timezone_selection.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_orageclock_plugin-timezone_selection.o `test -f 'timezone_selection.c' || echo '$(srcdir)/'`timezone_selection.c
-
-xfce4_orageclock_plugin-timezone_selection.obj: timezone_selection.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -MT xfce4_orageclock_plugin-timezone_selection.obj -MD -MP -MF $(DEPDIR)/xfce4_orageclock_plugin-timezone_selection.Tpo -c -o xfce4_orageclock_plugin-timezone_selection.obj `if test -f 'timezone_selection.c'; then $(CYGPATH_W) 'timezone_selection.c'; else $(CYGPATH_W) '$(srcdir)/timezone_selection.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xfce4_orageclock_plugin-timezone_selection.Tpo $(DEPDIR)/xfce4_orageclock_plugin-timezone_selection.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='timezone_selection.c' object='xfce4_orageclock_plugin-timezone_selection.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_orageclock_plugin-timezone_selection.obj `if test -f 'timezone_selection.c'; then $(CYGPATH_W) 'timezone_selection.c'; else $(CYGPATH_W) '$(srcdir)/timezone_selection.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-xfce4_orageclock_plugin-tz_zoneinfo_read.o: ../src/tz_zoneinfo_read.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -MT xfce4_orageclock_plugin-tz_zoneinfo_read.o -MD -MP -MF $(DEPDIR)/xfce4_orageclock_plugin-tz_zoneinfo_read.Tpo -c -o xfce4_orageclock_plugin-tz_zoneinfo_read.o `test -f '../src/tz_zoneinfo_read.c' || echo '$(srcdir)/'`../src/tz_zoneinfo_read.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xfce4_orageclock_plugin-tz_zoneinfo_read.Tpo $(DEPDIR)/xfce4_orageclock_plugin-tz_zoneinfo_read.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/tz_zoneinfo_read.c' object='xfce4_orageclock_plugin-tz_zoneinfo_read.o' libtool=no @AMDEPBACKSLASH@
+liborageclock_la-oc_config.lo: oc_config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborageclock_la_CFLAGS) $(CFLAGS) -MT liborageclock_la-oc_config.lo -MD -MP -MF $(DEPDIR)/liborageclock_la-oc_config.Tpo -c -o liborageclock_la-oc_config.lo `test -f 'oc_config.c' || echo '$(srcdir)/'`oc_config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liborageclock_la-oc_config.Tpo $(DEPDIR)/liborageclock_la-oc_config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='oc_config.c' object='liborageclock_la-oc_config.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_orageclock_plugin-tz_zoneinfo_read.o `test -f '../src/tz_zoneinfo_read.c' || echo '$(srcdir)/'`../src/tz_zoneinfo_read.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborageclock_la_CFLAGS) $(CFLAGS) -c -o liborageclock_la-oc_config.lo `test -f 'oc_config.c' || echo '$(srcdir)/'`oc_config.c
 
-xfce4_orageclock_plugin-tz_zoneinfo_read.obj: ../src/tz_zoneinfo_read.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -MT xfce4_orageclock_plugin-tz_zoneinfo_read.obj -MD -MP -MF $(DEPDIR)/xfce4_orageclock_plugin-tz_zoneinfo_read.Tpo -c -o xfce4_orageclock_plugin-tz_zoneinfo_read.obj `if test -f '../src/tz_zoneinfo_read.c'; then $(CYGPATH_W) '../src/tz_zoneinfo_read.c'; else $(CYGPATH_W) '$(srcdir)/../src/tz_zoneinfo_read.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xfce4_orageclock_plugin-tz_zoneinfo_read.Tpo $(DEPDIR)/xfce4_orageclock_plugin-tz_zoneinfo_read.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/tz_zoneinfo_read.c' object='xfce4_orageclock_plugin-tz_zoneinfo_read.obj' libtool=no @AMDEPBACKSLASH@
+liborageclock_la-timezone_selection.lo: timezone_selection.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborageclock_la_CFLAGS) $(CFLAGS) -MT liborageclock_la-timezone_selection.lo -MD -MP -MF $(DEPDIR)/liborageclock_la-timezone_selection.Tpo -c -o liborageclock_la-timezone_selection.lo `test -f 'timezone_selection.c' || echo '$(srcdir)/'`timezone_selection.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liborageclock_la-timezone_selection.Tpo $(DEPDIR)/liborageclock_la-timezone_selection.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='timezone_selection.c' object='liborageclock_la-timezone_selection.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_orageclock_plugin-tz_zoneinfo_read.obj `if test -f '../src/tz_zoneinfo_read.c'; then $(CYGPATH_W) '../src/tz_zoneinfo_read.c'; else $(CYGPATH_W) '$(srcdir)/../src/tz_zoneinfo_read.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborageclock_la_CFLAGS) $(CFLAGS) -c -o liborageclock_la-timezone_selection.lo `test -f 'timezone_selection.c' || echo '$(srcdir)/'`timezone_selection.c
 
-xfce4_orageclock_plugin-xfce4-orageclock-plugin.o: xfce4-orageclock-plugin.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -MT xfce4_orageclock_plugin-xfce4-orageclock-plugin.o -MD -MP -MF $(DEPDIR)/xfce4_orageclock_plugin-xfce4-orageclock-plugin.Tpo -c -o xfce4_orageclock_plugin-xfce4-orageclock-plugin.o `test -f 'xfce4-orageclock-plugin.c' || echo '$(srcdir)/'`xfce4-orageclock-plugin.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xfce4_orageclock_plugin-xfce4-orageclock-plugin.Tpo $(DEPDIR)/xfce4_orageclock_plugin-xfce4-orageclock-plugin.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xfce4-orageclock-plugin.c' object='xfce4_orageclock_plugin-xfce4-orageclock-plugin.o' libtool=no @AMDEPBACKSLASH@
+liborageclock_la-tz_zoneinfo_read.lo: ../src/tz_zoneinfo_read.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborageclock_la_CFLAGS) $(CFLAGS) -MT liborageclock_la-tz_zoneinfo_read.lo -MD -MP -MF $(DEPDIR)/liborageclock_la-tz_zoneinfo_read.Tpo -c -o liborageclock_la-tz_zoneinfo_read.lo `test -f '../src/tz_zoneinfo_read.c' || echo '$(srcdir)/'`../src/tz_zoneinfo_read.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liborageclock_la-tz_zoneinfo_read.Tpo $(DEPDIR)/liborageclock_la-tz_zoneinfo_read.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../src/tz_zoneinfo_read.c' object='liborageclock_la-tz_zoneinfo_read.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_orageclock_plugin-xfce4-orageclock-plugin.o `test -f 'xfce4-orageclock-plugin.c' || echo '$(srcdir)/'`xfce4-orageclock-plugin.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborageclock_la_CFLAGS) $(CFLAGS) -c -o liborageclock_la-tz_zoneinfo_read.lo `test -f '../src/tz_zoneinfo_read.c' || echo '$(srcdir)/'`../src/tz_zoneinfo_read.c
 
-xfce4_orageclock_plugin-xfce4-orageclock-plugin.obj: xfce4-orageclock-plugin.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -MT xfce4_orageclock_plugin-xfce4-orageclock-plugin.obj -MD -MP -MF $(DEPDIR)/xfce4_orageclock_plugin-xfce4-orageclock-plugin.Tpo -c -o xfce4_orageclock_plugin-xfce4-orageclock-plugin.obj `if test -f 'xfce4-orageclock-plugin.c'; then $(CYGPATH_W) 'xfce4-orageclock-plugin.c'; else $(CYGPATH_W) '$(srcdir)/xfce4-orageclock-plugin.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xfce4_orageclock_plugin-xfce4-orageclock-plugin.Tpo $(DEPDIR)/xfce4_orageclock_plugin-xfce4-orageclock-plugin.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xfce4-orageclock-plugin.c' object='xfce4_orageclock_plugin-xfce4-orageclock-plugin.obj' libtool=no @AMDEPBACKSLASH@
+liborageclock_la-xfce4-orageclock-plugin.lo: xfce4-orageclock-plugin.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborageclock_la_CFLAGS) $(CFLAGS) -MT liborageclock_la-xfce4-orageclock-plugin.lo -MD -MP -MF $(DEPDIR)/liborageclock_la-xfce4-orageclock-plugin.Tpo -c -o liborageclock_la-xfce4-orageclock-plugin.lo `test -f 'xfce4-orageclock-plugin.c' || echo '$(srcdir)/'`xfce4-orageclock-plugin.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liborageclock_la-xfce4-orageclock-plugin.Tpo $(DEPDIR)/liborageclock_la-xfce4-orageclock-plugin.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xfce4-orageclock-plugin.c' object='liborageclock_la-xfce4-orageclock-plugin.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_orageclock_plugin-xfce4-orageclock-plugin.obj `if test -f 'xfce4-orageclock-plugin.c'; then $(CYGPATH_W) 'xfce4-orageclock-plugin.c'; else $(CYGPATH_W) '$(srcdir)/xfce4-orageclock-plugin.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborageclock_la_CFLAGS) $(CFLAGS) -c -o liborageclock_la-xfce4-orageclock-plugin.lo `test -f 'xfce4-orageclock-plugin.c' || echo '$(srcdir)/'`xfce4-orageclock-plugin.c
 
-xfce4_orageclock_plugin-functions.o: ../src/functions.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -MT xfce4_orageclock_plugin-functions.o -MD -MP -MF $(DEPDIR)/xfce4_orageclock_plugin-functions.Tpo -c -o xfce4_orageclock_plugin-functions.o `test -f '../src/functions.c' || echo '$(srcdir)/'`../src/functions.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xfce4_orageclock_plugin-functions.Tpo $(DEPDIR)/xfce4_orageclock_plugin-functions.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/functions.c' object='xfce4_orageclock_plugin-functions.o' libtool=no @AMDEPBACKSLASH@
+liborageclock_la-functions.lo: ../src/functions.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborageclock_la_CFLAGS) $(CFLAGS) -MT liborageclock_la-functions.lo -MD -MP -MF $(DEPDIR)/liborageclock_la-functions.Tpo -c -o liborageclock_la-functions.lo `test -f '../src/functions.c' || echo '$(srcdir)/'`../src/functions.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liborageclock_la-functions.Tpo $(DEPDIR)/liborageclock_la-functions.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../src/functions.c' object='liborageclock_la-functions.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_orageclock_plugin-functions.o `test -f '../src/functions.c' || echo '$(srcdir)/'`../src/functions.c
-
-xfce4_orageclock_plugin-functions.obj: ../src/functions.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -MT xfce4_orageclock_plugin-functions.obj -MD -MP -MF $(DEPDIR)/xfce4_orageclock_plugin-functions.Tpo -c -o xfce4_orageclock_plugin-functions.obj `if test -f '../src/functions.c'; then $(CYGPATH_W) '../src/functions.c'; else $(CYGPATH_W) '$(srcdir)/../src/functions.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xfce4_orageclock_plugin-functions.Tpo $(DEPDIR)/xfce4_orageclock_plugin-functions.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/functions.c' object='xfce4_orageclock_plugin-functions.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_orageclock_plugin_CFLAGS) $(CFLAGS) -c -o xfce4_orageclock_plugin-functions.obj `if test -f '../src/functions.c'; then $(CYGPATH_W) '../src/functions.c'; else $(CYGPATH_W) '$(srcdir)/../src/functions.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborageclock_la_CFLAGS) $(CFLAGS) -c -o liborageclock_la-functions.lo `test -f '../src/functions.c' || echo '$(srcdir)/'`../src/functions.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -507,8 +568,11 @@
 	-rm -rf .libs _libs
 install-desktopDATA: $(desktop_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -522,30 +586,17 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -557,15 +608,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -574,6 +621,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -610,7 +672,7 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(PROGRAMS) $(DATA)
+all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(desktopdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
@@ -625,10 +687,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -643,7 +710,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-pluginPROGRAMS \
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -664,7 +731,7 @@
 
 info-am:
 
-install-data-am: install-desktopDATA install-pluginPROGRAMS
+install-data-am: install-desktopDATA install-pluginLTLIBRARIES
 
 install-dvi: install-dvi-am
 
@@ -710,33 +777,27 @@
 
 ps-am:
 
-uninstall-am: uninstall-desktopDATA uninstall-pluginPROGRAMS
+uninstall-am: uninstall-desktopDATA uninstall-pluginLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginPROGRAMS ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-desktopDATA install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pluginPROGRAMS install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-desktopDATA \
-	uninstall-pluginPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pluginLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-desktopDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-desktopDATA uninstall-pluginLTLIBRARIES
 
 @INTLTOOL_DESKTOP_RULE@
 
-# get full path into .desktop file
-#%.desktop.in: %.desktop.in.in
-xfce4-orageclock-plugin.desktop.in: xfce4-orageclock-plugin.desktop.in.in
-	sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
-		$< > $@
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru orage-4.8.3/panel-plugin/oc_config.c orage-4.12.1/panel-plugin/oc_config.c
--- orage-4.8.3/panel-plugin/oc_config.c	2011-01-13 10:25:01.000000000 +0000
+++ orage-4.12.1/panel-plugin/oc_config.c	2015-04-10 10:26:26.000000000 +0000
@@ -102,6 +102,25 @@
     oc_size_set(clock);
 }
 
+static void oc_rotation_changed(GtkComboBox *cb, Clock *clock)
+{
+    GList *tmp_list;
+
+    clock->rotation = gtk_combo_box_get_active(cb);
+    for (tmp_list = g_list_first(clock->lines);
+            tmp_list;
+         tmp_list = g_list_next(tmp_list)) {
+        oc_line_rotate(clock, tmp_list->data);
+    }
+}
+
+static void oc_lines_vertically_toggled(GtkToggleButton *cb, Clock *clock)
+{
+    clock->lines_vertically = gtk_toggle_button_get_active(cb);
+
+    oc_reorganize_lines(clock);
+}
+
 static void oc_timezone_selected(GtkButton *button, Clock *clock)
 {
     GtkWidget *dialog;
@@ -150,10 +169,12 @@
 static void oc_new_line(GtkToolButton *toolbutton, ClockLine *line)
 {
     Clock *clock = line->clock;;
+    ClockLine *new_line;
     gint pos;
-
     pos = g_list_index(clock->lines, line);
-    oc_add_line(clock, "%X", "", pos+1);
+    new_line = oc_add_new_line(clock, "%X", "", pos+1);
+    oc_set_line(clock, new_line, pos+1);
+    oc_fg_set(clock);
 
     oc_recreate_properties_options(clock);
 }
@@ -179,7 +200,7 @@
 
     pos = g_list_index(clock->lines, line);
     pos--;
-    gtk_box_reorder_child(GTK_BOX(clock->vbox), line->label, pos);
+    gtk_box_reorder_child(GTK_BOX(clock->mbox), line->label, pos);
     clock->lines = g_list_remove(clock->lines, line);
     clock->lines = g_list_insert(clock->lines, line, pos);
 
@@ -196,7 +217,7 @@
     pos++;
     if (pos == line_cnt)
         pos = 0;
-    gtk_box_reorder_child(GTK_BOX(clock->vbox), line->label, pos);
+    gtk_box_reorder_child(GTK_BOX(clock->mbox), line->label, pos);
     clock->lines = g_list_remove(clock->lines, line);
     clock->lines = g_list_insert(clock->lines, line, pos);
 
@@ -215,8 +236,11 @@
     GdkColor def_fg, def_bg;
     GtkStyle *def_style;
     GtkWidget *table;
+    char *clock_rotation_array[3] = {_("No rotation"), _("Rotate left")
+        , _("Rotate right")};
+
 
-    table = gtk_table_new(3, 4, FALSE);
+    table = gtk_table_new(4, 4, FALSE); /* rows, columns */
     gtk_container_set_border_width(GTK_CONTAINER(table), 10);
     gtk_table_set_row_spacings(GTK_TABLE(table), 6);
     gtk_table_set_col_spacings(GTK_TABLE(table), 6);
@@ -224,16 +248,16 @@
     frame = orage_create_framebox_with_content(_("Appearance"), table);
     gtk_container_set_border_width(GTK_CONTAINER(frame), 6);
     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame, FALSE, FALSE, 0);
+    
+    def_style = gtk_widget_get_default_style();
+    def_fg = def_style->fg[GTK_STATE_NORMAL];
+    def_bg = def_style->bg[GTK_STATE_NORMAL];
 
     /* show frame */
     cb = gtk_check_button_new_with_mnemonic(_("Show _frame"));
     oc_table_add(table, cb, 0, 0);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cb), clock->show_frame);
     g_signal_connect(cb, "toggled", G_CALLBACK(oc_show_frame_toggled), clock);
-    
-    def_style = gtk_widget_get_default_style();
-    def_fg = def_style->fg[GTK_STATE_NORMAL];
-    def_bg = def_style->bg[GTK_STATE_NORMAL];
 
     /* foreground color */
     cb = gtk_check_button_new_with_mnemonic(_("set foreground _color:"));
@@ -263,7 +287,7 @@
     g_signal_connect(G_OBJECT(color), "color-set"
             , G_CALLBACK(oc_bg_color_changed), clock);
 
-    /* clock size (=vbox size): height and width */
+    /* clock size (=mbox size): height and width */
     cb = gtk_check_button_new_with_mnemonic(_("set _height:"));
     oc_table_add(table, cb, 0, 2);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cb), clock->height_set);
@@ -285,7 +309,6 @@
     g_signal_connect(cb, "toggled", G_CALLBACK(oc_set_width_toggled), clock);
     sb = gtk_spin_button_new_with_range(10, 400, 1);
     oc_table_add(table, sb, 3, 2);
-
     if (!clock->width_set)
         clock->width = 70;
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(sb), (gdouble)clock->width);
@@ -294,6 +317,17 @@
             , NULL);
     g_signal_connect((gpointer) sb, "value-changed",
             G_CALLBACK(oc_set_width_changed), clock);
+
+    /* rotation and line (=box) position (top / left) */
+    cb = orage_create_combo_box_with_content(clock_rotation_array, 3);
+    oc_table_add(table, cb, 0, 3);
+    gtk_combo_box_set_active(GTK_COMBO_BOX(cb), clock->rotation);
+    g_signal_connect(cb, "changed", G_CALLBACK(oc_rotation_changed), clock);
+
+    cb = gtk_check_button_new_with_mnemonic(_("Show lines _vertically"));
+    oc_table_add(table, cb, 2, 3);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cb), clock->lines_vertically);
+    g_signal_connect(cb, "toggled", G_CALLBACK(oc_lines_vertically_toggled), clock);
 }
 
 void oc_properties_options(GtkWidget *dlg, Clock *clock)
diff -Nru orage-4.8.3/panel-plugin/xfce4-orageclock-plugin.c orage-4.12.1/panel-plugin/xfce4-orageclock-plugin.c
--- orage-4.8.3/panel-plugin/xfce4-orageclock-plugin.c	2011-12-12 10:26:42.000000000 +0000
+++ orage-4.12.1/panel-plugin/xfce4-orageclock-plugin.c	2015-04-10 10:26:26.000000000 +0000
@@ -1,7 +1,7 @@
 /* vim: set expandtab ts=4 sw=4: */
 /*
  *
- *  Copyright © 2006-2011 Juha Kautto <juha@xfce.org>
+ *  Copyright © 2006-2015 Juha Kautto <juha@xfce.org>
  *
  *  it under the terms of the GNU Library General Public License as published 
  *  by the Free Software Foundation; either version 2 of the License, or
@@ -82,27 +82,65 @@
         gtk_widget_modify_font(line->label, NULL);
 }
 
-void oc_add_line(Clock *clock, char *data, char *font, int pos)
+void oc_line_rotate(Clock *clock, ClockLine *line)
 {
-    ClockLine *clock_line;
-
-    clock_line = g_new0(ClockLine, 1);
-
-    clock_line->data = g_string_new(data);
-    clock_line->font = g_string_new(font);
-    strcpy(clock_line->prev, "New line");
-    clock_line->clock = clock;
+    switch (clock->rotation) {
+        case 0:
+            gtk_label_set_angle(GTK_LABEL(line->label), 0);
+            break;
+        case 1:
+            gtk_label_set_angle(GTK_LABEL(line->label), 90);
+            break;
+        case 2:
+            gtk_label_set_angle(GTK_LABEL(line->label), 270);
+            break;
+    }
+}
 
+void oc_set_line(Clock *clock, ClockLine *clock_line, int pos)
+{
     clock_line->label = gtk_label_new("");
-    gtk_box_pack_start(GTK_BOX(clock->vbox), clock_line->label
+    gtk_box_pack_start(GTK_BOX(clock->mbox), clock_line->label
             , FALSE, FALSE, 0);
-    gtk_box_reorder_child(GTK_BOX(clock->vbox), clock_line->label, pos);
+    gtk_box_reorder_child(GTK_BOX(clock->mbox), clock_line->label, pos);
     oc_line_font_set(clock_line);
+    oc_line_rotate(clock, clock_line);
     gtk_widget_show(clock_line->label);
     /* clicking does not work after this
     gtk_label_set_selectable(GTK_LABEL(clock_line->label), TRUE);
     */
-    clock->lines = g_list_insert(clock->lines, clock_line, pos);
+}
+
+static void oc_set_lines_to_panel(Clock *clock)
+{
+    ClockLine *clock_line;
+    GList   *tmp_list;
+
+    if (clock->lines_vertically)
+        clock->mbox = gtk_vbox_new(TRUE, 0);
+    else
+        clock->mbox = gtk_hbox_new(TRUE, 0);
+    gtk_widget_show(clock->mbox);
+    gtk_container_add(GTK_CONTAINER(clock->frame), clock->mbox);
+
+    for (tmp_list = g_list_first(clock->lines); 
+            tmp_list;
+         tmp_list = g_list_next(tmp_list)) {
+        clock_line = tmp_list->data;
+        /* make sure clock face is updated */
+        strcpy(clock_line->prev, "New line");
+        oc_set_line(clock, clock_line, -1);
+    }
+}
+
+void oc_reorganize_lines(Clock *clock)
+{
+    /* let's just do this easily as it is very seldom called: 
+       delete and recreate lines */
+    gtk_widget_destroy(GTK_WIDGET(clock->mbox));
+    oc_set_lines_to_panel(clock);
+    oc_fg_set(clock);
+    oc_size_set(clock);
 }
 
 static void oc_tooltip_set(Clock *clock)
@@ -298,11 +336,9 @@
 {
     if (size > 26) {
         gtk_container_set_border_width(GTK_CONTAINER(clock->frame), 2);
-        size -= 3;
     }
     else {
         gtk_container_set_border_width(GTK_CONTAINER(clock->frame), 0);
-        size -= 1;
     }
 }
 
@@ -401,6 +437,22 @@
 static gboolean oc_set_size(XfcePanelPlugin *plugin, int size, Clock *clock)
 {
     oc_update_size(clock, size);
+    if (clock->first_call) {
+    /* default is horizontal panel. 
+       we need to check and change if it is vertical */
+        if (xfce_panel_plugin_get_mode(plugin) 
+                == XFCE_PANEL_PLUGIN_MODE_VERTICAL) {
+            clock->lines_vertically = FALSE;
+        /* check rotation handling from oc_rotation_changed in oc_config.c */
+            if (xfce_screen_position_is_right(
+                        xfce_panel_plugin_get_screen_position(plugin)))
+                clock->rotation = 2;
+            else
+                clock->rotation = 1;
+            oc_reorganize_lines(clock);
+        }
+
+    }
 
     return(TRUE);
 }
@@ -440,6 +492,18 @@
     return(color);
 }
 
+ClockLine * oc_add_new_line(Clock *clock, const char *data, const char *font, int pos)
+{
+    ClockLine *clock_line = g_new0(ClockLine, 1);
+
+    clock_line->data = g_string_new(data);
+    clock_line->font = g_string_new(font);
+    strcpy(clock_line->prev, "New line");
+    clock_line->clock = clock;
+    clock->lines = g_list_insert(clock->lines, clock_line, pos);
+    return(clock_line);
+}
+
 static void oc_read_rc_file(XfcePanelPlugin *plugin, Clock *clock)
 {
     gchar  *file;
@@ -455,6 +519,7 @@
         g_warning("unable to read-open rc file (%s)", file);
         return;
     }
+    clock->first_call = FALSE;
 
     clock->show_frame = xfce_rc_read_bool_entry(rc, "show_frame", TRUE);
 
@@ -480,6 +545,9 @@
     if (clock->height_set) {
         clock->height = xfce_rc_read_int_entry(rc, "height", -1);
     }
+
+    clock->lines_vertically = xfce_rc_read_bool_entry(rc, "lines_vertically", FALSE);
+    clock->rotation = xfce_rc_read_int_entry(rc, "rotation", 0);
     
     for (i = 0, more_lines = TRUE; more_lines; i++) {
         sprintf(tmp, "data%d", i);
@@ -487,7 +555,7 @@
         if (data) { /* let's add it */
             sprintf(tmp, "font%d", i);
             font = xfce_rc_read_entry(rc, tmp, NULL);
-            oc_add_line(clock, (char *)data, (char *)font, -1);
+            oc_add_new_line(clock, data, font, -1);
         }
         else { /* no more clock lines */
             more_lines = FALSE;
@@ -562,6 +630,9 @@
         xfce_rc_delete_entry(rc, "height", TRUE);
     }
 
+    xfce_rc_write_bool_entry(rc, "lines_vertically", clock->lines_vertically);
+    xfce_rc_write_int_entry(rc, "rotation", clock->rotation);
+
     for (i = 0, tmp_list = g_list_first(clock->lines);
             tmp_list;
          i++, tmp_list = g_list_next(tmp_list)) {
@@ -589,8 +660,9 @@
 /* Create widgets and connect to signals */
 Clock *orage_oc_new(XfcePanelPlugin *plugin)
 {
-    Clock     *clock = g_new0(Clock, 1);
+    Clock *clock = g_new0(Clock, 1);
 
+    clock->first_call = TRUE; /* this is starting point */
     clock->plugin = plugin;
 
     clock->ebox = gtk_event_box_new();
@@ -600,20 +672,21 @@
     gtk_container_add(GTK_CONTAINER(clock->ebox), clock->frame);
     gtk_widget_show(clock->frame);
 
-    clock->vbox = gtk_vbox_new(TRUE, 0);
-    gtk_widget_show(clock->vbox);
-    gtk_container_add(GTK_CONTAINER(clock->frame), clock->vbox);
+    gtk_container_add(GTK_CONTAINER(plugin), clock->ebox);
 
     clock->show_frame = TRUE;
     clock->fg_set = FALSE;
     clock->bg_set = FALSE;
     clock->width_set = FALSE;
     clock->height_set = FALSE;
+    clock->lines_vertically = TRUE;
+    clock->rotation = 0; /* no rotation */
 
     clock->timezone = g_string_new(""); /* = not set */
     clock->TZ_orig = g_strdup(g_getenv("TZ"));
 
     clock->lines = NULL; /* no lines yet */
+    clock->orig_line_cnt = 0;
 
     /* TRANSLATORS: Use format characters from strftime(3)
      * to get the proper string for your locale.
@@ -689,7 +762,7 @@
 
     w = clock->width_set ? clock->width : -1;
     h = clock->height_set ? clock->height : -1;
-    gtk_widget_set_size_request(clock->vbox, w, h);
+    gtk_widget_set_size_request(clock->mbox, w, h);
 }
 
 static void oc_construct(XfcePanelPlugin *plugin)
@@ -700,12 +773,12 @@
 
     clock = orage_oc_new(plugin);
 
-    gtk_container_add(GTK_CONTAINER(plugin), clock->ebox);
-
     oc_read_rc_file(plugin, clock);
-    if (clock->lines == NULL) /* Let's setup a default clock_line */
-        oc_add_line(clock, "%X", "", -1);
+    if (clock->lines == NULL) { /* Let's setup a default clock_line */
+        oc_add_new_line(clock, "%X", "", -1);
+    }
 
+    oc_set_lines_to_panel(clock);
     oc_show_frame_set(clock);
     oc_fg_set(clock);
     oc_bg_set(clock);
@@ -714,8 +787,9 @@
 
     oc_init_timer(clock);
 
-    oc_update_size(clock, 
-            xfce_panel_plugin_get_size(XFCE_PANEL_PLUGIN(plugin)));
+    /* we are called through size-changed trigger
+    oc_update_size(clock, xfce_panel_plugin_get_size(plugin));
+    */
 
     xfce_panel_plugin_add_action_widget(plugin, clock->ebox);
     
@@ -740,5 +814,5 @@
 
 /* Register with the panel */
 
-XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(oc_construct);
+XFCE_PANEL_PLUGIN_REGISTER(oc_construct);
 
diff -Nru orage-4.8.3/panel-plugin/xfce4-orageclock-plugin.desktop.in orage-4.12.1/panel-plugin/xfce4-orageclock-plugin.desktop.in
--- orage-4.8.3/panel-plugin/xfce4-orageclock-plugin.desktop.in	1970-01-01 00:00:00.000000000 +0000
+++ orage-4.12.1/panel-plugin/xfce4-orageclock-plugin.desktop.in	2015-04-10 10:26:26.000000000 +0000
@@ -0,0 +1,8 @@
+[Xfce Panel]
+Type=X-XFCE-PanelPlugin
+_Name=Orage Panel Clock
+_Comment=Show time and date?
+Icon=xfce-schedule
+X-XFCE-Module=orageclock
+X-XFCE-Internal=FALSE
+
diff -Nru orage-4.8.3/panel-plugin/xfce4-orageclock-plugin.desktop.in.in orage-4.12.1/panel-plugin/xfce4-orageclock-plugin.desktop.in.in
--- orage-4.8.3/panel-plugin/xfce4-orageclock-plugin.desktop.in.in	2011-07-01 13:18:10.000000000 +0000
+++ orage-4.12.1/panel-plugin/xfce4-orageclock-plugin.desktop.in.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-[Xfce Panel]
-Type=X-XFCE-PanelPlugin
-_Name=Orage Panel Clock
-_Comment=Show time and date?
-Icon=xfce-schedule
-X-XFCE-Exec=@PLUGIN_PATH@/xfce4-orageclock-plugin
-
diff -Nru orage-4.8.3/panel-plugin/xfce4-orageclock-plugin.h orage-4.12.1/panel-plugin/xfce4-orageclock-plugin.h
--- orage-4.8.3/panel-plugin/xfce4-orageclock-plugin.h	2011-01-13 10:25:33.000000000 +0000
+++ orage-4.12.1/panel-plugin/xfce4-orageclock-plugin.h	2015-04-10 10:26:26.000000000 +0000
@@ -30,7 +30,7 @@
 
     GtkWidget *ebox;
     GtkWidget *frame;
-    GtkWidget *vbox;
+    GtkWidget *mbox; /* main box. Either vertical or horizontal */
     gboolean   show_frame;
     gboolean   fg_set;
     GdkColor   fg;
@@ -40,6 +40,8 @@
     gint       width;
     gboolean   height_set;
     gint       height;
+    gboolean   lines_vertically;
+    gint       rotation;
     GString   *timezone;
     gchar     *TZ_orig;
     GList     *lines;
@@ -53,6 +55,7 @@
     int delay_timeout_id;
     int interval;
     struct tm  now;
+    gboolean first_call; /* set defaults correct when clock is created */
 } Clock;
 
 typedef struct _clockline
@@ -72,7 +75,10 @@
 void oc_size_set(Clock *clock);
 void oc_timezone_set(Clock *clock);
 void oc_line_font_set(ClockLine *line);
+void oc_line_rotate(Clock *clock, ClockLine *line);
 void oc_write_rc_file(XfcePanelPlugin *plugin, Clock *clock);
 void oc_start_timer(Clock *clock);
 void oc_init_timer(Clock *clock);
-void oc_add_line(Clock *clock, char *data, char *font, int pos);
+void oc_set_line(Clock *clock, ClockLine *clock_line, int pos);
+ClockLine * oc_add_new_line(Clock *clock, const char *data, const char *font, int pos);
+void oc_reorganize_lines(Clock *clock);
diff -Nru orage-4.8.3/plugin/Makefile.in orage-4.12.1/plugin/Makefile.in
--- orage-4.8.3/plugin/Makefile.in	2012-01-04 12:52:49.000000000 +0000
+++ orage-4.12.1/plugin/Makefile.in	2015-04-10 10:26:54.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,17 +80,34 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = plugin
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,12 +129,20 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(desktopdir)"
 DATA = $(desktop_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -99,6 +168,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -122,6 +192,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -147,6 +221,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -172,6 +247,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -192,6 +269,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -220,11 +298,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -294,8 +373,11 @@
 	-rm -rf .libs _libs
 install-desktopDATA: $(desktop_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -309,14 +391,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -366,10 +446,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -451,16 +536,17 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-desktopDATA install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-desktopDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-desktopDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-desktopDATA
 
 @INTLTOOL_DESKTOP_RULE@
 
diff -Nru orage-4.8.3/po/am.po orage-4.12.1/po/am.po
--- orage-4.8.3/po/am.po	2012-01-03 12:00:59.000000000 +0000
+++ orage-4.12.1/po/am.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,21 +1,22 @@
-# Amharic translation to xfcalendar.
-# Copyright (C) 2002-2007 The Xfce development team.
-# This file is distributed under the same license as the xfcalendar package.
-# Tegegne Tefera <tefera@mekuria.com>, 2007.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Tegegne Tefera <tefera@mekuria.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: xfcalendar 4.4.1\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2008-01-06 18:37+0100\n"
-"Last-Translator: Tegegne Tefera <tefera@mekuria.com>\n"
-"Language-Team: Amharic <l10n-am@googlegroups.com>\n"
+"POT-Creation-Date: 2013-11-18 18:30+0100\n"
+"PO-Revision-Date: 2013-11-19 15:56+0000\n"
+"Last-Translator: Xfce <transifex@xfce.org>\n"
+"Language-Team: Amharic (http://www.transifex.com/projects/p/xfce/language/am/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: am\n"
-"X-Poedit-Bookmarks: -1,-1,-1,-1,535,-1,-1,-1,-1,-1\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -34,9 +35,8 @@
 msgstr ""
 
 #: ../globaltime/globaltime.c:386
-#, fuzzy
 msgid "Localtime"
-msgstr "ቦታ"
+msgstr ""
 
 #: ../globaltime/globaltime.c:464
 msgid ""
@@ -106,9 +106,8 @@
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "የዖራጌ ምርጫዎች"
+msgstr ""
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -120,9 +119,8 @@
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:613
-#, fuzzy
 msgid "enter name of clock"
-msgstr "ዖራጌ ስዓት"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
@@ -134,9 +132,8 @@
 
 #. ------------------------background-------------------------
 #: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
-#, fuzzy
 msgid "Background color:"
-msgstr "የኋላ ቀለምን ሰይም _b፦"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:656
 msgid "Click to change background colour for clock"
@@ -147,9 +144,8 @@
 #: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
 #: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
 #: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
-#, fuzzy
 msgid "Use default"
-msgstr "የዖራጌ ቀዳሚ ቀስቃሽ"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
@@ -159,9 +155,8 @@
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
-#, fuzzy
 msgid "Foreground (=text) color:"
-msgstr "የፊት ቀለምን ሰይም _c፦"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
@@ -234,30 +229,25 @@
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:1027
-#, fuzzy
 msgid "update preferences"
-msgstr "የዖራጌ ምርጫዎች"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "የዖራጌ ምርጫዎች"
+msgstr ""
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
-#, fuzzy
 msgid "General Preferences"
-msgstr "የዖራጌ ምርጫዎች"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1077
-#, fuzzy
 msgid "Decorations:"
-msgstr "ክፍለጊዜ"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1078
-#, fuzzy
 msgid "Standard"
-msgstr "ካለንደር"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1083
 msgid "Use normal decorations"
@@ -268,9 +258,8 @@
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:1100
-#, fuzzy
 msgid "Clock size:"
-msgstr "ዝጋ"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1101
 msgid "Equal"
@@ -281,18 +270,16 @@
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:1111
-#, fuzzy
 msgid "Varying"
-msgstr "ማስጠንቀቂያ"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1116
 msgid "Clock sizes vary"
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:1122
-#, fuzzy
 msgid "Local timezone:"
-msgstr "የጊዜ ቀጠና ምረጥ"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:101
 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
@@ -307,15 +294,15 @@
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
-msgstr "ስዓቶች"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "%d mins"
-msgstr "ደቂቃዎች"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
@@ -324,9 +311,8 @@
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-#, fuzzy
 msgid "forward"
-msgstr "ወደፊት"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
@@ -342,7 +328,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2771
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "ቦታ"
@@ -403,20 +389,18 @@
 msgid "floating"
 msgstr "ተንሳፋፊ"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "ቦታ"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "ካለንደር"
+msgstr ""
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr ""
 
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr ""
+
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
 msgstr "መልክ"
@@ -500,20 +484,11 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"ይህ ፕሮግራም ጊዜን ለማወቅ strftime functionን ይጠቀማል ።\n"
-"በሚፈልጉት ፎርማት ጊዜን ለማግኘት የትኛውንም ትክክለኝ የሆነ ኮድ ይጠቀሙ። ።\n"
-"አንዳንድ የተለመዱ ኮዶች ፤\n"
-"\t%A = የሳምንቱ ቀን\t\t\t%B = ወር\n"
-"\t%c = ቀንና ስዓት\t\t%R = ስዓትና ደቂቃ\n"
-"\t%V = የስምንት ቁጥር\t\t%Z = በጥቅም ላይ ያለ የጊዜ ክልል\n"
-"\t%H = ስዓቶች\t\t\t\t%M =ደቂቃዎች\n"
-"\t%X = የአካባቢ ስዓት\t\t\t%x = የአካባቢ ቀን"
+msgstr "ይህ ፕሮግራም ጊዜን ለማወቅ strftime functionን ይጠቀማል ።\nበሚፈልጉት ፎርማት ጊዜን ለማግኘት የትኛውንም ትክክለኝ የሆነ ኮድ ይጠቀሙ። ።\nአንዳንድ የተለመዱ ኮዶች ፤\n\t%A = የሳምንቱ ቀን\t\t\t%B = ወር\n\t%c = ቀንና ስዓት\t\t%R = ስዓትና ደቂቃ\n\t%V = የስምንት ቁጥር\t\t%Z = በጥቅም ላይ ያለ የጊዜ ክልል\n\t%H = ስዓቶች\t\t\t\t%M =ደቂቃዎች\n\t%X = የአካባቢ ስዓት\t\t\t%x = የአካባቢ ቀን"
 
 #: ../panel-plugin/oc_config.c:457
-#, fuzzy
 msgid "Orage clock Preferences"
-msgstr "የዖራጌ ምርጫዎች"
+msgstr ""
 
 #. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
@@ -524,7 +499,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
@@ -534,29 +509,27 @@
 msgstr ""
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "ጊዜዎን በሸፍሲ ያስተዳድሩ"
+msgstr ""
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2800
 msgid "End"
 msgstr "መጨረሻ"
 
 #: ../src/appointment.c:333
-#, fuzzy
 msgid "Due"
-msgstr "ማክሰኞ"
+msgstr ""
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "ዖራጌ"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "ፋይል ምረጥ"
 
@@ -564,224 +537,273 @@
 msgid "Sound Files"
 msgstr "የድምጽ ፋይል"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "ሁሉም ፋይሎች"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "የቀጠሮው መረጃ ተሻሽሏል"
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1282 ../src/event-list.c:921
 msgid "Do you want to continue?"
 msgstr "መቀጠል ይፈልጋሉ?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr ""
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr ""
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "የዚህ ቀጠሮ ማለቂያ ከመጀመሪያው በፊት ነው።"
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-#, fuzzy
+#: ../src/appointment.c:1035 ../src/appointment.c:1918
 msgid "Not set"
-msgstr "ማስታወሻ"
+msgstr ""
+
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1220
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1221
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1231
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1232
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1281
 msgid "This appointment will be permanently removed."
 msgstr "ይህ ቀጠሮ ለዘላለም ይሰረዛል።"
 
-#: ../src/appointment.c:1692
-#, fuzzy
+#: ../src/appointment.c:1283 ../src/event-list.c:922
+msgid "No, cancel the removal"
+msgstr ""
+
+#: ../src/appointment.c:1284
+msgid "Yes, remove it"
+msgstr ""
+
+#: ../src/appointment.c:1373 ../src/appointment.c:1388 ../src/day-view.c:457
+#: ../src/event-list.c:980
+msgid "Pick the date"
+msgstr "ቀን ምረጥ"
+
+#: ../src/appointment.c:1375 ../src/appointment.c:1390 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:982 ../src/event-list.c:1132
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "ዛሬ"
+
+#: ../src/appointment.c:1798
 msgid "This appointment does not exist."
-msgstr "ይህ ቀጠሮ ለዘላለም ይሰረዛል።"
+msgstr ""
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1799
 msgid "It was probably removed, please refresh your screen."
 msgstr ""
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2100
 msgid "Current categories"
 msgstr ""
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2115
 msgid "Add new category with color"
 msgstr ""
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2119
 msgid "Category:"
 msgstr ""
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2150
 msgid "Colors of categories - Orage"
 msgstr ""
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2196
 msgid " *** COPY ***"
 msgstr ""
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2461
 msgid "New appointment - Orage"
 msgstr "አዲስ ቀጠሮ - ዖራጌ"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2491 ../src/day-view.c:279 ../src/event-list.c:1033
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "ፋይል _F"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2497
 msgid "Sav_e and close"
 msgstr "አስቀምጥና ዝጋ _e"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2510 ../src/event-list.c:1039
 msgid "D_uplicate"
 msgstr "ቅዳ _u"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2697
 msgid "Save"
 msgstr "አስቀምጥ"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2699
 msgid "Save and close"
 msgstr "አስቀምጥና ዝጋ"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2704
 msgid "Revert"
 msgstr "ወደኋላ መልስ"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2706 ../src/event-list.c:1123
 msgid "Duplicate"
 msgstr "ቅዳ"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2711 ../src/event-list.c:1125
 msgid "Delete"
 msgstr "ሰርዝ"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Free"
 msgstr "ባዶ"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Busy"
 msgstr "በስራ ላይ"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2733
 msgid "General"
 msgstr "አጠቃላይ"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2739
 msgid "Type "
 msgstr ""
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2741 ../src/event-list.c:1176
 msgid "Event"
 msgstr ""
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2744
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
 msgstr ""
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-#, fuzzy
+#: ../src/appointment.c:2747 ../src/event-list.c:1196
 msgid "Todo"
-msgstr "ዛሬ"
+msgstr ""
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2750
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
 msgstr ""
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2753 ../src/event-list.c:1209
 msgid "Journal"
 msgstr ""
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2757
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
 msgstr ""
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2764
 msgid "Title "
 msgstr "አርዕስት"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2779
 msgid "All day event"
 msgstr "የሙሉ ቀን ስራ"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2785 ../src/appointment.c:3446 ../src/day-view.c:801
 msgid "Start"
 msgstr "ጀምር"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2805
 msgid "Set      "
 msgstr ""
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2826
 msgid "Duration"
 msgstr "ክፍለጊዜ"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2830 ../src/appointment.c:3020 ../src/reminder.c:758
 msgid "days"
 msgstr "ቀኖች"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2832 ../src/appointment.c:3022 ../src/reminder.c:760
 msgid "hours"
 msgstr "ስዓቶች"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2834 ../src/appointment.c:3024 ../src/reminder.c:762
 msgid "mins"
 msgstr "ደቂቃዎች"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2846
 msgid "Availability"
 msgstr "ተገኝነት"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
-#, fuzzy
+#: ../src/appointment.c:2854 ../src/appointment.c:3452
 msgid "Completed"
-msgstr "ውስብስብነት"
+msgstr ""
 
-#: ../src/appointment.c:2749
-#, fuzzy
+#: ../src/appointment.c:2857
 msgid "Done"
-msgstr "ምንም"
+msgstr ""
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2878
 msgid "Categories"
 msgstr ""
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2890
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
 msgstr ""
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2895
 msgid "update colors for categories."
 msgstr ""
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2901
 msgid "Priority"
 msgstr ""
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2911
 msgid "Note"
 msgstr "ማስታወሻ"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2932
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -790,38 +812,35 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before Start"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before End"
 msgstr ""
 
-#: ../src/appointment.c:2896
-#, fuzzy
+#: ../src/appointment.c:3004
 msgid "After Start"
-msgstr "ጀምር"
+msgstr ""
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After End"
 msgstr ""
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3011
 msgid "Alarm"
 msgstr "ማንቂያ"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-#, fuzzy
+#: ../src/appointment.c:3017
 msgid "Alarm time"
-msgstr "ማንቂያ"
+msgstr ""
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3041
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
@@ -829,92 +848,88 @@
 " 3) after Todo start"
 msgstr ""
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3046
 msgid "Persistent alarm"
 msgstr ""
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3048
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
 msgstr ""
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3057
 msgid "Sound"
 msgstr "ድምጽ"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3061 ../src/appointment.c:3181
 msgid "Use"
 msgstr ""
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3063
 msgid "Select this if you want audible alarm"
 msgstr ""
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3080
 msgid "Repeat alarm sound"
 msgstr "የማንቂያ ድምጽን ድገም"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3096 ../src/appointment.c:3395
 msgid "times"
 msgstr "ጊዜዎች"
 
-#: ../src/appointment.c:3004
-#, fuzzy
+#: ../src/appointment.c:3112
 msgid "sec interval"
-msgstr "ክፍለጊዜ"
+msgstr ""
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3122
 msgid "Visual"
 msgstr ""
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3126
 msgid "Use Orage window"
 msgstr ""
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3128
 msgid "Select this if you want Orage window alarm"
 msgstr ""
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3140
 msgid "Use notification"
 msgstr ""
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3142
 msgid "Select this if you want notification alarm"
 msgstr ""
 
-#: ../src/appointment.c:3040
-#, fuzzy
+#: ../src/appointment.c:3148
 msgid "Set timeout"
-msgstr "የጊዜ ቀጠናን ምረጥ"
+msgstr ""
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3150
 msgid "Select this if you want notification to expire automatically"
 msgstr ""
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3161
 msgid "0 = system default expiration time"
 msgstr ""
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3166
 msgid "seconds"
 msgstr ""
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
-#, fuzzy
+#: ../src/appointment.c:3177
 msgid "Procedure"
-msgstr "ባህሪዎች"
+msgstr ""
 
-#: ../src/appointment.c:3076
-#, fuzzy
+#: ../src/appointment.c:3183
 msgid "Select this if you want procedure or script alarm"
-msgstr "ተደጋጋሚ ሁኔታዎችን ለማስመዝገብ ይህንን ይጠቀሙ"
+msgstr ""
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3189
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -926,157 +941,148 @@
 "\t<&ET> appointment end time"
 msgstr ""
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3201
 msgid "Test this alarm by raising it now"
 msgstr ""
 
-#: ../src/appointment.c:3101
-#, fuzzy
+#: ../src/appointment.c:3208
 msgid "<b>Default alarm</b>"
-msgstr "የዖራጌ ቀዳሚ ቀስቃሽ"
+msgstr ""
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3216
 msgid "Store current settings as default alarm"
 msgstr ""
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3221
 msgid "Set current settings from default alarm"
 msgstr ""
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "None"
 msgstr "ምንም"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Daily"
 msgstr "በየቀኑ"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Weekly"
 msgstr "በየሳምንቱ"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Monthly"
 msgstr "በየወሩ"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Yearly"
 msgstr "በየዓመቱ"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Hourly"
 msgstr ""
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Mon"
 msgstr "ሰኞ"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Tue"
 msgstr "ማክሰኞ"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Wed"
 msgstr "ረቡዕ"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Thu"
 msgstr "ሐሙስ"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Fri"
 msgstr "ዓርብ"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sat"
 msgstr "ቅዳሜ"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sun"
 msgstr "እሑድ"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3290
 msgid "Recurrence"
 msgstr "ተደጋጋሚ"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3296
 msgid "Complexity"
 msgstr "ውስብስብነት"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3299
 msgid "Basic"
 msgstr "መሰረታዊ"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3305
 msgid "Advanced"
 msgstr "በጥልቀት"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3309
 msgid "Use this if you want regular repeating event"
 msgstr "ተደጋጋሚ ሁኔታዎችን ለማስመዝገብ ይህንን ይጠቀሙ"
 
-#: ../src/appointment.c:3204
-#, fuzzy
+#: ../src/appointment.c:3311
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
 msgstr ""
-"Use this if you need complex times like:\n"
-" Every second week or \n"
-" Every Saturday and Sunday or \n"
-" First Tuesday every month"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3317
 msgid "Frequency"
 msgstr "ተደጋጋሚነት"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3323
 msgid "Each"
 msgstr "እያንዳንዱ"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3330
 msgid "occurrence"
 msgstr "መቼ መቼ"
 
-#: ../src/appointment.c:3228
-#, fuzzy
+#: ../src/appointment.c:3334
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
 msgstr ""
-"Limit frequency to certain interval. For example:\n"
-" Every third day: Frequency = Daily and Interval = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3379
 msgid "Limit"
 msgstr "ገደብ"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3381
 msgid "Repeat forever"
 msgstr "ለሁሌም ድገም"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3387
 msgid "Repeat "
 msgstr "ድገም"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3403
 msgid "Repeat until "
 msgstr "ድገም እስከ"
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3416
 msgid "Weekdays"
 msgstr "የሳምንት ቀናት"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3428
 msgid "Which day"
 msgstr "የትኛው ቀን"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3436
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1084,115 +1090,108 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Specify which weekday for monthly and yearly events.\n"
-" For example:\n"
-" Second Wednesday each month:\n"
-"\tFrequency = Monthly,\n"
-"\tWeekdays = check only Wednesday,\n"
-"\tWhich day = select 2 from the number below Wednesday"
+msgstr "Specify which weekday for monthly and yearly events.\n For example:\n Second Wednesday each month:\n\tFrequency = Monthly,\n\tWeekdays = check only Wednesday,\n\tWhich day = select 2 from the number below Wednesday"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3443
 msgid "TODO base"
 msgstr ""
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3456
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
 msgstr ""
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3458
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 
 #. exceptions
-#: ../src/appointment.c:3361
-#, fuzzy
+#: ../src/appointment.c:3464
 msgid "Exceptions"
-msgstr "የስዓት ምርጫዎች"
+msgstr ""
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3477
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
 msgstr ""
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3482
 msgid "Add excluded date (-)"
 msgstr ""
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3484
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr ""
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3490
 msgid "Add included time (+)"
 msgstr ""
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3492
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
 msgstr ""
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3509
 msgid "Action dates"
 msgstr ""
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1056 ../src/mainbox.c:323
 msgid "_View"
 msgstr "አሳይ _V"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1075
 msgid "_Go"
 msgstr "ሂድ _G"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1121
 msgid "New"
 msgstr "አዲስ"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "ወደኋላ"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr ""
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "ዛሬ"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "ወደፊት"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1139
 msgid "Refresh"
 msgstr "እንደገና ጫን"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1146 ../src/interface.c:834
 msgid "Close"
 msgstr "ዝጋ"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr ""
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr ""
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr ""
 
@@ -1201,157 +1200,162 @@
 msgid "All day"
 msgstr "ሙሉ ቀን"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:583 ../src/event-list.c:1292
 msgid "Time"
 msgstr "ሰዓት"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:751
 msgid "No rows have been selected."
 msgstr ""
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:752
 msgid "Click a row to select it and after that you can copy it."
 msgstr ""
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:920
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
 msgstr ""
 
+#: ../src/event-list.c:923
+msgid "Yes, remove them"
+msgstr ""
+
 #: ../src/event-list.c:1130
+msgid "Back"
+msgstr "ወደኋላ"
+
+#: ../src/event-list.c:1134
+msgid "Forward"
+msgstr "ወደፊት"
+
+#: ../src/event-list.c:1141
 msgid "Find"
 msgstr ""
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1148
 msgid "Dayview"
 msgstr ""
 
-#: ../src/event-list.c:1170
+#: ../src/event-list.c:1181
 msgid "Extra days to show "
 msgstr ""
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1212
 msgid "Journal entries starting from:"
 msgstr ""
 
-#: ../src/event-list.c:1221
-#, fuzzy
+#: ../src/event-list.c:1232
 msgid "Search"
-msgstr "እያንዳንዱ"
+msgstr ""
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1235
 msgid "Search text "
 msgstr ""
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1300
 msgid "Flags"
 msgstr "ባንዲራዎች"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1308
 msgid "Title"
 msgstr "አርዕስት"
 
-#: ../src/event-list.c:1323
-#, fuzzy
+#: ../src/event-list.c:1334
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
-"Double click line to edit it.\n"
-"\n"
-"Flags in order:\n"
-"\t 1. Alarm: n=no alarm\n"
-"\t\tA=visual Alarm S=also Sound alarm\n"
-"\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
-"\t 3. Type: f=free B=Busy"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "ቀን ምረጥ"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr ""
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr ""
 
-#: ../src/ical-archive.c:347
-#, fuzzy, c-format
+#: ../src/ical-archive.c:349
+#, c-format
 msgid "Archiving threshold: %d month(s)"
-msgstr "Archive threshold"
+msgstr ""
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr ""
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr ""
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr ""
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr ""
 
-#: ../src/ical-archive.c:405
-#, fuzzy
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
-msgstr "አስቀምጥ"
+msgstr ""
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr ""
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr ""
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr ""
 
-#: ../src/ical-archive.c:470
-#, fuzzy
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
-msgstr "Archive threshold"
+msgstr ""
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "የዖራጌ ቀዳሚ ቀስቃሽ"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
+msgid "Created alarm list for foreign file: %s (%s)"
 msgstr ""
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr ""
+
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
@@ -1373,7 +1377,16 @@
 msgid "Import file preprocessing done"
 msgstr ""
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "የካለንደር ፋይሎች"
 
@@ -1381,322 +1394,345 @@
 msgid "Current foreign files"
 msgstr ""
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr ""
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr ""
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr ""
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr ""
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr ""
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr ""
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr ""
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
 msgstr ""
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr ""
 
-#: ../src/interface.c:1013
-#, fuzzy
+#: ../src/interface.c:1004
 msgid "Write to file:"
-msgstr "ፋይል አስቀምጥ"
+msgstr ""
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
-msgstr "ሰርዝ"
+msgstr ""
 
-#: ../src/interface.c:1037
-#, fuzzy
+#: ../src/interface.c:1028
 msgid "All appointments"
-msgstr "አዲስ ቀጥሮ"
+msgstr ""
 
-#: ../src/interface.c:1050
-#, fuzzy
+#: ../src/interface.c:1041
 msgid "Named appointments: "
-msgstr "አዲስ ቀጥሮ"
+msgstr ""
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr ""
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr ""
 
-#: ../src/interface.c:1076
-#, fuzzy
+#: ../src/interface.c:1067
 msgid "Archive"
-msgstr "አስቀምጥ"
+msgstr ""
 
-#: ../src/interface.c:1084
-#, fuzzy, c-format
+#: ../src/interface.c:1075
+#, c-format
 msgid "Archive now (threshold: %d months)"
-msgstr "Archive threshold"
+msgstr ""
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr ""
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr ""
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
 msgstr ""
 
-#: ../src/interface.c:1118
-#, fuzzy
+#: ../src/interface.c:1109
 msgid "Orage files"
-msgstr "የዖራጌ ምርጫዎች"
+msgstr ""
 
-#: ../src/interface.c:1125
-#, fuzzy
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
-msgstr "የካለንደር ፋይሎች"
+msgstr ""
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "የካለንደር ፋይሎች"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
 
-#: ../src/interface.c:1137 ../src/interface.c:1202
-#, fuzzy
-msgid "New file"
-msgstr "ፋይል አስቀምጥ"
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
 
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
 msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr ""
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
 msgstr ""
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr ""
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr ""
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr ""
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr ""
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "ፋይል አስቀምጥ"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr ""
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr ""
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr ""
 
-#: ../src/interface.c:1284
-#, fuzzy
-msgid "Options"
-msgstr "የስዓት ምርጫዎች"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr ""
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr ""
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
 msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr ""
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
 msgstr ""
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr ""
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr ""
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr ""
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr ""
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr ""
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr ""
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr ""
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr ""
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr ""
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr ""
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr ""
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
 msgstr ""
 
-#: ../src/main.c:307
-#, fuzzy, c-format
+#: ../src/main.c:314
+#, c-format
 msgid "Options:\n"
-msgstr "የስዓት ምርጫዎች"
+msgstr ""
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr ""
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr ""
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr ""
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr ""
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
 msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr ""
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
 msgstr ""
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr ""
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr ""
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
 msgstr ""
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
@@ -1704,278 +1740,321 @@
 "\n"
 msgstr ""
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr ""
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "አርም_E"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "የተመረጠውን ቀን ይመልከቱ_d"
 
-#: ../src/mainbox.c:311
-#, fuzzy
+#: ../src/mainbox.c:329
 msgid "View selected _week"
-msgstr "የተመረጠውን ቀን ይመልከቱ_d"
+msgstr ""
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "ዛሬን_ምረጥ"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "ቦታ"
+msgstr ""
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "መመሪያ (_H)"
 
-#: ../src/mainbox.c:448
-#, fuzzy
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr ""
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr ""
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr ""
+
+#: ../src/mainbox.c:489
 msgid "Never"
-msgstr "መቼም አይሁን"
+msgstr ""
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:495
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr ""
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr ""
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr ""
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:486
 msgid "Main settings"
-msgstr "ካለንደር ስየማዎች"
+msgstr ""
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:492
 msgid "Timezone"
 msgstr "የጊዜ ቀጠና"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:507
 msgid "You should always define your local timezone."
 msgstr ""
 
-#: ../src/parameters.c:552
-#, fuzzy
+#: ../src/parameters.c:515
 msgid "Archive threshold (months)"
-msgstr "Archive threshold"
+msgstr ""
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:525
 msgid "(0 = no archiving)"
 msgstr ""
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:528
 msgid "Archiving is used to save time and space when handling events."
 msgstr ""
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:536
 msgid "Sound command"
 msgstr ""
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:551
 msgid "This command is given to shell to make sound in alarms."
 msgstr ""
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "ታይቷል"
-
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
-msgstr "የካለንደር መስኮት"
+#: ../src/parameters.c:590
+msgid "Calendar window"
+msgstr ""
+
+#: ../src/parameters.c:597
+msgid "Calendar visual details"
+msgstr ""
 
-#: ../src/parameters.c:618
-#, fuzzy
+#: ../src/parameters.c:603
 msgid "Show borders"
-msgstr "ፍሬም አሳይ _f"
+msgstr ""
 
-#: ../src/parameters.c:625
-#, fuzzy
+#: ../src/parameters.c:608
 msgid "Show menu"
-msgstr "ፍሬም አሳይ _f"
-
-#: ../src/parameters.c:632
-#, fuzzy
-msgid "Show month and year"
-msgstr "pager ውስጥ አሳይ"
+msgstr ""
 
-#: ../src/parameters.c:639
-#, fuzzy
+#: ../src/parameters.c:616
 msgid "Show day names"
-msgstr "ፍሬም አሳይ _f"
+msgstr ""
 
-#: ../src/parameters.c:646
-#, fuzzy
+#: ../src/parameters.c:621
 msgid "Show week numbers"
-msgstr "ፍሬም አሳይ _f"
+msgstr ""
+
+#: ../src/parameters.c:629
+msgid "Show month and year"
+msgstr ""
+
+#: ../src/parameters.c:649
+msgid "Calendar info boxes"
+msgstr ""
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:654
 msgid "Show todo list"
 msgstr ""
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:661
 msgid "Number of days to show in event window"
 msgstr ""
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:667
 msgid "0 = do not show event list at all"
 msgstr ""
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:680
+msgid "Calendar visibility"
+msgstr ""
+
+#: ../src/parameters.c:685
 msgid "Show on all desktops"
 msgstr ""
 
-#: ../src/parameters.c:683
-#, fuzzy
+#: ../src/parameters.c:690
 msgid "Keep on top"
-msgstr "የጊዜ ቀጠናን ወደ...ሰይም፦"
+msgstr ""
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:698
 msgid "Show in taskbar"
 msgstr "ትዕዛዝ ማስጫ ውስጥ አሳይ"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:703
 msgid "Show in pager"
 msgstr "pager ውስጥ አሳይ"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:711
 msgid "Show in systray"
 msgstr "ሲስተም ትሬ ውስጥ አሳይ"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:732
 msgid "Calendar start"
 msgstr "ካለንደር ማስነሻ"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:737
 msgid "Show"
 msgstr "አሳይ"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:749
 msgid "Hide"
 msgstr "ደብቅ"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:761
 msgid "Minimized"
 msgstr "አሳንስ"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
+#: ../src/parameters.c:781
+msgid "On calendar window open"
 msgstr ""
 
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "የካለንደር መስኮት"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "ዛሬን_ምረጥ"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:786
+msgid "Select today's date"
 msgstr ""
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
+#: ../src/parameters.c:799
+msgid "Select previously selected date"
 msgstr ""
 
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
+#: ../src/parameters.c:817
+msgid "Calendar day double click shows"
 msgstr ""
 
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
-
-#: ../src/parameters.c:861
+#: ../src/parameters.c:822
 msgid "Days view"
 msgstr ""
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:834
 msgid "Event list"
 msgstr ""
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
+#: ../src/parameters.c:856
+msgid "Extra settings"
+msgstr ""
+
+#: ../src/parameters.c:863
+msgid "Event list window extra days"
 msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:868
 msgid "Number of extra days to show in event list"
 msgstr ""
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:876
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
 msgstr ""
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:886
+msgid "Day view window default first day"
+msgstr ""
+
+#: ../src/parameters.c:891
+msgid "First day of week"
+msgstr ""
+
+#: ../src/parameters.c:904
+msgid "Selected day"
+msgstr ""
+
+#: ../src/parameters.c:922
+msgid "Use dynamic tray icon"
+msgstr ""
+
+#: ../src/parameters.c:927
+msgid "Use dynamic icon"
+msgstr ""
+
+#: ../src/parameters.c:933
+msgid "Dynamic icon shows current month and day of the month."
+msgstr ""
+
+#: ../src/parameters.c:941 ../src/parameters.c:946
 msgid "Use wakeup timer"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:952
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:961
+msgid "Foreign file default visual alarm"
+msgstr ""
+
+#: ../src/parameters.c:966
+msgid "Orage window"
+msgstr ""
+
+#: ../src/parameters.c:979
+msgid "Notify notification"
+msgstr ""
+
+#: ../src/parameters.c:997
+msgid "Always quit when asked to close"
+msgstr ""
+
+#: ../src/parameters.c:1002
+msgid "Always quit"
+msgstr ""
+
+#: ../src/parameters.c:1008
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr ""
+
+#: ../src/parameters.c:1024
 msgid "Orage Preferences"
 msgstr "የዖራጌ ምርጫዎች"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1136
 msgid "First Orage start. Searching default timezone."
 msgstr ""
 
-#: ../src/parameters.c:1069
-#, fuzzy, c-format
+#: ../src/parameters.c:1155
+#, c-format
 msgid "Default timezone set to %s."
-msgstr "የጊዜ ቀጠናን ወደ...ሰይም፦"
+msgstr ""
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1158
 msgid "Default timezone not found, please, set it manually."
 msgstr ""
 
@@ -1987,41 +2066,35 @@
 msgid "Open"
 msgstr ""
 
-#: ../src/reminder.c:722
-#, fuzzy
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
-msgstr "አስታዋሽ"
+msgstr ""
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
+#: ../src/reminder.c:803
+msgid "Postpone"
 msgstr ""
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
 msgstr ""
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "የሚቀጥለው በስራ ላይ ያለ ማንቂያ፦"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d ቀን %02d ሰዓት %02d ደቂቃ ወደ: %s"
+msgstr "\n%02d ቀን %02d ሰዓት %02d ደቂቃ ወደ: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"ምንም በተግባር ማንቂያዎች የሉም"
+msgstr "\nምንም በተግባር ማንቂያዎች የሉም"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2260,29 +2333,24 @@
 msgstr "America/Araguaina"
 
 #: ../src/timezone_names.c:95
-#, fuzzy
 msgid "America/Argentina/Buenos_Aires"
-msgstr "America/Buenos_Aires"
+msgstr ""
 
 #: ../src/timezone_names.c:96
-#, fuzzy
 msgid "America/Argentina/Catamarca"
-msgstr "America/Catamarca"
+msgstr ""
 
 #: ../src/timezone_names.c:97
-#, fuzzy
 msgid "America/Argentina/Cordoba"
-msgstr "America/Cordoba"
+msgstr ""
 
 #: ../src/timezone_names.c:98
-#, fuzzy
 msgid "America/Argentina/Jujuy"
-msgstr "America/Jujuy"
+msgstr ""
 
 #: ../src/timezone_names.c:99
-#, fuzzy
 msgid "America/Argentina/Mendoza"
-msgstr "America/Mendoza"
+msgstr ""
 
 #: ../src/timezone_names.c:100
 msgid "America/Aruba"
@@ -3589,141 +3657,34 @@
 msgstr "ስለ ዖራጌ"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Orage Panel Clock"
-msgstr "ዖራጌ ስዓት"
+msgstr ""
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
 msgid "Show time and date?"
-msgstr "ቀኑና ስዓቱ ስንት ነው"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "ካለንደር"
+msgid "Orage preferences"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "የዖራጌ ምርጫዎች"
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "የዖራጌ ምርጫዎች"
+msgid "Orage Calendar Preferences"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "የሸፍሲ 4 ካለንደር ስየማዎች"
-
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "የገበታ ካለንደር"
-
 #: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
+msgid "Calendar"
 msgstr "ካለንደር"
 
-#~ msgid "Orage clock"
-#~ msgstr "ዖራጌ ስዓት"
-
-#~ msgid "Contributor"
-#~ msgstr "አስተዋጺ"
-
-#~ msgid "Warning"
-#~ msgstr "ማስጠንቀቂያ"
-
-#~ msgid "Display"
-#~ msgstr "አሳይ"
-
-#, fuzzy
-#~ msgid "Select always today"
-#~ msgstr "ዛሬን_ምረጥ"
-
-#, fuzzy
-#~ msgid "Vary"
-#~ msgstr "በየዓመቱ"
-
-#~ msgid "Select timezone"
-#~ msgstr "የጊዜ ቀጠናን ምረጥ"
-
-#, fuzzy
-#~ msgid "Modify Preferences"
-#~ msgstr "የዖራጌ ምርጫዎች"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr "ትክክለኛ የጊዜ ክልል (=TZ) ይሰይሙ ወይም ከዝርዝሩ ይምረጡ።"
-
-#~ msgid "show line _1:"
-#~ msgstr "መስመር_1ን አሳይ፦"
-
-#~ msgid "show line _2:"
-#~ msgstr "መስመር_2ን አሳይ፦"
-
-#~ msgid "show line _3:"
-#~ msgstr "መስመር_3ን አሳይ፦"
-
-#~ msgid "Properties"
-#~ msgstr "ባህሪዎች"
-
-#, fuzzy
-#~ msgid "Show event list"
-#~ msgstr "ሲስተም ትሬ ውስጥ አሳይ"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "የሸፍሲ 4 ካለንደር ስየማዎች"
-
-#~ msgid "Calendar borders"
-#~ msgstr "የካለንደር ወሰኖች"
-
-#~ msgid "Hidden"
-#~ msgstr "ተደብቋል"
-
-#~ msgid "3 months"
-#~ msgstr "3 ወር"
-
-#~ msgid "6 months"
-#~ msgstr "6 ወር"
-
-#~ msgid "1 year"
-#~ msgstr "1 ዓመት"
-
-#~ msgid "Application"
-#~ msgstr "ፕሮግራሞች"
-
-#~ msgid "Button Label|Orage"
-#~ msgstr "አዝራር ስም|ዖራጌ"
-
-#~ msgid "Core developer"
-#~ msgstr "ዋና ደራሲዎች"
-
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%m/%d/%Y"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "ከዚህ ቀን ጋር የተያያዘ \n"
-#~ " ማንኛውም መረጃ ይሰረዛል"
-
-#~ msgid "Clear"
-#~ msgstr "ሰርዝ"
-
-#~ msgid "uid"
-#~ msgstr "uid"
-
-#~ msgid "This should not happen"
-#~ msgstr "ይህ መሆን አይገባውም"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "የMCS ጠሪ ካናልን መፍጠር አልተቻለም"
-
-#~ msgid "Open archive file..."
-#~ msgstr "የማህደር ፋይልን ክፈት..."
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr ""
 
-#~ msgid "Close archive file"
-#~ msgstr "የማህደር ፋይልን ዝጋ"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "የገበታ ካለንደር"
diff -Nru orage-4.8.3/po/ar.po orage-4.12.1/po/ar.po
--- orage-4.8.3/po/ar.po	2012-01-03 12:00:59.000000000 +0000
+++ orage-4.12.1/po/ar.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,24 +1,47 @@
-# Arabic translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Saleh Alhathal <hathalsal@hotmail.com>, 2004.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Karim Oulad Chalha <herr.linux88@gmail.com>, 2013
+# mohammad alhargan <malham1@hotmail.com>, 2013
+# محمد الحرقان <malham1@gmail.com>, 2012
+# Saleh Alhathal <hathalsal@hotmail.com>, 2004
+# Karim Oulad Chalha <herr.linux88@gmail.com>, 2013
+# محمد الحرقان <malham1@gmail.com>, 2012-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfcalendar\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2011-08-01 16:37-0000\n"
-"Last-Translator: كريم اولاد الشلحة <herr.linux88@gmail.com>\n"
-"Language-Team: Arabeyes Translation & Documentation <admin@arabeyes.org>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2014-12-08 14:05+0000\n"
+"Last-Translator: عبدالله رضوان <abbodmar@gmail.com>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/xfce-apps/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr ""
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "فقط"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "ضعف"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "منخفض"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr "جلب نافذة الساعة العالمية"
+msgstr "جلب نافذة الساعة العالمية..."
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
@@ -30,21 +53,17 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"إضغط ﻷتحرير الساعة"
+msgstr "%s\nإضغط ﻷتحرير الساعة"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
-msgstr "المكان"
+msgstr "التوقيت المحلي"
 
 #: ../globaltime/globaltime.c:464
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"الزر 1 لتحرير الإعدادات \n"
-"الزر 2 لضبظ الساعة"
+msgstr "الزر 1 لتحرير التفصيلات \nالزر 2 لضبظ الساعة"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -53,7 +72,11 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr "لضبط الدقائق. إضغط فوق مع الزر 2 لتغيير دقيقة واحدة."
+msgstr "لضبط الدقائق. إضغط السهم للأعلى مع زر 2 لتغيير 1دقيقة فقط."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "التوقيت العالمي"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -77,7 +100,7 @@
 
 #: ../globaltime/gt_prefs.c:526
 msgid "add new clock using this clock as model"
-msgstr "إضافة ساعة جديدة باستخدام هذه الساعة نموذجا"
+msgstr "إضافة ساعة جديدة باستخدام هذه الساعة كنموذج"
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
@@ -109,16 +132,16 @@
 
 #: ../globaltime/gt_prefs.c:590
 msgid "Globaltime preferences "
-msgstr "تفضيلات الساعة العالمية"
+msgstr "تفضيلات الساعة العالمية "
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
 msgid "Clock Parameters"
-msgstr "معلمات الساعة"
+msgstr "إعدادات الساعة"
 
 #: ../globaltime/gt_prefs.c:607
 msgid "Name of the clock:"
-msgstr "اسم الساعة :"
+msgstr "اسم الساعة:"
 
 #: ../globaltime/gt_prefs.c:613
 msgid "enter name of clock"
@@ -126,7 +149,7 @@
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
-msgstr "التوقيت على مدار الساعة :منطقة توقيت الساعة:"
+msgstr "منطقة توقيت الساعة:"
 
 #: ../globaltime/gt_prefs.c:643
 msgid "Text Formatting"
@@ -135,7 +158,7 @@
 #. ------------------------background-------------------------
 #: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
 msgid "Background color:"
-msgstr "لون الخلفية :"
+msgstr "لون الخلفية:"
 
 #: ../globaltime/gt_prefs.c:656
 msgid "Click to change background colour for clock"
@@ -158,7 +181,7 @@
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
 msgid "Foreground (=text) color:"
-msgstr "المقدمة (= النص) اللون :"
+msgstr "المقدمة (=النص) اللون:"
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
@@ -167,7 +190,7 @@
 #. ------------------------name font-------------------------
 #: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
 msgid "Font for name of clock:"
-msgstr "الخط لاسم الساعة:"
+msgstr "خط اسم الساعة:"
 
 #: ../globaltime/gt_prefs.c:720
 msgid "Click to change font for clock name"
@@ -176,7 +199,7 @@
 #. ------------------------time font-------------------------
 #: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
 msgid "Font for time of clock:"
-msgstr "خط الوقت للساعة :"
+msgstr "خط وقت الساعة:"
 
 #: ../globaltime/gt_prefs.c:753
 msgid "Click to change font for clock time"
@@ -190,7 +213,7 @@
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:810
 msgid "Underline time of clock:"
-msgstr "سطر وقت الساعة:"
+msgstr "سَطِر وقت الساعة:"
 
 #: ../globaltime/gt_prefs.c:850
 msgid "Text Default Formatting"
@@ -202,7 +225,7 @@
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr "اجتز هذا لاستخدام لون النظام الافتراضي"
+msgstr "اختز هذا لاستخدام لون النظام الافتراضي"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
@@ -223,16 +246,16 @@
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:990
 msgid "Underline for name of clock:"
-msgstr "سطر اسم الساعة:"
+msgstr "سَطِر اسم الساعة:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:1004
 msgid "Underline for time of clock:"
-msgstr "سطر وقت الساعة:"
+msgstr "سَطِر وقت الساعة:"
 
 #: ../globaltime/gt_prefs.c:1027
 msgid "update preferences"
-msgstr "إعداد التحديث"
+msgstr "تحديث التفضيلات"
 
 #: ../globaltime/gt_prefs.c:1062
 msgid "Globaltime Preferences"
@@ -245,7 +268,7 @@
 
 #: ../globaltime/gt_prefs.c:1077
 msgid "Decorations:"
-msgstr "ديكور :"
+msgstr "ديكور:"
 
 #: ../globaltime/gt_prefs.c:1078
 msgid "Standard"
@@ -253,11 +276,15 @@
 
 #: ../globaltime/gt_prefs.c:1083
 msgid "Use normal decorations"
-msgstr "استخدام ديكورات طبيعية"
+msgstr "استخدام ديكورات عادية"
+
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "لا شيء"
 
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
-msgstr "ديكورات لا تظهر نافذة (الحدود)"
+msgstr "لا تظهر ديكور النوافذ (الحدود)"
 
 #: ../globaltime/gt_prefs.c:1100
 msgid "Clock size:"
@@ -265,7 +292,7 @@
 
 #: ../globaltime/gt_prefs.c:1101
 msgid "Equal"
-msgstr "متساو"
+msgstr "مساوي"
 
 #: ../globaltime/gt_prefs.c:1106
 msgid "All clocks have same size"
@@ -281,12 +308,12 @@
 
 #: ../globaltime/gt_prefs.c:1122
 msgid "Local timezone:"
-msgstr "التوقيت المحلي :"
+msgstr "المنطقة الزمنية المحلية:"
 
 #: ../globaltime/timezone_selection.c:101
 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
 msgid " Other"
-msgstr "اخرى"
+msgstr " اخرى"
 
 #: ../globaltime/timezone_selection.c:156
 #: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
@@ -330,7 +357,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "المكان"
@@ -343,7 +370,7 @@
 #: ../globaltime/timezone_selection.c:264
 #: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
 msgid "Previous/Next Change"
-msgstr "التغيير السابق / التالي"
+msgstr "التغيير السابق /التالي"
 
 #: ../globaltime/timezone_selection.c:269
 #: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
@@ -391,95 +418,108 @@
 msgid "floating"
 msgstr "عائم"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "المكان"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "التوقيت العالمي"
+msgstr "التوقيت العالمي أوراج"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "عرض الساعات من مختلف البلدان"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "التوقيت العالمي"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "لا دوران"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "دوران لليسار"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr ""
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
-msgstr "الشكل"
+msgstr "المظهر"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
 msgstr "أظهر النافذة"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
-msgstr "إختر اللون الأمامي"
+msgstr "اختر اللون الأمامي:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
-msgstr "إختر·اللون الخلفي"
+msgstr "اختر اللون الخلفي:"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
-msgstr "الطول"
+msgstr "ضبط الطول:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
 msgstr "لاحظ أنه لا يمكنك تغيير ارتفاع الألواح الأفقية"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
-msgstr "العرض"
+msgstr "ضبط العرض:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
 msgstr "لاحظ أنه لا يمكنك تغيير عرض اللوحات الرأسية"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr ""
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "خيارات الساعة"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
-msgstr "اختر النطاق الزمني"
+msgstr "تعيين المنطقة الزمنية إلى:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
-msgstr "خط %d:"
+msgstr "سطر %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
 msgstr "ادخل أي دالة صالحة."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
-msgstr "تلميح الأدوات :"
+msgstr "الأدوات التلميح:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
-msgstr "الإصلاح وقت بعد التعليق / السابات"
+msgstr "إصلاح الوقت بعد التعليق/السُبات"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"كل ما عليك على المدى القريب ( أقل من 5 ساعات)  التعليق أو الاسبات الزمن "
-"المرئية لا يتضمن ثواني. لذلك سيكون وقت Orageclock غير دقيق ما لم تقم بتحديد "
-"هذا الاختيار.(تحديد هذا يمنع المعالج من مقاطعة ميزة الادخار عن العمل)."
+msgstr "تحتاج هذا فقط إذا كان لديك تعليق قصير الأجل (أقل من 5 ساعات) أو الإسابات ووقتك المرئي لا يتضمن ثواني. في ظل هذه الظروف من الممكن أن تظهر ساعة أوراج الوقت بشكل غير دقيق إلا إذا قمت بتحديد هذا. (تحديده يمنع مقاطعة وحدة المعالجة المركزية لحفظ العمل.)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -489,21 +529,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"هذا البرنامج يستخدم الدالة strftime للحصول على وقت.\n"
-"يستخدم أي رمز صالحة للحصول على الوقت في التنسيق الذي تفضل.\n"
-"بعض الرموز مثل:\n"
-"\t%A = ايام الاسبوع\t\t\t%B = شهر\n"
-"\t%c = يوم & وقت\t\t%R = ساعه & دقيقة\n"
-"\t%V = رقم الاسبوع\t\t%Z = منطقة التوقيت\n"
-"\t%H = ساعات \t\t\t\t%M = دققائق\n"
-"\t%X = وقت محلي\t\t\t%x = lتاريخ محلي"
+msgstr "هذا البرنامج يستخدم الدالة strftime للحصول على وقت.\nيستخدم أي رمز صالحة للحصول على الوقت في التنسيق الذي تفضل.\nبعض الرموز مثل:\n\t%A = ايام الاسبوع\t\t\t%B = شهر\n\t%c = يوم & وقت\t\t%R = ساعه & دقيقة\n\t%V = رقم الاسبوع\t\t%Z = منطقة التوقيت\n\t%H = ساعات \t\t\t\t%M = دقائق\n\t%X = وقت محلي\t\t\t%x = lتاريخ محلي"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
-msgstr "إعدادات Orage ساعة"
+msgstr "إعدادات ساعة أوراج"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -512,8 +543,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
 
@@ -523,12 +553,12 @@
 
 #: ../src/about-xfcalendar.c:47
 msgid "Manage your time with Orage"
-msgstr "إدارة وقتك مع Orage"
+msgstr "أدر وقتك مع أوراج"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "نهاية"
 
@@ -536,241 +566,295 @@
 msgid "Due"
 msgstr "استحقاق"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
-msgstr "Orage"
+msgstr "أوراج"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
-msgstr "اختر ملف"
+msgstr "اختر ملف..."
 
 #: ../src/appointment.c:680
 msgid "Sound Files"
 msgstr "ملفات الصوت"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "جميع الملفات"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
-msgstr "معلومات الموعد تم تغييرها"
+msgstr "تم تعديل معلومات الموعد."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "هل تود الاستمرار؟"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "لا، لا تغادر"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "نعم، تجاهل التعديلات وغادر"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "نهاية هذا الموعد هي فبل بدايته."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "لم يتم تعيين"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "أضف موعد جديد لهذا الملف"
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "الملف الافتراضي لأوراج"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "فشل إضافة التعيين"
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "حدث خطأ عند إضافة التعيين، للمزيد من التفاصيل قم بفتح ملف السجل"
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "فشل تحديث التعيين"
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
-msgstr "هذا الموعد سيحذف بكسفسة نهائية."
+msgstr "هذا الموعد سيحذف بشكل نهائي."
+
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "لا، إلغاء أمر الإزالة"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "نعم، قم بإزالتها"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "اختر تاريخ"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "اليوم"
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
-msgstr "هذا التعيين لم يحدد."
+msgstr "هذا الموعد لم يحدد."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
 msgstr "ربما تمت إزالته ، يرجى تحديث الشاشة."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "الفئات الحالية"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "إضافة فئة جديدة مع اللون"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "الفئة:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
-msgstr "ألوان الفئات -- Orage"
+msgstr "ألوان الفئات -- أوراج"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr " *** نسخ ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
-msgstr "موعد جديد"
+msgstr "موعد جديد - أوراج"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_ملف"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
-msgstr "حفظ وقفل"
+msgstr "حف_ظ و إغلاق"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "مكررة"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "حفظ"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
-msgstr "حفظ وقفل"
+msgstr "حفظ و إغلاق"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "رجوع"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "مكررة"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "حذف"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "تحرير"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "مشغول"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "عمومي"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
-msgstr "نوع"
+msgstr "نوع "
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "حدث"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"الحدث الذي سيحدث في وقت ما. على سبيل المثال : \\ nاجتماع  أو عيد ميلاد أو "
-"برنامج تلفزيوني."
+msgstr "المناسبة اللتي ستحدث في وقت ما. على سبيل المثال:\nاجتماع أو عيد ميلاد أو برنامج تلفزيوني."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
-msgstr "يجب فعله"
+msgstr "مهام"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"شيء يجب عليك فعله في وقت ما. مثالاً :\n"
-"تغسل سيارتك  أو تجرب نسخة جديدة من Orage."
+msgstr "شيء يجب عليك فعله في وقت ما. مثالاً :\nتغسل سيارتك أو تجرب نسخة جديدة من أوراج."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
-msgstr "مجلة"
+msgstr "جريدة"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"تقديم مذكرة بأن شيئا ما حدث. على سبيل المثال : \\ nRemark أن والدتك أو ودعا "
-"جاء أول الثلوج."
+msgstr "تقديم مذكرة بأن شيئا ما حدث. على سبيل المثال:\nحدث مهم أو نزول أول الثلوج."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
-msgstr "عنوان"
+msgstr "عنوان "
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
-msgstr "حدث كل اليوم"
+msgstr "حدث لليوم كله"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "بداية"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
-msgstr "ضبط"
+msgstr "تحديد      "
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "مدة"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "أيام"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "ساعات"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "دقائق"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "متاح"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
-msgstr "الانتهاء"
+msgstr "منتهي"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "انتهى"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "الفئات"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"عمل مذكرة بشيئ حدث. مثلاً:\n"
-"دعاء والدتك أو مولود لصديق."
+msgstr "هذه هي الفئة الخاصة، التي يمكن استخدامها التعيين الألوان في طرق عرض القائمة."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
-msgstr "تحديث فئات الألوان."
+msgstr "تحديث ألوان الفئات."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "الأولوية"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr ""
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
-msgstr "لاحظ"
+msgstr "ملاحظة"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -779,138 +863,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"اختزال هذه الأوامر يسري مفعوله فورا:\n"
-" <D> إدراج التاريخ الحالي في تنسيق التاريخ المحلي:\n"
-" <T> إدراج الوقت و:\n"
-" <DT>إدراج التاريخ والوقت يتم تحويل:\n"
-" لاحقا عند النظر إليها:\n"
-" <&Ynnnn>ترجم إلى السنة الحالية ناقص nnnn.\n"
-"(يمكن استخدام هذا مثلاً في تذكير عيد ميلاد لمعرفة عمر الشخص)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "أوامر الإختزال هذه يسري مفعولها فورا:\n    <D> إدراج التاريخ الحالي بتنسيق التاريخ المحلي:\n    <T> إدراج الوقت و:\n    <DT> إدراج التاريخ والوقت يتم تحويل.\nلاحقا عند النظر إليها:\n    <&Ynnnn> ترجمة للسنة الحالية ناقص nnnn.\n(يمكن استخدام هذا مثلاً في تذكير عيد ميلاد \nلمعرفة عمر الشخص.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
-msgstr "قبل البدء"
+msgstr "قبل البداية"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "قبل النهاية"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
-msgstr "بعد البدء"
+msgstr "بعد البداية"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "بعد نهاية"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "منبه"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "ساعة المنبه"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"كثيرا ما ترغب في الحصول على تنبيه:\n"
-"1-قبل بدء الحدث:\n"
-"2-قيب أن تعمل شيئ:\n"
-"3-بعد عمل شيئ"
+msgstr "كثيرا ما ترغب في الحصول على تنبيه:\n1) قبل بدء الحدث\n2) قيل أن تعمل شيئ\n3) بعد عمل شيئ"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr "استمرار التنبيه"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"حدد هذا إذا كنت تريد أن يذكرك Orage بحدث حتى عندما يكون لا يكون مفعلاً عند "
-"وقت التنبيه."
+msgstr "حدد هذا إذا كنت تريد أن يذكرك أوراج بحدث حتى عندما لا يكون مفعلاً عند وقت التنبيه."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "صوت"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "استخدم"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
-msgstr "حدد هذا إذا كنت تريد التنبيه مسموعة"
+msgstr "حدد هذا إذا كنت تريد تنبيه مسموع"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
-msgstr "ترديد صوت المنبه"
+msgstr "تكرار المنبه"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "الوقت"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "ألثواني الفاصلة"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "بصري"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
-msgstr "استخدام نافذة Orage"
+msgstr "استخدام نافذة أوراج"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
-msgstr "حدد هذا إذا كنت تريد  نافذة تنبيهOrage"
+msgstr "حدد هذا إذا كنت تريد نافذة لتنبيه أوراج"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
-msgstr "استخدام الإعلام"
+msgstr "استخدم التنبيه"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
-msgstr "حدد هذا إذا كنت تريد التنبيه إعلام"
+msgstr "حدد هذا إذا كنت تريد إعلام بالتنبيه"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
-msgstr "تعيين المهلة"
+msgstr "تحديد المهلة"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
 msgstr "حدد هذا إذا كنت تريد أن ينتهي الإعلام تلقائيا"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0=انتهاء وقت النظام الافتراضي"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "ثانية"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "إجراءات"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
-msgstr "حدد هذا إذا كنت تريد التنبيه النصي"
+msgstr "حدد هذا إذا كنت تريد إجراء أو تنبيه نصي"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -920,153 +990,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
+msgstr "يجب عليك إدخالات الهروب وجميع الحروف إلخ بنفسك.\nتقدم هذه السلسلة إلى صدفة شيل لتنفيذها.\nيتم استبدال الأوامر الخاصة التالية أثناء وقت التشغيل:\n\t<&T>  عنوان الموعد\n\t<&D>  وصف الموعد\n\t<&AT> وقت التنبيه\n\t<&ST> وقت بدء الموعد\n\t<&ET> وقت إنتهاء الموعد"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
 msgstr "اختبار هذا التنبيه بالضغط عليه الآن"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "<b>التنبيه الافتراضي</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
-msgstr "تخزين الإعدادات الحالية كتنبيه الافتراضية"
+msgstr "تخزين الإعدادات الحالية كتنبيه افتراضي"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
 msgstr "ضبط الإعدادات الحالية من التنبيه الافتراضية"
 
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "لا شيء"
-
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "يومي"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "اسبوعي"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "شهري"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "سنوي"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
 msgstr "كل ساعة"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "الإثنين"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "الثلاثاء"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "الأربعاء"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "الخميس"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "الجمعة"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "السبت"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "الأحد"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "تكرار"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "تعقيد"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "بسيط"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "متقدم"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "استخدام هذا إذا كنت تريد تكرار الاحداث العادية"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"استخدام هذا اذا كنت بحاجة الى تركيبة معقدة مثل\n"
-"كل السبت والأحد أو\n"
-"الثلاثاء أول كل شهر."
+msgstr "استخدم هذا إذا كنت بحاجة إلي تركيبة معقدة مثل:\n كل سبت وأحد أو\n ثلاثاء أول كل شهر"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "التردد"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "كل"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "ظهور"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr "فترة تكرار التأكيد.\\مثلاً كل ثلاث أيام:\\تردد = يومياً ولمدة = 3"
+msgstr "فترة تكرار التأكيد.\nمثلاً كل ثلاث أيام: \nتردد = يومياً ولمدة = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "تحديد"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "كرر دائما"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
-msgstr "تكرار"
+msgstr "تكرار "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
-msgstr "كرر الى"
+msgstr "كرر حتى "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "ايام الاسبوع"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "اي يوم"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1074,283 +1137,297 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"تحديد أي يوم من أيام الأسبوع لحدث شهري وسنوي.\n"
-"مثلاً:\n"
-"ثاني اربعاء كل شهر:\n"
-"\tتكرار =شهرياً\n"
-"\tيوم الاسبوع= حدد فقط الاربعاء,\n"
-"\tأي يوم =اختر 2 من ترتيب يوم الاربعاء"
+msgstr "تحديد أي يوم من أيام الأسبوع لحدث شهري وسنوي.\nمثلاً:\nثاني اربعاء كل شهر:\n\tتكرار =شهرياً\n\tيوم الاسبوع = حدد فقط الاربعاء,\n\tأي يوم = اختر 2 من ترتيب يوم الاربعاء"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr "قاعدة المهام"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"مهام تتكرر بانتظام تبداه في وقت واحد وتكرار بعد فترة زمنية حتى اكتملها."
+msgstr "مهام تتكرر بانتظام تبدأ في وقت واحد وتكرار بعد فترة زمنية حتى اكتملها"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"مهام تستند على انقضاء زمن وتتكرر بعد فترة زمنية تحسب من وقت الانتهاء.\n"
-"(لاحظ أنه لا يمكن أن تحصي شيء عن تاريخ المهام منذ تكرارها حتى إنهائها.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "مهام تستند على انقضاء زمن وتتكرر بعد فترة زمنية تحسب من وقت الانتهاء.\n(لاحظ أنه لا يمكن أن تحصي شيء عن تاريخ المهام منذ تكرارها حتى إنهائها.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "الاستثناءات"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"أضف تواريخ استثناء أكثر بالنقر على أيام في التقويم أدناه.\n"
-"إستثناء أو استبعاد(-) أو إضافة(+) يعتمد على الاختيار.\n"
-"إزالة بالنقر على البيانات"
+msgstr "أضف تواريخ استثناء أكثر بالنقر على أيام في التقويم أدناه.\nاستثناء أو استبعاد(-) أو إضافة(+) يرجع للتحديد.\nإزالة بالنقر على البيانات."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr "إضافة تاريخ مستبعد (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr "الايام المستبعدة هي أيام كاملة لا يحدث فيها هذا التعيين"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
-msgstr "أضيف المزيد من الوقت (+)"
+msgstr "أضف المزيد من الوقت (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
 msgstr "تشمل المنطقة الزمنية نفسها من وقت البدء ، لكنها قد تختلف في الوقت"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
 msgstr "مواعيد العمل"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
-msgstr "_أظهر"
+msgstr "_اعرض"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "_إذهب"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "جديد"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "رجوع"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "اليوم"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "أمام"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "عودة أسبوع واحد"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "عودة يوم واحد"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "يوم واحد إلى الأمام"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "أسبوع واحد إلى الأمام"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
-msgstr "انعاش"
+msgstr "تجديد"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
-msgstr "قفل"
+msgstr "إغلاق"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
-msgstr "غير معروف"
+msgstr "مجهول"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
-msgstr "عدد أيام العرض"
+msgstr "       عدد أيام العرض"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
-msgstr "Orage - عرض اليوم"
+msgstr "أوراج - عرض اليوم"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "جميع الأيام"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "الوقت"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "لم يتم تحديد أي الصفوف."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
 msgstr "انقر فوق صف لتحديده وبعد ذلك يمكنك نسخها."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr "ستقوم بإزالة جميع \\ nالتعيينات بشكل دائم"
+msgstr "ستقوم بإزالة جميع\nالتعيينات بشكل دائم."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "نعم، قم بحذفها"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "رجوع"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "أمام"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "العثور على"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "عرض اليوم"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "أيام أضافية للإظهار"
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "إظهار أيام إضافية:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "كرر فقط لأول مرة"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr ""
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr ""
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr ""
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
-msgstr "إدخالات دفتر اليومية بدءا من :"
+msgstr "إدخالات دفتر اليومية بدءا من:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "بحث"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
-msgstr "البحث عن النص"
+msgstr "البحث عن النص "
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
-msgstr "راية"
+msgstr "علامات"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "عنوان"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"النقر مرتين فوق خط لتحريره\n"
-"\n"
-"الاعلام بالترتيب\n"
-"\t1.تنبيه: n=بدون تنبيه\n"
-"\t\t A=تنبيه بصري S= أيضاً تنبيه صوتي\n"
-"\t2.تكرار: n=بدوت تكرار\n"
-"\t\t d=d,ld W= اسبوعي M=شهري Y=سنوي\n"
-"\t3. نوع: f=متاح B=مشغول\n"
-"\t 4.موجود في ملف\n"
-"\t\tO=Orage A=ارشيف F=خارجي\n"
-"\t 5.نوع الموعد:\n"
-"\t\tE=تنبيه T=مهمه J= جريدة"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "اختر تاريخ"
+msgstr "انقر نقراً مزدوجاً فوق خط تحريره.\n\nعلامات النظام:\n\t 1. تنبيه: لا= بدون تنبيه\n\t\t ت = تم ضبط التنبيه م = التتنبيه المستمر تم تعيينه\n\t 2. التكرار: لا = بدون تكرار\n\t\t س= كل ساعة ي = يومي اس = أسبوعي ش= شهري سن = سنوي\n\t 3. النوع: ح = حر م = مشغول\n\t 4. موجود في الملف:\n\t\tأو=أوراج أ=أرشيف غ=غريب\n\t 5. نوع التعيين:\n\t\tح=حدث م=مهمة"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tانتهى التكرار، الانتقال إلى ملف أرشيف."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "لم يتم تمكين الأرشفة. خروج"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
-msgstr "  للأرشفة الحد الأدنى: %d شهر(s)"
+msgstr "أرشفة الحد الأدنى: %d شهر(s)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr "\tالأرشفة الأحداث، والتي مضى عليها أكثر من: %04d-%02d-%02d"
+msgstr "\tالأرشفة الأحداث، التي مضى عليها أكثر من: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "أرشفة uid: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
-msgstr "\tVلم تكتمل المهام. لم تؤرشف"
+msgstr "\tVلم تكتمل المهام; لم تؤرشف"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr "\tمكرر.نهاية السنة: %04d, شهر: %02d, يوم: %02d"
+msgstr "\tمكرر. نهاية السنة: %04d, شهر: %02d, يوم: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "انتهت الأرشفة\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "بدء إزالة أرشيف."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tالمرحلة 1 : إعادة تعيين المواعيد المتكررة"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tالمرحلة 2 : العودة للمواعيد المؤرشفة"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "اُزيل الأرشيف\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
-msgstr "Orage التنبيه الافتراضي"
+msgstr "التنبيه الافتراضي لأوراج"
+
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr ""
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "بناء قائمة التنبيه : إضافة %d تنبيهات. معالجة %d المهام."
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr ""
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr "العثور على %d تنبيه منها %d مؤرشفة. (بحث %d التنبيهات المتكررة.)"
+msgstr "\tالعثور على %d تنبيه منها %d مؤرشفة. (بحث %d التنبيهات المتكررة.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1358,2393 +1435,3019 @@
 
 #: ../src/ical-expimp.c:158
 msgid "... Patched DCREATED to be CREATED."
-msgstr "... تصحيح لم تنشأ إلى انشئت"
+msgstr "... تصحيح من لم تنشأ إلى أنشأت."
 
 #: ../src/ical-expimp.c:197
 msgid "... Patched timezone to Orage format."
-msgstr "... تصحيح التوقيت من المحلي إلى  Orage."
+msgstr "... تصحيح المنطقة الزمنية إلى تنسيق أوراج."
 
 #: ../src/ical-expimp.c:206
 msgid "Import file preprocessing done"
 msgstr "انتهي من معالجة استيراد ملف"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
-msgstr "ملفات التقويم "
+msgstr "ملفات التقويم"
 
 #: ../src/interface.c:631
 msgid "Current foreign files"
 msgstr "الملفات الحالية الخارجية"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "قراءة فقط"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "القراءة والكتابة"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
-msgstr "*****لا الملفات الخارجية *****"
+msgstr "***** لا ملفات خارجية *****"
+
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr ""
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
 
-#: ../src/interface.c:974
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "استيراد / تصدير"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "استيراد"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
-msgstr "قراءة من الملف :"
+msgstr "قراءة من الملف:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"أسماء الملفات المستقلة مع فاصلة(,).\n"
-"ملاحظة : الفاصلة ليس حرف صالح في أسماء لOrage."
+msgstr "أسماء الملفات المستقلة مع فاصلة(,).\n ملاحظة : الفاصلة ليست حرف صالح في أسماء أوراج."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "تصدير"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
-msgstr "الكتابة إلى الملف :"
+msgstr "الكتابة إلى الملف:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "حدد"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
-msgstr "جميع التعيينات"
+msgstr "جميع المواعيد"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
-msgstr "اسمه التعيينات :"
+msgstr "المواعيد مسماة: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"لاحظ أنه يقرأ الملف المحدد الرئيسي فقط.\n"
-"الارشيف والملفات الخارجية لا تقبل."
+msgstr "لاحظ أنه يقرأ ملف الموعد الرئيسي فقط.\nالارشيف والملفات الخارجية لا تصدر."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"لاحظ أنه يقرأ الملف المحدد الرئيسي فقط.\n"
-" والملفات الخارجية لا تقبل."
+msgstr "لاحظ أنه يقرأ ملف الموعد الرئيسي فقط.\nالأحدات الخارجية لا تصدر."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
-msgstr "يمكنك بسهولة سحب المهمة من نافذة لائحة المهام"
+msgstr "يمكنك بسهولة سحب المهمة من نافذة لائحة المهام."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
-msgstr "UIDs تعيين Orage مفصولة بفواصل."
+msgstr "مُعرفات مستخدمي لمواعيد أوراج مفصولة بفواصل."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "أرشيف"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "أرشف الآن (الحد الأدنى : %d أشهر)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
-msgstr "يمكنك تغيير حدود الأرشيف في معايير"
+msgstr "يمكنك تغيير حد الأدنى للأرشيف في معايير"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "رجوع الأرشيف الآن"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"إرجاع  جميع الأحداث المؤرشفة في ملف orage الرئيسي وإزالة ملفات الفهرس.\n"
-"هذا مفيد مثلاً عند تصدير أونقل مواعيد\n"
-"orage إلى نظام آخر."
+msgstr "إرجاع جميع الأحداث المؤرشفة في ملف أوراج الرئيسي وإزالة ملفات الفهرس.\nهذا مفيد مثلاً عند تصدير أونقل مواعيد\nأوراج إلى نظام آخر."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
-msgstr "ملفات Orage"
+msgstr "ملفات أوراج"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
-msgstr "Orage ملف التقويم الرئيسي"
+msgstr "ملف التقويم الرئيسي لأوراج"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "الملف الحالي"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
 
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "ملف جديد"
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
 
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "خيارات الأحداث"
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "إعادة تسمية"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"إعادة اسم الملف Orage الداخلي فقط.\n"
-"لا يمس نظام الملفات الخارجية.\n"
-"الملفات الجديدة يجب أن تبقى."
+msgstr "إعادة اسم الملف أوراج الداخلي فقط.\nلا يمس نظام الملفات الخارجية.\nالملفات الجديدة يجب أن تبقى."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "نسخة"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr "يتم نسخ الملف الحالي ويبقى غير معدل في مكانه القديم."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "حرك"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "يتم نقل الملف الحالي ويزال من المكان القديم."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "ملف الأرشيف"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
-msgstr "ملفات دخيلة"
+msgstr "ملفات خارجية"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
-msgstr "إضافة ملف دخيلة جديدة"
+msgstr "إضافة ملف خارجي جديد"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "ملف خارجي:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "خيارات"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "قراءة فقط"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"عين هذا إذا رغبت في التأكد من عدم تعديل هذا الملف من قبلOrage.\n"
-"لاحظ أن تعديل الملفات الخارجية ، قد يجعلها غير متوافقة مع الأداة الأصلية ، "
-"من حيث أتوا!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "عين هذا إذا رغبت في التأكد من عدم تعديل أوراج لهذا الملف.\nلاحظ أن تعديل الملفات الخارجية ، قد يجعلها غير متوافقة مع الأداة الأصلية ، من حيث اتت!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
-msgstr "تبادل البيانات - Orage"
+msgstr "تبادل البيانات - أوراج"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tهذا %s إصدار %s\n"
-"\n"
+msgstr "\tهذا %s إصدار %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tصدر بموجب شروط رخصة جنو العمومية.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr "\tالمترجمة من GTK+-%d.%d.%d, "
+msgstr "\tالمترجمة من جتك+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
-msgstr "باستخدام GTK+-%d.%d.%d.\n"
+msgstr "باستخدام جتك+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tاستخدم DBUS للاستيراد.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tلاحظ استخدام DBUS. يعمل على الاستيراد جزئياً.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tباستخدام libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tبدون استخدام libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tاستخدام الارشفة التلقائية.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tبدون استخدام الأرشفة.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tاستخدام حزم النظام libical.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tاستخدام حزمة نظام التشغيل لتفعيل libical.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"الاستعمال: orage [خيارات] [ملفات]\n"
-"\n"
+msgstr "الاستعمال: orage [خيارات] [ملفات]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "خيارات:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
-msgstr "--إصدار (-v) \t\tعرض إصدار orage\n"
+msgstr "--version (-v) \t\tعرض إصدار أوراج\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
-msgstr "--مساعدة (-h) \t\tإطبع هذا النص\n"
+msgstr "--help (-h) \t\tإطبع هذا النص\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
-msgstr "--تفضيلات (-p) \tصيغة عرض التفضيلات\n"
+msgstr "--preferences (-p) \tصيغة عرض التفضيلات\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr "--تبديل (-t) \t\tإجعل orage مرئي\\خفي\n"
+msgstr "--toggle (-t) \t\tإجعل أوراج مرئي/خفي\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--إضافة-خارجي (-a) file [RW] \\إضافة لملف خارجي\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr "--إزالة-خارجي (-r) ملف \tإزالة ملف خارجي\n"
+msgstr "--remove-foreign (-r) ملف \tإزالة ملف خارجي\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--export (-e) ملف [موعد...] \tتصدير المواعيد من أوراج إلى ملف\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
-msgstr "ملف=تحميل ملفات icalإلى orage\n"
+msgstr "ملف=تحميل ملفات ical إلى أوراج\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
-msgstr "\tdbusغير موجود في orage. \n"
+msgstr "\tdbus غير موجود في أوراج. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tبدون dbus [ملفات]وإعداد ملفات خارجية(-a & -r) سيستخدم فقط عند بدء orage \n"
+msgstr "\tبدون dbus [ملفات] وإعداد ملفات خارجية (-a & -r) سيستخدم فقط عند بدء أوراج \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"إعداد غير معروف %s\n"
-"\n"
+msgstr "\nإعداد غير معروف %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
-msgstr "تبادل البيانات"
+msgstr "_تبادل البيانات"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_تعديل"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
-msgstr "أظهر التاريخ المختار"
+msgstr "أظهر التاريخ المحدد"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
-msgstr "أظهر الأسبوع المحدد"
+msgstr "أظهر الأ_سبوع المحدد"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
-msgstr "إختر اليوم"
+msgstr "حدد الي_وم"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
 msgstr "عرض الساعة العالمية"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_مساعدة"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "لم يتم العثور على عنوان معرف"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr " الموقع: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n ملاحظة:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "أبدا"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"عنوان: %s\n"
-" بدء:\t%s\n"
-" نهاية:\t%s\n"
-" ملاحظة:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "العنوان: %s\n%s البدء:\t%s\n واجب الأداء:\t%s\nتم إنجازه:\t%s%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"عنوان: %s\n"
-" بدء:\t%s\n"
-" نهاية:\t%s\n"
-" ملاحظة:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "العنوان: %s\n%s بداية:\t%s\n نهاية:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>مهام:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
-msgstr "<b>أحداث ل %s:</b>"
+msgstr "<b>أحداث %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
-msgstr "<b>أحداث ل %s - %s:</b>"
+msgstr "<b>أحداث %s - %s:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "الإعدادات الرئيسية"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "النطاق الزمني"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "يجب عليك ان تعرف دائما توقيتك المحلي."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "بداية الأرشيف (أشهر)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = لا أرشفة)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr "يستخدم أرشفة لتوفير الوقت والمساحة عند التعامل مع الأحداث."
+msgstr "يستخدم الأرشفة لتوفير الوقت والمساحة عند التعامل مع الأحداث."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
-msgstr "أمر الصوت "
+msgstr "أمر الصوت"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr "هذا الأمر يعطي أمر بإطلاق صوت التنبيه"
+msgstr "يعطي هذا أمر للصدفة أمر بإطلاق صوت التنبيه."
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "إعدادات العرض"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "نافذة التقويم"
 
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "إطار التقويم الرئيسي"
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "تفاصيل التقويم البصري"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
-msgstr "تظهر حدود"
+msgstr "عرض الحدود"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
-msgstr "تظهر القائمة"
-
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "عرض الشهر والسنة"
+msgstr "عرض القائمة"
 
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
-msgstr "تظهر أسماء اليوم"
+msgstr "عرض أسماء الايام"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
-msgstr "تظهر أرقام الأسبوع"
+msgstr "عرض أرقام الأسبوع"
 
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr "تظهر قائمة المهام"
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "عرض الشهر والسنة"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "حقول معلومات التقويم"
 
 #: ../src/parameters.c:660
+msgid "Show todo list"
+msgstr "عرض قائمة المهام"
+
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
 msgstr "عدد أيام العرض في نافذة الحدث"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
 msgstr "= 0 لا تظهر قائمة الأحداث على الإطلاق"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "رؤية تقويم"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
 msgstr "اظهر على كل اسطح المكاتب"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
 msgstr "تبقي في الأعلى"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
-msgstr "تظهر في شريط المهام"
+msgstr "عرض في شريط المهام"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
-msgstr "تظهر في البيجر"
+msgstr "عرض في البيجر"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
-msgstr "تظهر في صينية النظام"
+msgstr "عرض في مصغرات شريط النظام"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
-msgstr "بداية تقويم "
+msgstr "بداية التقويم"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
-msgstr "أظهر"
+msgstr "عرض"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "اخفاء"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "تصغير"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr "إعدادات إضافية"
-
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr "نافذة التقويم"
-
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "إختر اليوم"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "في نافذة التقويم مفتوحة"
+
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "حدد تاريخ اليوم"
 
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
 msgstr "اختر الموعد المحدد سابقا"
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "استخدام رموز  الدينامية"
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "استخدام الرمز الديناميكي"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "يظهر الرمز الديناميكي الشهر الحالي واليوم من الشهر."
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "التقويم الرئيسي عرض النقر المزدوج"
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "النقر مرتين يعرض تقويم اليوم"
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
 msgstr "عرض أيام"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
-msgstr "قائمة الحدث"
+msgstr "قائمة الأحداث"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr " النافذة قائمة الاحداث"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "إعدادات إضافية"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
-msgstr "عدد أيام إضافية لتظهر في قائمة الأحداث"
+msgstr "عدد الأيام الإضافية المعروضة في قائمة الأحداث"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
 msgstr "هذه قيمة افتراضية ، يمكنك تغييرها في إطار قائمة ألاحدات الفعلية."
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "عرض الإطار الافتراضي اليوم الأول"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "اليوم الأول من الأسبوع"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "اليوم المحدد"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "استخدام رموز متحركة في مصغرات الشريط"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "استخدام الرمز المتحرك"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "عرض رمز الشهر الحالي واليوم من الشهر بشكل متحرك."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
+msgid "Use wakeup timer"
+msgstr "استخدم منبه الإيقاظ"
+
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "استخدم هذا المنبه إذا واجه أوراج مشكلة في الاستيقاض بعد التعليق أو الإسبات. (كمثال لم يتم تحديث أيقونة مصغرات شريط النظام أو لم يعمل التنبيه.)"
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "ملف الإنذار الخارجي الافتراضي مرئي"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "نافذة أوراج"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "تنبيه التنبيهات"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr ""
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr ""
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
-msgstr "تفضيلات Orage"
+msgstr "تفضيلات أوراج"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
-msgstr "تشغيل Orage أول مرة. بحث عن الزمن الافتراضي."
+msgstr "تشغيل أوراج أول مرة. بحث عن الزمن الافتراضي."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
-msgstr "تعيين الوقت الافتراضي إلى  %s."
+msgstr "تعيين الوقت الافتراضي إلى %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
 msgstr "لم يتم العثور على التوقيت الافتراضي ، من فضلك ، عينه يدوياً."
 
 #: ../src/reminder.c:562
 msgid "Reminder "
-msgstr "مذكر"
+msgstr "تذكير "
 
 #: ../src/reminder.c:591
 msgid "Open"
 msgstr "فتح"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
-msgstr "تذكير - Orage"
+msgstr "تذكير - أوراج"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr "أذكر لي مرة اخرى بعد الوقت المحدد"
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "تأجيل"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr "صحافة <نُفِذ> لتذكيري مرة أخرى بعد وقت محدد :"
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
+msgstr "ذكرني مرة اخرى بعد الوقت المحدد"
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
-msgstr "نشط التنبيهات التالية :"
+msgstr "نشط التنبيهات القادمة:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d d %02d h %02d دقيقة إلى: %s"
+msgstr "\n%02d d %02d h %02d دقيقة إلى: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"لم يوجد انذارات نشطة"
+msgstr "\nلا يوجد تنبيهات نشطة"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
-msgstr "Africa"
+msgstr "إفريقيا"
 
 #: ../src/timezone_names.c:37
 msgid "Africa/Abidjan"
-msgstr "Africa/Abidjan"
+msgstr "إفريقيا/أبدجان"
 
 #: ../src/timezone_names.c:38
 msgid "Africa/Accra"
-msgstr "Africa/Accra"
+msgstr "إفريقيا/أكرا"
 
 #: ../src/timezone_names.c:39
 msgid "Africa/Addis_Ababa"
-msgstr "Africa/Addis_Ababa"
+msgstr "إفريقيا/أديس أبابا"
 
 #: ../src/timezone_names.c:40
 msgid "Africa/Algiers"
-msgstr "Africa/الجزائر"
+msgstr "أفريقيا/الجزائر"
 
 #: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr "Africa/Asmera"
+msgid "Africa/Asmara"
+msgstr ""
 
 #: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr "Africa/Bamako"
+msgid "Africa/Asmera"
+msgstr "إفريقيا/أسمرة"
 
 #: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr "Africa/Bangui"
+msgid "Africa/Bamako"
+msgstr "إفريقيا/باماكو"
 
 #: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr "Africa/Banjul"
+msgid "Africa/Bangui"
+msgstr "إفريقيا/بانكوي"
 
 #: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr "Africa/Bissau"
+msgid "Africa/Banjul"
+msgstr "إفريقيا/بنجول"
 
 #: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr "Africa/Blantyre"
+msgid "Africa/Bissau"
+msgstr "إفريقيا/بيساو"
 
 #: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr "Africa/Brazzaville"
+msgid "Africa/Blantyre"
+msgstr "إفريقيا/بلنتيرا"
 
 #: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr "Africa/Bujumbura"
+msgid "Africa/Brazzaville"
+msgstr "إفريقيا/برازافيل"
 
 #: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr "Africa/القاهرة"
+msgid "Africa/Bujumbura"
+msgstr "إفريقيا/بوجمبورا"
 
 #: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr "Africa/كازبلانكا"
+msgid "Africa/Cairo"
+msgstr "أفريقيا/القاهرة"
 
 #: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr "Africa/Ceuta"
+msgid "Africa/Casablanca"
+msgstr "أفريقيا/الدار البضاء"
 
 #: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr "Africa/Conakry"
+msgid "Africa/Ceuta"
+msgstr "إفريقيا/سبتة"
 
 #: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr "Africa/Dakar"
+msgid "Africa/Conakry"
+msgstr "إفريقيا/كوناكري"
 
 #: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr "Africa/دار السلام"
+msgid "Africa/Dakar"
+msgstr "إفريقيا/دكّار"
 
 #: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr "Africa/Djibouti"
+msgid "Africa/Dar_es_Salaam"
+msgstr "أفريقيا/دار السلام"
 
 #: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr "Africa/Douala"
+msgid "Africa/Djibouti"
+msgstr "إفريقيا/جيبوتي"
 
 #: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr "Africa/العيون"
+msgid "Africa/Douala"
+msgstr "إفريقيا/دوآلا"
 
 #: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr "Africa/Freetown"
+msgid "Africa/El_Aaiun"
+msgstr "أفريقيا/العيون"
 
 #: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr "Africa/Gaborone"
+msgid "Africa/Freetown"
+msgstr "إفريقيا/فريتاون"
 
 #: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr "Africa/Harare"
+msgid "Africa/Gaborone"
+msgstr "إفريقيا/غابورون"
 
 #: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr "Africa/Johannesburg"
+msgid "Africa/Harare"
+msgstr "إفريقيا/هاراري"
 
 #: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr "Africa/Kampala"
+msgid "Africa/Juba"
+msgstr ""
 
 #: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr "Africa/الخرطوم"
+msgid "Africa/Johannesburg"
+msgstr "إفريقيا/جوهنسبورغ"
 
 #: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr "Africa/Kigali"
+msgid "Africa/Kampala"
+msgstr "إفريقيا/كمبالا"
 
 #: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr "Africa/Kinshasa"
+msgid "Africa/Khartoum"
+msgstr "أفريقيا/الخرطوم"
 
 #: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr "Africa/Lagos"
+msgid "Africa/Kigali"
+msgstr "أفريقيا/كيجالي"
 
 #: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr "Africa/Libreville"
+msgid "Africa/Kinshasa"
+msgstr "إفريقيا/كنشاسا"
 
 #: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr "Africa/Lome"
+msgid "Africa/Lagos"
+msgstr "إفريقيا/لاغوس"
 
 #: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr "Africa/Luanda"
+msgid "Africa/Libreville"
+msgstr "إفريقيا/ليبرفيل"
 
 #: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr "Africa/Lubumbashi"
+msgid "Africa/Lome"
+msgstr "إفريقيا/لومي"
 
 #: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr "Africa/Lusaka"
+msgid "Africa/Luanda"
+msgstr "إفريقيا/لواندا"
 
 #: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr "Africa/Malabo"
+msgid "Africa/Lubumbashi"
+msgstr "إفريقيا/لوبمباشي"
 
 #: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr "Africa/Maputo"
+msgid "Africa/Lusaka"
+msgstr "إفريقيا/لوساكا"
 
 #: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr "Africa/Maseru"
+msgid "Africa/Malabo"
+msgstr "إفريقيا/مالابو"
 
 #: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr "Africa/Mbabane"
+msgid "Africa/Maputo"
+msgstr "إفريقيا/مابوتو"
 
 #: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr "Africa/Mogadishu"
+msgid "Africa/Maseru"
+msgstr "إفريقيا/ماسيرو"
 
 #: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr "Africa/Monrovia"
+msgid "Africa/Mbabane"
+msgstr "أفريقيا/مباباني"
 
 #: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr "Africa/Nairobi"
+msgid "Africa/Mogadishu"
+msgstr "إفريقيا/مقديشو"
 
 #: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr "Africa/Ndjamena"
+msgid "Africa/Monrovia"
+msgstr "إفريقيا/منروفيا"
 
 #: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr "Africa/Niamey"
+msgid "Africa/Nairobi"
+msgstr "إفريقيا/نيروبي"
 
 #: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr "Africa/Nouakchott"
+msgid "Africa/Ndjamena"
+msgstr "إفريقيا/ندجامينا"
 
 #: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr "Africa/Ouagadougou"
+msgid "Africa/Niamey"
+msgstr "إفريقيا/نيامي"
 
 #: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr "Africa/Porto-Novo"
+msgid "Africa/Nouakchott"
+msgstr "إفريقيا/نواكشوط"
 
 #: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr "Africa/Sao_Tome"
+msgid "Africa/Ouagadougou"
+msgstr "إفريقيا/واكادوكو"
 
 #: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr "Africa/Timbuktu"
+msgid "Africa/Porto-Novo"
+msgstr "إفريقيا/برت نوفو"
 
 #: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr "Africa/Tripoli"
+msgid "Africa/Sao_Tome"
+msgstr "إفريقيا/صاو تومي"
 
 #: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr "Africa/Tunis"
+msgid "Africa/Timbuktu"
+msgstr "أفريقيا/تيمبَكتو"
 
 #: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr "Africa/Windhoek"
+msgid "Africa/Tripoli"
+msgstr "إفريقيا/طرابلس"
 
 #: ../src/timezone_names.c:89
-msgid "America"
-msgstr "America"
+msgid "Africa/Tunis"
+msgstr "إفريقيا/تونس"
 
 #: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr "America/Adak"
+msgid "Africa/Windhoek"
+msgstr "إفريقيا/وندهوك"
 
 #: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr "America/Anchorage"
+msgid "America"
+msgstr "أمريكا"
 
 #: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr "America/Anguilla"
+msgid "America/Adak"
+msgstr "أمريكا/أداك"
 
 #: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr "America/Antigua"
+msgid "America/Anchorage"
+msgstr "أمريكا/أنكورج"
 
 #: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr "America/Araguaina"
+msgid "America/Anguilla"
+msgstr "أمريكا/أنجويلا"
 
 #: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr "America/Argentina/Buenos_Aires"
+msgid "America/Antigua"
+msgstr "أمريكا/أنتيجوا"
 
 #: ../src/timezone_names.c:96
-msgid "America/Argentina/Catamarca"
-msgstr "America/Argentina/Catamarca"
+msgid "America/Araguaina"
+msgstr "أمريكا/أراجواينا"
 
 #: ../src/timezone_names.c:97
-msgid "America/Argentina/Cordoba"
-msgstr "America/Argentina/Cordoba"
+msgid "America/Argentina/Buenos_Aires"
+msgstr "أمريكا/الأرجنتين/بوينوس_آيريس"
 
 #: ../src/timezone_names.c:98
-msgid "America/Argentina/Jujuy"
-msgstr "America/Argentina/Jujuy"
+msgid "America/Argentina/Catamarca"
+msgstr "أمريكا/الأرجنتين/كاتاماركا"
 
 #: ../src/timezone_names.c:99
-msgid "America/Argentina/Mendoza"
-msgstr "America/Argentina/Mendoza"
+msgid "America/Argentina/ComodRivadavia"
+msgstr ""
 
 #: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr "America/Aruba"
+msgid "America/Argentina/Cordoba"
+msgstr "أمريكا/الأرجنتين/كوردوبا"
 
 #: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr "America/Asuncion"
+msgid "America/Argentina/Jujuy"
+msgstr "أمريكا/الأرجنتين/جوجوي"
 
 #: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr "America/Barbados"
+msgid "America/Argentina/La_Rioja"
+msgstr ""
 
 #: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr "America/Belem"
+msgid "America/Argentina/Mendoza"
+msgstr "أمريكا/الأرجنتين/مندوزا"
 
 #: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr "America/Belize"
+msgid "America/Argentina/Rio_Gallegos"
+msgstr ""
 
 #: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr "America/Boa_Vista"
+msgid "America/Argentina/Salta"
+msgstr ""
 
 #: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr "America/Bogota"
+msgid "America/Argentina/San_Juan"
+msgstr ""
 
 #: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr "America/Boise"
+msgid "America/Argentina/San_Luis"
+msgstr ""
 
 #: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr "America/Buenos_Aires"
+msgid "America/Argentina/Tucuman"
+msgstr ""
 
 #: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr "America/Cambridge_Bay"
+msgid "America/Argentina/Ushuaia"
+msgstr ""
 
 #: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr "America/Cancun"
+msgid "America/Aruba"
+msgstr "أمريكا/أروبا"
 
 #: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr "America/Caracas"
+msgid "America/Asuncion"
+msgstr "أمريكا/أسونسيون"
 
 #: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr "America/Catamarca"
+msgid "America/Atikokan"
+msgstr ""
 
 #: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr "America/Cayenne"
+msgid "America/Atka"
+msgstr ""
 
 #: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr "America/Cayman"
+msgid "America/Bahia"
+msgstr ""
 
 #: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr "America/Chicago"
+msgid "America/Bahia_Banderas"
+msgstr ""
 
 #: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr "America/Chihuahua"
+msgid "America/Barbados"
+msgstr "أمريكا/باربادوس"
 
 #: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr "America/Cordoba"
+msgid "America/Belem"
+msgstr "أمريكا/Belem"
 
 #: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr "America/Costa_Rica"
+msgid "America/Belize"
+msgstr "أمريكا/Belize"
 
 #: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr "America/Cuiaba"
+msgid "America/Blanc-Sablon"
+msgstr ""
 
 #: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr "America/Curacao"
+msgid "America/Boa_Vista"
+msgstr "امريكا/بُوا فيستا"
 
 #: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr "America/Dawson"
+msgid "America/Bogota"
+msgstr "أمريكا/بوغوتا"
 
 #: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr "America/Dawson_Creek"
+msgid "America/Boise"
+msgstr "أمريكا/Boise"
 
 #: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr "America/Denver"
+msgid "America/Buenos_Aires"
+msgstr "أمريكا/بوينوس_آيريس"
 
 #: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr "America/Detroit"
+msgid "America/Cambridge_Bay"
+msgstr "أمريكا/Cambridge_Bay"
 
 #: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr "America/Dominica"
+msgid "America/Campo_Grande"
+msgstr ""
 
 #: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr "America/Edmonton"
+msgid "America/Cancun"
+msgstr "أمريكا/Cancun"
 
 #: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr "America/Eirunepe"
+msgid "America/Caracas"
+msgstr "أمريكا/كاركاس"
 
 #: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr "America/El_Salvador"
+msgid "America/Catamarca"
+msgstr "أمريكا/Catamarca"
 
 #: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr "America/Fortaleza"
+msgid "America/Cayenne"
+msgstr "أمريكا/Cayenne"
 
 #: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr "America/Glace_Bay"
+msgid "America/Cayman"
+msgstr "أمريكا/Cayman"
 
 #: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr "America/Godthab"
+msgid "America/Chicago"
+msgstr "أمريكا/شيكاكو"
 
 #: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr "America/Goose_Bay"
+msgid "America/Chihuahua"
+msgstr "أمريكا/Chihuahua"
 
 #: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr "America/Grand_Turk"
+msgid "America/Coral_Harbour"
+msgstr ""
 
 #: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr "America/Grenada"
+msgid "America/Cordoba"
+msgstr "أمريكا/كوردوبا"
 
 #: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr "America/Guadeloupe"
+msgid "America/Costa_Rica"
+msgstr "أمريكا/كوستا_ريكا"
 
 #: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr "America/Guatemala"
+msgid "America/Creston"
+msgstr ""
 
 #: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr "America/Guayaquil"
+msgid "America/Cuiaba"
+msgstr "أمريكا/Cuiaba"
 
 #: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr "America/Guyana"
+msgid "America/Curacao"
+msgstr "أمريكا/Curacao"
 
 #: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr "America/Halifax"
+msgid "America/Danmarkshavn"
+msgstr ""
 
 #: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr "America/Havana"
+msgid "America/Dawson"
+msgstr "أمريكا/Dawson"
 
 #: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr "America/Hermosillo"
+msgid "America/Dawson_Creek"
+msgstr "أمريكا/Dawson_Creek"
 
 #: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr "America/Indiana/Indianapolis"
+msgid "America/Denver"
+msgstr "أمريكا/Denver"
 
 #: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr "America/Indiana/Knox"
+msgid "America/Detroit"
+msgstr "أمريكا/ديترُوي"
 
 #: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr "America/Indiana/Marengo"
+msgid "America/Dominica"
+msgstr "أمريكا/دومينيكا"
 
 #: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr "America/Indiana/Vevay"
+msgid "America/Edmonton"
+msgstr "أمريكا/إيدمونتو"
 
 #: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr "America/Indianapolis"
+msgid "America/Ensenada"
+msgstr ""
 
 #: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr "America/Inuvik"
+msgid "America/Eirunepe"
+msgstr "أمريكا/Eirunepe"
 
 #: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr "America/Iqaluit"
+msgid "America/El_Salvador"
+msgstr "أمريكا/السلفادور"
 
 #: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr "America/Jamaica"
+msgid "America/Fortaleza"
+msgstr "أمريكا/Fortaleza"
 
 #: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr "America/Jujuy"
+msgid "America/Fort_Wayne"
+msgstr ""
 
 #: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr "America/Juneau"
+msgid "America/Glace_Bay"
+msgstr "أمريكا/Glace_Bay"
 
 #: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr "America/Kentucky/Louisville"
+msgid "America/Godthab"
+msgstr "أمريكا/Godthab"
 
 #: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr "America/Kentucky/Monticello"
+msgid "America/Goose_Bay"
+msgstr "أمريكا/Goose_Bay"
 
 #: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr "America/La_Paz"
+msgid "America/Grand_Turk"
+msgstr "أمريكا/Grand_Turk"
 
 #: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr "America/Lima"
+msgid "America/Grenada"
+msgstr "أمريكا/غرينادا"
 
 #: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr "America/Los_Angeles"
+msgid "America/Guadeloupe"
+msgstr "أمريكا/غوادالوب"
 
 #: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr "America/Louisville"
+msgid "America/Guatemala"
+msgstr "أمريكا/غواتيمالا"
 
 #: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr "America/Maceio"
+msgid "America/Guayaquil"
+msgstr "أمريكا/Guayaquil"
 
 #: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr "America/Managua"
+msgid "America/Guyana"
+msgstr "أمريكا/جويانا"
 
 #: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr "America/Manaus"
+msgid "America/Halifax"
+msgstr "أمريكا/Halifax"
 
 #: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr "America/Martinique"
+msgid "America/Havana"
+msgstr "أمريكا/هافانا"
 
 #: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr "America/Mazatlan"
+msgid "America/Hermosillo"
+msgstr "أمريكا/Hermosillo"
 
 #: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr "America/Mendoza"
+msgid "America/Indiana/Indianapolis"
+msgstr "أمريكا/إتدياتا/إتديانابوليس"
 
 #: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr "America/Menominee"
+msgid "America/Indiana/Knox"
+msgstr "أمريكا/إتديانا/Knox"
 
 #: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr "America/Merida"
+msgid "America/Indiana/Marengo"
+msgstr "أمريكا/إتديانا/Marengo"
 
 #: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr "America/Mexico_City"
+msgid "America/Indiana/Petersburg"
+msgstr ""
 
 #: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr "America/Miquelon"
+msgid "America/Indiana/Tell_City"
+msgstr ""
 
 #: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr "America/Monterrey"
+msgid "America/Indiana/Vevay"
+msgstr "أمريكا/إتديانا/Vevay"
 
 #: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr "America/Montevideo"
+msgid "America/Indiana/Vincennes"
+msgstr ""
 
 #: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr "America/Montreal"
+msgid "America/Indiana/Winamac"
+msgstr ""
 
 #: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr "America/Montserrat"
+msgid "America/Indianapolis"
+msgstr "أمريكا/إتديانابوليس"
 
 #: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr "America/Nassau"
+msgid "America/Inuvik"
+msgstr "أمريكا/Inuvik"
 
 #: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr "America/New_York"
+msgid "America/Iqaluit"
+msgstr "أمريكا/Iqaluit"
 
 #: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr "America/Nipigon"
+msgid "America/Jamaica"
+msgstr "أمريكا/جامايكا"
 
 #: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr "America/Nome"
+msgid "America/Jujuy"
+msgstr "أمريكا/Jujuy"
 
 #: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr "America/Noronha"
+msgid "America/Juneau"
+msgstr "أمريكا/Juneau"
 
 #: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr "America/Panama"
+msgid "America/Kentucky/Louisville"
+msgstr "أمريكا/Kentucky/Louisville"
 
 #: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr "America/Pangnirtung"
+msgid "America/Kentucky/Monticello"
+msgstr "أمريكا/Kentucky/Monticello"
 
 #: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr "America/Paramaribo"
+msgid "America/Knox_IN"
+msgstr ""
 
 #: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr "America/Phoenix"
+msgid "America/Kralendijk"
+msgstr ""
 
 #: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr "America/Port-au-Prince"
+msgid "America/La_Paz"
+msgstr "أمريكا/لا_باز"
 
 #: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr "America/Port_of_Spain"
+msgid "America/Lima"
+msgstr "أمريكا/لبما"
 
 #: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr "America/Porto_Velho"
+msgid "America/Los_Angeles"
+msgstr "أمريكا/لوس_أنجليس"
 
 #: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr "America/Puerto_Rico"
+msgid "America/Louisville"
+msgstr "أمريكا/Louisville"
 
 #: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr "America/Rainy_River"
+msgid "America/Lower_Princes"
+msgstr ""
 
 #: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr "America/Rankin_Inlet"
+msgid "America/Maceio"
+msgstr "أمريكا/Maceio"
 
 #: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr "America/Recife"
+msgid "America/Managua"
+msgstr "أمريكا/Managua"
 
 #: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr "America/Regina"
+msgid "America/Manaus"
+msgstr "أمريكا/Manaus"
 
 #: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr "America/Rio_Branco"
+msgid "America/Marigot"
+msgstr ""
 
 #: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr "America/Rosario"
+msgid "America/Martinique"
+msgstr "أمريكا/مارتينيك"
 
 #: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr "America/Santiago"
+msgid "America/Matamoros"
+msgstr ""
 
 #: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr "America/Santo_Domingo"
+msgid "America/Mazatlan"
+msgstr "أمريكا/Mazatlan"
 
 #: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr "America/Sao_Paulo"
+msgid "America/Mendoza"
+msgstr "أمريكا/متدوزا"
 
 #: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr "America/Scoresbysund"
+msgid "America/Menominee"
+msgstr "أمريكا/Menominee"
 
 #: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr "America/Shiprock"
+msgid "America/Merida"
+msgstr "أمريكا/Merida"
 
 #: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr "America/St_Johns"
+msgid "America/Metlakatla"
+msgstr ""
 
 #: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr "America/St_Kitts"
+msgid "America/Mexico_City"
+msgstr "أمريكا/مدينة_مكسيكو"
 
 #: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr "America/St_Lucia"
+msgid "America/Miquelon"
+msgstr "أمريكا/Miquelon"
 
 #: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr "America/St_Thomas"
+msgid "America/Moncton"
+msgstr ""
 
 #: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr "America/St_Vincent"
+msgid "America/Monterrey"
+msgstr "أمريكا/Monterrey"
 
 #: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr "America/Swift_Current"
+msgid "America/Montevideo"
+msgstr "أمريكا/Montevideo"
 
 #: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr "America/Tegucigalpa"
+msgid "America/Montreal"
+msgstr "أمريكا/منتريال"
 
 #: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr "America/Thule"
+msgid "America/Montserrat"
+msgstr "أمريكا/Montserrat"
 
 #: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr "America/Thunder_Bay"
+msgid "America/Nassau"
+msgstr "أمريكا/Nassau"
 
 #: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr "America/Tijuana"
+msgid "America/New_York"
+msgstr "أمريكا/نيو_يورك"
 
 #: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr "America/Tortola"
+msgid "America/Nipigon"
+msgstr "أمريكا/Nipigon"
 
 #: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr "America/Vancouver"
+msgid "America/Nome"
+msgstr "أمريكا/Nome"
 
 #: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr "America/Whitehorse"
+msgid "America/North_Dakota/Beulah"
+msgstr ""
 
 #: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr "America/Winnipeg"
+msgid "America/North_Dakota/Center"
+msgstr ""
 
 #: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr "America/Yakutat"
+msgid "America/North_Dakota/New_Salem"
+msgstr ""
 
 #: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr "America/Yellowknife"
+msgid "America/Noronha"
+msgstr "أمريكا/Noronha"
 
 #: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr "Antarctica"
+msgid "America/Ojinaga"
+msgstr ""
 
 #: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr "Antarctica/Casey"
+msgid "America/Panama"
+msgstr "أمريكا/باناما"
 
 #: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr "Antarctica/Davis"
+msgid "America/Pangnirtung"
+msgstr "أمريكا/Pangnirtung"
 
 #: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr "Antarctica/DumontDUrville"
+msgid "America/Paramaribo"
+msgstr "أمريكا/Paramaribo"
 
 #: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr "Antarctica/Mawson"
+msgid "America/Phoenix"
+msgstr "أمريكا/فيونيكس"
 
 #: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr "Antarctica/McMurdo"
+msgid "America/Port-au-Prince"
+msgstr "أمريكا/بور_أو_برانس"
 
 #: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr "Antarctica/Palmer"
+msgid "America/Port_of_Spain"
+msgstr "أمريكا/Port_of_Spain"
 
 #: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr "Antarctica/South_Pole"
+msgid "America/Porto_Acre"
+msgstr ""
 
 #: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr "Antarctica/Syowa"
+msgid "America/Porto_Velho"
+msgstr "أمريكا/Porto_Velho"
 
 #: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr "Antarctica/Vostok"
+msgid "America/Puerto_Rico"
+msgstr "أمريكا/بورتو_ريكو"
 
 #: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr "Arctic"
+msgid "America/Rainy_River"
+msgstr "أمريكا/Rainy_River"
 
 #: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr "Arctic/Longyearbyen"
+msgid "America/Rankin_Inlet"
+msgstr "أمريكا/Rankin_Inlet"
 
 #: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr "Asia"
+msgid "America/Recife"
+msgstr "أمريكا/Recife"
 
 #: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr "Asia/Aden"
+msgid "America/Regina"
+msgstr "أمريكا/ريجينا"
 
 #: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr "Asia/Almaty"
+msgid "America/Resolute"
+msgstr ""
 
 #: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr "Asia/Amman"
+msgid "America/Rio_Branco"
+msgstr "أمريكا/ريو_برانكو"
 
 #: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr "Asia/Anadyr"
+msgid "America/Rosario"
+msgstr "أمريكا/روزاريو"
 
 #: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr "Asia/Aqtau"
+msgid "America/Santa_Isabel"
+msgstr ""
 
 #: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr "Asia/Aqtobe"
+msgid "America/Santarem"
+msgstr ""
 
 #: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr "Asia/Ashgabat"
+msgid "America/Santiago"
+msgstr "أمريكا/سنتياغو"
 
 #: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr "Asia/بغداد"
+msgid "America/Santo_Domingo"
+msgstr "أمريكا/سانتو_دومتغو"
 
 #: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr "Asia/البحرين"
+msgid "America/Sao_Paulo"
+msgstr "أمريكا/ساو_باولو"
 
 #: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr "Asia/Baku"
+msgid "America/Scoresbysund"
+msgstr "أمريكا/Scoresbysund"
 
 #: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr "Asia/Bangkok"
+msgid "America/Shiprock"
+msgstr "أمريكا/Shiprock"
 
 #: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr "Asia/بيروت"
+msgid "America/Sitka"
+msgstr ""
 
 #: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr "Asia/Bishkek"
+msgid "America/St_Barthelemy"
+msgstr ""
 
 #: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr "Asia/Brunei"
+msgid "America/St_Johns"
+msgstr "أمريكا/St_Johns"
 
 #: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr "Asia/Calcutta"
+msgid "America/St_Kitts"
+msgstr "أمريكا/St_Kitts"
 
 #: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr "Asia/Chungking"
+msgid "America/St_Lucia"
+msgstr "أمريكا/St_Lucia"
 
 #: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr "Asia/Colombo"
+msgid "America/St_Thomas"
+msgstr "أمريكا/St_Thomas"
 
 #: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr "Asia/دمشق"
+msgid "America/St_Vincent"
+msgstr "أمريكا/St_Vincent"
 
 #: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr "Asia/Dhaka"
+msgid "America/Swift_Current"
+msgstr "أمريكا/Swift_Current"
 
 #: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr "Asia/Dili"
+msgid "America/Tegucigalpa"
+msgstr "أمريكا/Tegucigalpa"
 
 #: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr "Asia/ابوظبي"
+msgid "America/Thule"
+msgstr "أمريكا/Thule"
 
 #: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr "Asia/Dushanbe"
+msgid "America/Thunder_Bay"
+msgstr "أمريكا/Thunder_Bay"
 
 #: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr "Asia/غزه"
+msgid "America/Tijuana"
+msgstr "أمريكا/Tijuana"
 
 #: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr "Asia/Harbin"
+msgid "America/Toronto"
+msgstr ""
 
 #: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr "Asia/Hong_Kong"
+msgid "America/Tortola"
+msgstr "أمريكا/Tortola"
 
 #: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr "Asia/Hovd"
+msgid "America/Vancouver"
+msgstr "أمريكا/Vancouver"
 
 #: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr "Asia/Irkutsk"
+msgid "America/Virgin"
+msgstr ""
 
 #: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr "Asia/Istanbul"
+msgid "America/Whitehorse"
+msgstr "أمريكا/Whitehorse"
 
 #: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr "Asia/Jakarta"
+msgid "America/Winnipeg"
+msgstr "أمريكا/Winnipeg"
 
 #: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr "Asia/Jayapura"
+msgid "America/Yakutat"
+msgstr "أمريكا/Yakutat"
 
 #: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr "Asia/القدس الشريف"
+msgid "America/Yellowknife"
+msgstr "أمريكا/Yellowknife"
 
 #: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr "Asia/Kabul"
+msgid "Antarctica"
+msgstr "القطب الجتوبي"
 
 #: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr "Asia/Kamchatka"
+msgid "Antarctica/Casey"
+msgstr "القطب الجتوبي/Casey"
 
 #: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr "Asia/Karachi"
+msgid "Antarctica/Davis"
+msgstr "القطب الجتوبي/Davis"
 
 #: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr "Asia/Kashgar"
+msgid "Antarctica/DumontDUrville"
+msgstr "القطب الجتوبي/DumontDUrville"
 
 #: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr "Asia/Katmandu"
+msgid "Antarctica/Macquarie"
+msgstr ""
 
 #: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr "Asia/Krasnoyarsk"
+msgid "Antarctica/Mawson"
+msgstr "القطب الجتوبي/Mawson"
 
 #: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr "Asia/Kuala_Lumpur"
+msgid "Antarctica/McMurdo"
+msgstr "القطب الجتوبي/McMurdo"
 
 #: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr "Asia/Kuching"
+msgid "Antarctica/Palmer"
+msgstr "القطب الجتوبي/Palmer"
 
 #: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr "Asia/الكويت"
+msgid "Antarctica/Rothera"
+msgstr ""
 
 #: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr "Asia/Macao"
+msgid "Antarctica/South_Pole"
+msgstr "القطب الجتوبي/القطب_الجتوبي"
 
 #: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr "Asia/Magadan"
+msgid "Antarctica/Syowa"
+msgstr "القطب الجتوبي/Syowa"
 
 #: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr "Asia/Manila"
+msgid "Antarctica/Vostok"
+msgstr "القطب الجتوبي/Vostok"
 
 #: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr "Asia/Muscat"
+msgid "Arctic"
+msgstr "القطب الشمالي"
 
 #: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr "Asia/Nicosia"
+msgid "Arctic/Longyearbyen"
+msgstr "المتجمّدة الشّمالية/لونغييرباين"
 
 #: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr "Asia/Novosibirsk"
+msgid "Asia"
+msgstr "أسيا"
 
 #: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr "Asia/Omsk"
+msgid "Asia/Aden"
+msgstr "أسيا/عدن"
 
 #: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr "Asia/Phnom_Penh"
+msgid "Asia/Almaty"
+msgstr "أسيا/Almaty"
 
 #: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr "Asia/Pontianak"
+msgid "Asia/Amman"
+msgstr "أسيا/عمان"
 
 #: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr "Asia/Pyongyang"
+msgid "Asia/Anadyr"
+msgstr "أسيا/Anadyr"
 
 #: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr "Asia/قطر"
+msgid "Asia/Aqtau"
+msgstr "أسيا/Aqtau"
 
 #: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr "Asia/Rangoon"
+msgid "Asia/Aqtobe"
+msgstr "أسيا/Aqtobe"
 
 #: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr "Asia/الرياض"
+msgid "Asia/Ashgabat"
+msgstr "أسيا/Ashgabat"
 
 #: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr "Asia/Saigon"
+msgid "Asia/Ashkhabad"
+msgstr ""
 
 #: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr "Asia/Samarkand"
+msgid "Asia/Baghdad"
+msgstr "أسيا/بغداد"
 
 #: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr "Asia/Seoul"
+msgid "Asia/Bahrain"
+msgstr "أسيا/البحرين"
 
 #: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr "Asia/Shanghai"
+msgid "Asia/Baku"
+msgstr "أسيا/Baku"
 
 #: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr "Asia/Singapore"
+msgid "Asia/Bangkok"
+msgstr "أسيا/بانكوك"
 
 #: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr "Asia/Taipei"
+msgid "Asia/Beirut"
+msgstr "أسيا/بيروت"
 
 #: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr "Asia/Tashkent"
+msgid "Asia/Bishkek"
+msgstr "أسيا/Bishkek"
 
 #: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr "Asia/Tbilisi"
+msgid "Asia/Brunei"
+msgstr "أسيا/Brunei"
 
 #: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr "Asia/Tehran"
+msgid "Asia/Calcutta"
+msgstr "أسيا/Calcutta"
 
 #: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr "Asia/Thimphu"
+msgid "Asia/Choibalsan"
+msgstr ""
 
 #: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr "Asia/Tokyo"
+msgid "Asia/Chongqing"
+msgstr ""
 
 #: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr "Asia/Ujung_Pandang"
+msgid "Asia/Chungking"
+msgstr "أسيا/Chungking"
 
 #: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr "Asia/Ulaanbaatar"
+msgid "Asia/Colombo"
+msgstr "أسيا/كولومبو"
 
 #: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr "Asia/Urumqi"
+msgid "Asia/Dacca"
+msgstr ""
 
 #: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr "Asia/Vientiane"
+msgid "Asia/Damascus"
+msgstr "أسيا/دمشق"
 
 #: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr "Asia/Vladivostok"
+msgid "Asia/Dhaka"
+msgstr "أسيا/Dhaka"
 
 #: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr "Asia/Yakutsk"
+msgid "Asia/Dili"
+msgstr "أسيا/Dili"
 
 #: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr "Asia/Yekaterinburg"
+msgid "Asia/Dubai"
+msgstr "أسيا/ابوظبي"
 
 #: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr "Asia/Yerevan"
+msgid "Asia/Dushanbe"
+msgstr "أسيا/Dushanbe"
 
 #: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr "Atlantic"
+msgid "Asia/Gaza"
+msgstr "أسيا/غزة"
 
 #: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr "Atlantic/Azores"
+msgid "Asia/Harbin"
+msgstr "أسيا/Harbin"
 
 #: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr "Atlantic/Bermuda"
+msgid "Asia/Hebron"
+msgstr ""
 
 #: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr "Atlantic/Canary"
+msgid "Asia/Hong_Kong"
+msgstr "أسيا/هونغ_كونغ"
 
 #: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr "Atlantic/Cape_Verde"
+msgid "Asia/Ho_Chi_Minh"
+msgstr ""
 
 #: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr "Atlantic/Faeroe"
+msgid "Asia/Hovd"
+msgstr "أسيا/Hovd"
 
 #: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr "Atlantic/Jan_Mayen"
+msgid "Asia/Irkutsk"
+msgstr "أسيا/Irkutsk"
 
 #: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr "Atlantic/Madeira"
+msgid "Asia/Istanbul"
+msgstr "أسيا/إسطنبول"
 
 #: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr "Atlantic/Reykjavik"
+msgid "Asia/Jakarta"
+msgstr "أسيا/جاكارطا"
 
 #: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr "Atlantic/South_Georgia"
+msgid "Asia/Jayapura"
+msgstr "أسيا/Jayapura"
 
 #: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr "Atlantic/St_Helena"
+msgid "Asia/Jerusalem"
+msgstr "أسيا/القدس"
 
 #: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr "Atlantic/Stanley"
+msgid "Asia/Kabul"
+msgstr "أسيا/كابول"
 
 #: ../src/timezone_names.c:309
+msgid "Asia/Kamchatka"
+msgstr "أسيا/Kamchatka"
+
+#: ../src/timezone_names.c:310
+msgid "Asia/Karachi"
+msgstr "أسيا/كاراشي"
+
+#: ../src/timezone_names.c:311
+msgid "Asia/Kashgar"
+msgstr "أسيا/Kashgar"
+
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr ""
+
+#: ../src/timezone_names.c:313
+msgid "Asia/Katmandu"
+msgstr "أسيا/Katmandu"
+
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr ""
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr ""
+
+#: ../src/timezone_names.c:316
+msgid "Asia/Krasnoyarsk"
+msgstr "أسيا/Krasnoyarsk"
+
+#: ../src/timezone_names.c:317
+msgid "Asia/Kuala_Lumpur"
+msgstr "أسيا/كوالا_لامبور"
+
+#: ../src/timezone_names.c:318
+msgid "Asia/Kuching"
+msgstr "أسيا/Kuching"
+
+#: ../src/timezone_names.c:319
+msgid "Asia/Kuwait"
+msgstr "أسيا/الكويت"
+
+#: ../src/timezone_names.c:320
+msgid "Asia/Macao"
+msgstr "أسيا/ماكاو"
+
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr ""
+
+#: ../src/timezone_names.c:322
+msgid "Asia/Magadan"
+msgstr "أسيا/Magadan"
+
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr ""
+
+#: ../src/timezone_names.c:324
+msgid "Asia/Manila"
+msgstr "أسيا/مانيلا"
+
+#: ../src/timezone_names.c:325
+msgid "Asia/Muscat"
+msgstr "أسيا/مسقط"
+
+#: ../src/timezone_names.c:326
+msgid "Asia/Nicosia"
+msgstr "أسيا/Nicosia"
+
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr ""
+
+#: ../src/timezone_names.c:328
+msgid "Asia/Novosibirsk"
+msgstr "أسيا/Novosibirsk"
+
+#: ../src/timezone_names.c:329
+msgid "Asia/Omsk"
+msgstr "أسيا/Omsk"
+
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr ""
+
+#: ../src/timezone_names.c:331
+msgid "Asia/Phnom_Penh"
+msgstr "أسيا/Phnom_Penh"
+
+#: ../src/timezone_names.c:332
+msgid "Asia/Pontianak"
+msgstr "أسيا/Pontianak"
+
+#: ../src/timezone_names.c:333
+msgid "Asia/Pyongyang"
+msgstr "أسيا/Pyongyang"
+
+#: ../src/timezone_names.c:334
+msgid "Asia/Qatar"
+msgstr "أسيا/قطر"
+
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: ../src/timezone_names.c:336
+msgid "Asia/Rangoon"
+msgstr "أسيا/Rangoon"
+
+#: ../src/timezone_names.c:337
+msgid "Asia/Riyadh"
+msgstr "أسيا/الرياض"
+
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr ""
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr ""
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr ""
+
+#: ../src/timezone_names.c:341
+msgid "Asia/Saigon"
+msgstr "أسيا/Saigon"
+
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: ../src/timezone_names.c:343
+msgid "Asia/Samarkand"
+msgstr "أسيا/سمرقند"
+
+#: ../src/timezone_names.c:344
+msgid "Asia/Seoul"
+msgstr "أسيا/سيول"
+
+#: ../src/timezone_names.c:345
+msgid "Asia/Shanghai"
+msgstr "أسيا/شتغاي"
+
+#: ../src/timezone_names.c:346
+msgid "Asia/Singapore"
+msgstr "أسيا/سنغافورا"
+
+#: ../src/timezone_names.c:347
+msgid "Asia/Taipei"
+msgstr "أسيا/Taipei"
+
+#: ../src/timezone_names.c:348
+msgid "Asia/Tashkent"
+msgstr "أسيا/Tashkent"
+
+#: ../src/timezone_names.c:349
+msgid "Asia/Tbilisi"
+msgstr "أسيا/Tbilisi"
+
+#: ../src/timezone_names.c:350
+msgid "Asia/Tehran"
+msgstr "أسيا/طهران"
+
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr ""
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr ""
+
+#: ../src/timezone_names.c:353
+msgid "Asia/Thimphu"
+msgstr "أسيا/Thimphu"
+
+#: ../src/timezone_names.c:354
+msgid "Asia/Tokyo"
+msgstr "أسيا/طوكيو"
+
+#: ../src/timezone_names.c:355
+msgid "Asia/Ujung_Pandang"
+msgstr "أسيا/Ujung_Pandang"
+
+#: ../src/timezone_names.c:356
+msgid "Asia/Ulaanbaatar"
+msgstr "أسيا/Ulaanbaatar"
+
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr ""
+
+#: ../src/timezone_names.c:358
+msgid "Asia/Urumqi"
+msgstr "أسيا/Urumqi"
+
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr ""
+
+#: ../src/timezone_names.c:360
+msgid "Asia/Vientiane"
+msgstr "أسيا/Vientiane"
+
+#: ../src/timezone_names.c:361
+msgid "Asia/Vladivostok"
+msgstr "أسيا/Vladivostok"
+
+#: ../src/timezone_names.c:362
+msgid "Asia/Yakutsk"
+msgstr "أسيا/Yakutsk"
+
+#: ../src/timezone_names.c:363
+msgid "Asia/Yekaterinburg"
+msgstr "أسيا/Yekaterinburg"
+
+#: ../src/timezone_names.c:364
+msgid "Asia/Yerevan"
+msgstr "أسيا/Yerevan"
+
+#: ../src/timezone_names.c:365
+msgid "Atlantic"
+msgstr "المحيط الأطلسي"
+
+#: ../src/timezone_names.c:366
+msgid "Atlantic/Azores"
+msgstr "المحيط الأطلسي/Azores"
+
+#: ../src/timezone_names.c:367
+msgid "Atlantic/Bermuda"
+msgstr "المحيط الأطلسي/برمودا"
+
+#: ../src/timezone_names.c:368
+msgid "Atlantic/Canary"
+msgstr "المحيط الأطلسي/جزر الجعفرية"
+
+#: ../src/timezone_names.c:369
+msgid "Atlantic/Cape_Verde"
+msgstr "المحيط الأطلسي/الرأس الأخضر"
+
+#: ../src/timezone_names.c:370
+msgid "Atlantic/Faeroe"
+msgstr "المحيط الأطلسي/Faeroe"
+
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr ""
+
+#: ../src/timezone_names.c:372
+msgid "Atlantic/Jan_Mayen"
+msgstr "المحيط الأطلسي/Jan_Mayen"
+
+#: ../src/timezone_names.c:373
+msgid "Atlantic/Madeira"
+msgstr "المحيط الأطلسي/Madeira"
+
+#: ../src/timezone_names.c:374
+msgid "Atlantic/Reykjavik"
+msgstr "المحيط الأطلسي/Reykjavik"
+
+#: ../src/timezone_names.c:375
+msgid "Atlantic/South_Georgia"
+msgstr "المحيط الأطلسي/جورجيا_الحنوبية"
+
+#: ../src/timezone_names.c:376
+msgid "Atlantic/St_Helena"
+msgstr "المحيط الأطلسي/St_Helena"
+
+#: ../src/timezone_names.c:377
+msgid "Atlantic/Stanley"
+msgstr "المحيط الأطلسي/Stanley"
+
+#: ../src/timezone_names.c:378
 msgid "Australia"
-msgstr "Australia"
+msgstr "أستراليا"
+
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr ""
+
+#: ../src/timezone_names.c:380
+msgid "Australia/Adelaide"
+msgstr "أستراليا/Adelaide"
+
+#: ../src/timezone_names.c:381
+msgid "Australia/Brisbane"
+msgstr "أستراليا/Brisbane"
+
+#: ../src/timezone_names.c:382
+msgid "Australia/Broken_Hill"
+msgstr "أستراليا/Broken_Hill"
+
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr ""
+
+#: ../src/timezone_names.c:384
+msgid "Australia/Darwin"
+msgstr "أستراليا/داروين"
+
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr ""
+
+#: ../src/timezone_names.c:386
+msgid "Australia/Hobart"
+msgstr "أستراليا/Hobart"
+
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr "أستراليا/Lindeman"
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr "أستراليا/Lord_Howe"
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "أستراليا/ميلبورن"
+
+#: ../src/timezone_names.c:390
+msgid "Australia/Perth"
+msgstr "أستراليا/Perth"
+
+#: ../src/timezone_names.c:391
+msgid "Australia/Sydney"
+msgstr "أستراليا/سيدني"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr ""
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr ""
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr ""
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr ""
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr ""
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr ""
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr ""
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr ""
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr ""
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr ""
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr ""
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr ""
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr ""
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr ""
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr ""
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr ""
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr ""
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr ""
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr ""
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr ""
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr ""
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr ""
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr ""
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr ""
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr ""
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr ""
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr ""
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr ""
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr ""
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr ""
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr ""
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr ""
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr ""
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr ""
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr ""
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr ""
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr ""
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr ""
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr ""
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr ""
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr ""
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr ""
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr ""
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr ""
 
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr "Australia/Adelaide"
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr ""
 
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr "Australia/Brisbane"
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr ""
 
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr "Australia/Broken_Hill"
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr ""
 
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr "Australia/Darwin"
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr ""
 
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr "Australia/Hobart"
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr ""
 
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr "Australia/Lindeman"
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr ""
 
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr "Australia/Lord_Howe"
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr ""
 
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr "Australia/Melbourne"
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr ""
 
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr "Australia/Perth"
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr ""
 
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr "Australia/Sydney"
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr ""
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:446
 msgid "Europe"
-msgstr "Europe"
+msgstr "أوروبا"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
-msgstr "Europe/Amsterdam"
+msgstr "أوروبا/أمستردام"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
-msgstr "Europe/Andorra"
+msgstr "أوروبا/اندور"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
-msgstr "Europe/Athens"
+msgstr "أوروبا/اثينا"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
-msgstr "Europe/Belfast"
+msgstr "أوروبا/بيلفاست"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
-msgstr "Europe/Belgrade"
+msgstr "أوروبا/بلغراد"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
-msgstr "Europe/Berlin"
+msgstr "أوروبا/برلين"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
-msgstr "Europe/Bratislava"
+msgstr "أوروبا/Bratislava"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
-msgstr "Europe/Brussels"
+msgstr "أوروبا/بروكسيل"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
-msgstr "Europe/Bucharest"
+msgstr "أوروبا/بوخاريست"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
-msgstr "Europe/Budapest"
+msgstr "أوروبا/Budapest"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr ""
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
-msgstr "Europe/Chisinau"
+msgstr "أوروبا/Chisinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
-msgstr "Europe/Copenhagen"
+msgstr "أوروبا/كوبينهاغن"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
-msgstr "Europe/Dublin"
+msgstr "أوروبا/دوبلان"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
-msgstr "Europe/Gibraltar"
+msgstr "أوروبا/جبل طارق"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr ""
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
-msgstr "Europe/Helsinki"
+msgstr "أوروبا/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr ""
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
-msgstr "Europe/Istanbul"
+msgstr "أوروبا/إسطنبول"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr ""
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
-msgstr "Europe/Kaliningrad"
+msgstr "أوروبا/Kaliningrad"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
-msgstr "Europe/Kiev"
+msgstr "أوروبا/كييف"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
-msgstr "Europe/Lisbon"
+msgstr "أوروبا/ليشبونا"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
-msgstr "Europe/Ljubljana"
+msgstr "أوروبا/Ljubljana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
-msgstr "Europe/London"
+msgstr "أوروبا/لندن"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
-msgstr "Europe/Luxembourg"
+msgstr "أوروبا/لوكسنبورغ"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
-msgstr "Europe/Madrid"
+msgstr "أوروبا/مدريد"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
-msgstr "Europe/Malta"
+msgstr "أوروبا/مالط"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr ""
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
-msgstr "Europe/Minsk"
+msgstr "أوروبا/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
-msgstr "Europe/Monaco"
+msgstr "أوروبا/موتاكو"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
-msgstr "Europe/Moscow"
+msgstr "أوروبا/موسكو"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
-msgstr "Europe/Nicosia"
+msgstr "أوروبا/Nicosia"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
-msgstr "Europe/Oslo"
+msgstr "أوروبا/أوسلو"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
-msgstr "Europe/Paris"
+msgstr "أوروبا/باريس"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr ""
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
-msgstr "Europe/Prague"
+msgstr "أوروبا/براغ"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
-msgstr "Europe/Riga"
+msgstr "أوروبا/ريغا"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
-msgstr "Europe/Rome"
+msgstr "أوروبا/روما"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
-msgstr "Europe/Samara"
+msgstr "أوروبا/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
-msgstr "Europe/San_Marino"
+msgstr "أوروبا/سات_مارينو"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
-msgstr "Europe/Sarajevo"
+msgstr "أوروبا/سارايفو"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
-msgstr "Europe/Simferopol"
+msgstr "أوروبا/Simferopol"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
-msgstr "Europe/Skopje"
+msgstr "أوروبا/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
-msgstr "Europe/Sofia"
+msgstr "أوروبا/سوفيا"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
-msgstr "Europe/Stockholm"
+msgstr "أوروبا/ستوكهولم"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
-msgstr "Europe/Tallinn"
+msgstr "أوروبا/Tallinn"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
-msgstr "Europe/Tirane"
+msgstr "أوروبا/Tirane"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr ""
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
-msgstr "Europe/Uzhgorod"
+msgstr "أوروبا/Uzhgorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
-msgstr "Europe/Vaduz"
+msgstr "أوروبا/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
-msgstr "Europe/Vatican"
+msgstr "أوروبا/فاتيكان"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
-msgstr "Europe/Vienna"
+msgstr "أوروبا/فيينا"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
-msgstr "Europe/Vilnius"
+msgstr "أوروبا/Vilnius"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr ""
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
-msgstr "Europe/Warsaw"
+msgstr "أوروبا/وارسو"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
-msgstr "Europe/Zagreb"
+msgstr "أوروبا/زاغرب"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
-msgstr "Europe/Zaporozhye"
+msgstr "أوروبا/Zaporozhye"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
-msgstr "Europe/Zurich"
+msgstr "أوروبا/زيُرخ"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
-msgstr "Indian"
+msgstr "المحيط الهندي"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
-msgstr "Indian/Antananarivo"
+msgstr "المحيط الهندي/Antananarivo"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
-msgstr "Indian/Chagos"
+msgstr "المحيط الهندي/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
-msgstr "Indian/Christmas"
+msgstr "المحيط الهندي/Christmas"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
-msgstr "Indian/Cocos"
+msgstr "المحيط الهندي/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
-msgstr "Indian/Comoro"
+msgstr "المحيط الهندي/جزر القمر"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
-msgstr "Indian/Kerguelen"
+msgstr "المحيط الهندي/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
-msgstr "Indian/Mahe"
+msgstr "المحيط الهندي/Mahe"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
-msgstr "Indian/Maldives"
+msgstr "المحيط الهندي/ملديف"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
-msgstr "Indian/Mauritius"
+msgstr "المحيط الهندي/Mauritius"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
-msgstr "Indian/Mayotte"
+msgstr "المحيط الهندي/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
-msgstr "Indian/Reunion"
+msgstr "المحيط الهندي/Reunion"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr ""
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr ""
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr ""
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr ""
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr ""
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr ""
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr ""
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr ""
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
-msgstr "Pacific"
+msgstr "المحيط الهادي"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
-msgstr "Pacific/Apia"
+msgstr "المحيط الهادي/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
-msgstr "Pacific/Auckland"
+msgstr "المحيط الهادي/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
-msgstr "Pacific/Chatham"
+msgstr "المحيط الهادي/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr ""
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
-msgstr "Pacific/Easter"
+msgstr "المحيط الهادي/Easter"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
-msgstr "Pacific/Efate"
+msgstr "المحيط الهادي/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
-msgstr "Pacific/Enderbury"
+msgstr "المحيط الهادي/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
-msgstr "Pacific/Fakaofo"
+msgstr "المحيط الهادي/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
-msgstr "Pacific/Fiji"
+msgstr "المحيط الهادي/فيدجي"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
-msgstr "Pacific/Funafuti"
+msgstr "المحيط الهادي/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
-msgstr "Pacific/Galapagos"
+msgstr "المحيط الهادي/Galapagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
-msgstr "Pacific/Gambier"
+msgstr "المحيط الهادي/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
-msgstr "Pacific/Guadalcanal"
+msgstr "المحيط الهادي/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
-msgstr "Pacific/Guam"
+msgstr "المحيط الهادي/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
-msgstr "Pacific/Honolulu"
+msgstr "المحيط الهادي/هوتولولو"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
-msgstr "Pacific/Johnston"
+msgstr "المحيط الهادي/جونستون"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
-msgstr "Pacific/Kiritimati"
+msgstr "المحيط الهادي/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
-msgstr "Pacific/Kosrae"
+msgstr "المحيط الهادي/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
-msgstr "Pacific/Kwajalein"
+msgstr "المحيط الهادي/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
-msgstr "Pacific/Majuro"
+msgstr "المحيط الهادي/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
-msgstr "Pacific/Marquesas"
+msgstr "المحيط الهادي/Marquesas"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
-msgstr "Pacific/Midway"
+msgstr "المحيط الهادي/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
-msgstr "Pacific/Nauru"
+msgstr "الهادي/ناورو"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
-msgstr "Pacific/Niue"
+msgstr "المحيط الهادي/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
-msgstr "Pacific/Norfolk"
+msgstr "المحيط الهادي/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
-msgstr "Pacific/Noumea"
+msgstr "المحيط الهادي/Noumea"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
-msgstr "Pacific/Pago_Pago"
+msgstr "المحيط الهادي/Pago_Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
-msgstr "Pacific/Palau"
+msgstr "المحيط الهادي/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
-msgstr "Pacific/Pitcairn"
+msgstr "المحيط الهادي/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr ""
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
-msgstr "Pacific/Ponape"
+msgstr "المحيط الهادي/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
-msgstr "Pacific/Port_Moresby"
+msgstr "المحيط الهادي/Port_Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
-msgstr "Pacific/Rarotonga"
+msgstr "المحيط الهادي/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
-msgstr "Pacific/Saipan"
+msgstr "المحيط الهادي/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr ""
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
-msgstr "Pacific/Tahiti"
+msgstr "المحيط الهادي/تاهيتي"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
-msgstr "Pacific/Tarawa"
+msgstr "المحيط الهادي/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
-msgstr "Pacific/Tongatapu"
+msgstr "المحيط الهادي/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
-msgstr "Pacific/Truk"
+msgstr "المحيط الهادي/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
-msgstr "Pacific/Wake"
+msgstr "المحيط الهادي/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
-msgstr "Pacific/Wallis"
+msgstr "المحيط الهادي/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
-msgstr "Pacific/Yap"
-
-#: ../src/tray_icon.c:469
-msgid "New appointment"
-msgstr "موعد جديد"
-
-#: ../src/tray_icon.c:485
-msgid "About Orage"
-msgstr "حول Orage"
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-msgid "Orage Panel Clock"
-msgstr "لوحة ساعة Orage"
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-msgid "Show time and date?"
-msgstr "عرض الوقت والتاريخ؟"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "تقويم "
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Orage تفضيلات التقويم"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-msgid "Orage preferences"
-msgstr "إعداد Orage"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "ضبط تطبيق تقويم إكسفيس 4  (Orage)"
+msgstr "Pacificالمحيط الهادي/Yap"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "تقويم المكتب"
-
-#: ../xfcalendar.desktop.in.h:3
-msgid "Orage Calendar"
-msgstr "Orage تقويم"
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr ""
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "عنوان: %s\n"
-#~ " بدء:\t%s\n"
-#~ " مهمة:\t%s\n"
-#~ " انتهت:\t%s\n"
-#~ "ملاحظة:\n"
-#~ "%s"
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr ""
 
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "يجب عليك إدخال كل حروف الهروب وغيرها نفسك.\n"
-#~ "هذا يبدأ فور الانتهاء من المعالجة في الطرفية"
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr ""
 
-#~ msgid "Orage clock"
-#~ msgstr "الساعة"
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr ""
 
-#~ msgid "Contributor"
-#~ msgstr "المساهمون"
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr ""
 
-#~ msgid "Warning"
-#~ msgstr "تحذير"
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr ""
 
-#~ msgid "Select always today"
-#~ msgstr "إختر اليوم"
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr ""
 
-#~ msgid "Vary"
-#~ msgstr "سنوي"
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr ""
 
-#~ msgid "Select timezone"
-#~ msgstr "إختيار النطاق"
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr ""
 
-#~ msgid "Modify Preferences"
-#~ msgstr "أداء"
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr ""
 
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr "قم بإدخال نطاق زمني أو قم باختيار واحد من الائحة"
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr ""
 
-#~ msgid "show line _1:"
-#~ msgstr "أظهر السطر_1:"
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr ""
 
-#~ msgid "show line _2:"
-#~ msgstr "أظهر السطر_2:"
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr ""
 
-#~ msgid "show line _3:"
-#~ msgstr "أظهر·السطر_3:"
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr ""
 
-#~ msgid "Properties"
-#~ msgstr "الخيارات"
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr ""
 
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "خيارات التقويم"
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr ""
 
-#~ msgid "Monday"
-#~ msgstr "اليوم"
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr ""
 
-#~ msgid "Tuesday"
-#~ msgstr "اليوم"
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr ""
 
-#~ msgid "Wednesday"
-#~ msgstr "ايام الاسبوع"
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr ""
 
-#~ msgid "Thursday"
-#~ msgstr "اليوم"
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr ""
 
-#~ msgid "Friday"
-#~ msgstr "الجمعة"
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr ""
 
-#~ msgid "Sunday"
-#~ msgstr "صوت"
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr ""
 
-#~ msgid "Hidden"
-#~ msgstr "خفي"
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr ""
 
-#~ msgid "3 months"
-#~ msgstr "3 أشهر"
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr ""
 
-#~ msgid "6 months"
-#~ msgstr "6 أشهر"
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr ""
 
-#~ msgid "1 year"
-#~ msgstr "1 سنة"
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr ""
 
-#~ msgid "Application"
-#~ msgstr "تطبيق"
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr ""
 
-#~ msgid "Core developer"
-#~ msgstr "مطوري النواة"
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr ""
 
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "سيتم حذف كل المعلومات\n"
-#~ "ويشمل البينات المرتبطهة بها"
+#: ../src/tray_icon.c:469
+msgid "New appointment"
+msgstr "موعد جديد"
 
-#~ msgid "Clear"
-#~ msgstr "مسح"
+#: ../src/tray_icon.c:485
+msgid "About Orage"
+msgstr "حول أوراج"
 
-#~ msgid "This should not happen"
-#~ msgstr "ﻻ يجب ان يحدوث هذا"
+#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
+msgid "Orage Panel Clock"
+msgstr "لوحة ساعة أوراج"
 
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "لم أتمكن من تكوين وصلة لعميل MCS"
+#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
+msgid "Show time and date?"
+msgstr "عرض الوقت والتاريخ؟"
 
-#~ msgid "Open archive file..."
-#~ msgstr "فتخ ملف الأرشيف..."
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
+msgid "Orage preferences"
+msgstr "إعداد أوراج"
 
-#~ msgid "Close archive file"
-#~ msgstr "غلق ملف الأرشيف"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr "ضبط تطبيق تقويم إكسفس 4 (أوراج)"
 
-#~ msgid "Saturday"
-#~ msgstr "صوت"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "تفضيلات التقويم أوراج"
 
-#~ msgid "Days"
-#~ msgstr "اليوم"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "تقويم"
 
-#~ msgid "Calendar borders"
-#~ msgstr "ملفات التقويم "
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr "تقويم أوراج"
 
-#~ msgid "Calendar Files"
-#~ msgstr "ملفات التقويم "
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "تقويم سطح المكتب"
diff -Nru orage-4.8.3/po/ast.po orage-4.12.1/po/ast.po
--- orage-4.8.3/po/ast.po	2012-01-03 12:01:00.000000000 +0000
+++ orage-4.12.1/po/ast.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,15 +1,40 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Ḷḷumex03 <tornes@opmbx.org>, 2014
+# Ḷḷumex03 <tornes@opmbx.org>, 2014
+# Ḷḷumex03 <tornes@opmbx.org>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: xcalendar\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2009-07-06 19:27+0100\n"
-"Last-Translator: astur <malditoastur@gmail.com>\n"
-"Language-Team: Asturian <alministradores@softastur.org>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2014-12-07 00:01+0000\n"
+"Last-Translator: Ḷḷumex03 <tornes@opmbx.org>\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/xfce-apps/language/ast/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr ""
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr ""
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr ""
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr ""
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -25,9 +50,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"clic pa camudar el reló"
+msgstr "%s\nclic pa modificar el reló"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -37,9 +60,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"botón 1 pa camudar preferencies \n"
-"botón 2 p'axustar la hora de los relós"
+msgstr "botón 1 pa camudar preferencies \nbotón 2 p'axustar la hora de los relós"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -50,17 +71,21 @@
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
 msgstr ""
 
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr ""
+
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
 msgstr "NUEVA"
 
 #: ../globaltime/gt_prefs.c:289
 msgid "NEW COPY"
-msgstr "NUEVA COPIA"
+msgstr "COPIA NUEVA"
 
 #: ../globaltime/gt_prefs.c:310
 msgid "Not possible to delete the last clock."
-msgstr "Nun foi dable desaniciar el caberu reló."
+msgstr "Nun ye posible desaniciar el caberu reló."
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
@@ -84,7 +109,7 @@
 
 #: ../globaltime/gt_prefs.c:544
 msgid "move this clock left"
-msgstr "mover esti reló a la esquierda"
+msgstr "mover esti reló a la izquierda"
 
 #: ../globaltime/gt_prefs.c:549
 msgid "move this clock right"
@@ -92,21 +117,19 @@
 
 #: ../globaltime/gt_prefs.c:554
 msgid "move this clock last"
-msgstr "mover esti reló al final"
+msgstr "mover esti reló a la fin"
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
-msgstr ""
-"afitar la estaya horaria pa esti reló pa que seya la estaya horaria llocal"
+msgstr "afitar la estaya horaria pa esti reló pa que seya la estaya horaria llocal"
 
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
 msgstr "zarrar la ventana y colar"
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "Anovar preferencies"
+msgstr "Preferencies d'hora global"
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -119,7 +142,7 @@
 
 #: ../globaltime/gt_prefs.c:613
 msgid "enter name of clock"
-msgstr "meta nome del reló"
+msgstr "introduz nome del reló"
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
@@ -150,9 +173,7 @@
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
 #: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
 msgid "Cross this to use default instead of selected value"
-msgstr ""
-"Conseñar con una cruz pa usar el valor predetermináu en cuentes del "
-"seleicionáu"
+msgstr "Conseñar esto pa usar el predetermináu encuantes del valor esbilláu"
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
@@ -161,7 +182,7 @@
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
-msgstr "Clic pa camudar el color de primer planu del reló"
+msgstr "Primi pa camudar el color de primer planu del reló"
 
 #. ------------------------name font-------------------------
 #: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
@@ -170,7 +191,7 @@
 
 #: ../globaltime/gt_prefs.c:720
 msgid "Click to change font for clock name"
-msgstr "Clic pa camudar la fonte del nome'l reló"
+msgstr "Primi pa camudar la fonte pal nome del reló"
 
 #. ------------------------time font-------------------------
 #: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
@@ -179,67 +200,63 @@
 
 #: ../globaltime/gt_prefs.c:753
 msgid "Click to change font for clock time"
-msgstr "Clic pa camudar la fonte predeterminada de la hora del reló"
+msgstr "Primi pa camudar la fonte por defeutu de la hora del reló"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:780
 msgid "Underline name of clock:"
-msgstr "Sorrayar nome del reló:"
+msgstr "Solliñar el nome del reló"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:810
 msgid "Underline time of clock:"
-msgstr "Sorrayar la hora del reló:"
+msgstr "Solliñar la hora del reló:"
 
 #: ../globaltime/gt_prefs.c:850
 msgid "Text Default Formatting"
-msgstr "Formatu de testu predetermináu"
+msgstr "Formatu de testu por defeutu"
 
 #: ../globaltime/gt_prefs.c:863
 msgid "Click to change default background colour for clocks"
-msgstr "Clic pa camudar el color de fondu predetermináu pa los relós"
+msgstr "Primi pa camudar el color de fondu por defeutu pa los relós"
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
-"Marcar pa usar el color de sistema predetermináu en llugar del seleicionáu"
+msgstr "Conseña esto pa usar la color por defeutu'l sistema en cuantes de la esbillada"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
-msgstr "Clic pa camudar el color de testu predetermináu pa los relós"
+msgstr "Primi pa camudar la color de testu por defeutu pa los relós"
 
 #: ../globaltime/gt_prefs.c:929
 msgid "Click to change default font for clock name"
-msgstr "Clic pa camudar la fonte predeterminada del nome del reló"
+msgstr "Primi pa camudar la fonte por defeutu del nome del reló"
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"Marcar pa usar la fonte predeterminada del sistema en cuentes de la fonte "
-"seleccionada"
+msgstr "Conseña esto pa usar la fontes por defeutu'l sistema en cuantes de la esbillada"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
-msgstr "Clic pa camudar la fontepredeterminada pa la hora del reló"
+msgstr "Primi pa camudar la fonte por defeutu pa la hora del reló"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:990
 msgid "Underline for name of clock:"
-msgstr "Sorrayáu pal nome'l reló:"
+msgstr "Solliñu pal nome'l reló:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:1004
 msgid "Underline for time of clock:"
-msgstr "Sorrayáu pa la hora del reló:"
+msgstr "Solliñu pa la hora'l reló:"
 
 #: ../globaltime/gt_prefs.c:1027
 msgid "update preferences"
-msgstr "Anovar preferencies"
+msgstr "anovar preferencies"
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "Preferencies xenerales"
+msgstr "Preferencies d'hora global"
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
@@ -252,15 +269,19 @@
 
 #: ../globaltime/gt_prefs.c:1078
 msgid "Standard"
-msgstr "Standard"
+msgstr "Estándar"
 
 #: ../globaltime/gt_prefs.c:1083
 msgid "Use normal decorations"
 msgstr "Usar decoraciones normales"
 
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Dengún"
+
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
-msgstr "Nun amosar decoración de ventana (bordes)"
+msgstr "Nun amosar decoración de ventana (bervesos)"
 
 #: ../globaltime/gt_prefs.c:1100
 msgid "Clock size:"
@@ -289,25 +310,25 @@
 #: ../globaltime/timezone_selection.c:101
 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
 msgid " Other"
-msgstr ""
+msgstr "Otru"
 
 #: ../globaltime/timezone_selection.c:156
 #: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
 #, c-format
 msgid "%d hour %d mins"
-msgstr ""
+msgstr "%d hora %d minutos"
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
-msgstr "hores"
+msgstr "%d hora"
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "%d mins"
-msgstr "minutos"
+msgstr "%d minutos"
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
@@ -316,33 +337,32 @@
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-#, fuzzy
 msgid "forward"
-msgstr "Alantre"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
 msgid "not changed"
-msgstr ""
+msgstr "non camudáu"
 
 #: ../globaltime/timezone_selection.c:195
 #: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
 msgid "not changing"
-msgstr ""
+msgstr "non camudar"
 
 #. location
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
-msgstr "Llugar"
+msgstr "Allugamientu"
 
 #: ../globaltime/timezone_selection.c:258
 #: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
 msgid "GMT Offset"
-msgstr ""
+msgstr "Offset GMT"
 
 #: ../globaltime/timezone_selection.c:264
 #: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
@@ -352,7 +372,7 @@
 #: ../globaltime/timezone_selection.c:269
 #: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
 msgid "Country"
-msgstr ""
+msgstr "País"
 
 #. We are actually setting the g_par parameter. In other words
 #. we are setting the global default timezone for Orage. This is
@@ -373,7 +393,7 @@
 #: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
 #: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
 msgid "Change mode"
-msgstr ""
+msgstr "Mou cambéu"
 
 #: ../globaltime/timezone_selection.c:303
 #: ../globaltime/timezone_selection.c:313
@@ -395,99 +415,108 @@
 msgid "floating"
 msgstr "flotante"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "Hora llocal"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "Orage - Calendariu"
+msgstr "Hora global Orage"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
+msgstr "Amosar relós de diferentes países"
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Tiempu global"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr ""
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr ""
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
 msgstr ""
 
-#: ../panel-plugin/oc_config.c:224
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "Aspeutu"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
 msgstr "Amosar _marcu"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
 msgstr "afitar _color de primer planu"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
 msgstr "afitar color de _fondu"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
 msgstr "afitar _altor:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
+msgstr "Percátate que nun pues camudar l'altor de los paneles horizontales"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
 msgstr "afitar a_nchor:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
-msgstr ""
+msgstr "Percátate que nun pues camudar l'anchor de los paneles verticales"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Amosar llinies _verticalmente"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "Opciones de reló"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
 msgstr "afitar estaya horaria en:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
-msgstr ""
+msgstr "Llinia %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
-msgstr "Meta cualesquier parámetru válidu de la función strftime."
+msgstr "Introduz cualesquier parámetru válidu de la función strftime."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
-msgstr "Cuadru emerxente:"
+msgstr "Caxa de función:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
-msgstr "correxir hora dempués de suspender/hibernar"
+msgstr "iguar la hora dempués de suspender/hibernar"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Sólo necesita esto si hiberna o suspende l'equipu per un curtiu periodu "
-"tiempu (menos de 5 hores) y el tiempu visible nun incluye segundos. Baxo "
-"estes circunstancies ye dable qu'Orageclock amuese'l tiempu de forma "
-"inesauta a menos qu'heba seleicionao esto. (Seleicionalo evita que furrules "
-"funcionalidaes d'aforru de CPU ya interrupciones)."
+msgstr "Namái necesites esto si faes una suspensión o ivernación nun periodu curtiu de tiempu, (menos de 5 hores), y la to hora visible nun inclúi segundos. Baxo estes circustancies ye dable qu'Orageclock amuese la hora de mou non afayadizu a nun ser que tengas esto esbillao. (Esbillar esto antemana les carauterístiques d'interrupción d'aforru d'enerxía y l'usu de la CPU nel funcionamientu.)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -497,22 +526,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Esti programa usa la función strftime pa obtener la hora.\n"
-"Use cualesquier códigu válidu pa obtener la hora nel formatu que prefiera.\n"
-"Dalgunos códigos comunes son:\n"
-"\t%A = día de la selmana\t\t\t%B = mes\n"
-"\t%c = data & hora\t\t%R = hora & minutu\n"
-"\t%V = día de la selmana (numbéricu)\t\t%Z = estaya horaria n'usu\n"
-"\t%H = hora \t\t\t\t%M = minutu\n"
-"\t%X = hora llocal\t\t\t%x = data llocal"
+msgstr "Esti programa usa la función strftime pa obtener la hora.\nUse cualesquier códigu válidu pa obtener la hora nel formatu que prefiera.\nDalgunos códigos comunes son:\n\t%A = día de la selmana\t\t\t%B = mes\n\t%c = data & hora\t\t%R = hora & minutu\n\t%V = día de la selmana (numbéricu)\t\t%Z = estaya horaria n'usu\n\t%H = hora \t\t\t\t%M = minutu\n\t%X = hora llocal\t\t\t%x = data llocal"
 
-#: ../panel-plugin/oc_config.c:457
-#, fuzzy
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
-msgstr "Preferencies d'Orage"
+msgstr "Preferencies del reló Orage"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -521,8 +540,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
 
@@ -531,14 +549,13 @@
 msgstr "Caltenedor"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "Alministre el so tiempu con Xfce4"
+msgstr "Alministra'l to tiempu con Orage"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Fin"
 
@@ -546,13 +563,13 @@
 msgid "Due"
 msgstr "Data llímite"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Seleiciona un ficheru..."
 
@@ -560,227 +577,281 @@
 msgid "Sound Files"
 msgstr "Ficheros de soníu"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Tolos ficheros"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "La información de la cita modificóse."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "¿Quies siguir?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Non, nun colar"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Sí, inorar les camudancies y colar"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "El fin d'esta cita ye anterior al so aniciu."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "Nun afitáu"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Amestar un cita nueva a esti ficheru."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Ficheru por defeutu Orage"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Fallu na amestanza de la cita."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Asocedió un fallu cuando s'amestaba la cita. Mira más detalles nel ficheru de rexistru."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Fallu nel anovamientu de la cita."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Mira más detalles nel ficheru de rexistru. (¿Nun s'anovaría'l ficheru esternamente?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
 msgstr "Esta cita desaniciaráse dafechu."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Non, encaboxar el desaniciu"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Sí, desanicialu"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Escueye la data"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Güei"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "Esta cita nun esiste."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
 msgstr "Probablemente desanicióse. Por favor, refresque la pantalla."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Categoríes actuales"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Amestar una nueva categoría con color"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Categoría:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Colores de categoríes - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr " *** COPIAR ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "Nueva cita - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Ficheru"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "_Guardar y zarrar"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "D_uplicar"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Guardar"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Guardar y zarrar"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Revertir"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Desaniciar"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Lliberar"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Ocupáu"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Xeneral"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Triba"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Eventu"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Eventu qu'ocurrirá en dalgún intre. Por exemplu:\n"
-"Cita, cumpleaños o programa TV."
+msgstr "Eventu qu'ocurrirá en dalgún intre. Por exemplu:\nCita, cumpleaños o programa TV."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "Xeres pendientes"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Daqué que tendría de facer en dalguna ocasión. Por exemplu:\n"
-"Llavar el so coche o prebar la nueva versión d'Orage."
+msgstr "Daqué que tendría de facer en dalguna ocasión. Por exemplu:\nLlavar el so coche o prebar la nueva versión d'Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Diariu"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Tome nota cuando daqué asoceda. Por exemplu:\n"
-"Remembre que la so madre llamó o que cayó la primer nevada."
+msgstr "Tome nota cuando daqué asoceda. Por exemplu:\nRemembre que la so madre llamó o que cayó la primer nevada."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Títulu"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "Eventu que dura tol día"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Aniciu"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Afitar"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Duración"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "díes"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "hores"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "minutos"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Disponibilidá"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Completáu"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "Fecho"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Categoríes"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Ésta ye una categoría especial que pue usase pa colorear esta cita nes "
-"vistes como llista."
+msgstr "Ésta ye una categoría especial que pue usase pa colorear esta cita nes vistes como llista."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "anovar colores de categoríes."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
-msgstr ""
+msgstr "Prioridá"
+
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Si afites esto a 8 o más grande, la cita NUN s'amosará nes ventanes de llista.\nPues usar una carauterística pa ordenar les tos ventanes de llista, pero fadrá abegoso alcontrar esa cita.\n(Les alarmes entá se prenderán de mou normal.)\n(Hai un parámetru ensin documentar nel que pues camudar el llimite por defeutu de 8.)"
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Nota"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -789,133 +860,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "Enantes del aniciu"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "Enantes del fin"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "Dempués del aniciu"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "Dempués del fin"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Alarma"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Hora d'alarma"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"A vegaes quies que l'alarma s'active:\n"
-" 1) enantes del aniciu del eventu\n"
-" 2) enantes del fin de xeres pendientes\n"
-" 3) dempués del aniciu de xeres pendientes"
+msgstr "A vegaes quies que l'alarma s'active:\n 1) enantes del aniciu del eventu\n 2) enantes del fin de xeres pendientes\n 3) dempués del aniciu de xeres pendientes"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr "Alarma persistente"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Seleiciona esta opción si quies qu'Orage t'avise inclusu si nun taba activu "
-"cuando ocurrió l'alarma."
+msgstr "Seleiciona esta opción si quies qu'Orage t'avise inclusu si nun taba activu cuando ocurrió l'alarma."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Soníu"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "Usar"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
 msgstr "Seleiciona esta opción si quies una alarma sonora"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "Repetir soníu d'alarma"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "vegaes"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "intervalu en seg."
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "Visual"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Usar ventana d'Orage"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
 msgstr "Seleiciona esta opción si quies la ventana d'alarma d'Orage"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Usar notificación"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
 msgstr "Seleiciona esta opción si quies l'alarma de notificación"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "Afitar tiempu d'expiración"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
-msgstr ""
-"Seleiciona esta opción si quies que les notificaciones acaben automáticamente"
+msgstr "Seleiciona esta opción si quies que les notificaciones acaben automáticamente"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 = tiempu d'acabu predetermináu del sistema"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "segundos"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Procedimientu"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
-msgstr ""
-"Seleiciona esta opción si quies una alarma per aciu de procedimientu o script"
+msgstr "Seleiciona esta opción si quies una alarma per aciu de procedimientu o script"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -927,155 +989,144 @@
 "\t<&ET> appointment end time"
 msgstr ""
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
 msgstr ""
 
-#: ../src/appointment.c:3101
-#, fuzzy
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
-msgstr "Alarma predeterminada"
+msgstr "<b>Alarma por defeutu</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
 msgstr "Atroxar la configuración d'anguaño como alarma predeterminada"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
 msgstr "Afitar la configuración d'anguaño dende la de l'alarma predeterminada"
 
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Dengún"
-
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Diariu"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Selmanal"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Mensual"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Añal"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
 msgstr ""
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Llun"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Mar"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Mié"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Xue"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Vie"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "Sáb"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "Dom"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Repetición"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Complexidá"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Básicu"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Avanzáu"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "Use esta opción si quier la repetición regular del eventu"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Use esta opción si necesita dates complexes como:\n"
-" Cada sábadu y domingu o \n"
-" el primer xueves de cada mes"
+msgstr "Use esta opción si necesita dates complexes como:\n Cada sábadu y domingu o \n el primer xueves de cada mes"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Frecuencia"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Cada"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "ocurrencia"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Llimitar la frecuencia a un intervalu determináu.\n"
-" Por exemplu: Cada tercer día:\n"
-" Frecuencia = Diaria ya Intervalu = 3"
+msgstr "Llimitar la frecuencia a un intervalu determináu.\n Por exemplu: Cada tercer día:\n Frecuencia = Diaria ya Intervalu = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Llimitar"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Repetir pa siempres"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Repetir "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Repetir fasta "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Díes de la selmana"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "Qué día"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1083,283 +1134,297 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Especificar díes de la selmana pa eventos mensuales y añales.\n"
-" Por exemplu:\n"
-" El segundu miércoles de cada mes:\n"
-"\tFrecuencia = Mensual,\n"
-"\tDíes de la selmana = conseñe namái'l miércoles,\n"
-"\tQué día = seleiciona 2 del númberu debaxo de miércoles"
+msgstr "Especificar díes de la selmana pa eventos mensuales y añales.\n Por exemplu:\n El segundu miércoles de cada mes:\n\tFrecuencia = Mensual,\n\tDíes de la selmana = conseñe namái'l miércoles,\n\tQué día = seleiciona 2 del númberu debaxo de miércoles"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr ""
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
 msgstr ""
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 
 #. exceptions
-#: ../src/appointment.c:3361
-#, fuzzy
+#: ../src/appointment.c:3471
 msgid "Exceptions"
-msgstr "Opciones"
+msgstr "Esceiciones"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
 msgstr ""
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
-msgstr ""
+msgstr "Amestar data escluyida (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr ""
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
-msgstr ""
+msgstr "Amestar hora incluyida (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
 msgstr ""
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
-#, fuzzy
+#: ../src/appointment.c:3516
 msgid "Action dates"
-msgstr "Opciones d'aición"
+msgstr ""
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Ver"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "_Dir"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Nuevu"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Atrás"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr ""
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Güei"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Alantre"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
+
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Zarrar"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Desconocíu"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
-msgstr ""
+msgstr "Númberu de díes p'amosar"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - Vista de día"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Tol día"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "Nun se seleicionó nenguna filera."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Fai clic nuna filera pa seleicionala y pa poder copiala dempués."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"Va desaniciar dafechu toes\n"
-"les citas seleicionaes."
+msgstr "Va desaniciar dafechu toes\nles citas seleicionaes."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Sí, desanicialos"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Atrás"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Alantre"
+
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Guetar"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "Vista de día"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Díes estra a amosar"
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Díes estra p'amosar:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "namái la primer repetición"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Conseña esto si namái quies ver el primer eventu repetitivu. Por defeutu amuésense toos.\nDecátate que esto tamién amuesa toles urxencies.\nDel mesmu mou, los eventos repetitivos puen apaecer ceo na llista como la primera ocurencia namái llistada."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "tamién vieyos"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Conseña esto si quies ver tamién los eventos vieyos. Esto namái pue esbillase si s'habilita 'namái la primer repetición' pa evitar llistes perllargues.\nDecátate que la esbilla de díes estra entá define si se llisten cites más nueves."
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "Entamu d'entraes de diariu dende:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Guetar"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "Guetar testu"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Marques"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Títulu"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
-"Fai doble clic nuna llinia pa editala.\n"
-"\n"
-"Marques n'orde:\n"
-"\t 1. Alarma: n=ensin alarma\n"
-"\t\t A=alarma visual S=tamién alarma sonora\n"
-"\t 2. Recurrencia: n=ensin recurrencia\n"
-"\t\t D=diaria W=selmanal M=mensual Y=añal\n"
-"\t 3. Triba: f=llibre B=ocupáu\n"
-"\t 4. Asitiáu en ficheru:\n"
-"\t\tO=Orage A=ficheru F=esternu\n"
-"\t 5. Triba de cita:\n"
-"\t\tE=eventu T=xera pendiente J=diariu"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Escueye la data"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tAcabó la repetición, moviendo a un ficheru."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Archiváu non activáu. Colando"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Umbral d'archiváu: %d mes(es)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tArchivando eventos más antiguos que: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Identificador d'archiváu: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tVTOO non completáu; non archiváu"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tRepetitivo. Final d'añu: %04d, mes: %02d, día: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Archiváu completáu\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Escomencipiando desaniciu del ficheru."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tFASE 1: reaniciar cites repetitives"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tFASE 2: torne les cites archivaes"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Desaniciu del ficheru fechu\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Alarma predeterminada d'Orage"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Creóse la llista d'alarma pal ficheru principal d'Orage:"
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Creóse la llista d'alarmes pal ficheru foriatu: %s (%s)"
+
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "Crear llista d'alarmes: %d alarmes amestaes. %d eventos procesaos."
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\tAmestaes %d alarmes. Procesaos %d eventos."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tAtopáronse %d alarmes, de les que %d tán actives (%d alarmes repetitives "
-"guetaes)."
+msgstr "\tAtopáronse %d alarmes, de les que %d tán actives (%d alarmes repetitives guetaes)."
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1377,7 +1442,16 @@
 msgid "Import file preprocessing done"
 msgstr "Preprocesáu del ficheru d'importación fináu"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Alcontróse un anovamientu esternu nel ficheru %s."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Refrescando les alarmes y el calandariu pola mor d'un anovamientu de ficheru esternu."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Ficheros de calendarios"
 
@@ -1385,628 +1459,670 @@
 msgid "Current foreign files"
 msgstr "Ficheros externos d'anguaño"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "NAMÁI LLECTURA"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "LLECTURA/ESCRITURA"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Nun hai ficheros esternos *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Fallu al amestar un ficheru foriatu"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage namái pue remanar 10 ficheros foriatos. Algamóse'l llimite"
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "El nome de ficheru ta baleru."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "El nome ta baleru."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "El ficheru nun esiste"
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Yá esiste'l mesmu ficheru n'Orage"
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Yá esiste'l mesmu nome n'Orage."
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Importar/esportar"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Lleer de ficheru:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Separtar nomes de ficheru con coma (,).\n"
-" NOTA: la coma nun ye un caráuter válidu pa nomes de ficheru d'Orage."
+msgstr "Separtar nomes de ficheru con coma (,).\n NOTA: la coma nun ye un caráuter válidu pa nomes de ficheru d'Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Esportar"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Escribir a ficheru:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Seleicionar"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Toles cites"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Cites con nome: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Decátate de que namái se lleen les cites del ficheru principal.\n"
-"Los eventos archivaos y los esternos nun s'exporten."
+msgstr "Decátate de que namái se lleen les cites del ficheru principal.\nLos eventos archivaos y los esternos nun s'exporten."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Decátate de que namái se lleen les cites del ficheru principal.\n"
-"Los eventos esternos nun s'exporten."
+msgstr "Decátate de que namái se lleen les cites del ficheru principal.\nLos eventos esternos nun s'exporten."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
-msgstr ""
-"Pues arrastrar estos cenciellamente fora la ventana de llista d'eventos."
+msgstr "Pues arrastrar estos cenciellamente fora la ventana de llista d'eventos."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "Identificadores de cites d'Orage separtaos por comes."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Archivar"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Archivar agora (umbral: %d meses)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Pues camudar l'umbral d'archiváu nos parámetros"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Recuperar ficheru agora"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Devolver tolos eventos archivaos al ficheru principal d'Orage y desaniciar "
-"el ficheru de ficheru.\n"
-"Esto ye útil por exemplu al exportar y mover cites d'Orage\n"
-"a otru sistema."
+msgstr "Devolver tolos eventos archivaos al ficheru principal d'Orage y desaniciar el ficheru de ficheru.\nEsto ye útil por exemplu al exportar y mover cites d'Orage\na otru sistema."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Ficheros d'Orage"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Ficheru de calendariu principal d'Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Ficheru actual"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Nuevu ficheru"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Opciones d'aición"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Ficheru actual:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Ficheru nuevu:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Opciones d'aición:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Renomar"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Sólo renoma'l ficheru internu d'Orage.\n"
-"Nun altera un res el sistema de ficheros esternu.\n"
-"Un nuevu ficheru tien d'esistir."
+msgstr "Sólo renoma'l ficheru internu d'Orage.\nNun altera un res el sistema de ficheros esternu.\nUn nuevu ficheru tien d'esistir."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-"El ficheru actual copiase y permanez ensin modificaciones nel so antiguu "
-"llugar."
+msgstr "El ficheru actual copiase y permanez ensin modificaciones nel so antiguu llugar."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Mover"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "El ficheru actual muévese y desapaez del so antiguu llugar."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Ficheru d'archivu"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Ficheros esternos"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Amestar nuevu ficheru esternu"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Ficheru esternu:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Opciones"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Nome visible:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Namái llectura"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Active esta opción si quier tar ciertu de qu'esti ficheru nunca nun "
-"camudaráse por Orage.\n"
-"Ten en cuenta que'l cambéu de ficheros esternos pue facelos incompatibles "
-"cola ferramienta orixinal cola que foron xeneraos."
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Active esta opción si quier tar ciertu de qu'esti ficheru nunca nun camudaráse por Orage.\nTen en cuenta que'l cambéu de ficheros esternos pue facelos incompatibles cola ferramienta orixinal cola que foron xeneraos."
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Amuesase esti nome internu al usuariu en cuantes del nome de ficheru"
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Intercambéu de datos - Orage"
 
-#: ../src/main.c:268
-#, fuzzy, c-format
+#: ../src/main.c:275
+#, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tEsto ye %s versión %s pa Xfce %s\n"
-"\n"
+msgstr "\tEsto ye %s versión %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tDistribuyíu baxo los términos de la llicencia GPL de GNU.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tCompiláu con GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "usando GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tUsa DBUS pa importación.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tNun s'usa DBUS. La importación furrula namái parcialmente.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tUsa libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tNun s'usa libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tUsa archiváu automáticu.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tNun s'usa archiváu.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
-msgstr ""
+msgstr "\tUsando paquete libical del sistema operativu.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
+msgstr "\tUsando versión local d'Orage de libical.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Usu: orage [opciones] [ficheros]\n"
-"\n"
+msgstr "Usu: orage [opciones] [ficheros]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Opciones:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\\amuesa la versión d'orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tamuesa esti testu\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferencies (-p) \tamosar formulariu de preferencies\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\tfacer orage visible/invisible\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) ficheru [RW] \tamestar un ficheru esternu\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) ficheru [LE] [nome] \tamiesta un ficheru foriatu\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) ficheru \tdesaniciar un ficheru esternu\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--export (-e) file [cita...] \tesporta cites d'Orage a un file\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "ficheros=ficheros ical a cargar n'orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tdbus nun incluyíu n'orage.\n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tensin dbus les opciones (-a y -r) pa [ficheros] y ficheros esternos namái "
-"puen usase al entamar orage \n"
+msgstr "\tensin dbus les opciones (-a y -r) pa [ficheros] y ficheros esternos namái puen usase al entamar orage \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Opción %s desconocía\n"
-"\n"
+msgstr "\nOpción %s desconocía\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Intercamudar datos"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Ver _data seleicionada"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Ver _selmana seleicionada"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Seleicionar güe_i"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Hora llocal"
+msgstr ""
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
-msgstr "Ai_da"
+msgstr "A_yuda"
+
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Ensin títulu definíu"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr "Allugamientu: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n Nota:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Nunca"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
-"Títulu: %s\n"
-" Aniciu:\t%s\n"
-" Acabu:\t%s\n"
-" Nota:\n"
-"%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
-"Títulu: %s\n"
-" Aniciu:\t%s\n"
-" Acabu:\t%s\n"
-" Nota:\n"
-"%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Xeres pendientes:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Eventos pa %s:</b>"
 
-#: ../src/mainbox.c:593
-#, fuzzy, c-format
+#: ../src/mainbox.c:660
+#, c-format
 msgid "<b>Events for %s - %s:</b>"
-msgstr "<b>Eventos pa %s:</b>"
+msgstr ""
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:492
 msgid "Main settings"
-msgstr "Opciones principales"
+msgstr "Axustes principales"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Estaya horaria"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "Tendría de definir siempres la so estaya horaria llocal."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "Umbral d'archiváu (meses)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = ensin archivar)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
 msgstr "L'archiváu s'usa p'aforrar tiempu y espaciu al tratar los eventos."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Comandu de soníu"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-"Esti comandu execútase nel intérprete de comandos pa facer sonar les alarmas."
+msgstr "Esti comandu execútase nel intérprete de comandos pa facer sonar les alarmas."
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Vista"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Ventana principal de calendariu"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Ventanu del calandariu"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Detalles visuales del calandariu"
+
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "Amosar berbesos"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "Amosar menú"
 
-#: ../src/parameters.c:632
-#, fuzzy
-msgid "Show month and year"
-msgstr "Amosar nel seleutor d'estaya de trabayu"
-
-#: ../src/parameters.c:639
-#, fuzzy
+#: ../src/parameters.c:622
 msgid "Show day names"
-msgstr "Amosar _marcu"
+msgstr "Amosar nomes de díes"
 
-#: ../src/parameters.c:646
-#, fuzzy
+#: ../src/parameters.c:627
 msgid "Show week numbers"
-msgstr "Amosar berbesos"
+msgstr "Amosar númberos de la selmana"
+
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Amosar mes y añu"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Caxes d'información del calandariu"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "Amosar llista de xeres pendientes"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
-msgstr ""
+msgstr "Númberu de díes p'amosar na ventana d'eventu"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
-msgstr ""
+msgstr "0 = nun amosar pa nada la llista d'eventos"
+
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Visibilidá del calandariu"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
-msgstr ""
+msgstr "Amosar en tolos escritorios"
 
-#: ../src/parameters.c:683
-#, fuzzy
+#: ../src/parameters.c:696
 msgid "Keep on top"
-msgstr "Siempres enriba"
+msgstr "Caltener arriba"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "Amosar na barra de xeres"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "Amosar nel seleutor d'estaya de trabayu"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "Amosar na estaya de notificación"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "Aniciu de calendariu"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Amosar"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Anubrir"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Minimizáu"
 
-#: ../src/parameters.c:793
-#, fuzzy
-msgid "Extra settings"
-msgstr "Opciones estra"
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Ventana principal de calendariu"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "Seleicionar güe_i"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
 msgstr ""
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Esbillar la data de güei"
 
-#: ../src/parameters.c:841
-#, fuzzy
-msgid "Use dynamic icon"
-msgstr "Tamañu dinámicu d'iconu"
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Esbillar la data esbillada enantes"
 
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
 msgstr ""
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Duble clic sobro'l calendariu principal amuesa"
-
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
 msgstr "Vista de díes"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
 msgstr "Llista d'eventos"
 
-#: ../src/parameters.c:890
-#, fuzzy
-msgid "Eventlist window"
-msgstr "Llista d'eventos"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Axustes estra"
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Ventana de llista d'eventos"
+
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
-msgstr ""
+msgstr "Númberu de díes estra p'amosar na llista d'eventos"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
+msgstr "Esto ye namái'l valor por defeutu, pues camudalu na ventana de llista d'eventos d'anguaño."
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Amosar namái'l primer eventu repetitivu"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
 msgstr ""
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Primer día de la selmana"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Día esbilláu"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Usar iconu de bandexa dinámicu"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Usar icOnu dinámicu"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Los iconos dinámicos amuesen el mes y el día del mes d'anguaño. "
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "Usa esti temporizador si Orage tien problemes d'espertar dempués de la suspensión o ivernación. (Por exemplu l'iconu la bandexa nun se refresca o les alarmes nun se prenden.)"
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
 msgstr ""
 
-#: ../src/parameters.c:938
-msgid "Orage Preferences"
-msgstr "Preferencies d'Orage"
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Ventana d'Orage"
 
-#: ../src/parameters.c:1050
-msgid "First Orage start. Searching default timezone."
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Notificar notificación"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Colar siempres cuando s'entrugue al zarrar"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Colar siempres"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr ""
+
+#: ../src/parameters.c:1045
+msgid "Orage Preferences"
+msgstr "Preferencies d'Orage"
+
+#: ../src/parameters.c:1157
+msgid "First Orage start. Searching default timezone."
 msgstr "Primer aniciu d'Orage. Guetando estaya horaria predeterminada."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Estaya horaria predeterminada configurada como %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
 msgstr "Estaya horaria nun atopada. Por favor, configúrela manualmente."
 
@@ -2018,40 +2134,35 @@
 msgid "Open"
 msgstr "Abrir"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Recordatoriu - Orage"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Posponer"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
 msgstr ""
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Siguientes alarmes activaes:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d d %02d h %02d min pa: %s"
+msgstr "\n%02d d %02d h %02d min pa: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Nun s'atopó denguna alarma activa"
+msgstr "\nNun s'atopó denguna alarma activa"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2074,1537 +2185,2229 @@
 msgstr "África/Arxel"
 
 #: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
+msgid "Africa/Asmara"
 msgstr "África/Asmara"
 
 #: ../src/timezone_names.c:42
+msgid "Africa/Asmera"
+msgstr "África/Asmara"
+
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "África/Bamako"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "África/Bangui"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "África/Banjul"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "África/Bissau"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "África/Blantyre"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "África/Brazzaville"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "África/Boujoumboura"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "África/El Cairo"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "África/Casablanca"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "África/Ceuta"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "África/Conakry"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "África/Dakar"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "África/Dar es Salaam"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "África/Djibouti"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "África/Douala"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "África/El Aaiun"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "África/Freetown"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "África/Gaborone"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "África/Harare"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "Africa/Juba"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "África/Johannesburgo"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "África/Kampala"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "África/Jartum"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "África/Kigali"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "África/Kinshasa"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "África/Lagos"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "África/Libreville"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "África/Lome"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "África/Luanda"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "África/Lubumbashi"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "África/Lusaka"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "África/Malabo"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "África/Maputo"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "África/Maseru"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "África/Mbabane"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "África/Mogadiscio"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "África/Monrovia"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "África/Nairobi"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "África/Ndjamena"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "África/Niamey"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "África/Nouakchott"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "África/Uagadugú"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "África/Porto-Novo"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "África/Santo Tomé"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "África/Tombuctú"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "África/Trípoli"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "África/Túnez"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "África/Windhoek"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "América"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "América/Adak"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "América/Anchorage"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "América/Anguilla"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "América/Antigua"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "América/Araguaia"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "América/L'Arxentina/Buenos Aires"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "América/L'Arxentina/Catamarca"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "América/Argentina/ComodRivadavia"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "América/L'Arxentina/Córdoba"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "América/L'Arxentina/Jujuy"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "América/Argentina/La_Rioxa"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "América/L'Arxentina/Mendoza"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "América/Argentina/Rio_Gallegos"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "América/Argentina/Salta"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "América/Argentina/San_Xuan"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "América/Argentina/San_Lluis"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "América/Argentina/Tucumán"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "América/Argentina/Ushuaía"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "América/Aruba"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "América/Asunción"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "América/Atikokan"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "América/Atka"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "América/Bahía"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "América/Bahía_Banderas"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "América/Barbados"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "América/Belén"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "América/Belize"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "América/Blanc-Sablon"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "América/Boa Vista"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "América/Bogotá"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "América/Boise"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "América/Buenos Aires"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "América/Cambridge Bay"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "América/Campo_Grande"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "América/Cancún"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "América/Caracas"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "América/Catamarca"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "América/Cayenne"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "América/Caimán"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "América/Chicago"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "América/Chihuahua"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "América/Coral_Harbour"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "América/Córdoba"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "América/Costa Rica"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "América/Creston"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "América/Cuiabá"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "América/Curaçao"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "América/Danmarkshavn"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "América/Dawson"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "América/Dawson Creek"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "América/Denver"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "América/Detroit"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "América/Dominique"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "América/Edmonton"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "América/Ensenada"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "América/Eirunepé"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "América/San Salvador"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "América/Fortaleza"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "América/Fort_Wayne"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "América/Glace Bay"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "América/Godthab"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "América/Goose Bay"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "América/Grand Turk"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "América/Granada"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "América/Guadalupe"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "América/Guatemala"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "América/Guayaquil"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "América/Guyana"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "América/Halifax"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "América/L'Habana"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "América/Hermosillo"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "América/Indiana/Indianápolis"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "América/Indiana/Knox"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "América/Indiana/Marengo"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "América/Indiana/Petersburgu"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "América/Indiana/Tell_City"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "América/Indiana/Vevay"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "América/Indiana/Vincennes"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "América/Indiana/Winamac"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "América/Indianapolis"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "América/Inuvik"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "América/Iqaluit"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "América/Xamaica"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "América/Jujuy"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "América/Juneau"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "América/Kentucky/Louisville"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "América/Kentucky/Monticello"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "América/Knox_IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "América/Kralendijk"
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "América/La Paz"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "América/Lima"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "América/Los Ánxeles"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "América/Louisville"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "América/Lower_Princes"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "América/Maceio"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "América/Managua"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "América/Manaos"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "América/Marigot"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "América/Martinica"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "América/Matamoros"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "América/Mazatlan"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "América/Mendoza"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "América/Menominee"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "América/Mérida"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "América/Metlakatla"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "América/México DF"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "América/Miquelón"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "América/Moncton"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "América/Monterrey"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "América/Montevideo"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "América/Montreal"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "América/Montserrat"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "América/Nassau"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "América/Nueva York"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "América/Nipigon"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "América/Nome"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "América/Dacota_Norte/Beulah"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "América/Dacota_Norte/Centru"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "América/Dacota_Norte/Nueva_Sálem"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "América/Noronha"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "América/Ojinaga"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "América/Panamá"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "América/Pangnirtung"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "América/Paramaribo"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "América/Phoenix"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "América/Port-au-Prince"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "América/Puertu España"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "América/Porto_Acre"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "América/Pôrto Velho"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "América/Puertu Rico"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "América/Rainy River"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "América/Rankin Inlet"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "América/Recife"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "América/Regina"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "América/Resolute"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "América/Rio Branco"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "América/Rosario"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "América/Santa_Isabel"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "América/Santárem"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "América/Santiago"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "América/Santo Domingu"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "América/São Paulo"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "América/Scoresbysund"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "América/Shiprock"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "América/Sitka"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "América/San_Barthelemy"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "América/San Juan"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "América/St. Kitts"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "América/Sta. Lucía"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "América/Sto Tomás"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "América/San Vicente"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "América/Swift Current"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "América/Tegucigalpa"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "América/Thule"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "América/Thunder Bay"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "América/Tijuana"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "América/Toronto"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "América/Tórtola"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "América/Vancouver"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "América/Virxinia"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "América/Whitehorse"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "América/Winnipeg"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "América/Yakutat"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "América/Yellowknife"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Antártida"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Antártida/Casey"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Antártida/Davis"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Antártida/Dumont D'Urville"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Antártida/Macquarie"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Antártida/Mawson"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Antártida/McMurdo"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Antártida/Palmer"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Antártida/Rothera"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Antártida/Polo Sur"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "Antártida/Syowa"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Antártida/Vostok"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Árticu"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Árticu/Longyearbyen"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Asia"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Asia/Aden"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Asia/Almati"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Asia/Amán"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Asia/Anadyr"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Asia/Aktau"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aktobe"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "Asia/Achkhabad"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Asia/Ashkhabad"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "Asia/Bagdad"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Asia/Bahréin"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Asia/Baku"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Asia/Bishkek"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Asia/Brunei"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Asia/Calcuta"
 
-#: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr "Asia/Chongqing"
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Asia/Choibalsan"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "Asia/Chongqing"
+
+#: ../src/timezone_names.c:289
+msgid "Asia/Chungking"
+msgstr "Asia/Chongqing"
+
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Asia/Colombo"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Asia/Dacca"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "Asia/Damas"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Asia/Dhaka"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Asia/Dubai"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dusambé"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Asia/Harbin"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Asia/Hebron"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong Kong"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Asia/Ho_Chi_Minh"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Asia/Hovd"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Asia/Estambul"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Asia/Jakarta"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Asia/Jerusalén"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamchatka"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Asia/Karachi"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Asia/Kathmandu"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Asia/Katmandú"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Asia/Khandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Asia/Kolkata"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnoyarsk"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala Lumpur"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Asia/Kuching"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Asia/Macáu"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Asia/Magadán"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Asia/Makassar"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Asia/Muscat"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Asia/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Asia/Oral"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom Penh"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Asia/Qyzylorda"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangún"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Asia/Riad"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Asia/Riyadh87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Asia/Riyadh88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Asia/Riyadh89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Asia/Saigón"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Asia/Sakhalin"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarkanda"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Asia/Seúl"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Asia/Singapur"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Asia/Tachkent"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Asia/Teherán"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Asia/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Asia/Thimbu"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimbu"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokyo"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung Pandang"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulán Bator"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Asia/Ulán_Bator"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Asia/Ust-Nera"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientián"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Asia/Iakoutsk"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Ekaterimburgo"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Asia/Erevan"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Atlánticu"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Atlánticu/Azores"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Atlánticu/Bermuda"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Atlánticu/Canaries"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlánticu/Cabo Verde"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "Atlánticu/Feroe"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlantic/Faroe"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlánticu/Jan Mayen"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "Atlánticu/Madeira"
 
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr "Atlánticu/Reykjavik"
+#: ../src/timezone_names.c:374
+msgid "Atlantic/Reykjavik"
+msgstr "Atlánticu/Reykjavik"
+
+#: ../src/timezone_names.c:375
+msgid "Atlantic/South_Georgia"
+msgstr "Atlánticu/Isles Georgias del Sur"
+
+#: ../src/timezone_names.c:376
+msgid "Atlantic/St_Helena"
+msgstr "Atlánticu/Sta. Helena"
+
+#: ../src/timezone_names.c:377
+msgid "Atlantic/Stanley"
+msgstr "Atlánticu/Stanley"
+
+#: ../src/timezone_names.c:378
+msgid "Australia"
+msgstr "Australia"
+
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Australia/ACT"
+
+#: ../src/timezone_names.c:380
+msgid "Australia/Adelaide"
+msgstr "Australia/Adelaida"
+
+#: ../src/timezone_names.c:381
+msgid "Australia/Brisbane"
+msgstr "Australia/Brisbane"
+
+#: ../src/timezone_names.c:382
+msgid "Australia/Broken_Hill"
+msgstr "Australia/Broken Hill"
+
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Australia/Currie"
+
+#: ../src/timezone_names.c:384
+msgid "Australia/Darwin"
+msgstr "Australia/Darwin"
+
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Australia/Eucla"
+
+#: ../src/timezone_names.c:386
+msgid "Australia/Hobart"
+msgstr "Australia/Hobart"
+
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr "Australia/Lindeman"
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr "Australia/Lord Howe"
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "Australia/Melbourne"
+
+#: ../src/timezone_names.c:390
+msgid "Australia/Perth"
+msgstr "Australia/Perth"
+
+#: ../src/timezone_names.c:391
+msgid "Australia/Sydney"
+msgstr "Australia/Sydney"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brasíl"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brasil/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brasil/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brasil/Este"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brasil/Oeste"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Canadá"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Canadá/Atlánticu"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Canadá/Central"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Canadá/Saskatchewan-Este"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr ""
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr ""
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr ""
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Canadá/Pacíficu"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr ""
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Canadá/Yukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Chile"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Chile/Continental"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr ""
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
 
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr "Atlánticu/Isles Georgias del Sur"
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
 
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr "Atlánticu/Sta. Helena"
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
 
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr "Atlánticu/Stanley"
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
 
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr "Australia"
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
 
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr "Australia/Adelaida"
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
 
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr "Australia/Brisbane"
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
 
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr "Australia/Broken Hill"
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
 
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr "Australia/Darwin"
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
 
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr "Australia/Hobart"
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
 
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr "Australia/Lindeman"
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
 
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr "Australia/Lord Howe"
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
 
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr "Australia/Melbourne"
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
 
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr "Australia/Perth"
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
 
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr "Australia/Sydney"
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Universal"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Zulú"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Europa"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Europa/Atenes"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgráu"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Europa/Berlín"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Europa/Bruxeles"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Europa/Bucarest"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr ""
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Europa/Copenhague"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Europa/Xibraltar"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr ""
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Europa/Islla_de_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Europa/Estambul"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr ""
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningráu"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisboa"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Europa/Londres"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxemburgo"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr ""
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Europa/Mónaco"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Europa/Moscú"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Europa/París"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr ""
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Europa/Praga"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Europa/San Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Europa/Sofía"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Europa/Estocolmo"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallin"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr ""
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Europa/Vaticanu"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Europa/Viena"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr ""
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "Europa/Varsovia"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "Europa/Zurich"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Índicu"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "Índicu/Antananarivo"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "Índicu/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "Índicu/Navidad"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "Índicu/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "Índicu/Comores"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "Índicu/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "Índicu/Mahé"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "Índicu/Maldivas"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "Índicu/Mauricio"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "Índicu/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "Índicu/Reunión"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Méxicu"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Méxicu/BaxaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Méxicu/BaxaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Méxicu/Xeneral"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr ""
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr ""
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr ""
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr ""
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Pacíficu"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "Pacíficu/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Pacíficu/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Pacíficu/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr ""
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "Pacíficu/Pascua"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "Pacíficu/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "Pacíficu/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Pacíficu/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "Pacíficu/Fidji"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Pacíficu/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Pacíficu/Galápagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Pacíficu/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "Pacíficu/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Pacíficu/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Pacíficu/Honolulú"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Pacíficu/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "Pacíficu/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "Pacíficu/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "Pacíficu/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Pacíficu/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Pacíficu/Marquesas"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Pacíficu/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Pacíficu/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Pacíficu/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Pacíficu/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "Pacíficu/Noumea"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Pacíficu/Pago Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Pacíficu/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "Pacíficu/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr ""
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "Pacíficu/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Pacíficu/Port Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Pacíficu/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Pacíficu/Saipán"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pacíficu/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Pacíficu/Tahití"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Pacíficu/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Pacíficu/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Pacíficu/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Pacíficu/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Pacíficu/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "Pacíficu/Yap"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "EEXX"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr ""
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr ""
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "EEXX/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "EEXX/Central"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr ""
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr ""
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr ""
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr ""
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "EEXX/Míchigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr ""
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "EEXX/Pacíficu"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr ""
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "EEXX/Samoa"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "Nueva cita"
@@ -3614,179 +4417,34 @@
 msgstr "Tocante a Orage"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Orage Panel Clock"
-msgstr "Reló Orage"
+msgstr "Reló de panel Orage"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
 msgid "Show time and date?"
-msgstr "¿Qué hora y qué día ye?"
+msgstr "¿Amosar data y hora?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Calendariu"
+msgid "Orage preferences"
+msgstr "Preferencies de Orage"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Preferencies d'Orage"
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr "Axustes pa la aplicación de calandariu de Xfce 4 (Orage)"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Preferencies d'Orage"
+msgid "Orage Calendar Preferences"
+msgstr "Preferencies del calendariu Orage"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Configuración pa l'aplicación de calendariu de Xfce 4"
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Calendariu"
+
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr "Calendariu d'Orage"
 
 #: ../xfcalendar.desktop.in.h:2
 msgid "Desktop calendar"
 msgstr "Calendariu d'escritoriu"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "Orage - Calendariu"
-
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Títulu: %s\n"
-#~ " Aniciu:\t%s\n"
-#~ " Data llímite:\t%s\n"
-#~ " Acabáu:\t%s\n"
-#~ "Nota:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Tien de meter tolos carauteres d'escape, etc. vusté mesmu.\n"
-#~ "Esta cadena se-y pasa al intérprete de comandos pa ser procesada"
-
-#~ msgid "Orage clock"
-#~ msgstr "Reló Orage"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Creador orixinal, caltenedor retiráu"
-
-#~ msgid "Contributor"
-#~ msgstr "Collaborador"
-
-#~ msgid "Info"
-#~ msgstr "Información"
-
-#~ msgid "Warning"
-#~ msgstr "Atención"
-
-#~ msgid "Error"
-#~ msgstr "Error"
-
-#~ msgid "Set sticked"
-#~ msgstr "Amosar en toles estayes de trabayu"
-
-#~ msgid "Select always today"
-#~ msgstr "Siempres seleicionar güei"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Al amosar el calendariu principal, colocar el punteru nel día previamente "
-#~ "seleicionáu o siempres nel día actual."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Acabando mou d'axuste d'hora"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Entamando mou d'axuste d'hora"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "axustar pa camudar minutos"
-
-#~ msgid "Vary"
-#~ msgstr "Variable"
-
-#~ msgid "Select timezone"
-#~ msgstr "Seleicionar estaya horaria"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Camudar reló"
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "introduz estaya horaria del reló,\n"
-#~ "(=cualesquier valor TZ válidu)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Camudar preferencies"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Meta la estaya horaria llocal (amestar +/- dempués de la hora pa indicar "
-#~ "si la hora correspuende a una data posterior o anterior, respeutivamente)."
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr ""
-#~ "Afitar cualesquier valor de estaya horaria (=TZ) válidu o escueya ún de "
-#~ "la llista."
-
-#~ msgid "show line _1:"
-#~ msgstr "amosar llinia _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "amosar llinia _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "amosar llinia _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Propiedaes"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Fallu al executar 'orage -p'"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> meti la data actual col formatu de data llocal.\n"
-#~ "<T> meti la hora y\n"
-#~ "<DT> meti la data y la hora."
-
-#~ msgid "Show event list"
-#~ msgstr "Amosar llista d'eventos"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = usar iconu estáticu)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "L'iconu dinámicu amuesa'l día y mes d'anguaño. Ye visible namái na estaya "
-#~ "de notificación. Si la estaya de notificación ye enforma pequeña pal "
-#~ "tamañu\n"
-#~ "dinámicu d'iconu, Orage camúdalu automáticamente n'iconu estáticu."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Configuración del calendariu"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Configuración pal calendariu de Xfce 4"
diff -Nru orage-4.8.3/po/az.po orage-4.12.1/po/az.po
--- orage-4.8.3/po/az.po	2012-01-03 12:01:00.000000000 +0000
+++ orage-4.12.1/po/az.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,3632 +0,0 @@
-# Azerbaijani Turkish translation of orage.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Mətin Əmirov <metin@karegen.com>, 2003, 2004.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2005-09-14 01:38+0900\n"
-"Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
-"Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: az\n"
-"X-Generator: KBabel 1.3.1\n"
-
-#: ../globaltime/globaltime.c:100
-msgid "Raising GlobalTime window..."
-msgstr ""
-
-#: ../globaltime/globaltime.c:102
-msgid "GlobalTime window raise failed"
-msgstr ""
-
-#. ********** timezone tooltip **********
-#: ../globaltime/globaltime.c:277
-#, c-format
-msgid ""
-"%s\n"
-"click to modify clock"
-msgstr ""
-
-#: ../globaltime/globaltime.c:386
-msgid "Localtime"
-msgstr ""
-
-#: ../globaltime/globaltime.c:464
-msgid ""
-"button 1 to change preferences \n"
-"button 2 to adjust time of clocks"
-msgstr ""
-
-#: ../globaltime/globaltime.c:480
-msgid "adjust to change hour"
-msgstr ""
-
-#: ../globaltime/globaltime.c:496
-msgid ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
-msgid "NEW"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:289
-msgid "NEW COPY"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:310
-msgid "Not possible to delete the last clock."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:516
-msgid "update this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
-msgid "add new empty clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:526
-msgid "add new clock using this clock as model"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:531
-msgid "delete this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:539
-msgid "move this clock first"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:544
-msgid "move this clock left"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:549
-msgid "move this clock right"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:554
-msgid "move this clock last"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:562
-msgid "set the timezone of this clock to be local timezone"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
-msgid "close window and exit"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:590
-#, fuzzy
-msgid "Globaltime preferences "
-msgstr "Seçimlər"
-
-#. -----------------------HEADING-------------------------------------------
-#: ../globaltime/gt_prefs.c:603
-msgid "Clock Parameters"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:607
-msgid "Name of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:613
-msgid "enter name of clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:616
-msgid "Timezone of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:643
-msgid "Text Formatting"
-msgstr ""
-
-#. ------------------------background-------------------------
-#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
-msgid "Background color:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:656
-msgid "Click to change background colour for clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
-#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
-#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
-#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
-#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
-msgid "Use default"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
-#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
-#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
-msgid "Cross this to use default instead of selected value"
-msgstr ""
-
-#. ------------------------foreground-------------------------
-#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
-msgid "Foreground (=text) color:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:688
-msgid "Click to change foreground colour for clock"
-msgstr ""
-
-#. ------------------------name font-------------------------
-#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
-msgid "Font for name of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:720
-msgid "Click to change font for clock name"
-msgstr ""
-
-#. ------------------------time font-------------------------
-#: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
-msgid "Font for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:753
-msgid "Click to change font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:780
-msgid "Underline name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:810
-msgid "Underline time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:850
-msgid "Text Default Formatting"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:863
-msgid "Click to change default background colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
-msgid "Cross this to use system default instead of selected color"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:896
-msgid "Click to change default text colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:929
-msgid "Click to change default font for clock name"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
-msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:963
-msgid "Click to change default font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:990
-msgid "Underline for name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:1004
-msgid "Underline for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1027
-#, fuzzy
-msgid "update preferences"
-msgstr "Seçimlər"
-
-#: ../globaltime/gt_prefs.c:1062
-#, fuzzy
-msgid "Globaltime Preferences"
-msgstr "Seçimlər"
-
-#. -----------------------HEADING--------------------------------------
-#: ../globaltime/gt_prefs.c:1073
-#, fuzzy
-msgid "General Preferences"
-msgstr "Seçimlər"
-
-#: ../globaltime/gt_prefs.c:1077
-msgid "Decorations:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1078
-#, fuzzy
-msgid "Standard"
-msgstr "Xfcalendar"
-
-#: ../globaltime/gt_prefs.c:1083
-msgid "Use normal decorations"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1094
-msgid "Do not show window decorations (borders)"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1100
-msgid "Clock size:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1101
-msgid "Equal"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1106
-msgid "All clocks have same size"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1111
-#, fuzzy
-msgid "Varying"
-msgstr "Diqqət"
-
-#: ../globaltime/gt_prefs.c:1116
-msgid "Clock sizes vary"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1122
-msgid "Local timezone:"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:101
-#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
-msgid " Other"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:156
-#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
-#, c-format
-msgid "%d hour %d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:159
-#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, c-format
-msgid "%d hour"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:161
-#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, c-format
-msgid "%d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:167
-#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
-msgid "backward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:170
-#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-msgid "forward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:194
-#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
-msgid "not changed"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:195
-#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
-msgid "not changing"
-msgstr ""
-
-#. location
-#: ../globaltime/timezone_selection.c:247
-#: ../globaltime/timezone_selection.c:252
-#: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
-#: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
-msgid "Location"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:258
-#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
-msgid "GMT Offset"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:264
-#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
-msgid "Previous/Next Change"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:269
-#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
-msgid "Country"
-msgstr ""
-
-#. We are actually setting the g_par parameter. In other words
-#. we are setting the global default timezone for Orage. This is
-#. done very seldom and we do not want to allow "floating" here.
-#. This test is ugly, but it is not worth an extra parameter.
-#. this is normal appointment
-#: ../globaltime/timezone_selection.c:299
-#: ../globaltime/timezone_selection.c:309
-#: ../panel-plugin/timezone_selection.c:300
-#: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
-#: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
-msgid "Pick timezone"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:302
-#: ../globaltime/timezone_selection.c:312
-#: ../panel-plugin/timezone_selection.c:303
-#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
-#: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
-msgid "Change mode"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:303
-#: ../globaltime/timezone_selection.c:313
-#: ../globaltime/timezone_selection.c:352
-#: ../panel-plugin/timezone_selection.c:304
-#: ../panel-plugin/timezone_selection.c:314
-#: ../panel-plugin/timezone_selection.c:353 ../src/timezone_selection.c:320
-#: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
-#: ../src/timezone_selection.c:379
-msgid "UTC"
-msgstr ""
-
-#. NOTE: this exists only if ical timezones are being used
-#: ../globaltime/timezone_selection.c:304
-#: ../globaltime/timezone_selection.c:357
-#: ../panel-plugin/timezone_selection.c:305
-#: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
-#: ../src/timezone_selection.c:384
-msgid "floating"
-msgstr ""
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "Seçimlər"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
-msgid "Orage Globaltime"
-msgstr "Xfcalendar"
-
-#: ../globaltime/globaltime.desktop.in.h:3
-msgid "Show clocks from different countries"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:224
-msgid "Appearance"
-msgstr ""
-
-#. show frame
-#: ../panel-plugin/oc_config.c:229
-msgid "Show _frame"
-msgstr ""
-
-#. foreground color
-#: ../panel-plugin/oc_config.c:239
-msgid "set foreground _color:"
-msgstr ""
-
-#. background color
-#: ../panel-plugin/oc_config.c:253
-msgid "set _background color:"
-msgstr ""
-
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
-msgid "set _height:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:277
-msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:282
-msgid "set _width:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:293
-msgid "Note that you can not change the width of vertical panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:316
-msgid "Clock Options"
-msgstr ""
-
-#. timezone
-#: ../panel-plugin/oc_config.c:326
-msgid "set timezone to:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:347
-#, c-format
-msgid "Line %d:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:357
-msgid "Enter any valid strftime function parameter."
-msgstr ""
-
-#. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
-msgid "Tooltip:"
-msgstr ""
-
-#. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
-msgid "fix time after suspend/hibernate"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:415
-msgid ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:432
-msgid ""
-"This program uses strftime function to get time.\n"
-"Use any valid code to get time in the format you prefer.\n"
-"Some common codes are:\n"
-"\t%A = weekday\t\t\t%B = month\n"
-"\t%c = date & time\t\t%R = hour & minute\n"
-"\t%V = week number\t\t%Z = timezone in use\n"
-"\t%H = hours \t\t\t\t%M = minute\n"
-"\t%X = local time\t\t\t%x = local date"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:457
-#, fuzzy
-msgid "Orage clock Preferences"
-msgstr "Seçimlər"
-
-#. no lines yet
-#. TRANSLATORS: Use format characters from strftime(3)
-#. * to get the proper string for your locale.
-#. * I used these:
-#. * %A  : full weekday name
-#. * %d  : day of the month
-#. * %B  : full month name
-#. * %Y  : four digit year
-#. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
-msgid "%A %d %B %Y/%V"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:40
-msgid "Maintainer"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:47
-#, fuzzy
-msgid "Manage your time with Orage"
-msgstr "Vaxtınızı Xfce4 ilə idarə edin"
-
-#. if (gtk_toggle_button_get_active(
-#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
-#. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
-msgid "End"
-msgstr ""
-
-#: ../src/appointment.c:333
-msgid "Due"
-msgstr ""
-
-#: ../src/appointment.c:493 ../src/mainbox.c:783
-msgid "Orage"
-msgstr ""
-
-#. to avoid timing problems when updating entry
-#. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
-msgid "Select a file..."
-msgstr ""
-
-#: ../src/appointment.c:680
-msgid "Sound Files"
-msgstr ""
-
-#: ../src/appointment.c:687 ../src/interface.c:290
-msgid "All Files"
-msgstr ""
-
-#: ../src/appointment.c:739
-msgid "The appointment information has been modified."
-msgstr ""
-
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
-msgid "Do you want to continue?"
-msgstr ""
-
-#: ../src/appointment.c:767
-msgid "The end of this appointment is earlier than the beginning."
-msgstr ""
-
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-msgid "Not set"
-msgstr ""
-
-#: ../src/appointment.c:1193
-msgid "This appointment will be permanently removed."
-msgstr ""
-
-#: ../src/appointment.c:1692
-msgid "This appointment does not exist."
-msgstr ""
-
-#: ../src/appointment.c:1693
-msgid "It was probably removed, please refresh your screen."
-msgstr ""
-
-#: ../src/appointment.c:1995
-#, fuzzy
-msgid "Current categories"
-msgstr "Xfcalendar"
-
-#: ../src/appointment.c:2010
-msgid "Add new category with color"
-msgstr ""
-
-#: ../src/appointment.c:2014
-msgid "Category:"
-msgstr ""
-
-#: ../src/appointment.c:2045
-msgid "Colors of categories - Orage"
-msgstr ""
-
-#: ../src/appointment.c:2092
-msgid " *** COPY ***"
-msgstr ""
-
-#: ../src/appointment.c:2353
-#, fuzzy
-msgid "New appointment - Orage"
-msgstr "Görüş"
-
-#. File menu stuff
-#. ********* File menu *********
-#. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
-msgid "_File"
-msgstr "_Fayl"
-
-#: ../src/appointment.c:2388
-msgid "Sav_e and close"
-msgstr ""
-
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
-msgid "D_uplicate"
-msgstr ""
-
-#: ../src/appointment.c:2589
-msgid "Save"
-msgstr ""
-
-#: ../src/appointment.c:2591
-msgid "Save and close"
-msgstr ""
-
-#: ../src/appointment.c:2596
-msgid "Revert"
-msgstr ""
-
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
-msgid "Duplicate"
-msgstr ""
-
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
-msgid "Delete"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Free"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Busy"
-msgstr ""
-
-#: ../src/appointment.c:2625
-msgid "General"
-msgstr ""
-
-#. type
-#: ../src/appointment.c:2631
-msgid "Type "
-msgstr ""
-
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
-msgid "Event"
-msgstr ""
-
-#: ../src/appointment.c:2636
-msgid ""
-"Event that will happen sometime. For example:\n"
-"Meeting or birthday or TV show."
-msgstr ""
-
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-#, fuzzy
-msgid "Todo"
-msgstr "Bugün"
-
-#: ../src/appointment.c:2642
-msgid ""
-"Something that you should do sometime. For example:\n"
-"Wash your car or test new version of Orage."
-msgstr ""
-
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
-msgid "Journal"
-msgstr ""
-
-#: ../src/appointment.c:2649
-msgid ""
-"Make a note that something happened. For example:\n"
-"Remark that your mother called or first snow came."
-msgstr ""
-
-#. title
-#: ../src/appointment.c:2656
-msgid "Title "
-msgstr ""
-
-#: ../src/appointment.c:2671
-msgid "All day event"
-msgstr ""
-
-#. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
-msgid "Start"
-msgstr ""
-
-#: ../src/appointment.c:2697
-msgid "Set      "
-msgstr ""
-
-#: ../src/appointment.c:2718
-msgid "Duration"
-msgstr ""
-
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
-#, fuzzy
-msgid "days"
-msgstr "Bugün"
-
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
-msgid "hours"
-msgstr ""
-
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
-msgid "mins"
-msgstr ""
-
-#. Availability (only for EVENT)
-#: ../src/appointment.c:2738
-msgid "Availability"
-msgstr ""
-
-#. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
-msgid "Completed"
-msgstr ""
-
-#: ../src/appointment.c:2749
-msgid "Done"
-msgstr ""
-
-#. categories
-#: ../src/appointment.c:2770
-msgid "Categories"
-msgstr ""
-
-#: ../src/appointment.c:2782
-msgid ""
-"This is special category, which can be used to color this appointment in "
-"list views."
-msgstr ""
-
-#: ../src/appointment.c:2787
-msgid "update colors for categories."
-msgstr ""
-
-#. priority
-#: ../src/appointment.c:2793
-msgid "Priority"
-msgstr ""
-
-#. note
-#: ../src/appointment.c:2803
-msgid "Note"
-msgstr ""
-
-#: ../src/appointment.c:2824
-msgid ""
-"These shorthand commands take effect immediately:\n"
-"    <D> inserts current date in local date format\n"
-"    <T> inserts time and\n"
-"    <DT> inserts date and time.\n"
-"\n"
-"These are converted only later when they are seen:\n"
-"    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before Start"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before End"
-msgstr ""
-
-#: ../src/appointment.c:2896
-msgid "After Start"
-msgstr ""
-
-#: ../src/appointment.c:2896
-msgid "After End"
-msgstr ""
-
-#: ../src/appointment.c:2903
-msgid "Alarm"
-msgstr ""
-
-#. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-msgid "Alarm time"
-msgstr ""
-
-#: ../src/appointment.c:2933
-msgid ""
-"Often you want to get alarm:\n"
-" 1) before Event start\n"
-" 2) before Todo end\n"
-" 3) after Todo start"
-msgstr ""
-
-#: ../src/appointment.c:2938
-msgid "Persistent alarm"
-msgstr ""
-
-#: ../src/appointment.c:2940
-msgid ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
-msgstr ""
-
-#. **** Audio Alarm ****
-#: ../src/appointment.c:2949
-#, fuzzy
-msgid "Sound"
-msgstr "Bazar günü"
-
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
-msgid "Use"
-msgstr ""
-
-#: ../src/appointment.c:2955
-msgid "Select this if you want audible alarm"
-msgstr ""
-
-#: ../src/appointment.c:2972
-msgid "Repeat alarm sound"
-msgstr ""
-
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
-msgid "times"
-msgstr ""
-
-#: ../src/appointment.c:3004
-msgid "sec interval"
-msgstr ""
-
-#. **** Display Alarm ****
-#: ../src/appointment.c:3014
-msgid "Visual"
-msgstr ""
-
-#: ../src/appointment.c:3018
-msgid "Use Orage window"
-msgstr ""
-
-#: ../src/appointment.c:3020
-msgid "Select this if you want Orage window alarm"
-msgstr ""
-
-#: ../src/appointment.c:3032
-msgid "Use notification"
-msgstr ""
-
-#: ../src/appointment.c:3034
-msgid "Select this if you want notification alarm"
-msgstr ""
-
-#: ../src/appointment.c:3040
-msgid "Set timeout"
-msgstr ""
-
-#: ../src/appointment.c:3043
-msgid "Select this if you want notification to expire automatically"
-msgstr ""
-
-#: ../src/appointment.c:3054
-msgid "0 = system default expiration time"
-msgstr ""
-
-#: ../src/appointment.c:3059
-msgid "seconds"
-msgstr ""
-
-#. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
-msgid "Procedure"
-msgstr ""
-
-#: ../src/appointment.c:3076
-msgid "Select this if you want procedure or script alarm"
-msgstr ""
-
-#: ../src/appointment.c:3082
-msgid ""
-"You must enter all escape etc characters yourself.\n"
-"This string is just given to shell to process.\n"
-"The following special commands are replaced at run time:\n"
-"\t<&T>  appointment title\n"
-"\t<&D>  appointment description\n"
-"\t<&AT> alarm time\n"
-"\t<&ST> appointment start time\n"
-"\t<&ET> appointment end time"
-msgstr ""
-
-#: ../src/appointment.c:3094
-msgid "Test this alarm by raising it now"
-msgstr ""
-
-#: ../src/appointment.c:3101
-msgid "<b>Default alarm</b>"
-msgstr ""
-
-#: ../src/appointment.c:3109
-msgid "Store current settings as default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3114
-msgid "Set current settings from default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Daily"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Weekly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-#, fuzzy
-msgid "Monthly"
-msgstr "Bazar ertəsi"
-
-#: ../src/appointment.c:3176
-msgid "Yearly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Hourly"
-msgstr ""
-
-#: ../src/appointment.c:3178
-#, fuzzy
-msgid "Mon"
-msgstr "Bazar ertəsi"
-
-#: ../src/appointment.c:3178
-msgid "Tue"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Wed"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Thu"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Fri"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Sat"
-msgstr ""
-
-#: ../src/appointment.c:3178
-#, fuzzy
-msgid "Sun"
-msgstr "Bazar günü"
-
-#: ../src/appointment.c:3183
-msgid "Recurrence"
-msgstr ""
-
-#. complexity
-#: ../src/appointment.c:3189
-msgid "Complexity"
-msgstr ""
-
-#: ../src/appointment.c:3192
-msgid "Basic"
-msgstr ""
-
-#: ../src/appointment.c:3198
-msgid "Advanced"
-msgstr ""
-
-#: ../src/appointment.c:3202
-msgid "Use this if you want regular repeating event"
-msgstr ""
-
-#: ../src/appointment.c:3204
-msgid ""
-"Use this if you need complex times like:\n"
-" Every Saturday and Sunday or \n"
-" First Tuesday every month"
-msgstr ""
-
-#. frequency
-#: ../src/appointment.c:3211
-msgid "Frequency"
-msgstr ""
-
-#: ../src/appointment.c:3217
-msgid "Each"
-msgstr ""
-
-#: ../src/appointment.c:3224
-msgid "occurrence"
-msgstr ""
-
-#: ../src/appointment.c:3228
-msgid ""
-"Limit frequency to certain interval.\n"
-" For example: Every third day:\n"
-" Frequency = Daily and Interval = 3"
-msgstr ""
-
-#: ../src/appointment.c:3274
-msgid "Limit"
-msgstr ""
-
-#: ../src/appointment.c:3276
-msgid "Repeat forever"
-msgstr ""
-
-#: ../src/appointment.c:3282
-msgid "Repeat "
-msgstr ""
-
-#: ../src/appointment.c:3298
-msgid "Repeat until "
-msgstr ""
-
-#. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-#, fuzzy
-msgid "Weekdays"
-msgstr "Bugün"
-
-#: ../src/appointment.c:3323
-msgid "Which day"
-msgstr ""
-
-#: ../src/appointment.c:3331
-msgid ""
-"Specify which weekday for monthly and yearly events.\n"
-" For example:\n"
-" Second Wednesday each month:\n"
-"\tFrequency = Monthly,\n"
-"\tWeekdays = check only Wednesday,\n"
-"\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-
-#. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
-msgid "TODO base"
-msgstr ""
-
-#: ../src/appointment.c:3352
-msgid ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
-msgstr ""
-
-#: ../src/appointment.c:3354
-msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-
-#. exceptions
-#: ../src/appointment.c:3361
-msgid "Exceptions"
-msgstr ""
-
-#: ../src/appointment.c:3374
-msgid ""
-"Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
-"Remove by clicking the data."
-msgstr ""
-
-#: ../src/appointment.c:3379
-msgid "Add excluded date (-)"
-msgstr ""
-
-#: ../src/appointment.c:3381
-msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-
-#: ../src/appointment.c:3387
-msgid "Add included time (+)"
-msgstr ""
-
-#: ../src/appointment.c:3389
-msgid ""
-"Included times have same timezone than start time, but they may have "
-"different time"
-msgstr ""
-
-#. calendars showing the action days
-#: ../src/appointment.c:3406
-msgid "Action dates"
-msgstr ""
-
-#. ********* View menu *********
-#. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
-msgid "_View"
-msgstr ""
-
-#. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
-msgid "_Go"
-msgstr ""
-
-#: ../src/day-view.c:319 ../src/event-list.c:1110
-msgid "New"
-msgstr ""
-
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr ""
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Bugün"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr ""
-
-#: ../src/day-view.c:333 ../src/event-list.c:1128
-msgid "Refresh"
-msgstr ""
-
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
-msgid "Close"
-msgstr ""
-
-#: ../src/day-view.c:454
-msgid "Unknown"
-msgstr ""
-
-#: ../src/day-view.c:704
-msgid "       Number of days to show"
-msgstr ""
-
-#: ../src/day-view.c:935
-#, fuzzy
-msgid "Orage - day view"
-msgstr "Xfcalendar"
-
-#. date only appointment
-#: ../src/event-list.c:190
-msgid "All day"
-msgstr ""
-
-#: ../src/event-list.c:580 ../src/event-list.c:1281
-msgid "Time"
-msgstr ""
-
-#: ../src/event-list.c:748
-msgid "No rows have been selected."
-msgstr ""
-
-#: ../src/event-list.c:749
-msgid "Click a row to select it and after that you can copy it."
-msgstr ""
-
-#: ../src/event-list.c:918
-msgid ""
-"You will permanently remove all\n"
-"selected appointments."
-msgstr ""
-
-#: ../src/event-list.c:1130
-msgid "Find"
-msgstr ""
-
-#: ../src/event-list.c:1137
-msgid "Dayview"
-msgstr ""
-
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr ""
-
-#: ../src/event-list.c:1201
-msgid "Journal entries starting from:"
-msgstr ""
-
-#: ../src/event-list.c:1221
-msgid "Search"
-msgstr ""
-
-#: ../src/event-list.c:1224
-msgid "Search text "
-msgstr ""
-
-#: ../src/event-list.c:1289
-msgid "Flags"
-msgstr ""
-
-#: ../src/event-list.c:1297
-msgid "Title"
-msgstr ""
-
-#: ../src/event-list.c:1323
-msgid ""
-"Double click line to edit it.\n"
-"\n"
-"Flags in order:\n"
-"\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
-"\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
-"\t 3. Type: f=free B=Busy\n"
-"\t 4. Located in file:\n"
-"\t\tO=Orage A=Archive F=Foreign\n"
-"\t 5. Appointment type:\n"
-"\t\tE=Event T=Todo J=Journal"
-msgstr ""
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr ""
-
-#. remove since it has ended
-#: ../src/ical-archive.c:267
-msgid "\tRecur ended, moving to archive file."
-msgstr ""
-
-#: ../src/ical-archive.c:329
-msgid "Archiving not enabled. Exiting"
-msgstr ""
-
-#: ../src/ical-archive.c:347
-#, c-format
-msgid "Archiving threshold: %d month(s)"
-msgstr ""
-
-#. yy mon day
-#: ../src/ical-archive.c:350
-#, c-format
-msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr ""
-
-#: ../src/ical-archive.c:377
-#, c-format
-msgid "Archiving uid: %s"
-msgstr ""
-
-#. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
-msgid "\tVTODO not complete; not archived"
-msgstr ""
-
-#. it is recurrent event
-#: ../src/ical-archive.c:388
-#, c-format
-msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr ""
-
-#: ../src/ical-archive.c:405
-msgid "Archiving done\n"
-msgstr ""
-
-#. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
-msgid "Starting archive removal."
-msgstr ""
-
-#: ../src/ical-archive.c:422
-msgid "\tPHASE 1: reset recurring appointments"
-msgstr ""
-
-#. PHASE 2: go through archive file and add everything back to base orage.
-#. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
-msgid "\tPHASE 2: return archived appointments"
-msgstr ""
-
-#: ../src/ical-archive.c:470
-msgid "Archive removal done\n"
-msgstr ""
-
-#: ../src/ical-code.c:932
-msgid "Orage default alarm"
-msgstr ""
-
-#: ../src/ical-code.c:3115
-#, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-
-#: ../src/ical-code.c:3117
-#, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-
-#: ../src/ical-expimp.c:123
-msgid "Starting import file preprocessing"
-msgstr ""
-
-#: ../src/ical-expimp.c:158
-msgid "... Patched DCREATED to be CREATED."
-msgstr ""
-
-#: ../src/ical-expimp.c:197
-msgid "... Patched timezone to Orage format."
-msgstr ""
-
-#: ../src/ical-expimp.c:206
-msgid "Import file preprocessing done"
-msgstr ""
-
-#: ../src/interface.c:284
-#, fuzzy
-msgid "Calendar files"
-msgstr "Xfcalendar"
-
-#: ../src/interface.c:631
-msgid "Current foreign files"
-msgstr ""
-
-#: ../src/interface.c:643
-msgid "READ ONLY"
-msgstr ""
-
-#: ../src/interface.c:645
-msgid "READ WRITE"
-msgstr ""
-
-#: ../src/interface.c:663
-msgid "***** No foreign files *****"
-msgstr ""
-
-#: ../src/interface.c:974
-msgid "Import/export"
-msgstr ""
-
-#: ../src/interface.c:981
-msgid "Import"
-msgstr ""
-
-#: ../src/interface.c:986
-msgid "Read from file:"
-msgstr ""
-
-#: ../src/interface.c:1003
-msgid ""
-"Separate filenames with comma(,).\n"
-" NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-
-#: ../src/interface.c:1008
-msgid "Export"
-msgstr ""
-
-#: ../src/interface.c:1013
-msgid "Write to file:"
-msgstr ""
-
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
-msgid "Select"
-msgstr "_Bugünü Seç"
-
-#: ../src/interface.c:1037
-#, fuzzy
-msgid "All appointments"
-msgstr "Görüş"
-
-#: ../src/interface.c:1050
-#, fuzzy
-msgid "Named appointments: "
-msgstr "Görüş"
-
-#: ../src/interface.c:1062
-msgid ""
-"Note that only main file appointments are read.\n"
-"Archived and Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1065
-msgid ""
-"Note that only main file appointments are read.\n"
-"Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1068
-msgid "You can easily drag these from event-list window."
-msgstr ""
-
-#: ../src/interface.c:1070
-msgid "Orage appointment UIDs separated by commas."
-msgstr ""
-
-#: ../src/interface.c:1076
-msgid "Archive"
-msgstr ""
-
-#: ../src/interface.c:1084
-#, c-format
-msgid "Archive now (threshold: %d months)"
-msgstr ""
-
-#: ../src/interface.c:1094
-msgid "You can change archive threshold in parameters"
-msgstr ""
-
-#: ../src/interface.c:1101
-msgid "Revert archive now"
-msgstr ""
-
-#: ../src/interface.c:1107
-msgid ""
-"Return all archived events into main orage file and remove arch file.\n"
-"This is useful for example when doing export and moving orage\n"
-"appointments to another system."
-msgstr ""
-
-#: ../src/interface.c:1118
-#, fuzzy
-msgid "Orage files"
-msgstr "Seçimlər"
-
-#: ../src/interface.c:1125
-#, fuzzy
-msgid "Orage main calendar file"
-msgstr "Xfcalendar"
-
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "Xfcalendar"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr ""
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr ""
-
-#: ../src/interface.c:1156 ../src/interface.c:1222
-msgid "Rename"
-msgstr ""
-
-#: ../src/interface.c:1160
-msgid ""
-"Orage internal file rename only.\n"
-"Does not touch external filesystem at all.\n"
-"New file must exist."
-msgstr ""
-
-#: ../src/interface.c:1164 ../src/interface.c:1227
-msgid "Copy"
-msgstr ""
-
-#: ../src/interface.c:1168
-msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-
-#: ../src/interface.c:1172 ../src/interface.c:1232
-msgid "Move"
-msgstr ""
-
-#: ../src/interface.c:1176
-msgid "Current file is moved and vanishes from the old place."
-msgstr ""
-
-#: ../src/interface.c:1190
-msgid "Archive file"
-msgstr ""
-
-#: ../src/interface.c:1254
-msgid "Foreign files"
-msgstr ""
-
-#: ../src/interface.c:1261
-msgid "Add new foreign file"
-msgstr ""
-
-#: ../src/interface.c:1266
-msgid "Foreign file:"
-msgstr ""
-
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr ""
-
-#: ../src/interface.c:1286
-msgid "Read only"
-msgstr ""
-
-#: ../src/interface.c:1294
-msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-
-#: ../src/interface.c:1308
-msgid "Exchange data - Orage"
-msgstr ""
-
-#: ../src/main.c:268
-#, c-format
-msgid ""
-"\tThis is %s version %s\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:270
-#, c-format
-msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
-
-#: ../src/main.c:271
-#, c-format
-msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
-
-#: ../src/main.c:273
-#, c-format
-msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
-
-#: ../src/main.c:276
-#, c-format
-msgid "\tUsing DBUS for import.\n"
-msgstr ""
-
-#: ../src/main.c:278
-#, c-format
-msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
-
-#: ../src/main.c:281
-#, c-format
-msgid "\tUsing libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:283
-#, c-format
-msgid "\tNot using libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:286
-#, c-format
-msgid "\tUsing automatic archiving.\n"
-msgstr ""
-
-#: ../src/main.c:288
-#, c-format
-msgid "\tNot using archiving.\n"
-msgstr ""
-
-#: ../src/main.c:291
-#, c-format
-msgid "\tUsing operating system package libical.\n"
-msgstr ""
-
-#: ../src/main.c:293
-#, c-format
-msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
-
-#: ../src/main.c:306
-#, c-format
-msgid ""
-"Usage: orage [options] [files]\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:307
-#, c-format
-msgid "Options:\n"
-msgstr ""
-
-#: ../src/main.c:308
-#, c-format
-msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
-
-#: ../src/main.c:309
-#, c-format
-msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
-
-#: ../src/main.c:310
-#, c-format
-msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
-
-#: ../src/main.c:311
-#, c-format
-msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
-
-#: ../src/main.c:312
-#, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:313
-#, c-format
-msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:314
-#, c-format
-msgid ""
-"--export (-e) file [appointment...] \texport appointments from Orage to "
-"file\n"
-msgstr ""
-
-#: ../src/main.c:316
-#, c-format
-msgid "files=ical files to load into orage\n"
-msgstr ""
-
-#: ../src/main.c:318
-#, c-format
-msgid "\tdbus not included in orage. \n"
-msgstr ""
-
-#: ../src/main.c:319
-#, c-format
-msgid ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
-msgstr ""
-
-#: ../src/main.c:511
-#, c-format
-msgid ""
-"\n"
-"Unknown option %s\n"
-"\n"
-msgstr ""
-
-#: ../src/mainbox.c:287
-msgid "_Exchange data"
-msgstr ""
-
-#. Edit menu
-#: ../src/mainbox.c:298
-msgid "_Edit"
-msgstr ""
-
-#: ../src/mainbox.c:308
-msgid "View selected _date"
-msgstr ""
-
-#: ../src/mainbox.c:311
-msgid "View selected _week"
-msgstr ""
-
-#: ../src/mainbox.c:317
-msgid "Select _Today"
-msgstr "_Bugünü Seç"
-
-#: ../src/mainbox.c:323
-#, fuzzy
-msgid "Show _Globaltime"
-msgstr "Seçimlər"
-
-#. Help menu
-#: ../src/mainbox.c:327
-msgid "_Help"
-msgstr "_Yardım"
-
-#: ../src/mainbox.c:448
-msgid "Never"
-msgstr ""
-
-#: ../src/mainbox.c:453
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:460
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:546
-msgid "<b>To do:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:582
-#, c-format
-msgid "<b>Events for %s:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:593
-#, c-format
-msgid "<b>Events for %s - %s:</b>"
-msgstr ""
-
-#: ../src/parameters.c:522
-#, fuzzy
-msgid "Main settings"
-msgstr "_Qurğular"
-
-#: ../src/parameters.c:528
-msgid "Timezone"
-msgstr ""
-
-#: ../src/parameters.c:543
-msgid "You should always define your local timezone."
-msgstr ""
-
-#: ../src/parameters.c:552
-msgid "Archive threshold (months)"
-msgstr ""
-
-#: ../src/parameters.c:562
-msgid "(0 = no archiving)"
-msgstr ""
-
-#: ../src/parameters.c:565
-msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-
-#: ../src/parameters.c:574
-msgid "Sound command"
-msgstr ""
-
-#: ../src/parameters.c:589
-msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "_Qurğular"
-
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
-msgstr "Pəncərəni _bağla"
-
-#: ../src/parameters.c:618
-msgid "Show borders"
-msgstr ""
-
-#: ../src/parameters.c:625
-msgid "Show menu"
-msgstr ""
-
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr ""
-
-#: ../src/parameters.c:639
-msgid "Show day names"
-msgstr ""
-
-#: ../src/parameters.c:646
-msgid "Show week numbers"
-msgstr ""
-
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr ""
-
-#: ../src/parameters.c:660
-msgid "Number of days to show in event window"
-msgstr ""
-
-#: ../src/parameters.c:666
-msgid "0 = do not show event list at all"
-msgstr ""
-
-#: ../src/parameters.c:676
-msgid "Show on all desktops"
-msgstr ""
-
-#: ../src/parameters.c:683
-msgid "Keep on top"
-msgstr ""
-
-#: ../src/parameters.c:690
-msgid "Show in taskbar"
-msgstr ""
-
-#: ../src/parameters.c:697
-msgid "Show in pager"
-msgstr ""
-
-#: ../src/parameters.c:704
-msgid "Show in systray"
-msgstr ""
-
-#: ../src/parameters.c:739
-#, fuzzy
-msgid "Calendar start"
-msgstr "Xfcalendar"
-
-#: ../src/parameters.c:744
-msgid "Show"
-msgstr ""
-
-#: ../src/parameters.c:756
-msgid "Hide"
-msgstr ""
-
-#: ../src/parameters.c:768
-msgid "Minimized"
-msgstr ""
-
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr ""
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Pəncərəni _bağla"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "_Bugünü Seç"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr ""
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
-
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr ""
-
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr ""
-
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr ""
-
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr ""
-
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
-
-#: ../src/parameters.c:921
-msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-
-#: ../src/parameters.c:938
-#, fuzzy
-msgid "Orage Preferences"
-msgstr "Seçimlər"
-
-#: ../src/parameters.c:1050
-msgid "First Orage start. Searching default timezone."
-msgstr ""
-
-#: ../src/parameters.c:1069
-#, c-format
-msgid "Default timezone set to %s."
-msgstr ""
-
-#: ../src/parameters.c:1072
-msgid "Default timezone not found, please, set it manually."
-msgstr ""
-
-#: ../src/reminder.c:562
-#, fuzzy
-msgid "Reminder "
-msgstr "Yada salıcı"
-
-#: ../src/reminder.c:591
-msgid "Open"
-msgstr ""
-
-#: ../src/reminder.c:722
-#, fuzzy
-msgid "Reminder - Orage"
-msgstr "Yada salıcı"
-
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
-
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-
-#: ../src/reminder.c:1099
-msgid "Next active alarms:"
-msgstr ""
-
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
-#, c-format
-msgid ""
-"\n"
-"%02d d %02d h %02d min to: %s"
-msgstr ""
-
-#: ../src/reminder.c:1166
-#, c-format
-msgid ""
-"\n"
-"No active alarms found"
-msgstr ""
-
-#: ../src/timezone_names.c:36
-msgid "Africa"
-msgstr ""
-
-#: ../src/timezone_names.c:37
-msgid "Africa/Abidjan"
-msgstr ""
-
-#: ../src/timezone_names.c:38
-msgid "Africa/Accra"
-msgstr ""
-
-#: ../src/timezone_names.c:39
-msgid "Africa/Addis_Ababa"
-msgstr ""
-
-#: ../src/timezone_names.c:40
-msgid "Africa/Algiers"
-msgstr ""
-
-#: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr ""
-
-#: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr ""
-
-#: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr ""
-
-#: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr ""
-
-#: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr ""
-
-#: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr ""
-
-#: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr ""
-
-#: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr ""
-
-#: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr ""
-
-#: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr ""
-
-#: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr ""
-
-#: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr ""
-
-#: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr ""
-
-#: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr ""
-
-#: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr ""
-
-#: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr ""
-
-#: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr ""
-
-#: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr ""
-
-#: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr ""
-
-#: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr ""
-
-#: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr ""
-
-#: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr ""
-
-#: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr ""
-
-#: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr ""
-
-#: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr ""
-
-#: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr ""
-
-#: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr ""
-
-#: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr ""
-
-#: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr ""
-
-#: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr ""
-
-#: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr ""
-
-#: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr ""
-
-#: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr ""
-
-#: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr ""
-
-#: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr ""
-
-#: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr ""
-
-#: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr ""
-
-#: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr ""
-
-#: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr ""
-
-#: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr ""
-
-#: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr ""
-
-#: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr ""
-
-#: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr ""
-
-#: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr ""
-
-#: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr ""
-
-#: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr ""
-
-#: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr ""
-
-#: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr ""
-
-#: ../src/timezone_names.c:89
-msgid "America"
-msgstr ""
-
-#: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr ""
-
-#: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr ""
-
-#: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr ""
-
-#: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr ""
-
-#: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr ""
-
-#: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:96
-msgid "America/Argentina/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:97
-msgid "America/Argentina/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:98
-msgid "America/Argentina/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:99
-msgid "America/Argentina/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr ""
-
-#: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr ""
-
-#: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr ""
-
-#: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr ""
-
-#: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr ""
-
-#: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr ""
-
-#: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr ""
-
-#: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr ""
-
-#: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr ""
-
-#: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr ""
-
-#: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr ""
-
-#: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr ""
-
-#: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr ""
-
-#: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr ""
-
-#: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr ""
-
-#: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr ""
-
-#: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr ""
-
-#: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr ""
-
-#: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr ""
-
-#: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr ""
-
-#: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr ""
-
-#: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr ""
-
-#: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr ""
-
-#: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr ""
-
-#: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr ""
-
-#: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr ""
-
-#: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr ""
-
-#: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr ""
-
-#: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr ""
-
-#: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr ""
-
-#: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr ""
-
-#: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr ""
-
-#: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr ""
-
-#: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr ""
-
-#: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr ""
-
-#: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr ""
-
-#: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr ""
-
-#: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr ""
-
-#: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr ""
-
-#: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr ""
-
-#: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr ""
-
-#: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr ""
-
-#: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr ""
-
-#: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr ""
-
-#: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr ""
-
-#: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr ""
-
-#: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr ""
-
-#: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr ""
-
-#: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr ""
-
-#: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr ""
-
-#: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr ""
-
-#: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr ""
-
-#: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr ""
-
-#: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr ""
-
-#: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr ""
-
-#: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr ""
-
-#: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr ""
-
-#: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr ""
-
-#: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr ""
-
-#: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr ""
-
-#: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr ""
-
-#: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr ""
-
-#: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr ""
-
-#: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr ""
-
-#: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr ""
-
-#: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr ""
-
-#: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr ""
-
-#: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr ""
-
-#: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr ""
-
-#: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr ""
-
-#: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr ""
-
-#: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr ""
-
-#: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr ""
-
-#: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr ""
-
-#: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr ""
-
-#: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr ""
-
-#: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr ""
-
-#: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr ""
-
-#: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr ""
-
-#: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr ""
-
-#: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr ""
-
-#: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr ""
-
-#: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr ""
-
-#: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr ""
-
-#: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr ""
-
-#: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr ""
-
-#: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr ""
-
-#: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr ""
-
-#: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr ""
-
-#: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr ""
-
-#: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr ""
-
-#: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr ""
-
-#: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr ""
-
-#: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr ""
-
-#: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr ""
-
-#: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr ""
-
-#: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr ""
-
-#: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr ""
-
-#: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr ""
-
-#: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr ""
-
-#: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr ""
-
-#: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr ""
-
-#: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr ""
-
-#: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr ""
-
-#: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr ""
-
-#: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr ""
-
-#: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr ""
-
-#: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr ""
-
-#: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr ""
-
-#: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr ""
-
-#: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr ""
-
-#: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr ""
-
-#: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr ""
-
-#: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr ""
-
-#: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr ""
-
-#: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr ""
-
-#: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr ""
-
-#: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr ""
-
-#: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr ""
-
-#: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr ""
-
-#: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr ""
-
-#: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr ""
-
-#: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr ""
-
-#: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr ""
-
-#: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr ""
-
-#: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr ""
-
-#: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr ""
-
-#: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr ""
-
-#: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr ""
-
-#: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr ""
-
-#: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr ""
-
-#: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr ""
-
-#: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr ""
-
-#: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr ""
-
-#: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr ""
-
-#: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr ""
-
-#: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr ""
-
-#: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr ""
-
-#: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr ""
-
-#: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr ""
-
-#: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr ""
-
-#: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr ""
-
-#: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr ""
-
-#: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr ""
-
-#: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr ""
-
-#: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr ""
-
-#: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr ""
-
-#: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr ""
-
-#: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr ""
-
-#: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr ""
-
-#: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr ""
-
-#: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr ""
-
-#: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr ""
-
-#: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr ""
-
-#: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr ""
-
-#: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr ""
-
-#: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr ""
-
-#: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr ""
-
-#: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr ""
-
-#: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr ""
-
-#: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr ""
-
-#: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr ""
-
-#: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr ""
-
-#: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr ""
-
-#: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr ""
-
-#: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr ""
-
-#: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr ""
-
-#: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr ""
-
-#: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr ""
-
-#: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr ""
-
-#: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr ""
-
-#: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr ""
-
-#: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr ""
-
-#: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr ""
-
-#: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr ""
-
-#: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr ""
-
-#: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr ""
-
-#: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr ""
-
-#: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr ""
-
-#: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr ""
-
-#: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr ""
-
-#: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr ""
-
-#: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr ""
-
-#: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr ""
-
-#: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr ""
-
-#: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr ""
-
-#: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr ""
-
-#: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr ""
-
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr ""
-
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr ""
-
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr ""
-
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr ""
-
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr ""
-
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr ""
-
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr ""
-
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr ""
-
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr ""
-
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr ""
-
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr ""
-
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr ""
-
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr ""
-
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr ""
-
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr ""
-
-#: ../src/timezone_names.c:320
-msgid "Europe"
-msgstr ""
-
-#: ../src/timezone_names.c:321
-msgid "Europe/Amsterdam"
-msgstr ""
-
-#: ../src/timezone_names.c:322
-msgid "Europe/Andorra"
-msgstr ""
-
-#: ../src/timezone_names.c:323
-msgid "Europe/Athens"
-msgstr ""
-
-#: ../src/timezone_names.c:324
-msgid "Europe/Belfast"
-msgstr ""
-
-#: ../src/timezone_names.c:325
-msgid "Europe/Belgrade"
-msgstr ""
-
-#: ../src/timezone_names.c:326
-msgid "Europe/Berlin"
-msgstr ""
-
-#: ../src/timezone_names.c:327
-msgid "Europe/Bratislava"
-msgstr ""
-
-#: ../src/timezone_names.c:328
-msgid "Europe/Brussels"
-msgstr ""
-
-#: ../src/timezone_names.c:329
-msgid "Europe/Bucharest"
-msgstr ""
-
-#: ../src/timezone_names.c:330
-msgid "Europe/Budapest"
-msgstr ""
-
-#: ../src/timezone_names.c:331
-msgid "Europe/Chisinau"
-msgstr ""
-
-#: ../src/timezone_names.c:332
-msgid "Europe/Copenhagen"
-msgstr ""
-
-#: ../src/timezone_names.c:333
-msgid "Europe/Dublin"
-msgstr ""
-
-#: ../src/timezone_names.c:334
-msgid "Europe/Gibraltar"
-msgstr ""
-
-#: ../src/timezone_names.c:335
-msgid "Europe/Helsinki"
-msgstr ""
-
-#: ../src/timezone_names.c:336
-msgid "Europe/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:337
-msgid "Europe/Kaliningrad"
-msgstr ""
-
-#: ../src/timezone_names.c:338
-msgid "Europe/Kiev"
-msgstr ""
-
-#: ../src/timezone_names.c:339
-msgid "Europe/Lisbon"
-msgstr ""
-
-#: ../src/timezone_names.c:340
-msgid "Europe/Ljubljana"
-msgstr ""
-
-#: ../src/timezone_names.c:341
-msgid "Europe/London"
-msgstr ""
-
-#: ../src/timezone_names.c:342
-msgid "Europe/Luxembourg"
-msgstr ""
-
-#: ../src/timezone_names.c:343
-msgid "Europe/Madrid"
-msgstr ""
-
-#: ../src/timezone_names.c:344
-msgid "Europe/Malta"
-msgstr ""
-
-#: ../src/timezone_names.c:345
-msgid "Europe/Minsk"
-msgstr ""
-
-#: ../src/timezone_names.c:346
-msgid "Europe/Monaco"
-msgstr ""
-
-#: ../src/timezone_names.c:347
-msgid "Europe/Moscow"
-msgstr ""
-
-#: ../src/timezone_names.c:348
-msgid "Europe/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:349
-msgid "Europe/Oslo"
-msgstr ""
-
-#: ../src/timezone_names.c:350
-msgid "Europe/Paris"
-msgstr ""
-
-#: ../src/timezone_names.c:351
-msgid "Europe/Prague"
-msgstr ""
-
-#: ../src/timezone_names.c:352
-msgid "Europe/Riga"
-msgstr ""
-
-#: ../src/timezone_names.c:353
-msgid "Europe/Rome"
-msgstr ""
-
-#: ../src/timezone_names.c:354
-msgid "Europe/Samara"
-msgstr ""
-
-#: ../src/timezone_names.c:355
-msgid "Europe/San_Marino"
-msgstr ""
-
-#: ../src/timezone_names.c:356
-msgid "Europe/Sarajevo"
-msgstr ""
-
-#: ../src/timezone_names.c:357
-msgid "Europe/Simferopol"
-msgstr ""
-
-#: ../src/timezone_names.c:358
-msgid "Europe/Skopje"
-msgstr ""
-
-#: ../src/timezone_names.c:359
-msgid "Europe/Sofia"
-msgstr ""
-
-#: ../src/timezone_names.c:360
-msgid "Europe/Stockholm"
-msgstr ""
-
-#: ../src/timezone_names.c:361
-msgid "Europe/Tallinn"
-msgstr ""
-
-#: ../src/timezone_names.c:362
-msgid "Europe/Tirane"
-msgstr ""
-
-#: ../src/timezone_names.c:363
-msgid "Europe/Uzhgorod"
-msgstr ""
-
-#: ../src/timezone_names.c:364
-msgid "Europe/Vaduz"
-msgstr ""
-
-#: ../src/timezone_names.c:365
-msgid "Europe/Vatican"
-msgstr ""
-
-#: ../src/timezone_names.c:366
-msgid "Europe/Vienna"
-msgstr ""
-
-#: ../src/timezone_names.c:367
-msgid "Europe/Vilnius"
-msgstr ""
-
-#: ../src/timezone_names.c:368
-msgid "Europe/Warsaw"
-msgstr ""
-
-#: ../src/timezone_names.c:369
-msgid "Europe/Zagreb"
-msgstr ""
-
-#: ../src/timezone_names.c:370
-msgid "Europe/Zaporozhye"
-msgstr ""
-
-#: ../src/timezone_names.c:371
-msgid "Europe/Zurich"
-msgstr ""
-
-#: ../src/timezone_names.c:372
-msgid "Indian"
-msgstr ""
-
-#: ../src/timezone_names.c:373
-msgid "Indian/Antananarivo"
-msgstr ""
-
-#: ../src/timezone_names.c:374
-msgid "Indian/Chagos"
-msgstr ""
-
-#: ../src/timezone_names.c:375
-msgid "Indian/Christmas"
-msgstr ""
-
-#: ../src/timezone_names.c:376
-msgid "Indian/Cocos"
-msgstr ""
-
-#: ../src/timezone_names.c:377
-msgid "Indian/Comoro"
-msgstr ""
-
-#: ../src/timezone_names.c:378
-msgid "Indian/Kerguelen"
-msgstr ""
-
-#: ../src/timezone_names.c:379
-msgid "Indian/Mahe"
-msgstr ""
-
-#: ../src/timezone_names.c:380
-msgid "Indian/Maldives"
-msgstr ""
-
-#: ../src/timezone_names.c:381
-msgid "Indian/Mauritius"
-msgstr ""
-
-#: ../src/timezone_names.c:382
-msgid "Indian/Mayotte"
-msgstr ""
-
-#: ../src/timezone_names.c:383
-msgid "Indian/Reunion"
-msgstr ""
-
-#: ../src/timezone_names.c:384
-msgid "Pacific"
-msgstr ""
-
-#: ../src/timezone_names.c:385
-msgid "Pacific/Apia"
-msgstr ""
-
-#: ../src/timezone_names.c:386
-msgid "Pacific/Auckland"
-msgstr ""
-
-#: ../src/timezone_names.c:387
-msgid "Pacific/Chatham"
-msgstr ""
-
-#: ../src/timezone_names.c:388
-msgid "Pacific/Easter"
-msgstr ""
-
-#: ../src/timezone_names.c:389
-msgid "Pacific/Efate"
-msgstr ""
-
-#: ../src/timezone_names.c:390
-msgid "Pacific/Enderbury"
-msgstr ""
-
-#: ../src/timezone_names.c:391
-msgid "Pacific/Fakaofo"
-msgstr ""
-
-#: ../src/timezone_names.c:392
-msgid "Pacific/Fiji"
-msgstr ""
-
-#: ../src/timezone_names.c:393
-msgid "Pacific/Funafuti"
-msgstr ""
-
-#: ../src/timezone_names.c:394
-msgid "Pacific/Galapagos"
-msgstr ""
-
-#: ../src/timezone_names.c:395
-msgid "Pacific/Gambier"
-msgstr ""
-
-#: ../src/timezone_names.c:396
-msgid "Pacific/Guadalcanal"
-msgstr ""
-
-#: ../src/timezone_names.c:397
-msgid "Pacific/Guam"
-msgstr ""
-
-#: ../src/timezone_names.c:398
-msgid "Pacific/Honolulu"
-msgstr ""
-
-#: ../src/timezone_names.c:399
-msgid "Pacific/Johnston"
-msgstr ""
-
-#: ../src/timezone_names.c:400
-msgid "Pacific/Kiritimati"
-msgstr ""
-
-#: ../src/timezone_names.c:401
-msgid "Pacific/Kosrae"
-msgstr ""
-
-#: ../src/timezone_names.c:402
-msgid "Pacific/Kwajalein"
-msgstr ""
-
-#: ../src/timezone_names.c:403
-msgid "Pacific/Majuro"
-msgstr ""
-
-#: ../src/timezone_names.c:404
-msgid "Pacific/Marquesas"
-msgstr ""
-
-#: ../src/timezone_names.c:405
-msgid "Pacific/Midway"
-msgstr ""
-
-#: ../src/timezone_names.c:406
-msgid "Pacific/Nauru"
-msgstr ""
-
-#: ../src/timezone_names.c:407
-msgid "Pacific/Niue"
-msgstr ""
-
-#: ../src/timezone_names.c:408
-msgid "Pacific/Norfolk"
-msgstr ""
-
-#: ../src/timezone_names.c:409
-msgid "Pacific/Noumea"
-msgstr ""
-
-#: ../src/timezone_names.c:410
-msgid "Pacific/Pago_Pago"
-msgstr ""
-
-#: ../src/timezone_names.c:411
-msgid "Pacific/Palau"
-msgstr ""
-
-#: ../src/timezone_names.c:412
-msgid "Pacific/Pitcairn"
-msgstr ""
-
-#: ../src/timezone_names.c:413
-msgid "Pacific/Ponape"
-msgstr ""
-
-#: ../src/timezone_names.c:414
-msgid "Pacific/Port_Moresby"
-msgstr ""
-
-#: ../src/timezone_names.c:415
-msgid "Pacific/Rarotonga"
-msgstr ""
-
-#: ../src/timezone_names.c:416
-msgid "Pacific/Saipan"
-msgstr ""
-
-#: ../src/timezone_names.c:417
-msgid "Pacific/Tahiti"
-msgstr ""
-
-#: ../src/timezone_names.c:418
-msgid "Pacific/Tarawa"
-msgstr ""
-
-#: ../src/timezone_names.c:419
-msgid "Pacific/Tongatapu"
-msgstr ""
-
-#: ../src/timezone_names.c:420
-msgid "Pacific/Truk"
-msgstr ""
-
-#: ../src/timezone_names.c:421
-msgid "Pacific/Wake"
-msgstr ""
-
-#: ../src/timezone_names.c:422
-msgid "Pacific/Wallis"
-msgstr ""
-
-#: ../src/timezone_names.c:423
-msgid "Pacific/Yap"
-msgstr ""
-
-#: ../src/tray_icon.c:469
-#, fuzzy
-msgid "New appointment"
-msgstr "Görüş"
-
-#: ../src/tray_icon.c:485
-msgid "About Orage"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-msgid "Orage Panel Clock"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-msgid "Show time and date?"
-msgstr ""
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-#, fuzzy
-msgid "Calendar"
-msgstr "Xfcalendar"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Seçimlər"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Seçimlər"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr ""
-
-#: ../xfcalendar.desktop.in.h:2
-#, fuzzy
-msgid "Desktop calendar"
-msgstr "Xfcalendar Haqqında"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "Xfcalendar"
-
-#~ msgid "Contributor"
-#~ msgstr "Dəstəkçi"
-
-#~ msgid "Warning"
-#~ msgstr "Diqqət"
-
-#, fuzzy
-#~ msgid "Select always today"
-#~ msgstr "_Bugünü Seç"
-
-#, fuzzy
-#~ msgid "Modify Preferences"
-#~ msgstr "Seçimlər"
-
-#, fuzzy
-#~ msgid "Monday"
-#~ msgstr "Bugün"
-
-#, fuzzy
-#~ msgid "Tuesday"
-#~ msgstr "Bugün"
-
-#, fuzzy
-#~ msgid "Wednesday"
-#~ msgstr "Bugün"
-
-#, fuzzy
-#~ msgid "Thursday"
-#~ msgstr "Bugün"
-
-#, fuzzy
-#~ msgid "Friday"
-#~ msgstr "Bugün"
-
-#, fuzzy
-#~ msgid "Sunday"
-#~ msgstr "Bazar günü"
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "Bugün"
-
-#, fuzzy
-#~ msgid "Calendar Files"
-#~ msgstr "Xfcalendar"
-
-#, fuzzy
-#~ msgid "Calendar borders"
-#~ msgstr "Xfcalendar"
-
-#~ msgid "Core developer"
-#~ msgstr "Əsas inkişafçı"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Bu tarixlə əlaqəli olan bütün \n"
-#~ "mə'lumatı siləcəksiniz."
-
-#~ msgid "Clear"
-#~ msgstr "Təmizlə"
-
-#~ msgid "This should not happen"
-#~ msgstr "Bu olmamalıdır"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "MCS alıcı kanalı yaradıla bilmir"
diff -Nru orage-4.8.3/po/be.po orage-4.12.1/po/be.po
--- orage-4.8.3/po/be.po	2012-01-03 12:01:00.000000000 +0000
+++ orage-4.12.1/po/be.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,28 +1,30 @@
-# translation of orage.po to Belarusian.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Ales Nyakhaychyk <nab@mail.by>, 2004.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Mikalai Udodau <crom-a@tut.by>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: orage trunk\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2007-09-17 04:51+0300\n"
-"Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
-"Language-Team: Belarusian <i18n@mova.org>\n"
+"POT-Creation-Date: 2013-11-18 18:30+0100\n"
+"PO-Revision-Date: 2013-11-19 15:56+0000\n"
+"Last-Translator: Xfce <transifex@xfce.org>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/xfce/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr ""
+msgstr "Стварэнне вакна глабальнага часу..."
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
-msgstr ""
+msgstr "Стварэнне вакна глабальнага часу схібіла"
 
 #. ********** timezone tooltip **********
 #: ../globaltime/globaltime.c:277
@@ -30,9 +32,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"пстрыкніце, каб зьмяніць час"
+msgstr "%s\nнацісніце, каб змяніць час"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -42,7 +42,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
+msgstr "кнопка 1 змяняе настаўленні \nкнопка 2 змяняе час гадзінніка"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -55,7 +55,7 @@
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
-msgstr ""
+msgstr "НОВЫ"
 
 #: ../globaltime/gt_prefs.c:289
 msgid "NEW COPY"
@@ -63,23 +63,23 @@
 
 #: ../globaltime/gt_prefs.c:310
 msgid "Not possible to delete the last clock."
-msgstr "Немагчыма выдаліць апошні гадзіньнік."
+msgstr "Немагчыма выдаліць апошні гадзіннік."
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
-msgstr "абнавіць гэты гадзіньнік"
+msgstr "абнавіць гэты гадзіннік"
 
 #: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
 msgid "add new empty clock"
-msgstr "дадаць новы пусты гадзіньнік"
+msgstr "дадаць новы пусты гадзіннік"
 
 #: ../globaltime/gt_prefs.c:526
 msgid "add new clock using this clock as model"
-msgstr ""
+msgstr "дадаць новы гадзіннік, узяўшы гэты за аснову"
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
-msgstr "выдаліць гэты гадзіньнік"
+msgstr "выдаліць гэты гадзіннік"
 
 #: ../globaltime/gt_prefs.c:539
 msgid "move this clock first"
@@ -87,11 +87,11 @@
 
 #: ../globaltime/gt_prefs.c:544
 msgid "move this clock left"
-msgstr ""
+msgstr "пасунуць гадзіннік улева"
 
 #: ../globaltime/gt_prefs.c:549
 msgid "move this clock right"
-msgstr ""
+msgstr "пасунуць гадзіннік управа"
 
 #: ../globaltime/gt_prefs.c:554
 msgid "move this clock last"
@@ -99,46 +99,45 @@
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
-msgstr ""
+msgstr "устанавіць часавы пояс гэтага гадзінніка як мясцовы"
 
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
-msgstr ""
+msgstr "закрыць акно і выйсці"
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "абнавіць перавагі"
+msgstr "Настаўленні глабальнага часу "
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
 msgid "Clock Parameters"
-msgstr ""
+msgstr "Параметры гадзінніка"
 
 #: ../globaltime/gt_prefs.c:607
 msgid "Name of the clock:"
-msgstr ""
+msgstr "Назва гадзінніка:"
 
 #: ../globaltime/gt_prefs.c:613
 msgid "enter name of clock"
-msgstr ""
+msgstr "увядзіце назву гадзінніка"
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
-msgstr ""
+msgstr "Часавы пояс гадзінніка:"
 
 #: ../globaltime/gt_prefs.c:643
 msgid "Text Formatting"
-msgstr ""
+msgstr "Фарматаванне тэксту"
 
 #. ------------------------background-------------------------
 #: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
 msgid "Background color:"
-msgstr ""
+msgstr "Колер фону:"
 
 #: ../globaltime/gt_prefs.c:656
 msgid "Click to change background colour for clock"
-msgstr ""
+msgstr "Націсніце, каб змяніць фонавы колер гадзінніка"
 
 #: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
 #: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
@@ -146,7 +145,7 @@
 #: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
 #: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
 msgid "Use default"
-msgstr ""
+msgstr "Ужываць базавыя"
 
 #: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
@@ -166,38 +165,38 @@
 #. ------------------------name font-------------------------
 #: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
 msgid "Font for name of clock:"
-msgstr ""
+msgstr "Шрыфт назвы гадзінніка:"
 
 #: ../globaltime/gt_prefs.c:720
 msgid "Click to change font for clock name"
-msgstr ""
+msgstr "Націсніце, каб змяніць шрыфт назвы гадзінніка"
 
 #. ------------------------time font-------------------------
 #: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
 msgid "Font for time of clock:"
-msgstr ""
+msgstr "Шрыфт часу гадзінніка:"
 
 #: ../globaltime/gt_prefs.c:753
 msgid "Click to change font for clock time"
-msgstr ""
+msgstr "Націсніце, каб змяніць шрыфт часу"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:780
 msgid "Underline name of clock:"
-msgstr ""
+msgstr "Падкрэсліваць назву гадзінніка:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:810
 msgid "Underline time of clock:"
-msgstr ""
+msgstr "Падкрэсліваць час у гадзінніку:"
 
 #: ../globaltime/gt_prefs.c:850
 msgid "Text Default Formatting"
-msgstr ""
+msgstr "Базавае фарматаванне тэксту"
 
 #: ../globaltime/gt_prefs.c:863
 msgid "Click to change default background colour for clocks"
-msgstr ""
+msgstr "Націсніце, каб змяніць базавы колер фону гадзіннікаў"
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
@@ -205,11 +204,11 @@
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
-msgstr ""
+msgstr "Націсніце, каб змяніць базавы колер тэксту гадзінніка"
 
 #: ../globaltime/gt_prefs.c:929
 msgid "Click to change default font for clock name"
-msgstr ""
+msgstr "Націсніце, каб змяніць базавы шрыфт назвы гадзінніка"
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
@@ -217,31 +216,30 @@
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
-msgstr ""
+msgstr "Націсніце, каб змяніць базавы шрыфт часу гадзінніка"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:990
 msgid "Underline for name of clock:"
-msgstr ""
+msgstr "Падкрэсліваць назву гадзінніка:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:1004
 msgid "Underline for time of clock:"
-msgstr ""
+msgstr "Падкрэсліваць час гадзінніка:"
 
 #: ../globaltime/gt_prefs.c:1027
 msgid "update preferences"
-msgstr "абнавіць перавагі"
+msgstr "абнавіць настаўленні"
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "Агульныя перавагі"
+msgstr "Настаўленні глабальнага часу"
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
 msgid "General Preferences"
-msgstr "Агульныя перавагі"
+msgstr "Агульныя настаўленні"
 
 #: ../globaltime/gt_prefs.c:1077
 msgid "Decorations:"
@@ -261,15 +259,15 @@
 
 #: ../globaltime/gt_prefs.c:1100
 msgid "Clock size:"
-msgstr ""
+msgstr "Памер гадзінніка:"
 
 #: ../globaltime/gt_prefs.c:1101
 msgid "Equal"
-msgstr ""
+msgstr "Аднолькавы"
 
 #: ../globaltime/gt_prefs.c:1106
 msgid "All clocks have same size"
-msgstr ""
+msgstr "Усе гадзіннікі маюць аднолькавы памер"
 
 #: ../globaltime/gt_prefs.c:1111
 msgid "Varying"
@@ -277,79 +275,78 @@
 
 #: ../globaltime/gt_prefs.c:1116
 msgid "Clock sizes vary"
-msgstr ""
+msgstr "Памеры гадзіннікаў розняцца"
 
 #: ../globaltime/gt_prefs.c:1122
 msgid "Local timezone:"
-msgstr ""
+msgstr "Мясцовы часавы пояс:"
 
 #: ../globaltime/timezone_selection.c:101
 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
 msgid " Other"
-msgstr ""
+msgstr " Іншыя"
 
 #: ../globaltime/timezone_selection.c:156
 #: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
 #, c-format
 msgid "%d hour %d mins"
-msgstr ""
+msgstr "%d гадз %d мін"
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
-msgstr "гадзіны"
+msgstr "%d гадз"
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "%d mins"
-msgstr "хвіліны"
+msgstr "%d мін"
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
 msgid "backward"
-msgstr ""
+msgstr "назад"
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-#, fuzzy
 msgid "forward"
-msgstr "Пераслаць"
+msgstr "наперад"
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
 msgid "not changed"
-msgstr ""
+msgstr "не зменена"
 
 #: ../globaltime/timezone_selection.c:195
 #: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
 msgid "not changing"
-msgstr ""
+msgstr "не змяняецца"
 
 #. location
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2771
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
-msgstr "Разьмяшчэньне"
+msgstr "Мясцовасць"
 
 #: ../globaltime/timezone_selection.c:258
 #: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
 msgid "GMT Offset"
-msgstr ""
+msgstr "Зрух ад GMT"
 
 #: ../globaltime/timezone_selection.c:264
 #: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
 msgid "Previous/Next Change"
-msgstr ""
+msgstr "Папярэдняе/наступнае змяненне"
 
 #: ../globaltime/timezone_selection.c:269
 #: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
 msgid "Country"
-msgstr ""
+msgstr "Краіна"
 
 #. We are actually setting the g_par parameter. In other words
 #. we are setting the global default timezone for Orage. This is
@@ -362,7 +359,7 @@
 #: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
 #: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
 msgid "Pick timezone"
-msgstr ""
+msgstr "Выберыце часавы пояс"
 
 #: ../globaltime/timezone_selection.c:302
 #: ../globaltime/timezone_selection.c:312
@@ -390,45 +387,43 @@
 #: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
 #: ../src/timezone_selection.c:384
 msgid "floating"
-msgstr ""
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "Мясцовы час"
+msgstr "зменны"
 
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "Orage - Каляндар"
+msgstr "Глабальны час Orage"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
-msgstr ""
+msgstr "Паказвае гадзіннікі з розных краін"
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Глабальны час"
 
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
-msgstr ""
+msgstr "Выгляд"
 
 #. show frame
 #: ../panel-plugin/oc_config.c:229
 msgid "Show _frame"
-msgstr ""
+msgstr "Паказваць р_амку"
 
 #. foreground color
 #: ../panel-plugin/oc_config.c:239
 msgid "set foreground _color:"
-msgstr ""
+msgstr "у_станавіць колер тэксту:"
 
 #. background color
 #: ../panel-plugin/oc_config.c:253
 msgid "set _background color:"
-msgstr ""
+msgstr "устанав_іць колер фону:"
 
 #. clock size (=vbox size): height and width
 #: ../panel-plugin/oc_config.c:267
 msgid "set _height:"
-msgstr ""
+msgstr "устанавіць вышы_ню:"
 
 #: ../panel-plugin/oc_config.c:277
 msgid "Note that you can not change the height of horizontal panels"
@@ -436,25 +431,25 @@
 
 #: ../panel-plugin/oc_config.c:282
 msgid "set _width:"
-msgstr ""
+msgstr "устанаві_ць шырыню:"
 
 #: ../panel-plugin/oc_config.c:293
 msgid "Note that you can not change the width of vertical panels"
-msgstr ""
+msgstr "Заўвага: вы не можаце змяняць шырыню вертыкальных панэляў"
 
 #: ../panel-plugin/oc_config.c:316
 msgid "Clock Options"
-msgstr ""
+msgstr "Опцыі гадзінніка"
 
 #. timezone
 #: ../panel-plugin/oc_config.c:326
 msgid "set timezone to:"
-msgstr ""
+msgstr "устанавіць часавы пояс на:"
 
 #: ../panel-plugin/oc_config.c:347
 #, c-format
 msgid "Line %d:"
-msgstr ""
+msgstr "Радок %d:"
 
 #: ../panel-plugin/oc_config.c:357
 msgid "Enter any valid strftime function parameter."
@@ -463,12 +458,12 @@
 #. Tooltip hint
 #: ../panel-plugin/oc_config.c:401
 msgid "Tooltip:"
-msgstr ""
+msgstr "Падказка:"
 
 #. special timing for SUSPEND/HIBERNATE
 #: ../panel-plugin/oc_config.c:411
 msgid "fix time after suspend/hibernate"
-msgstr ""
+msgstr "выпраўляць час пасля чакання/сну"
 
 #: ../panel-plugin/oc_config.c:415
 msgid ""
@@ -492,9 +487,8 @@
 msgstr ""
 
 #: ../panel-plugin/oc_config.c:457
-#, fuzzy
 msgid "Orage clock Preferences"
-msgstr "Перавагі Orage"
+msgstr "Настаўленні гадзінніка Orage"
 
 #. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
@@ -505,260 +499,311 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
-msgstr ""
+msgstr "%A %d %B %Y/%V"
 
 #: ../src/about-xfcalendar.c:40
 msgid "Maintainer"
-msgstr ""
+msgstr "Суправаджальнік"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "Кіруйце вашым часам разам з Xfce4"
+msgstr "Кіруйце вашым часам з дапамогай Orage"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2800
 msgid "End"
 msgstr "Канец"
 
 #: ../src/appointment.c:333
 msgid "Due"
-msgstr "Тэрмін выкананьня"
+msgstr ""
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
-msgstr ""
+msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
-msgstr ""
+msgstr "Выберыце файл..."
 
 #: ../src/appointment.c:680
 msgid "Sound Files"
-msgstr ""
+msgstr "Гукавыя файлы"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
-msgstr ""
+msgstr "Усе файлы"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
-msgstr ""
+msgstr "Звесткі па прызначэнні зменены."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1282 ../src/event-list.c:921
 msgid "Do you want to continue?"
+msgstr "Працягваць?"
+
+#: ../src/appointment.c:740
+msgid "No, do not leave"
 msgstr ""
 
-#: ../src/appointment.c:767
-msgid "The end of this appointment is earlier than the beginning."
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
 msgstr ""
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-#, fuzzy
+#: ../src/appointment.c:768
+msgid "The end of this appointment is earlier than the beginning."
+msgstr "Канец прызначэння раней за пачатак."
+
+#: ../src/appointment.c:1035 ../src/appointment.c:1918
 msgid "Not set"
-msgstr "Заўвага"
+msgstr "Не вызначаны"
+
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1220
+msgid "Appointment addition failed."
+msgstr ""
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1221
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1231
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1232
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1281
 msgid "This appointment will be permanently removed."
+msgstr "Прызначэнне будзе назаўсёды сцёрта."
+
+#: ../src/appointment.c:1283 ../src/event-list.c:922
+msgid "No, cancel the removal"
 msgstr ""
 
-#: ../src/appointment.c:1692
-msgid "This appointment does not exist."
+#: ../src/appointment.c:1284
+msgid "Yes, remove it"
 msgstr ""
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1373 ../src/appointment.c:1388 ../src/day-view.c:457
+#: ../src/event-list.c:980
+msgid "Pick the date"
+msgstr "Выберыце дату"
+
+#: ../src/appointment.c:1375 ../src/appointment.c:1390 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:982 ../src/event-list.c:1132
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Сёння"
+
+#: ../src/appointment.c:1798
+msgid "This appointment does not exist."
+msgstr "Няма такога прызначэння."
+
+#: ../src/appointment.c:1799
 msgid "It was probably removed, please refresh your screen."
-msgstr ""
+msgstr "Магчыма, яно было сцёрта, калі ласка, абнавіце экран."
 
-#: ../src/appointment.c:1995
-#, fuzzy
+#: ../src/appointment.c:2100
 msgid "Current categories"
-msgstr "Бягучы файл"
+msgstr "Бягучыя катэгорыі"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2115
 msgid "Add new category with color"
-msgstr ""
+msgstr "Дадаць катэгорыю з колерам"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2119
 msgid "Category:"
-msgstr ""
+msgstr "Катэгорыя:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2150
 msgid "Colors of categories - Orage"
-msgstr ""
+msgstr "Колеры катэгорый - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2196
 msgid " *** COPY ***"
 msgstr ""
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2461
 msgid "New appointment - Orage"
-msgstr "Новая сустрэча - Orage"
+msgstr "Новае прызначэнне - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2491 ../src/day-view.c:279 ../src/event-list.c:1033
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
-msgstr "_Файл"
+msgstr "Ф_айл"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2497
 msgid "Sav_e and close"
-msgstr ""
+msgstr "Запісаць і закрыць"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2510 ../src/event-list.c:1039
 msgid "D_uplicate"
-msgstr ""
+msgstr "Д_убляваць"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2697
 msgid "Save"
-msgstr "Захаваць"
+msgstr "Запісаць"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2699
 msgid "Save and close"
-msgstr ""
+msgstr "Запісаць і закрыць"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2704
 msgid "Revert"
-msgstr ""
+msgstr "Наадварот"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2706 ../src/event-list.c:1123
 msgid "Duplicate"
-msgstr ""
+msgstr "Дубляваць"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2711 ../src/event-list.c:1125
 msgid "Delete"
-msgstr "Выдаліць"
+msgstr "Сцерці"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Free"
 msgstr "Вольны"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Busy"
 msgstr "Заняты"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2733
 msgid "General"
-msgstr "Асноўнае"
+msgstr "Агульныя"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2739
 msgid "Type "
-msgstr ""
+msgstr "Тып"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2741 ../src/event-list.c:1176
 msgid "Event"
-msgstr ""
+msgstr "Падзея"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2744
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
+msgstr "Падзея, якая мусіць некалі адбыцца. Напрыклад:\nСустрэча, ці дзень нараджэння, ці тэлевезійнае шоy."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2747 ../src/event-list.c:1196
 msgid "Todo"
-msgstr "Зрабіць"
+msgstr "Задача"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2750
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
+msgstr "Нешта, што вы мусіце некалі зрабіць. Напрыклад:\nПамыць сваю машыну ці выпрабаваць новую версію Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2753 ../src/event-list.c:1209
 msgid "Journal"
-msgstr "Часопіс"
+msgstr "Журнал"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2757
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
+msgstr "Зрабіце зацемку, калі нешта адбылося. Напрыклад:\nАдзначце, што званіла маці, ці пайшоў першы снег."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2764
 msgid "Title "
-msgstr ""
+msgstr "Назва"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2779
 msgid "All day event"
-msgstr ""
+msgstr "На ўвесь дзень"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2785 ../src/appointment.c:3446 ../src/day-view.c:801
 msgid "Start"
 msgstr "Пачатак"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2805
 msgid "Set      "
 msgstr ""
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2826
 msgid "Duration"
-msgstr ""
+msgstr "Працягласць"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2830 ../src/appointment.c:3020 ../src/reminder.c:758
 msgid "days"
 msgstr "дні"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2832 ../src/appointment.c:3022 ../src/reminder.c:760
 msgid "hours"
-msgstr "гадзіны"
+msgstr "гадзін"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2834 ../src/appointment.c:3024 ../src/reminder.c:762
 msgid "mins"
-msgstr "хвіліны"
+msgstr "мінут"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2846
 msgid "Availability"
-msgstr ""
+msgstr "Занятасць"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2854 ../src/appointment.c:3452
 msgid "Completed"
-msgstr "Выкананае"
+msgstr "Выканана"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2857
 msgid "Done"
 msgstr "Зроблена"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2878
 msgid "Categories"
-msgstr ""
+msgstr "Катэгорыі"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2890
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
 msgstr ""
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2895
 msgid "update colors for categories."
-msgstr ""
+msgstr "абнавіць колеры катэгорый."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2901
 msgid "Priority"
-msgstr ""
+msgstr "Прыярытэт"
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2911
 msgid "Note"
-msgstr "Заўвага"
+msgstr "Заўвагі"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2932
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -767,125 +812,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before Start"
-msgstr ""
+msgstr "Перад пачаткам"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before End"
-msgstr ""
+msgstr "Перад канцом"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After Start"
-msgstr ""
+msgstr "Пасля пачатку"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After End"
-msgstr ""
+msgstr "Пасля канца"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3011
 msgid "Alarm"
-msgstr ""
+msgstr "Сігнал"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3017
 msgid "Alarm time"
-msgstr ""
+msgstr "Час сігнала"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3041
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
+msgstr "Калі вы хочаце атрымаць сігнал:\n 1) да пачатку Падзеі\n 2) перад канцом Задачы\n 3) пасля пачатку Задачы"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3046
 msgid "Persistent alarm"
-msgstr ""
+msgstr "Трывалы сігнал"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3048
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
 msgstr ""
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3057
 msgid "Sound"
-msgstr ""
+msgstr "Гук"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3061 ../src/appointment.c:3181
 msgid "Use"
-msgstr ""
+msgstr "Ужыць"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3063
 msgid "Select this if you want audible alarm"
-msgstr ""
+msgstr "Пазначце, каб атрымліваць гукавы сігнал"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3080
 msgid "Repeat alarm sound"
-msgstr ""
+msgstr "Паўтараць гук сігнала"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3096 ../src/appointment.c:3395
 msgid "times"
-msgstr ""
+msgstr "разы"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3112
 msgid "sec interval"
-msgstr ""
+msgstr "сек. інтрэрвал"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3122
 msgid "Visual"
-msgstr "Візуальна"
+msgstr "Візуальны"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3126
 msgid "Use Orage window"
-msgstr ""
+msgstr "Ужываць акно Orage"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3128
 msgid "Select this if you want Orage window alarm"
-msgstr ""
+msgstr "Пазначце, каб атрымліваць сігнал акном Orage"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3140
 msgid "Use notification"
-msgstr ""
+msgstr "Ужываць паведамленне"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3142
 msgid "Select this if you want notification alarm"
-msgstr ""
+msgstr "Пазначце, каб атрымаць сігнал паведамленнем"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3148
 msgid "Set timeout"
-msgstr ""
+msgstr "Задаць таймаўт"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3150
 msgid "Select this if you want notification to expire automatically"
 msgstr ""
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3161
 msgid "0 = system default expiration time"
 msgstr ""
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3166
 msgid "seconds"
-msgstr "сэкундаў"
+msgstr "секунд"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3177
 msgid "Procedure"
-msgstr ""
+msgstr "Працэдура"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3183
 msgid "Select this if you want procedure or script alarm"
-msgstr ""
+msgstr "Пазначце, каб атрымаць сігнал працэдурай ці скрыптам"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3189
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -897,96 +941,96 @@
 "\t<&ET> appointment end time"
 msgstr ""
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3201
 msgid "Test this alarm by raising it now"
 msgstr ""
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3208
 msgid "<b>Default alarm</b>"
-msgstr ""
+msgstr "<b>Звычайны сігнал</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3216
 msgid "Store current settings as default alarm"
-msgstr ""
+msgstr "Захваць бягучыя настаўленні як звычайны сігнал"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3221
 msgid "Set current settings from default alarm"
-msgstr ""
+msgstr "Узяць бягучыя настаўленні са звычайнага сігнала"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "None"
 msgstr "Няма"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Daily"
-msgstr ""
+msgstr "Дзённы"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Weekly"
-msgstr ""
+msgstr "Тыднёвы"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Monthly"
-msgstr ""
+msgstr "Месячны"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Yearly"
-msgstr ""
+msgstr "Гадавы"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Hourly"
-msgstr ""
+msgstr "Гадзінны"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Mon"
-msgstr ""
+msgstr "Пан"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Tue"
-msgstr ""
+msgstr "Аўт"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Wed"
-msgstr ""
+msgstr "Срд"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Thu"
-msgstr ""
+msgstr "Чац"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Fri"
-msgstr ""
+msgstr "Пят"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sat"
-msgstr ""
+msgstr "Суб"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sun"
-msgstr ""
+msgstr "Няд"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3290
 msgid "Recurrence"
-msgstr "Паўтарэньне"
+msgstr "Паўтарэнні"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3296
 msgid "Complexity"
-msgstr ""
+msgstr "Складанасць"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3299
 msgid "Basic"
-msgstr "Асноўнае"
+msgstr "Базавая"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3305
 msgid "Advanced"
-msgstr ""
+msgstr "Адмысловая"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3309
 msgid "Use this if you want regular repeating event"
-msgstr ""
+msgstr "Выкарыстайце, калі хочаце каб прызначэнне паўтаралася"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3311
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
@@ -994,51 +1038,51 @@
 msgstr ""
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3317
 msgid "Frequency"
-msgstr ""
+msgstr "Частата"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3323
 msgid "Each"
-msgstr ""
+msgstr "Кожнае"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3330
 msgid "occurrence"
-msgstr ""
+msgstr "з'яўленне"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3334
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
 msgstr ""
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3379
 msgid "Limit"
-msgstr ""
+msgstr "Абмежаваць"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3381
 msgid "Repeat forever"
-msgstr ""
+msgstr "Паўтараць бясконца"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3387
 msgid "Repeat "
-msgstr ""
+msgstr "Паўтараць "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3403
 msgid "Repeat until "
-msgstr ""
+msgstr "Паўтараць да "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3416
 msgid "Weekdays"
-msgstr "Працоўныя дні"
+msgstr "Дні тыдня"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3428
 msgid "Which day"
-msgstr ""
+msgstr "Кожны дзень"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3436
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1049,174 +1093,184 @@
 msgstr ""
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3443
 msgid "TODO base"
-msgstr ""
+msgstr "Аснова задачы"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3456
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
 msgstr ""
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3458
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 
 #. exceptions
-#: ../src/appointment.c:3361
-#, fuzzy
+#: ../src/appointment.c:3464
 msgid "Exceptions"
-msgstr "Можнасьці"
+msgstr "Выключэнні"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3477
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
 msgstr ""
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3482
 msgid "Add excluded date (-)"
-msgstr ""
+msgstr "Дадаць дзень выключэння (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3484
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr ""
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3490
 msgid "Add included time (+)"
-msgstr ""
+msgstr "Дадаць час уключэння (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3492
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
 msgstr ""
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3509
 msgid "Action dates"
 msgstr ""
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1056 ../src/mainbox.c:323
 msgid "_View"
-msgstr "_Выгляд"
+msgstr "Выгляд"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1075
 msgid "_Go"
-msgstr ""
+msgstr "_Перайсці"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1121
 msgid "New"
-msgstr "Стварыць"
+msgstr "Новы"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
+#: ../src/day-view.c:382
+msgid "Back one week"
 msgstr ""
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Сёньня"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Пераслаць"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1139
 msgid "Refresh"
 msgstr "Абнавіць"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1146 ../src/interface.c:834
 msgid "Close"
 msgstr "Закрыць"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
-msgstr ""
+msgstr "Невядома"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
-msgstr ""
+msgstr "       Колькі дзён паказваць"
 
-#: ../src/day-view.c:935
-#, fuzzy
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
-msgstr "Orage - Каляндар"
+msgstr "Orage - прагляд дзён"
 
 #. date only appointment
 #: ../src/event-list.c:190
 msgid "All day"
-msgstr ""
+msgstr "Увесь дзень"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:583 ../src/event-list.c:1292
 msgid "Time"
-msgstr ""
+msgstr "Час"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:751
 msgid "No rows have been selected."
-msgstr ""
+msgstr "Не вылучаны ніводзін радок."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:752
 msgid "Click a row to select it and after that you can copy it."
-msgstr ""
+msgstr "Націсніце на радок, каб вылучыць, потым вы зможаце яго скапіраваць."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:920
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
+msgstr "Вы назаўсёды сатраце ўсе\nвылучаныя прызначэнні."
+
+#: ../src/event-list.c:923
+msgid "Yes, remove them"
 msgstr ""
 
 #: ../src/event-list.c:1130
+msgid "Back"
+msgstr "Назад"
+
+#: ../src/event-list.c:1134
+msgid "Forward"
+msgstr "Наперад"
+
+#: ../src/event-list.c:1141
 msgid "Find"
-msgstr ""
+msgstr "Пошук"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1148
 msgid "Dayview"
-msgstr ""
+msgstr "Прагляд дзён"
 
-#: ../src/event-list.c:1170
+#: ../src/event-list.c:1181
 msgid "Extra days to show "
-msgstr ""
+msgstr "Дадаткова паказваць дзён"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1212
 msgid "Journal entries starting from:"
-msgstr ""
+msgstr "Паказваць запісы ў журнале пачынаючы з:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1232
 msgid "Search"
-msgstr ""
+msgstr "Знайсці"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1235
 msgid "Search text "
-msgstr ""
+msgstr "Шукаць тэкст"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1300
 msgid "Flags"
-msgstr ""
+msgstr "Сцягі"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1308
 msgid "Title"
-msgstr "Пасада"
+msgstr "Загаловак"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1334
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
@@ -1224,79 +1278,84 @@
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
 
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr ""
-
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr ""
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
-msgstr ""
+msgstr "Архівацыя не ўключана. Выхад"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr ""
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr ""
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr ""
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr ""
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr ""
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
-msgstr ""
+msgstr "Архівацыя скончана\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
-msgstr ""
+msgstr "Пачата сціранне архіва."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr ""
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr ""
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
-msgstr ""
+msgstr "Сціранне архіва скончана\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
+msgstr "Звычайны сігнал Orage"
+
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
 msgstr ""
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
+msgid "\tAdded %d alarms. Processed %d events."
 msgstr ""
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
@@ -1318,638 +1377,728 @@
 msgid "Import file preprocessing done"
 msgstr ""
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
-msgstr "Файлы Каляндара"
+msgstr "Файлы календара"
 
 #: ../src/interface.c:631
 msgid "Current foreign files"
-msgstr ""
+msgstr "Бягучыя чужыя файлы"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr ""
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr ""
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
+msgstr "***** Няма чужых файлаў *****"
+
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
 msgstr ""
 
-#: ../src/interface.c:974
-msgid "Import/export"
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
 msgstr ""
 
-#: ../src/interface.c:981
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
+msgid "Import/export"
+msgstr "Імпарт/экспарт"
+
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Імпарт"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
-msgstr ""
+msgstr "Чытаць з файла:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
 msgstr ""
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
-msgstr ""
+msgstr "Экспарт"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
-msgstr ""
+msgstr "Запісаць у файл:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Вылучыць"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
-msgstr "Усе сустрэчы"
+msgstr "Усе прызначэнні"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
-msgstr "Сустрэчы з назвай: "
+msgstr "Прызначэнні з назвай: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
+msgstr "Заўвага: чытаюцца толькі прызначэнні з галоўнага файла.\nЧужыя прызначэнні не экспартуюцца."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
-msgstr ""
+msgstr "Вы лёгка можаце перацягнуць іх з спіса прызначэнняў."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
-msgstr ""
+msgstr "UIDы прызначэнняў Orage, раздзеленыя коскамі."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
-msgstr "Архіў"
+msgstr "Архівацыя"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
-msgstr ""
+msgstr "Архіваваць зараз (парог: %d месяцаў)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
-msgstr ""
+msgstr "Вы можаце змяніць парог архівацыі ў параметрах"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
-msgstr ""
+msgstr "Адкаціць архівацыю зараз"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
 msgstr ""
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Файлы Orage"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Асноўны файл каляндара Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Бягучы файл"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
 
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Новы файл"
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
 
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
 msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Перайменаваць"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
 msgstr ""
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
-msgstr "Скапіяваць"
+msgstr "Капіраваць"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
+msgstr "Бягучы файл капіруецца і застаецца нязменным на старым месцы."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
-msgstr "Перамясьціць"
+msgstr "Перамясціць"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
-msgstr ""
+msgstr "Бягучы файл пераносіцца і сціраецца са старога месца."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
-msgstr ""
+msgstr "Файл архіва"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
-msgstr ""
+msgstr "Чужыя файлы"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
-msgstr ""
+msgstr "Дадаць чужы файл"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
-msgstr ""
+msgstr "Чужы файл:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Можнасьці"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
+msgstr "Толькі-чытанне"
+
+#: ../src/interface.c:1292
+msgid ""
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
 msgstr ""
 
 #: ../src/interface.c:1294
-msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
+msgid "This internal name is displayed to user instead of file name."
 msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
-msgstr ""
+msgstr "Абмен звесткамі - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
+msgstr "\tГэта %s версіі %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
+msgstr "\tВыдадзена на ўмовах Агульнай грамадскай ліцэнзіі GNU (GPL).\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr ""
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr ""
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr ""
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr ""
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr ""
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr ""
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr ""
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr ""
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr ""
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr ""
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
+msgstr "Usage: orage [опцыі] [файлы]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
-msgstr ""
+msgstr "Опцыі:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
+msgstr "--version (-v) \t\tпаказаць версію orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
+msgstr "--help (-h) \t\tпаказаць гэты тэкст\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
+msgstr "--preferences (-p) \tпаказаць форму настаўленняў\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
+msgstr "--toggle (-t) \t\tзрабіць orage бачным/нябачным\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
 msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr ""
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
 msgstr ""
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr ""
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
-msgstr ""
+msgstr "\tdbus не ўключаны ў orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
 msgstr ""
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
+msgstr "\nНевядомая опцыя %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
-msgstr ""
+msgstr "Абмен звест_камі"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
-msgstr "_Рэдагаваньне"
+msgstr "_Рэдагаваць"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
-msgstr ""
+msgstr "Паказаць _вылучаны дзень"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
-msgstr ""
+msgstr "Паказа_ць вылучаны тыдзень"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
-msgstr "Вылучыць _сёньня"
+msgstr "Вылучыць сённяшні дз_ень"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Мясцовы час"
+msgstr "_Паказаць агульны час"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Даведка"
 
-#: ../src/mainbox.c:448
-msgid "Never"
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
 msgstr ""
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr ""
+
+#: ../src/mainbox.c:481
 #, c-format
 msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" Due:\t%s\n"
-" Done:\t%s\n"
+"\n"
 " Note:\n"
 "%s"
 msgstr ""
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:489
+msgid "Never"
+msgstr "Ніколі"
+
+#: ../src/mainbox.c:495
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" Due:\t%s\n"
+" Done:\t%s%s"
 msgstr ""
 
-#: ../src/mainbox.c:546
-msgid "<b>To do:</b>"
+#: ../src/mainbox.c:503
+#, c-format
+msgid ""
+"Title: %s\n"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:613
+msgid "<b>To do:</b>"
+msgstr "<b>Зрабіць:</b>"
+
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
-msgstr ""
+msgstr "<b>Падзеі для %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
-msgstr ""
+msgstr "<b>Падзеі для %s - %s:</b>"
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:486
 msgid "Main settings"
-msgstr "Настаўленьні календара"
+msgstr "Агульныя настаўленні"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:492
 msgid "Timezone"
-msgstr "Часавая зона"
+msgstr "Часавы пояс"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:507
 msgid "You should always define your local timezone."
-msgstr ""
+msgstr "Вы мусіце заўсёды вызначаць свой мясцовы часавы пояс."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:515
 msgid "Archive threshold (months)"
-msgstr ""
+msgstr "Парог архівацыі (месяцаў)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:525
 msgid "(0 = no archiving)"
-msgstr ""
+msgstr "(0 = не архіваваць)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:528
 msgid "Archiving is used to save time and space when handling events."
 msgstr ""
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:536
 msgid "Sound command"
-msgstr ""
+msgstr "Загад гуку"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:551
 msgid "This command is given to shell to make sound in alarms."
+msgstr "Гэты загад даецца абалонцы, каб падаць гукавы сігнал."
+
+#: ../src/parameters.c:590
+msgid "Calendar window"
 msgstr ""
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Адлюстраваньне"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Асноўнае вакно календара"
+#: ../src/parameters.c:597
+msgid "Calendar visual details"
+msgstr ""
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:603
 msgid "Show borders"
 msgstr "Паказваць межы"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:608
 msgid "Show menu"
-msgstr "Паказваць мэню"
-
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr ""
+msgstr "Паказваць меню"
 
-#: ../src/parameters.c:639
-#, fuzzy
+#: ../src/parameters.c:616
 msgid "Show day names"
-msgstr "Паказваць межы"
+msgstr "Паказваць назвы дзён"
 
-#: ../src/parameters.c:646
-#, fuzzy
+#: ../src/parameters.c:621
 msgid "Show week numbers"
-msgstr "Паказваць межы"
+msgstr "Паказваць нумары тыдняў"
 
-#: ../src/parameters.c:653
-#, fuzzy
+#: ../src/parameters.c:629
+msgid "Show month and year"
+msgstr "Паказваць месяц і год"
+
+#: ../src/parameters.c:649
+msgid "Calendar info boxes"
+msgstr ""
+
+#: ../src/parameters.c:654
 msgid "Show todo list"
-msgstr "Паказваць межы"
+msgstr "Паказваць спіс задач"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:661
 msgid "Number of days to show in event window"
-msgstr ""
+msgstr "Колькі дзён паказваць у вакне падзей"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:667
 msgid "0 = do not show event list at all"
+msgstr "0 = не паказваць спіс падзей зусім"
+
+#: ../src/parameters.c:680
+msgid "Calendar visibility"
 msgstr ""
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:685
 msgid "Show on all desktops"
-msgstr ""
+msgstr "Паказваць на ўсіх прасторах"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:690
 msgid "Keep on top"
-msgstr ""
+msgstr "Трымаць наверсе"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:698
 msgid "Show in taskbar"
-msgstr ""
+msgstr "Паказваць у панэлі задач"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:703
 msgid "Show in pager"
-msgstr ""
+msgstr "Паказваць у пэйджары"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:711
 msgid "Show in systray"
-msgstr ""
+msgstr "Паказваць у трэі"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:732
 msgid "Calendar start"
 msgstr "Запуск календара"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:737
 msgid "Show"
-msgstr ""
+msgstr "Паказаць"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:749
 msgid "Hide"
-msgstr ""
+msgstr "Схаваць"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:761
 msgid "Minimized"
+msgstr "Мінімізаваць"
+
+#: ../src/parameters.c:781
+msgid "On calendar window open"
 msgstr ""
 
-#: ../src/parameters.c:793
+#: ../src/parameters.c:786
+msgid "Select today's date"
+msgstr ""
+
+#: ../src/parameters.c:799
+msgid "Select previously selected date"
+msgstr ""
+
+#: ../src/parameters.c:817
+msgid "Calendar day double click shows"
+msgstr ""
+
+#: ../src/parameters.c:822
+msgid "Days view"
+msgstr "Дзённы від"
+
+#: ../src/parameters.c:834
+msgid "Event list"
+msgstr "Спіс падзей"
+
+#: ../src/parameters.c:856
 msgid "Extra settings"
+msgstr "Дадатковыя настаўленні"
+
+#: ../src/parameters.c:863
+msgid "Event list window extra days"
 msgstr ""
 
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Асноўнае вакно календара"
+#: ../src/parameters.c:868
+msgid "Number of extra days to show in event list"
+msgstr "Колькі дадатковых дзён паказваць у спісе падзей"
 
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "Вылучыць _сёньня"
+#: ../src/parameters.c:876
+msgid ""
+"This is just the default value, you can change it in the actual eventlist "
+"window."
+msgstr ""
 
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:886
+msgid "Day view window default first day"
 msgstr ""
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
+#: ../src/parameters.c:891
+msgid "First day of week"
 msgstr ""
 
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
+#: ../src/parameters.c:904
+msgid "Selected day"
 msgstr ""
 
-#: ../src/parameters.c:847
+#: ../src/parameters.c:922
+msgid "Use dynamic tray icon"
+msgstr "Ужываць дынамічны значок у трэі"
+
+#: ../src/parameters.c:927
+msgid "Use dynamic icon"
+msgstr "Ужываць дынамічны значок"
+
+#: ../src/parameters.c:933
 msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
+msgstr "Дынамічны значок паказвае бягучы месяц і дзень месяца."
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
+#: ../src/parameters.c:941 ../src/parameters.c:946
+msgid "Use wakeup timer"
 msgstr ""
 
-#: ../src/parameters.c:861
-msgid "Days view"
+#: ../src/parameters.c:952
+msgid ""
+"Use this timer if Orage has problems waking up properly after suspend or "
+"hibernate. (For example tray icon not refreshed or alarms not firing.)"
 msgstr ""
 
-#: ../src/parameters.c:873
-msgid "Event list"
+#: ../src/parameters.c:961
+msgid "Foreign file default visual alarm"
 msgstr ""
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
+#: ../src/parameters.c:966
+msgid "Orage window"
 msgstr ""
 
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
+#: ../src/parameters.c:979
+msgid "Notify notification"
 msgstr ""
 
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
+#: ../src/parameters.c:997
+msgid "Always quit when asked to close"
 msgstr ""
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
+#: ../src/parameters.c:1002
+msgid "Always quit"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:1008
 msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1024
 msgid "Orage Preferences"
-msgstr "Перавагі Orage"
+msgstr "Настаўленні Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1136
 msgid "First Orage start. Searching default timezone."
-msgstr ""
+msgstr "Першы запуск Orage. Шукаю базавы часавы пояс."
 
-#: ../src/parameters.c:1069
-#, fuzzy, c-format
+#: ../src/parameters.c:1155
+#, c-format
 msgid "Default timezone set to %s."
-msgstr "Вылучыце часавы пояс"
+msgstr "Базавы часавы пояс %s устаноўлены."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1158
 msgid "Default timezone not found, please, set it manually."
-msgstr ""
+msgstr "Базавы часавы пояс не знойдзены, задайце яго самастойна."
 
 #: ../src/reminder.c:562
 msgid "Reminder "
-msgstr "Нагадвальнік "
+msgstr "Напамінаць "
 
 #: ../src/reminder.c:591
 msgid "Open"
 msgstr "Адкрыць"
 
-#: ../src/reminder.c:722
-#, fuzzy
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
-msgstr "Нагадвальнік "
+msgstr "Нагадванне - Orage"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
+#: ../src/reminder.c:803
+msgid "Postpone"
 msgstr ""
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
+msgstr "Нагадаць ізноў пасля вызначанага часу"
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
-msgstr ""
+msgstr "Наступныя дзейныя сігналы:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
+msgstr "\n%02d д %02d г %02d мін да: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
+msgstr "\nДзейных сігналаў не знойдзена"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
-msgstr ""
+msgstr "Афрыка"
 
 #: ../src/timezone_names.c:37
 msgid "Africa/Abidjan"
@@ -1965,11 +2114,11 @@
 
 #: ../src/timezone_names.c:40
 msgid "Africa/Algiers"
-msgstr "Афрыка/Альжыр"
+msgstr "Афрыка/Алжыр"
 
 #: ../src/timezone_names.c:41
 msgid "Africa/Asmera"
-msgstr "Афрыка/Асьмера"
+msgstr "Афрыка/Асмера"
 
 #: ../src/timezone_names.c:42
 msgid "Africa/Bamako"
@@ -1977,11 +2126,11 @@
 
 #: ../src/timezone_names.c:43
 msgid "Africa/Bangui"
-msgstr "Афрыка/Бангуі"
+msgstr "Афрыка/Бангі"
 
 #: ../src/timezone_names.c:44
 msgid "Africa/Banjul"
-msgstr "Афрыка/Банджул"
+msgstr "Афрыка/Банжул"
 
 #: ../src/timezone_names.c:45
 msgid "Africa/Bissau"
@@ -1993,7 +2142,7 @@
 
 #: ../src/timezone_names.c:47
 msgid "Africa/Brazzaville"
-msgstr "Афрыка/Браззавіль"
+msgstr "Афрыка/Бразавіль"
 
 #: ../src/timezone_names.c:48
 msgid "Africa/Bujumbura"
@@ -2005,7 +2154,7 @@
 
 #: ../src/timezone_names.c:50
 msgid "Africa/Casablanca"
-msgstr "Афрыка/Касаблянка"
+msgstr "Афрыка/Касабланка"
 
 #: ../src/timezone_names.c:51
 msgid "Africa/Ceuta"
@@ -2021,7 +2170,7 @@
 
 #: ../src/timezone_names.c:54
 msgid "Africa/Dar_es_Salaam"
-msgstr "Афрыка/Дар эс Салям"
+msgstr "Афрыка/Дар эс Салам"
 
 #: ../src/timezone_names.c:55
 msgid "Africa/Djibouti"
@@ -2049,7 +2198,7 @@
 
 #: ../src/timezone_names.c:61
 msgid "Africa/Johannesburg"
-msgstr "Афрыка/Яганэсбург"
+msgstr "Афрыка/Яханесбург"
 
 #: ../src/timezone_names.c:62
 msgid "Africa/Kampala"
@@ -2081,11 +2230,11 @@
 
 #: ../src/timezone_names.c:69
 msgid "Africa/Luanda"
-msgstr "Афрыка/Люанда"
+msgstr "Афрыка/Луанда"
 
 #: ../src/timezone_names.c:70
 msgid "Africa/Lubumbashi"
-msgstr "Афрыка/Любумбашы"
+msgstr "Афрыка/Лубумбашы"
 
 #: ../src/timezone_names.c:71
 msgid "Africa/Lusaka"
@@ -2121,7 +2270,7 @@
 
 #: ../src/timezone_names.c:79
 msgid "Africa/Ndjamena"
-msgstr "Афрыка/Ндзямэна"
+msgstr "Афрыка/Нджамена"
 
 #: ../src/timezone_names.c:80
 msgid "Africa/Niamey"
@@ -2161,504 +2310,499 @@
 
 #: ../src/timezone_names.c:89
 msgid "America"
-msgstr ""
+msgstr "Амерыка"
 
 #: ../src/timezone_names.c:90
 msgid "America/Adak"
-msgstr "Амэрыка/Адак"
+msgstr "Амерыка/Адак"
 
 #: ../src/timezone_names.c:91
 msgid "America/Anchorage"
-msgstr "Амэрыка/Анчураг"
+msgstr "Амерыка/Анкорыдж"
 
 #: ../src/timezone_names.c:92
 msgid "America/Anguilla"
-msgstr "Амэрыка/Анджулія"
+msgstr "Амерыка/Ангілья"
 
 #: ../src/timezone_names.c:93
 msgid "America/Antigua"
-msgstr "Амэрыка/Анцігуа"
+msgstr "Амерыка/Анцігуа"
 
 #: ../src/timezone_names.c:94
 msgid "America/Araguaina"
-msgstr "Амэрыка/Арагуяна"
+msgstr "Амерыка/Арагуяна"
 
 #: ../src/timezone_names.c:95
-#, fuzzy
 msgid "America/Argentina/Buenos_Aires"
-msgstr "Амэрыка/Буанас-Айрэс"
+msgstr "Амерыка/Аргенціна/Буэнас-Айрэс"
 
 #: ../src/timezone_names.c:96
-#, fuzzy
 msgid "America/Argentina/Catamarca"
-msgstr "Амэрыка/Катамарка"
+msgstr "Амерыка/Аргенціна/Катамарка"
 
 #: ../src/timezone_names.c:97
-#, fuzzy
 msgid "America/Argentina/Cordoba"
-msgstr "Амэрыка/Кардоба"
+msgstr "Амерыка/Аргенціна/Кардоба"
 
 #: ../src/timezone_names.c:98
-#, fuzzy
 msgid "America/Argentina/Jujuy"
-msgstr "Амэрыка/Яджі"
+msgstr "Амерыка/Аргенціна/Яджы"
 
 #: ../src/timezone_names.c:99
-#, fuzzy
 msgid "America/Argentina/Mendoza"
-msgstr "Амэрыка/Мэндоза"
+msgstr "Амерыка/Аргенціна/Мендоса"
 
 #: ../src/timezone_names.c:100
 msgid "America/Aruba"
-msgstr "Амэрыка/Аруба"
+msgstr "Амерыка/Аруба"
 
 #: ../src/timezone_names.c:101
 msgid "America/Asuncion"
-msgstr "Амэрыка/Асунсьён"
+msgstr "Амерыка/Асунсьён"
 
 #: ../src/timezone_names.c:102
 msgid "America/Barbados"
-msgstr "Амэрыка/Барбадас"
+msgstr "Амерыка/Барбадас"
 
 #: ../src/timezone_names.c:103
 msgid "America/Belem"
-msgstr "Амэрыка/Бэлем"
+msgstr "Амерыка/Белем"
 
 #: ../src/timezone_names.c:104
 msgid "America/Belize"
-msgstr "Амэрыка/Беліз"
+msgstr "Амерыка/Беліз"
 
 #: ../src/timezone_names.c:105
 msgid "America/Boa_Vista"
-msgstr "Амэрыка/Боа-Віста"
+msgstr "Амерыка/Боа-Віста"
 
 #: ../src/timezone_names.c:106
 msgid "America/Bogota"
-msgstr "Амэрыка/Багата"
+msgstr "Амерыка/Багата"
 
 #: ../src/timezone_names.c:107
 msgid "America/Boise"
-msgstr "Амэрыка/Бойзе"
+msgstr "Амерыка/Бойзе"
 
 #: ../src/timezone_names.c:108
 msgid "America/Buenos_Aires"
-msgstr "Амэрыка/Буанас-Айрэс"
+msgstr "Амерыка/Буэнас-Айрэс"
 
 #: ../src/timezone_names.c:109
 msgid "America/Cambridge_Bay"
-msgstr "Амэрыка/Кэмбрыдж-Бай"
+msgstr "Амерыка/Кембрыдж-Бэй"
 
 #: ../src/timezone_names.c:110
 msgid "America/Cancun"
-msgstr "Амэрыка/Канкун"
+msgstr "Амерыка/Канкун"
 
 #: ../src/timezone_names.c:111
 msgid "America/Caracas"
-msgstr "Амэрыка/Каракас"
+msgstr "Амерыка/Каракас"
 
 #: ../src/timezone_names.c:112
 msgid "America/Catamarca"
-msgstr "Амэрыка/Катамарка"
+msgstr "Амерыка/Катамарка"
 
 #: ../src/timezone_names.c:113
 msgid "America/Cayenne"
-msgstr "Амэрыка/Кайін"
+msgstr "Амерыка/Каен"
 
 #: ../src/timezone_names.c:114
 msgid "America/Cayman"
-msgstr "Амэрыка/Кайман"
+msgstr "Амерыка/Кайман"
 
 #: ../src/timezone_names.c:115
 msgid "America/Chicago"
-msgstr "Амэрыка/Чыкага"
+msgstr "Амерыка/Чыкага"
 
 #: ../src/timezone_names.c:116
 msgid "America/Chihuahua"
-msgstr "Амэрыка/Чыхуахуа"
+msgstr "Амерыка/Чыхуахуа"
 
 #: ../src/timezone_names.c:117
 msgid "America/Cordoba"
-msgstr "Амэрыка/Кардоба"
+msgstr "Амерыка/Кардоба"
 
 #: ../src/timezone_names.c:118
 msgid "America/Costa_Rica"
-msgstr "Амэрыка/Коста-Рыка"
+msgstr "Амерыка/Коста-Рыка"
 
 #: ../src/timezone_names.c:119
 msgid "America/Cuiaba"
-msgstr "Амэрыка/Куяба"
+msgstr "Амерыка/Куяба"
 
 #: ../src/timezone_names.c:120
 msgid "America/Curacao"
-msgstr "Амэрыка/Курацао"
+msgstr "Амерыка/Кюрасаа"
 
 #: ../src/timezone_names.c:121
 msgid "America/Dawson"
-msgstr "Амэрыка/Даўнсан"
+msgstr "Амерыка/Доўсан"
 
 #: ../src/timezone_names.c:122
 msgid "America/Dawson_Creek"
-msgstr "Амэрыка/Даўнсан-Крык"
+msgstr "Амерыка/Доўсан-Крык"
 
 #: ../src/timezone_names.c:123
 msgid "America/Denver"
-msgstr "Амэрыка/Дэнвэр"
+msgstr "Амерыка/Дэнвер"
 
 #: ../src/timezone_names.c:124
 msgid "America/Detroit"
-msgstr "Амэрыка/Дэтройт"
+msgstr "Амерыка/Дэтройт"
 
 #: ../src/timezone_names.c:125
 msgid "America/Dominica"
-msgstr "Амэрыка/Дамініка"
+msgstr "Амерыка/Дамініка"
 
 #: ../src/timezone_names.c:126
 msgid "America/Edmonton"
-msgstr "Амэрыка/Эдмантан"
+msgstr "Амерыка/Эдмантан"
 
 #: ../src/timezone_names.c:127
 msgid "America/Eirunepe"
-msgstr "Амэрыка/Эйрунеп"
+msgstr "Амерыка/Эйрунеп"
 
 #: ../src/timezone_names.c:128
 msgid "America/El_Salvador"
-msgstr "Амэрыка/Эль-Сальвадор"
+msgstr "Амерыка/Эль-Сальвадор"
 
 #: ../src/timezone_names.c:129
 msgid "America/Fortaleza"
-msgstr "Амэрыка/Фарталіза"
+msgstr "Амерыка/Фарталіза"
 
 #: ../src/timezone_names.c:130
 msgid "America/Glace_Bay"
-msgstr "Амэрыка/Гляцэ-Бай"
+msgstr "Амерыка/Глэйс-Бэй"
 
 #: ../src/timezone_names.c:131
 msgid "America/Godthab"
-msgstr "Амэрыка/Гудсаб"
+msgstr "Амерыка/Нук"
 
 #: ../src/timezone_names.c:132
 msgid "America/Goose_Bay"
-msgstr "Амэрыка/Гузе-Бай"
+msgstr "Амерыка/Гіз-Бэй"
 
 #: ../src/timezone_names.c:133
 msgid "America/Grand_Turk"
-msgstr "Амэрыка/Гранд-Турк"
+msgstr "Амерыка/Гранд-Турк"
 
 #: ../src/timezone_names.c:134
 msgid "America/Grenada"
-msgstr "Амэрыка/Грэнада"
+msgstr "Амерыка/Грэнада"
 
 #: ../src/timezone_names.c:135
 msgid "America/Guadeloupe"
-msgstr "Амэрыка/Гвадэлупа"
+msgstr "Амерыка/Гвадэлупа"
 
 #: ../src/timezone_names.c:136
 msgid "America/Guatemala"
-msgstr "Амэрыка/Гватэмала"
+msgstr "Амерыка/Гватэмала"
 
 #: ../src/timezone_names.c:137
 msgid "America/Guayaquil"
-msgstr "Амэрыка/Гуяквіл"
+msgstr "Амерыка/Гуяквіл"
 
 #: ../src/timezone_names.c:138
 msgid "America/Guyana"
-msgstr "Амэрыка/Гаяна"
+msgstr "Амерыка/Гаяна"
 
 #: ../src/timezone_names.c:139
 msgid "America/Halifax"
-msgstr "Амэрыка/Галіхвакс"
+msgstr "Амерыка/Галіфакс"
 
 #: ../src/timezone_names.c:140
 msgid "America/Havana"
-msgstr "Амэрыка/Гавана"
+msgstr "Амерыка/Гавана"
 
 #: ../src/timezone_names.c:141
 msgid "America/Hermosillo"
-msgstr "Амэрыка/Гермасіла"
+msgstr "Амерыка/Гермасіла"
 
 #: ../src/timezone_names.c:142
 msgid "America/Indiana/Indianapolis"
-msgstr "Амэрыка/Індыяна/Індыянаполіс"
+msgstr "Амерыка/Індыяна/Індыянаполіс"
 
 #: ../src/timezone_names.c:143
 msgid "America/Indiana/Knox"
-msgstr "Амэрыка/Індыяна/Кнокс"
+msgstr "Амерыка/Індыяна/Кнокс"
 
 #: ../src/timezone_names.c:144
 msgid "America/Indiana/Marengo"
-msgstr "Амэрыка/Індыяна/Марэнга"
+msgstr "Амерыка/Індыяна/Марэнга"
 
 #: ../src/timezone_names.c:145
 msgid "America/Indiana/Vevay"
-msgstr "Амэрыка/Індыяна/Вівэй"
+msgstr "Амерыка/Індыяна/Вівэй"
 
 #: ../src/timezone_names.c:146
 msgid "America/Indianapolis"
-msgstr "Амэрыка/Індыянаполіс"
+msgstr "Амерыка/Індыянаполіс"
 
 #: ../src/timezone_names.c:147
 msgid "America/Inuvik"
-msgstr "Амэрыка/Інівік"
+msgstr "Амерыка/Інувік"
 
 #: ../src/timezone_names.c:148
 msgid "America/Iqaluit"
-msgstr "Амэрыка/Іквілют"
+msgstr "Амерыка/Ікалуіт"
 
 #: ../src/timezone_names.c:149
 msgid "America/Jamaica"
-msgstr "Амэрыка/Ямайка"
+msgstr "Амерыка/Ямайка"
 
 #: ../src/timezone_names.c:150
 msgid "America/Jujuy"
-msgstr "Амэрыка/Яджі"
+msgstr "Амерыка/Жужуй"
 
 #: ../src/timezone_names.c:151
 msgid "America/Juneau"
-msgstr "Амэрыка/Янея"
+msgstr "Амерыка/Джуна"
 
 #: ../src/timezone_names.c:152
 msgid "America/Kentucky/Louisville"
-msgstr "Амэрыка/Кентукі/Лёўсьвіль"
+msgstr "Амерыка/Кентукі/Луісвіл"
 
 #: ../src/timezone_names.c:153
 msgid "America/Kentucky/Monticello"
-msgstr "Амэрыка/Кентукі/Манцічэла"
+msgstr "Амерыка/Кентукі/Манцічэла"
 
 #: ../src/timezone_names.c:154
 msgid "America/La_Paz"
-msgstr "Амэрыка/Ля-паз"
+msgstr "Амерыка/Ла-Пас"
 
 #: ../src/timezone_names.c:155
 msgid "America/Lima"
-msgstr "Амэрыка/Ліма"
+msgstr "Амерыка/Ліма"
 
 #: ../src/timezone_names.c:156
 msgid "America/Los_Angeles"
-msgstr "Амэрыка/Лос-Анжэлес"
+msgstr "Амерыка/Лос-Анджэлес"
 
 #: ../src/timezone_names.c:157
 msgid "America/Louisville"
-msgstr "Амэрыка/Лёўсьвіль"
+msgstr "Амерыка/Луісвіл"
 
 #: ../src/timezone_names.c:158
 msgid "America/Maceio"
-msgstr "Амэрыка/Мацейо"
+msgstr "Амерыка/Масеё"
 
 #: ../src/timezone_names.c:159
 msgid "America/Managua"
-msgstr "Амэрыка/Манагуа"
+msgstr "Амерыка/Манагуа"
 
 #: ../src/timezone_names.c:160
 msgid "America/Manaus"
-msgstr "Амэрыка/Манаўс"
+msgstr "Амерыка/Манаўс"
 
 #: ../src/timezone_names.c:161
 msgid "America/Martinique"
-msgstr "Амэрыка/Марцініка"
+msgstr "Амерыка/Марцініка"
 
 #: ../src/timezone_names.c:162
 msgid "America/Mazatlan"
-msgstr "Амэрыка/Мазатлян"
+msgstr "Амерыка/Мацалтан"
 
 #: ../src/timezone_names.c:163
 msgid "America/Mendoza"
-msgstr "Амэрыка/Мэндоза"
+msgstr "Амерыка/Мендоса"
 
 #: ../src/timezone_names.c:164
 msgid "America/Menominee"
-msgstr "Амэрыка/Мэнаміні"
+msgstr "Амерыка/Меноміні"
 
 #: ../src/timezone_names.c:165
 msgid "America/Merida"
-msgstr "Амэрыка/Мэрыда"
+msgstr "Амерыка/Мерыда"
 
 #: ../src/timezone_names.c:166
 msgid "America/Mexico_City"
-msgstr "Амэрыка/Мэхіко"
+msgstr "Амерыка/Мехіка-Сіці"
 
 #: ../src/timezone_names.c:167
 msgid "America/Miquelon"
-msgstr "Амэрыка/Мікелён"
+msgstr "Амерыка/Мікелон"
 
 #: ../src/timezone_names.c:168
 msgid "America/Monterrey"
-msgstr "Амэрыка/Монтэрэй"
+msgstr "Амерыка/Мантэрэй"
 
 #: ../src/timezone_names.c:169
 msgid "America/Montevideo"
-msgstr "Амэрыка/Монтэвідэа"
+msgstr "Амерыка/Мантэвідэа"
 
 #: ../src/timezone_names.c:170
 msgid "America/Montreal"
-msgstr "Амэрыка/Монрэаль"
+msgstr "Амерыка/Манрэаль"
 
 #: ../src/timezone_names.c:171
 msgid "America/Montserrat"
-msgstr "Амэрыка/Монтсэрат"
+msgstr "Амерыка/Мантсерат"
 
 #: ../src/timezone_names.c:172
 msgid "America/Nassau"
-msgstr "Амэрыка/Нассаў"
+msgstr "Амерыка/Насау"
 
 #: ../src/timezone_names.c:173
 msgid "America/New_York"
-msgstr "Амэрыка/Ню-Ёрк"
+msgstr "Амерыка/Нью-Ёрк"
 
 #: ../src/timezone_names.c:174
 msgid "America/Nipigon"
-msgstr "Амэрыка/Ніпігон"
+msgstr "Амерыка/Ніпіган"
 
 #: ../src/timezone_names.c:175
 msgid "America/Nome"
-msgstr "Амэрыка/Ном"
+msgstr "Амерыка/Ном"
 
 #: ../src/timezone_names.c:176
 msgid "America/Noronha"
-msgstr "Амэрыка/Наронга"
+msgstr "Амерыка/Наронья"
 
 #: ../src/timezone_names.c:177
 msgid "America/Panama"
-msgstr "Амэрыка/Панама"
+msgstr "Амерыка/Панама"
 
 #: ../src/timezone_names.c:178
 msgid "America/Pangnirtung"
-msgstr "Амэрыка/Пангніцюнг"
+msgstr "Амерыка/Пангніртунг"
 
 #: ../src/timezone_names.c:179
 msgid "America/Paramaribo"
-msgstr "Амэрыка/Парамарыба"
+msgstr "Амерыка/Парамарыба"
 
 #: ../src/timezone_names.c:180
 msgid "America/Phoenix"
-msgstr "Амэрыка/Фенікс"
+msgstr "Амерыка/Фінікс"
 
 #: ../src/timezone_names.c:181
 msgid "America/Port-au-Prince"
-msgstr "Амэрыка/Порт-аў-Прынц"
+msgstr "Амерыка/Порт-о-Прэнс"
 
 #: ../src/timezone_names.c:182
 msgid "America/Port_of_Spain"
-msgstr "Амэрыка/Гішпанскі порт"
+msgstr "Амерыка/Порт-оф-Спейн"
 
 #: ../src/timezone_names.c:183
 msgid "America/Porto_Velho"
-msgstr "Амэрыка/Порта-Вэльга"
+msgstr "Амерыка/Порту-Велю"
 
 #: ../src/timezone_names.c:184
 msgid "America/Puerto_Rico"
-msgstr "Амэрыка/Пуэрта-Рэка"
+msgstr "Амерыка/Пуэрта-Рыка"
 
 #: ../src/timezone_names.c:185
 msgid "America/Rainy_River"
-msgstr "Амэрыка/Рэйні-Рыва"
+msgstr "Амерыка/Рэйні-Рыва"
 
 #: ../src/timezone_names.c:186
 msgid "America/Rankin_Inlet"
-msgstr "Амэрыка/Ранкін-Інлет"
+msgstr "Амерыка/Ранкін-Інлет"
 
 #: ../src/timezone_names.c:187
 msgid "America/Recife"
-msgstr "Амэрыка/Рэцыф"
+msgstr "Амерыка/Рэсіфі"
 
 #: ../src/timezone_names.c:188
 msgid "America/Regina"
-msgstr "Амэрыка/Рэгуна"
+msgstr "Амерыка/Рэджайна"
 
 #: ../src/timezone_names.c:189
 msgid "America/Rio_Branco"
-msgstr "Амэрыка/Рыя-Бранка"
+msgstr "Амерыка/Рыу-Бранку"
 
 #: ../src/timezone_names.c:190
 msgid "America/Rosario"
-msgstr "Амэрыка/Разаліё"
+msgstr "Амерыка/Расарыа"
 
 #: ../src/timezone_names.c:191
 msgid "America/Santiago"
-msgstr "Амэрыка/Санц'яга"
+msgstr "Амерыка/Сант'яга"
 
 #: ../src/timezone_names.c:192
 msgid "America/Santo_Domingo"
-msgstr "Амэрыка/Санта-Дамінга"
+msgstr "Амерыка/Санта-Дамінга"
 
 #: ../src/timezone_names.c:193
 msgid "America/Sao_Paulo"
-msgstr "Амэрыка/Сяо-Паўла"
+msgstr "Амерыка/Сан-Паўлу"
 
 #: ../src/timezone_names.c:194
 msgid "America/Scoresbysund"
-msgstr "Амэрыка/Скорэбысанд"
+msgstr "Амерыка/Скорэсбайсанд"
 
 #: ../src/timezone_names.c:195
 msgid "America/Shiprock"
-msgstr "Амэрыка/Шыпрок"
+msgstr "Амерыка/Шыпрок"
 
 #: ../src/timezone_names.c:196
 msgid "America/St_Johns"
-msgstr "Амэрыка/Санта-Джонс"
+msgstr "Амерыка/Сент-Джонс"
 
 #: ../src/timezone_names.c:197
 msgid "America/St_Kitts"
-msgstr "Амэрыка/Санта-Кітс"
+msgstr "Амерыка/Сент-Кітс"
 
 #: ../src/timezone_names.c:198
 msgid "America/St_Lucia"
-msgstr "Амэрыка/Санта-Лючыя"
+msgstr "Амерыка/Сент-Люсія"
 
 #: ../src/timezone_names.c:199
 msgid "America/St_Thomas"
-msgstr "Амэрыка/Sанта-Томас"
+msgstr "Амерыка/Сан-Томас"
 
 #: ../src/timezone_names.c:200
 msgid "America/St_Vincent"
-msgstr "Амэрыка/Санта-Вінцэнт"
+msgstr "Амерыка/Сент-Вінсент"
 
 #: ../src/timezone_names.c:201
 msgid "America/Swift_Current"
-msgstr "Амэрыка/Свіфт-Карэнт"
+msgstr "Амерыка/Свіфт-Кёрэнт"
 
 #: ../src/timezone_names.c:202
 msgid "America/Tegucigalpa"
-msgstr "Амэрыка/Тэгуцыгалпа"
+msgstr "Амерыка/Тэгусігальпа"
 
 #: ../src/timezone_names.c:203
 msgid "America/Thule"
-msgstr "Амэрыка/Тал"
+msgstr "Амерыка/Туле"
 
 #: ../src/timezone_names.c:204
 msgid "America/Thunder_Bay"
-msgstr "Амэрыка/Тандэр-Бай"
+msgstr "Амерыка/Тандэр-Бэй"
 
 #: ../src/timezone_names.c:205
 msgid "America/Tijuana"
-msgstr "Амэрыка/Ціяна"
+msgstr "Амерыка/Тыгуана"
 
 #: ../src/timezone_names.c:206
 msgid "America/Tortola"
-msgstr "Амэрыка/Тартала"
+msgstr "Амерыка/Тортола"
 
 #: ../src/timezone_names.c:207
 msgid "America/Vancouver"
-msgstr "Амэрыка/Ванкувэр"
+msgstr "Амерыка/Ванкувер"
 
 #: ../src/timezone_names.c:208
 msgid "America/Whitehorse"
-msgstr "Амэрыка/Вайтхос"
+msgstr "Амерыка/Уайтхорс"
 
 #: ../src/timezone_names.c:209
 msgid "America/Winnipeg"
-msgstr "Амэрыка/Вініпег"
+msgstr "Амерыка/Вініпег"
 
 #: ../src/timezone_names.c:210
 msgid "America/Yakutat"
-msgstr "Амэрыка/Якутат"
+msgstr "Амерыка/Якутат"
 
 #: ../src/timezone_names.c:211
 msgid "America/Yellowknife"
-msgstr "Амэрыка/Елаўкніф"
+msgstr "Амерыка/Елаўнайф"
 
 #: ../src/timezone_names.c:212
 msgid "Antarctica"
-msgstr "Антарктыка"
+msgstr "Антарктыда"
 
 #: ../src/timezone_names.c:213
 msgid "Antarctica/Casey"
@@ -2670,11 +2814,11 @@
 
 #: ../src/timezone_names.c:215
 msgid "Antarctica/DumontDUrville"
-msgstr "Антарктыда/Д'юмонтдьюрвіль"
+msgstr "Антарктыда/Д'юмон Д'юрвіль"
 
 #: ../src/timezone_names.c:216
 msgid "Antarctica/Mawson"
-msgstr "Антарктыда/Маўсан"
+msgstr "Антарктыда/Моўсан"
 
 #: ../src/timezone_names.c:217
 msgid "Antarctica/McMurdo"
@@ -2686,11 +2830,11 @@
 
 #: ../src/timezone_names.c:219
 msgid "Antarctica/South_Pole"
-msgstr "Антарктыда/Сыдполен"
+msgstr "Антарктыда/Паўднёвы полюс"
 
 #: ../src/timezone_names.c:220
 msgid "Antarctica/Syowa"
-msgstr "Антарктыда/Сыёва"
+msgstr "Антарктыда/Сёва"
 
 #: ../src/timezone_names.c:221
 msgid "Antarctica/Vostok"
@@ -2698,15 +2842,15 @@
 
 #: ../src/timezone_names.c:222
 msgid "Arctic"
-msgstr ""
+msgstr "Арктыка"
 
 #: ../src/timezone_names.c:223
 msgid "Arctic/Longyearbyen"
-msgstr "Арктыка/Лёнгырбаен"
+msgstr "Арктыка/Лонгйір"
 
 #: ../src/timezone_names.c:224
 msgid "Asia"
-msgstr ""
+msgstr "Азія"
 
 #: ../src/timezone_names.c:225
 msgid "Asia/Aden"
@@ -2714,7 +2858,7 @@
 
 #: ../src/timezone_names.c:226
 msgid "Asia/Almaty"
-msgstr "Азія/Алма-Аты"
+msgstr "Азія/Алма-Ата"
 
 #: ../src/timezone_names.c:227
 msgid "Asia/Amman"
@@ -2762,7 +2906,7 @@
 
 #: ../src/timezone_names.c:238
 msgid "Asia/Brunei"
-msgstr "Азія/Брунеі"
+msgstr "Азія/Бруней"
 
 #: ../src/timezone_names.c:239
 msgid "Asia/Calcutta"
@@ -2770,11 +2914,11 @@
 
 #: ../src/timezone_names.c:240
 msgid "Asia/Chungking"
-msgstr ""
+msgstr "Азія/Чуньцын"
 
 #: ../src/timezone_names.c:241
 msgid "Asia/Colombo"
-msgstr "Азія/Калюмба"
+msgstr "Азія/Каломба"
 
 #: ../src/timezone_names.c:242
 msgid "Asia/Damascus"
@@ -2782,15 +2926,15 @@
 
 #: ../src/timezone_names.c:243
 msgid "Asia/Dhaka"
-msgstr "Азія/Дгака"
+msgstr "Азія/Дака"
 
 #: ../src/timezone_names.c:244
 msgid "Asia/Dili"
-msgstr "Азія/Ділі"
+msgstr "Азія/Дылі"
 
 #: ../src/timezone_names.c:245
 msgid "Asia/Dubai"
-msgstr "Азія/Дубаі"
+msgstr "Азія/Дубай"
 
 #: ../src/timezone_names.c:246
 msgid "Asia/Dushanbe"
@@ -2802,15 +2946,15 @@
 
 #: ../src/timezone_names.c:248
 msgid "Asia/Harbin"
-msgstr "Азія/Гарбін"
+msgstr "Азія/Харбін"
 
 #: ../src/timezone_names.c:249
 msgid "Asia/Hong_Kong"
-msgstr "Азія/Сян-Ган"
+msgstr "Азія/Ганконг"
 
 #: ../src/timezone_names.c:250
 msgid "Asia/Hovd"
-msgstr "Азія/Гоўд"
+msgstr "Азія/Хоўд"
 
 #: ../src/timezone_names.c:251
 msgid "Asia/Irkutsk"
@@ -2858,19 +3002,19 @@
 
 #: ../src/timezone_names.c:262
 msgid "Asia/Kuala_Lumpur"
-msgstr "Азія/Куала-Люмпур"
+msgstr "Азія/Куала-Лумпур"
 
 #: ../src/timezone_names.c:263
 msgid "Asia/Kuching"
-msgstr "Азія/Качынг"
+msgstr "Азія/Кучынг"
 
 #: ../src/timezone_names.c:264
 msgid "Asia/Kuwait"
-msgstr "Азія/Кувэйт"
+msgstr "Азія/Кувейт"
 
 #: ../src/timezone_names.c:265
 msgid "Asia/Macao"
-msgstr "Азія/Макао"
+msgstr "Азія/Макаа"
 
 #: ../src/timezone_names.c:266
 msgid "Asia/Magadan"
@@ -2882,15 +3026,15 @@
 
 #: ../src/timezone_names.c:268
 msgid "Asia/Muscat"
-msgstr "Азія/Мускат"
+msgstr "Азія/Маскат"
 
 #: ../src/timezone_names.c:269
 msgid "Asia/Nicosia"
-msgstr "Азія/Нікося"
+msgstr "Азія/Нікасія"
 
 #: ../src/timezone_names.c:270
 msgid "Asia/Novosibirsk"
-msgstr "Азія/Новасыбірск"
+msgstr "Азія/Навасібірск"
 
 #: ../src/timezone_names.c:271
 msgid "Asia/Omsk"
@@ -2898,7 +3042,7 @@
 
 #: ../src/timezone_names.c:272
 msgid "Asia/Phnom_Penh"
-msgstr "Азія/Хном-Пэнг"
+msgstr "Азія/Пнампень"
 
 #: ../src/timezone_names.c:273
 msgid "Asia/Pontianak"
@@ -2906,11 +3050,11 @@
 
 #: ../src/timezone_names.c:274
 msgid "Asia/Pyongyang"
-msgstr "Азія/Пёнгянг"
+msgstr "Азія/Пхеньян"
 
 #: ../src/timezone_names.c:275
 msgid "Asia/Qatar"
-msgstr "Азія/Кватэр"
+msgstr "Азія/Катар"
 
 #: ../src/timezone_names.c:276
 msgid "Asia/Rangoon"
@@ -2938,7 +3082,7 @@
 
 #: ../src/timezone_names.c:282
 msgid "Asia/Singapore"
-msgstr "Азія/Сынгапур"
+msgstr "Азія/Сінгапур"
 
 #: ../src/timezone_names.c:283
 msgid "Asia/Taipei"
@@ -2958,15 +3102,15 @@
 
 #: ../src/timezone_names.c:287
 msgid "Asia/Thimphu"
-msgstr "Азія/Цімпху"
+msgstr "Азія/Тхімпху"
 
 #: ../src/timezone_names.c:288
 msgid "Asia/Tokyo"
-msgstr "Азія/Токіо"
+msgstr "Азія/Токіа"
 
 #: ../src/timezone_names.c:289
 msgid "Asia/Ujung_Pandang"
-msgstr "Азія/Ёнг-Панданг"
+msgstr "Азія/Макасар"
 
 #: ../src/timezone_names.c:290
 msgid "Asia/Ulaanbaatar"
@@ -2974,11 +3118,11 @@
 
 #: ../src/timezone_names.c:291
 msgid "Asia/Urumqi"
-msgstr "Азія/Юрумкві"
+msgstr "Азія/Урумчы"
 
 #: ../src/timezone_names.c:292
 msgid "Asia/Vientiane"
-msgstr "Азія/Вэнцын"
+msgstr "Азія/В'енцьян"
 
 #: ../src/timezone_names.c:293
 msgid "Asia/Vladivostok"
@@ -2998,51 +3142,51 @@
 
 #: ../src/timezone_names.c:297
 msgid "Atlantic"
-msgstr ""
+msgstr "Атлантыка"
 
 #: ../src/timezone_names.c:298
 msgid "Atlantic/Azores"
-msgstr "Атлянтыка/Азорэс"
+msgstr "Атлантыка/Азоры"
 
 #: ../src/timezone_names.c:299
 msgid "Atlantic/Bermuda"
-msgstr "Атлянтыка/Бермуды"
+msgstr "Атлантыка/Бермуды"
 
 #: ../src/timezone_names.c:300
 msgid "Atlantic/Canary"
-msgstr "Атлянтыка/Канары"
+msgstr "Атлантыка/Канары"
 
 #: ../src/timezone_names.c:301
 msgid "Atlantic/Cape_Verde"
-msgstr "Атлянтыка/Капе-Вэрдзі"
+msgstr "Атлантыка/Каба-Вердэ"
 
 #: ../src/timezone_names.c:302
 msgid "Atlantic/Faeroe"
-msgstr "Атлянтыка/Фару"
+msgstr "Атлантыка/Фару"
 
 #: ../src/timezone_names.c:303
 msgid "Atlantic/Jan_Mayen"
-msgstr "Атлянтыка/Ян-Майен"
+msgstr "Атлантыка/Ян-Майен"
 
 #: ../src/timezone_names.c:304
 msgid "Atlantic/Madeira"
-msgstr "Атлянтыка/Мадэйра"
+msgstr "Атлантыка/Мадэйра"
 
 #: ../src/timezone_names.c:305
 msgid "Atlantic/Reykjavik"
-msgstr "Атлянтыка/Рэйк'явік"
+msgstr "Атлантыка/Рэйк'явік"
 
 #: ../src/timezone_names.c:306
 msgid "Atlantic/South_Georgia"
-msgstr "Атлянтыка/Паўдзенная Джорджыя"
+msgstr "Атлантыка/Паўднёвая Джорджыя"
 
 #: ../src/timezone_names.c:307
 msgid "Atlantic/St_Helena"
-msgstr "Атлянтыка/Сан-Галена"
+msgstr "Атлантыка/Святая Алена"
 
 #: ../src/timezone_names.c:308
 msgid "Atlantic/Stanley"
-msgstr "Атлянтыка/Стэнлі"
+msgstr "Атлантыка/Стэнлі"
 
 #: ../src/timezone_names.c:309
 msgid "Australia"
@@ -3050,11 +3194,11 @@
 
 #: ../src/timezone_names.c:310
 msgid "Australia/Adelaide"
-msgstr "Аўстралія/Адэляйд"
+msgstr "Аўстралія/Адэлаіда"
 
 #: ../src/timezone_names.c:311
 msgid "Australia/Brisbane"
-msgstr "Аўстралія/Брышбан"
+msgstr "Аўстралія/Брысбен"
 
 #: ../src/timezone_names.c:312
 msgid "Australia/Broken_Hill"
@@ -3078,11 +3222,11 @@
 
 #: ../src/timezone_names.c:317
 msgid "Australia/Melbourne"
-msgstr "Аўстралія/Мэльбурн"
+msgstr "Аўстралія/Мельбурн"
 
 #: ../src/timezone_names.c:318
 msgid "Australia/Perth"
-msgstr "Аўстралія/Пэрс"
+msgstr "Аўстралія/Перт"
 
 #: ../src/timezone_names.c:319
 msgid "Australia/Sydney"
@@ -3090,227 +3234,227 @@
 
 #: ../src/timezone_names.c:320
 msgid "Europe"
-msgstr "Эўропа"
+msgstr "Еўропа"
 
 #: ../src/timezone_names.c:321
 msgid "Europe/Amsterdam"
-msgstr "Эўропа/Амстэрдам"
+msgstr "Еўропа/Амстэрдам"
 
 #: ../src/timezone_names.c:322
 msgid "Europe/Andorra"
-msgstr "Эўропа/Андора"
+msgstr "Еўропа/Андора"
 
 #: ../src/timezone_names.c:323
 msgid "Europe/Athens"
-msgstr "Эўропа/Атэнс"
+msgstr "Еўропа/Афіны"
 
 #: ../src/timezone_names.c:324
 msgid "Europe/Belfast"
-msgstr "Эўропа/Белфаст"
+msgstr "Еўропа/Белфаст"
 
 #: ../src/timezone_names.c:325
 msgid "Europe/Belgrade"
-msgstr "Эўропа/Белград"
+msgstr "Еўропа/Белград"
 
 #: ../src/timezone_names.c:326
 msgid "Europe/Berlin"
-msgstr "Эўропа/Бэрлін"
+msgstr "Еўропа/Берлін"
 
 #: ../src/timezone_names.c:327
 msgid "Europe/Bratislava"
-msgstr "Эўропа/Браціслава"
+msgstr "Еўропа/Браціслава"
 
 #: ../src/timezone_names.c:328
 msgid "Europe/Brussels"
-msgstr "Эўропа/Брусэль"
+msgstr "Еўропа/Брусель"
 
 #: ../src/timezone_names.c:329
 msgid "Europe/Bucharest"
-msgstr "Эўропа/Бухарэст"
+msgstr "Еўропа/Бухарэст"
 
 #: ../src/timezone_names.c:330
 msgid "Europe/Budapest"
-msgstr "Эўропа/Будапэшт"
+msgstr "Еўропа/Будапешт"
 
 #: ../src/timezone_names.c:331
 msgid "Europe/Chisinau"
-msgstr "Эўропа/Чызінаў"
+msgstr "Еўропа/Кішынёў"
 
 #: ../src/timezone_names.c:332
 msgid "Europe/Copenhagen"
-msgstr "Эўропа/Капэнгаген"
+msgstr "Еўропа/Капенгаген"
 
 #: ../src/timezone_names.c:333
 msgid "Europe/Dublin"
-msgstr "Эўропа/Дублін"
+msgstr "Еўропа/Дублін"
 
 #: ../src/timezone_names.c:334
 msgid "Europe/Gibraltar"
-msgstr "Эўропа/Гібральтар"
+msgstr "Еўропа/Гібралтар"
 
 #: ../src/timezone_names.c:335
 msgid "Europe/Helsinki"
-msgstr "Эўропа/Хэльсынкі"
+msgstr "Еўропа/Хельсінкі"
 
 #: ../src/timezone_names.c:336
 msgid "Europe/Istanbul"
-msgstr "Эўропа/Стамбул"
+msgstr "Еўропа/Стамбул"
 
 #: ../src/timezone_names.c:337
 msgid "Europe/Kaliningrad"
-msgstr "Эўропа/Калінінград"
+msgstr "Еўропа/Калінінград"
 
 #: ../src/timezone_names.c:338
 msgid "Europe/Kiev"
-msgstr "Эўропа/Кіеў"
+msgstr "Еўропа/Кіеў"
 
 #: ../src/timezone_names.c:339
 msgid "Europe/Lisbon"
-msgstr "Эўропа/Лісабон"
+msgstr "Еўропа/Лісабон"
 
 #: ../src/timezone_names.c:340
 msgid "Europe/Ljubljana"
-msgstr "Эўропа/Любляна"
+msgstr "Еўропа/Любляна"
 
 #: ../src/timezone_names.c:341
 msgid "Europe/London"
-msgstr "Эўропа/Лёндан"
+msgstr "Еўропа/Лондан"
 
 #: ../src/timezone_names.c:342
 msgid "Europe/Luxembourg"
-msgstr "Эўропа/Люксэмбург"
+msgstr "Еўропа/Люксембург"
 
 #: ../src/timezone_names.c:343
 msgid "Europe/Madrid"
-msgstr "Эўропа/Мадрыд"
+msgstr "Еўропа/Мадрыд"
 
 #: ../src/timezone_names.c:344
 msgid "Europe/Malta"
-msgstr "Эўропа/Мальта"
+msgstr "Еўропа/Мальта"
 
 #: ../src/timezone_names.c:345
 msgid "Europe/Minsk"
-msgstr "Эўропа/Менск"
+msgstr "Еўропа/Мінск"
 
 #: ../src/timezone_names.c:346
 msgid "Europe/Monaco"
-msgstr "Эўропа/Манака"
+msgstr "Еўропа/Манака"
 
 #: ../src/timezone_names.c:347
 msgid "Europe/Moscow"
-msgstr "Эўропа/Масква"
+msgstr "Еўропа/Масква"
 
 #: ../src/timezone_names.c:348
 msgid "Europe/Nicosia"
-msgstr "Эўропа/Нікосія"
+msgstr "Еўропа/Нікасія"
 
 #: ../src/timezone_names.c:349
 msgid "Europe/Oslo"
-msgstr "Эўропа/Осла"
+msgstr "Еўропа/Осла"
 
 #: ../src/timezone_names.c:350
 msgid "Europe/Paris"
-msgstr "Эўропа/Парыж"
+msgstr "Еўропа/Парыж"
 
 #: ../src/timezone_names.c:351
 msgid "Europe/Prague"
-msgstr "Эўропа/Прага"
+msgstr "Еўропа/Прага"
 
 #: ../src/timezone_names.c:352
 msgid "Europe/Riga"
-msgstr "Эўропа/Рыга"
+msgstr "Еўропа/Рыга"
 
 #: ../src/timezone_names.c:353
 msgid "Europe/Rome"
-msgstr "Эўропа/Рым"
+msgstr "Еўропа/Рым"
 
 #: ../src/timezone_names.c:354
 msgid "Europe/Samara"
-msgstr "Эўропа/Самара"
+msgstr "Еўропа/Самара"
 
 #: ../src/timezone_names.c:355
 msgid "Europe/San_Marino"
-msgstr "Эўропа/Сан-Марына"
+msgstr "Еўропа/Сан-Марына"
 
 #: ../src/timezone_names.c:356
 msgid "Europe/Sarajevo"
-msgstr "Эўропа/Сараева"
+msgstr "Еўропа/Сараева"
 
 #: ../src/timezone_names.c:357
 msgid "Europe/Simferopol"
-msgstr "Эўропа/Сімфэропаль"
+msgstr "Еўропа/Сімферопаль"
 
 #: ../src/timezone_names.c:358
 msgid "Europe/Skopje"
-msgstr "Эўропа/Скоп'е"
+msgstr "Еўропа/Скоп'е"
 
 #: ../src/timezone_names.c:359
 msgid "Europe/Sofia"
-msgstr "Эўропа/Сафія"
+msgstr "Еўропа/Сафія"
 
 #: ../src/timezone_names.c:360
 msgid "Europe/Stockholm"
-msgstr "Эўропа/Стакгольм"
+msgstr "Еўропа/Стакгольм"
 
 #: ../src/timezone_names.c:361
 msgid "Europe/Tallinn"
-msgstr "Эўропа/Талін"
+msgstr "Еўропа/Талін"
 
 #: ../src/timezone_names.c:362
 msgid "Europe/Tirane"
-msgstr "Эўропа/Цірана"
+msgstr "Еўропа/Тырана"
 
 #: ../src/timezone_names.c:363
 msgid "Europe/Uzhgorod"
-msgstr "Эўропа/Ужгарад"
+msgstr "Еўропа/Ужгарад"
 
 #: ../src/timezone_names.c:364
 msgid "Europe/Vaduz"
-msgstr "Эўропа/Вадуц"
+msgstr "Еўропа/Вадуц"
 
 #: ../src/timezone_names.c:365
 msgid "Europe/Vatican"
-msgstr "Эўропа/Ватыкан"
+msgstr "Еўропа/Ватыкан"
 
 #: ../src/timezone_names.c:366
 msgid "Europe/Vienna"
-msgstr "Эўропа/Вена"
+msgstr "Еўропа/Вена"
 
 #: ../src/timezone_names.c:367
 msgid "Europe/Vilnius"
-msgstr "Эўропа/Вільня"
+msgstr "Еўропа/Вільнюс"
 
 #: ../src/timezone_names.c:368
 msgid "Europe/Warsaw"
-msgstr "Эўропа/Варшава"
+msgstr "Еўропа/Варшава"
 
 #: ../src/timezone_names.c:369
 msgid "Europe/Zagreb"
-msgstr "Эўропа/Заграб"
+msgstr "Еўропа/Заграб"
 
 #: ../src/timezone_names.c:370
 msgid "Europe/Zaporozhye"
-msgstr "Эўропа/Запарожжа"
+msgstr "Еўропа/Запарожжа"
 
 #: ../src/timezone_names.c:371
 msgid "Europe/Zurich"
-msgstr "Эўропа/Цюрых"
+msgstr "Еўропа/Цюрых"
 
 #: ../src/timezone_names.c:372
 msgid "Indian"
-msgstr ""
+msgstr "Індыйскі акіян"
 
 #: ../src/timezone_names.c:373
 msgid "Indian/Antananarivo"
-msgstr "Індыйскі акіян/Антананарыва"
+msgstr "Індыйскі акіян/Антананарыву"
 
 #: ../src/timezone_names.c:374
 msgid "Indian/Chagos"
-msgstr "Індыйскі акіян/Чага"
+msgstr "Індыйскі акіян/Чагас"
 
 #: ../src/timezone_names.c:375
 msgid "Indian/Christmas"
-msgstr "Індыйскі акіян/Раство"
+msgstr "Індыйскі акіян/Ражство"
 
 #: ../src/timezone_names.c:376
 msgid "Indian/Cocos"
@@ -3330,7 +3474,7 @@
 
 #: ../src/timezone_names.c:380
 msgid "Indian/Maldives"
-msgstr "Індыйскі акіян/Мальды"
+msgstr "Індыйскі акіян/Мальдывы"
 
 #: ../src/timezone_names.c:381
 msgid "Indian/Mauritius"
@@ -3346,7 +3490,7 @@
 
 #: ../src/timezone_names.c:384
 msgid "Pacific"
-msgstr ""
+msgstr "Ціхі акіян"
 
 #: ../src/timezone_names.c:385
 msgid "Pacific/Apia"
@@ -3358,7 +3502,7 @@
 
 #: ../src/timezone_names.c:387
 msgid "Pacific/Chatham"
-msgstr "Ціхі акіян/Чатем"
+msgstr "Ціхі акіян/Чатэм"
 
 #: ../src/timezone_names.c:388
 msgid "Pacific/Easter"
@@ -3410,7 +3554,7 @@
 
 #: ../src/timezone_names.c:400
 msgid "Pacific/Kiritimati"
-msgstr "Ціхі акіян/Кіріцімаці"
+msgstr "Ціхі акіян/Кірыцімаці"
 
 #: ../src/timezone_names.c:401
 msgid "Pacific/Kosrae"
@@ -3498,7 +3642,7 @@
 
 #: ../src/timezone_names.c:422
 msgid "Pacific/Wallis"
-msgstr "Ціхі акіян/Валі"
+msgstr "Ціхі акіян/Увеа"
 
 #: ../src/timezone_names.c:423
 msgid "Pacific/Yap"
@@ -3506,120 +3650,41 @@
 
 #: ../src/tray_icon.c:469
 msgid "New appointment"
-msgstr "Новая сустрэча"
+msgstr "Новае прызначэнне"
 
 #: ../src/tray_icon.c:485
 msgid "About Orage"
-msgstr ""
+msgstr "Пра Orage"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
 msgid "Orage Panel Clock"
-msgstr ""
+msgstr "Гадзіннік Orage на панэлі"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
 msgid "Show time and date?"
-msgstr ""
+msgstr "Паказваць час і дату?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Каляндар"
+msgid "Orage preferences"
+msgstr "Настаўленні Orage"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Перавагі Orage"
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr "Настаўленні праграмы календара (Orage) для Xfce 4"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Перавагі Orage"
+msgid "Orage Calendar Preferences"
+msgstr "Настаўленні календара Orage"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr ""
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Каляндар"
+
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr "Каляндар Orage"
 
 #: ../xfcalendar.desktop.in.h:2
 msgid "Desktop calendar"
 msgstr "Настольны каляндар"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "Orage - Каляндар"
-
-#~ msgid "Contributor"
-#~ msgstr "Укладальнік"
-
-#~ msgid "Warning"
-#~ msgstr "Увага"
-
-#~ msgid "Select always today"
-#~ msgstr "Заўсёды вылучыць сёньня"
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Завяршэньне рэжыму карэкцыі часу"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Запуск рэжыму карэкцыі часу"
-
-#~ msgid "Select timezone"
-#~ msgstr "Вылучыце часавы пояс"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Зьмяніць гадзіньнік"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Зьмяніць перавагі"
-
-#~ msgid "Monday"
-#~ msgstr "Панядзелак"
-
-#~ msgid "Tuesday"
-#~ msgstr "Аўторак"
-
-#~ msgid "Wednesday"
-#~ msgstr "Серада"
-
-#~ msgid "Thursday"
-#~ msgstr "Чацьвер"
-
-#~ msgid "Friday"
-#~ msgstr "Пятніца"
-
-#~ msgid "Saturday"
-#~ msgstr "Субота"
-
-#~ msgid "Sunday"
-#~ msgstr "Нядзела"
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "дні"
-
-#, fuzzy
-#~ msgid "Calendar Files"
-#~ msgstr "Каляндар"
-
-#, fuzzy
-#~ msgid "Calendar borders"
-#~ msgstr "Каляндар"
-
-#~ msgid "Core developer"
-#~ msgstr "Асноўны распрацоўнік"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Вы выдаліце ўсе зьвесткі,\n"
-#~ "зьвязаныя з гэтай датай."
-
-#~ msgid "Clear"
-#~ msgstr "Ачысьціць"
-
-#~ msgid "This should not happen"
-#~ msgstr "Гэта не павінна было здарыцца"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Немагчыма стварыць кліенцкі MCS канал"
diff -Nru orage-4.8.3/po/bg.po orage-4.12.1/po/bg.po
--- orage-4.8.3/po/bg.po	2012-01-03 12:01:00.000000000 +0000
+++ orage-4.12.1/po/bg.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,28 +1,49 @@
-# Bulgarian translation of orage.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Miroslav Yordanov <miordanov@i-space.org>, 2004.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Kiril Kirilov <cybercop_montana@abv.bg>, 2012-2013
+# Kiril Kirilov <cybercop_montana@abv.bg>, 2012
+# Kiril Kirilov <cybercop_montana@abv.bg>, 2013-2014
+# Lyubomir Vasilev, 2013,2015
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2005-09-14 01:03+0900\n"
-"Last-Translator: Miroslav Yordanov <miordanov@i-space.org>\n"
-"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2015-02-23 12:30+0000\n"
+"Last-Translator: Lyubomir Vasilev\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/xfce-apps/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "неподчертано"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "единично"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "двойно"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "ниско"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr ""
+msgstr "Показване на прозорец Световно време..."
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
-msgstr ""
+msgstr "Неуспех при показването на прозорец Световно време"
 
 #. ********** timezone tooltip **********
 #: ../globaltime/globaltime.c:277
@@ -30,113 +51,116 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
+msgstr "%s\nкликнете, за да промените часовника"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
-msgstr ""
+msgstr "Местно време"
 
 #: ../globaltime/globaltime.c:464
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
+msgstr "бутон 1 за промяна на настройките\nбутон 2 за сверяване на часовника"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
-msgstr ""
+msgstr "смяна на часа"
 
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
+msgstr "промяна на минутите. Кликнете на бутон 2 да промените само с  1 минута."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Световно време"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
-msgstr ""
+msgstr "НОВ"
 
 #: ../globaltime/gt_prefs.c:289
 msgid "NEW COPY"
-msgstr ""
+msgstr "НОВО КОПИЕ"
 
 #: ../globaltime/gt_prefs.c:310
 msgid "Not possible to delete the last clock."
-msgstr ""
+msgstr "Не е възможно да се изтрие последния часовник."
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
-msgstr ""
+msgstr "сверяване на този часовник"
 
 #: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
 msgid "add new empty clock"
-msgstr ""
+msgstr "добавяне на нов празен часовник"
 
 #: ../globaltime/gt_prefs.c:526
 msgid "add new clock using this clock as model"
-msgstr ""
+msgstr "добавяне на нов часовник, като се използва този часовник за шаблон"
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
-msgstr ""
+msgstr "премахване на този часовник"
 
 #: ../globaltime/gt_prefs.c:539
 msgid "move this clock first"
-msgstr ""
+msgstr "преместване на този часовник на първо място"
 
 #: ../globaltime/gt_prefs.c:544
 msgid "move this clock left"
-msgstr ""
+msgstr "преместване на този часовник в ляво"
 
 #: ../globaltime/gt_prefs.c:549
 msgid "move this clock right"
-msgstr ""
+msgstr "преместванена този часовник в дясно"
 
 #: ../globaltime/gt_prefs.c:554
 msgid "move this clock last"
-msgstr ""
+msgstr "преместване на този часовник на последно място"
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
-msgstr ""
+msgstr "задаване на часовата зона за този часовник да бъде в местно време"
 
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
-msgstr ""
+msgstr "затваряне на прозореца и изход"
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "Предпочитания"
+msgstr "Настройка на световното време"
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
 msgid "Clock Parameters"
-msgstr ""
+msgstr "Параметри на часовника"
 
 #: ../globaltime/gt_prefs.c:607
 msgid "Name of the clock:"
-msgstr ""
+msgstr "Име на часовника:"
 
 #: ../globaltime/gt_prefs.c:613
 msgid "enter name of clock"
-msgstr ""
+msgstr "въведете име на часовник"
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
-msgstr ""
+msgstr "Часова зона на часовника:"
 
 #: ../globaltime/gt_prefs.c:643
 msgid "Text Formatting"
-msgstr ""
+msgstr "Форматиране на текста"
 
 #. ------------------------background-------------------------
 #: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
 msgid "Background color:"
-msgstr ""
+msgstr "Цвят на фона:"
 
 #: ../globaltime/gt_prefs.c:656
 msgid "Click to change background colour for clock"
-msgstr ""
+msgstr "Кликнете, за да смените цвета на фона на часовника"
 
 #: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
 #: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
@@ -144,213 +168,212 @@
 #: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
 #: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
 msgid "Use default"
-msgstr ""
+msgstr "Използване по подразбиране"
 
 #: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
 #: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
 msgid "Cross this to use default instead of selected value"
-msgstr ""
+msgstr "Отметнете това, за да използва по подразбиране вместо избраната стойност"
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
 msgid "Foreground (=text) color:"
-msgstr ""
+msgstr "Цвят на текстово съдържание:"
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
-msgstr ""
+msgstr "Кликнете за да смените цвета на текстовото съдържание на часовника"
 
 #. ------------------------name font-------------------------
 #: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
 msgid "Font for name of clock:"
-msgstr ""
+msgstr "Шрифт за името на часовника:"
 
 #: ../globaltime/gt_prefs.c:720
 msgid "Click to change font for clock name"
-msgstr ""
+msgstr "Кликнете за да смените шрифта за името на часовника"
 
 #. ------------------------time font-------------------------
 #: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
 msgid "Font for time of clock:"
-msgstr ""
+msgstr "Шрифт за времето на часовника"
 
 #: ../globaltime/gt_prefs.c:753
 msgid "Click to change font for clock time"
-msgstr ""
+msgstr "Кликнете, за да смените шрифта за времето на часовника"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:780
 msgid "Underline name of clock:"
-msgstr ""
+msgstr "Подчертаване на името на часовника:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:810
 msgid "Underline time of clock:"
-msgstr ""
+msgstr "Подчертаване на времето на часовника:"
 
 #: ../globaltime/gt_prefs.c:850
 msgid "Text Default Formatting"
-msgstr ""
+msgstr "Форматиране на текста по подразбиране"
 
 #: ../globaltime/gt_prefs.c:863
 msgid "Click to change default background colour for clocks"
-msgstr ""
+msgstr "Кликнете, за да смените фоновият цвят по подразбиране за часовниците"
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
+msgstr "Отметнете, за да използвате системен цвят вместо зададеният"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
-msgstr ""
+msgstr "Кликнете, за да промените цвета на текста по подразбиране за часовниците"
 
 #: ../globaltime/gt_prefs.c:929
 msgid "Click to change default font for clock name"
-msgstr ""
+msgstr "Кликнете, за да промените шрифта по подразбиране за името на часовника"
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
+msgstr "Отметнете, за да използвате системен шрифт вместо зададеният"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
-msgstr ""
+msgstr "Кликнете, за да смените шрифта по подразбиране за времето на часовника"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:990
 msgid "Underline for name of clock:"
-msgstr ""
+msgstr "Подчертаване името на часовника:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:1004
 msgid "Underline for time of clock:"
-msgstr ""
+msgstr "Подчертаване времето на часовника:"
 
 #: ../globaltime/gt_prefs.c:1027
-#, fuzzy
 msgid "update preferences"
-msgstr "Предпочитания"
+msgstr "обновяване на настройките"
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "Предпочитания"
+msgstr "Настройки на Световно време"
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
-#, fuzzy
 msgid "General Preferences"
-msgstr "Предпочитания"
+msgstr "Общи настройки"
 
 #: ../globaltime/gt_prefs.c:1077
 msgid "Decorations:"
-msgstr ""
+msgstr "Декорация:"
 
 #: ../globaltime/gt_prefs.c:1078
-#, fuzzy
 msgid "Standard"
-msgstr "XFCalendar"
+msgstr "Стандартен"
 
 #: ../globaltime/gt_prefs.c:1083
 msgid "Use normal decorations"
-msgstr ""
+msgstr "Използване на нормална декорация"
+
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Без"
 
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
-msgstr ""
+msgstr "Не показвай декорация на прозорците (граници)"
 
 #: ../globaltime/gt_prefs.c:1100
 msgid "Clock size:"
-msgstr ""
+msgstr "Размер на часовник:"
 
 #: ../globaltime/gt_prefs.c:1101
 msgid "Equal"
-msgstr ""
+msgstr "Еднакъв"
 
 #: ../globaltime/gt_prefs.c:1106
 msgid "All clocks have same size"
-msgstr ""
+msgstr "Всички часовници да имат еднакъв размер"
 
 #: ../globaltime/gt_prefs.c:1111
-#, fuzzy
 msgid "Varying"
-msgstr "Внимание"
+msgstr "Различен"
 
 #: ../globaltime/gt_prefs.c:1116
 msgid "Clock sizes vary"
-msgstr ""
+msgstr "Размерът на часовниците да е различен"
 
 #: ../globaltime/gt_prefs.c:1122
 msgid "Local timezone:"
-msgstr ""
+msgstr "Местна часова зона:"
 
 #: ../globaltime/timezone_selection.c:101
 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
 msgid " Other"
-msgstr ""
+msgstr "Други"
 
 #: ../globaltime/timezone_selection.c:156
 #: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
 #, c-format
 msgid "%d hour %d mins"
-msgstr ""
+msgstr "%d час %d минути"
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
 #, c-format
 msgid "%d hour"
-msgstr ""
+msgstr "%d час"
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
 #, c-format
 msgid "%d mins"
-msgstr ""
+msgstr "%d минути"
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
 msgid "backward"
-msgstr ""
+msgstr "назад"
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
 msgid "forward"
-msgstr ""
+msgstr "напред"
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
 msgid "not changed"
-msgstr ""
+msgstr "без промяна"
 
 #: ../globaltime/timezone_selection.c:195
 #: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
 msgid "not changing"
-msgstr ""
+msgstr "не се променя"
 
 #. location
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
-msgstr ""
+msgstr "Местоположение"
 
 #: ../globaltime/timezone_selection.c:258
 #: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
 msgid "GMT Offset"
-msgstr ""
+msgstr "Разлика с GMT"
 
 #: ../globaltime/timezone_selection.c:264
 #: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
 msgid "Previous/Next Change"
-msgstr ""
+msgstr "Предишна/следваща промяна"
 
 #: ../globaltime/timezone_selection.c:269
 #: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
 msgid "Country"
-msgstr ""
+msgstr "Страна"
 
 #. We are actually setting the g_par parameter. In other words
 #. we are setting the global default timezone for Orage. This is
@@ -363,7 +386,7 @@
 #: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
 #: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
 msgid "Pick timezone"
-msgstr ""
+msgstr "Избор на часова зона"
 
 #: ../globaltime/timezone_selection.c:302
 #: ../globaltime/timezone_selection.c:312
@@ -371,7 +394,7 @@
 #: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
 #: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
 msgid "Change mode"
-msgstr ""
+msgstr "Промяна на режима"
 
 #: ../globaltime/timezone_selection.c:303
 #: ../globaltime/timezone_selection.c:313
@@ -382,7 +405,7 @@
 #: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
 #: ../src/timezone_selection.c:379
 msgid "UTC"
-msgstr ""
+msgstr "UTC"
 
 #. NOTE: this exists only if ical timezones are being used
 #: ../globaltime/timezone_selection.c:304
@@ -391,96 +414,110 @@
 #: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
 #: ../src/timezone_selection.c:384
 msgid "floating"
-msgstr ""
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "Предпочитания"
+msgstr "плаващо"
 
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "XFCalendar"
+msgstr "Orage Световно време"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
-msgstr ""
+msgstr "Показване на часовници от различни страни"
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Световно време"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Без завъртане"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Завъртане наляво"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Завъртане надясно"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
-msgstr ""
+msgstr "Външен вид"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
-msgstr ""
+msgstr "Показване на рамка"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
-msgstr ""
+msgstr "Задаване цвят на шрифта:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
-msgstr ""
+msgstr "Задаване на фонов цвят:"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
-msgstr ""
+msgstr "Задаване на височина:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
+msgstr "Имайте предвид, че не можете да промените височината на хоризонталните панели"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
-msgstr ""
+msgstr "Задаване на ширина:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
-msgstr ""
+msgstr "Имайте предвид, че не можете да промените ширината на вертикалните панели"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Показване на редовете вертикално"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
-msgstr ""
+msgstr "Опции на часовник"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
-msgstr ""
+msgstr "задаване на часови пояс за:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
-msgstr ""
+msgstr "Линия %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
-msgstr ""
+msgstr "Въведете параметър за функция stftime."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
-msgstr ""
+msgstr "Подсказка:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
-msgstr ""
+msgstr "Сверяване на времето след приспиване/хибернация"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
+msgstr "Вие се нуждаете от това, само ако за кратък срок (по малко от 5 часа) включите приспиване или хибернация и във времето не са включени секунди. При тези условия Orageclock може да не показва коректно времето, ако не сте избрали тази опция. (Избирането на това не позволява да се ключва режим на пестене на енергия.)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -490,14 +527,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
+msgstr "Тази програма използва strftime функция за изобразяване на времето.\nИзползвайте някой от валидните кодове за показване на времето в предпочитан формат.\nВалидните кодове са:\n\t%A = ден от седмицата\t\t\t%B = месец\n\t%c = дата & час\t\t%R = час & минути\n\t%V = поредна седмица\t\t%Z = текуща часова зона\n\t%H = час \t\t\t\t%M = минута\n\t%X = местно време\t\t\t%x = местна дата"
 
-#: ../panel-plugin/oc_config.c:457
-#, fuzzy
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
-msgstr "Предпочитания"
+msgstr "Настройки на Orage часовник"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -506,261 +541,318 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
-msgstr ""
+msgstr "%A %d %B %Y/%V"
 
 #: ../src/about-xfcalendar.c:40
 msgid "Maintainer"
-msgstr ""
+msgstr "Разработчик"
 
 #: ../src/about-xfcalendar.c:47
 msgid "Manage your time with Orage"
-msgstr ""
+msgstr "Организирайте своето време с Orage"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
-msgstr ""
+msgstr "Край"
 
 #: ../src/appointment.c:333
 msgid "Due"
-msgstr ""
+msgstr "Времетраене"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
-msgstr ""
+msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
-msgstr ""
+msgstr "Избор на файл..."
 
 #: ../src/appointment.c:680
 msgid "Sound Files"
-msgstr ""
+msgstr "Звукови файлове"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
-msgstr ""
+msgstr "Всички файлове"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
-msgstr ""
+msgstr "Информацията за събитието е променена."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
-msgstr ""
+msgstr "Искате ли да продължите?"
+
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Не, не напускай"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Да, откажи промените и напусни"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
-msgstr ""
+msgstr "Краят на това събитие е по ранен от началото."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
-msgstr ""
+msgstr "Не е зададено"
+
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Добави нова среща в този файл."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Файл по подразбиране за Orage."
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Неуспешно добавяне на среща."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Възникна грешка при добавянето на среща. Погледнете за подробности лог файла."
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Неуспешно актуализиране на среща."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "За повече подробности, вижте лог файла. (Може би файлът е актуализиран външно от Orage?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
-msgstr ""
+msgstr "Това събитие ще бъде премахнато окончателно."
+
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Не, прекрати премахването"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Да, премахни го"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Избор на дата"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Днес"
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
-msgstr ""
+msgstr "Това събитие не съществува."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
-msgstr ""
+msgstr "Това вероятно е било премахнато, моля, обновете вашият екран."
 
-#: ../src/appointment.c:1995
-#, fuzzy
+#: ../src/appointment.c:2105
 msgid "Current categories"
-msgstr "XFCalendar"
+msgstr "Текущи категории"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
-msgstr ""
+msgstr "Добавяне на нова категория с цвят"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
-msgstr ""
+msgstr "Категория:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
-msgstr ""
+msgstr "Цветове на категории - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
-msgstr ""
+msgstr " *** КОПИЕ ***"
 
-#: ../src/appointment.c:2353
-#, fuzzy
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
-msgstr "Среща"
+msgstr "Ново събитие - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Файл"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
-msgstr ""
+msgstr "Запазване и затваряне"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
-msgstr ""
+msgstr "Дублиране"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
-msgstr ""
+msgstr "Запазване"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
-msgstr ""
+msgstr "Запазване и затваряне"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
-msgstr ""
+msgstr "Възстановяване"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
-msgstr ""
+msgstr "Дублиране"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
-msgstr ""
+msgstr "Изтриване"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
-msgstr ""
+msgstr "Свободно"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
-msgstr ""
+msgstr "Заето"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
-msgstr ""
+msgstr "Основен"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
-msgstr ""
+msgstr "Тип"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
-msgstr ""
+msgstr "Събитие"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
+msgstr "Събитие, което някога ще се случи. Например:\nсреща, рожден ден или телевизионно предаване."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-#, fuzzy
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
-msgstr "Днес"
+msgstr "Задача"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
+msgstr "Нещо, което някога трябва да свършите. Например:\nда измиете колата си или да тествате новата версия на Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
-msgstr ""
+msgstr "Дневник"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
+msgstr "Отбележете, че нещо се е случило. Например:\nОтбележете, че вашата майка ви е поздравила по случай първият сняг."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
-msgstr ""
+msgstr "Заглавие"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
-msgstr ""
+msgstr "Събитията от целият ден"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
-msgstr ""
+msgstr "Стартиране"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
-msgstr ""
+msgstr "Задаване    "
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
-msgstr ""
+msgstr "Продължителност"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
-#, fuzzy
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
-msgstr "Днес"
+msgstr "дни"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
-msgstr ""
+msgstr "часове"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
-msgstr ""
+msgstr "минути"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
-msgstr ""
+msgstr "Наличност"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
-msgstr ""
+msgstr "Завършено"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
-msgstr ""
+msgstr "Готово"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
-msgstr ""
+msgstr "Категории"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
+msgstr "Това е специална категория, която може да се използва, за да оцветите тези събития в списъка."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
-msgstr ""
+msgstr "обновяване на цветовете за категориите."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
-msgstr ""
+msgstr "Приоритет"
+
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Ако зададете 8 или по голямо, задачата не се показва в списъка с прозорците.\nМожете да използвате тази опция, за да опростите списъка с прозорци, но така по- трудно ще намерите задачата.\n(Алармата ще стартира нормално.)\n(Това е недокоментиран параметър, така, че може да промените стойностите по подразбиране на 8.)"
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
-msgstr ""
+msgstr "Пояснение"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -769,125 +861,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Тези съкращения имат незабавен ефект:\n    <D> въвеждане на текущата дата в местен формат\n    <T> въвежда време и\n    <DT> дата и време.\n\nТе се преобразуват едва по-късно, когато се разглеждат:\n    <&Ynnnn> текущата година минус nnnn.\n(например, за изчисляване на възрастта в съобщенията за рожден ден.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
-msgstr ""
+msgstr "Преди стартиране"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
-msgstr ""
+msgstr "Преди края"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
-msgstr ""
+msgstr "След стартиране"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
-msgstr ""
+msgstr "След края"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
-msgstr ""
+msgstr "Аларма"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
-msgstr ""
+msgstr "Време за алармата"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
+msgstr "Обикновено алармата е необходима:\n 1) преди за започне събитие\n 2) преди да приключи събитие\n 3) след началото на задачата"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
-msgstr ""
+msgstr "Постоянна аларма"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
+msgstr "Изберете тази опция, ако искате Orage да ви напомня, дори, ако тя не е активна, когато времето за задействане на алармата настъпи."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
-msgstr ""
+msgstr "Звук"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
-msgstr ""
+msgstr "Използване"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
-msgstr ""
+msgstr "Изберете това, ако ви е необходима звукова аларма"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
-msgstr ""
+msgstr "Повтаряне на звука на алармата"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
-msgstr ""
+msgstr "пъти"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
-msgstr ""
+msgstr "интервал в секунди"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
-msgstr ""
+msgstr "Визуално"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
-msgstr ""
+msgstr "Използване на прозореца на Orage"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
-msgstr ""
+msgstr "Изберете това, ако искате да ви уведомява прозорецът на Orage"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
-msgstr ""
+msgstr "Използване на уведомление"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
-msgstr ""
+msgstr "Изберето това, ако искате аларма с уведомление"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
-msgstr ""
+msgstr "Задаване на изчакване"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
-msgstr ""
+msgstr "Изберете това, ако искате уведомлението да завърши автоматично"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
-msgstr ""
+msgstr "0 = системно време по подразбиране"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
-msgstr ""
+msgstr "секунди"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
-msgstr ""
+msgstr "Процедура"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
-msgstr ""
+msgstr "Изберете това, ако искате процедура или скрипт за алармата"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -897,153 +988,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
+msgstr "Въведете всички данни за събитието.\nВъведените данни ще се появят на обложката в непроменен вид.\nМожете да ги замените, като използвате следните команди:\n\t<&T> име на събитие\n\t<&D> описание на събитие\n\t<&AT> време на известяване\n\t<&ST> време на започване\n\t<&ET> време на завършване"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
-msgstr ""
+msgstr "Проверка на зададеният сигнал за аларма"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
-msgstr ""
+msgstr "<b>Аларма по подразбиране</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
-msgstr ""
+msgstr "Запазване на текущите настройки като алармата по подразбиране"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
-msgstr ""
+msgstr "Задаване на текущи настройки от алармата по подразбиране"
 
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr ""
-
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
-msgstr ""
+msgstr "Ежедневно"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
-msgstr ""
+msgstr "Седмично"
 
-#: ../src/appointment.c:3176
-#, fuzzy
+#: ../src/appointment.c:3290
 msgid "Monthly"
-msgstr "Днес"
+msgstr "Месечно"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
-msgstr ""
+msgstr "Годишно"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
-msgstr ""
+msgstr "Всеки час"
 
-#: ../src/appointment.c:3178
-#, fuzzy
+#: ../src/appointment.c:3292
 msgid "Mon"
-msgstr "Днес"
+msgstr "Пн"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
-msgstr ""
+msgstr "Вт"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
-msgstr ""
+msgstr "Ср"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
-msgstr ""
+msgstr "Чт"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
-msgstr ""
+msgstr "Пт"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
-msgstr ""
+msgstr "Сб"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
-msgstr ""
+msgstr "Нд"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
-msgstr ""
+msgstr "Повторение"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
-msgstr ""
+msgstr "Осложнен"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
-msgstr ""
+msgstr "Обикновен"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
-msgstr ""
+msgstr "Разширен"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
-msgstr ""
+msgstr "Използвайте това, ако искате събитието да се повтаря периодично"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
+msgstr "Използвайте това, ако е необходимо сложно време, например:\nВсяка събота и неделя или \nПървият вторник на всеки месец"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
-msgstr ""
+msgstr "Повторяемост"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
-msgstr ""
+msgstr "Всеки"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
-msgstr ""
+msgstr "интервал"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
+msgstr "Ограничава честотата на конкретният интервал.\n Например: Всеки трети ден:\n Честота = Ежедневно и Интервал = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
-msgstr ""
+msgstr "Ограничение"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
-msgstr ""
+msgstr "Постоянно повтаряне"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
-msgstr ""
+msgstr "Повтаряне"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
-msgstr ""
+msgstr "Повтаряне до"
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-#, fuzzy
+#: ../src/appointment.c:3423
 msgid "Weekdays"
-msgstr "Днес"
+msgstr "Дни от седмицата"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
-msgstr ""
+msgstr "В кой ден"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1051,2567 +1135,3317 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
+msgstr "Определя, в кой ден от седмицата ще настъпи ежемесечното или годишното събитие.\n Например:\n Втората сряда на всеки месец:\n Честота = Ежемесечно,\nДни от седмицата= отмята се само сряда,\nВ кой ден = изберете 2 от номерата до сряда"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
-msgstr ""
+msgstr "Начална дата на задача"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
+msgstr "Времето за повторение на задачата се отчита от нейното начало и не зависи от това, дали е била изпълнена"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "Времето на повторение на задачата се отчита от нейното изпълнение.\n(Имайте в предвид, че началната дата на задачата ще бъде променяна с всяко повторение.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
-msgstr ""
+msgstr "Изключения"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
+msgstr "Може да добавите изключения, като щракнете върху календарни дни по-долу.\nИзключение е или изключване (-) или включване (+), в зависимост от селекцията\nПремахнете с кликване върху датата."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
-msgstr ""
+msgstr "Добавяне на изключена дата (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
+msgstr "В изключените дни не настъпва събитие"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
-msgstr ""
+msgstr "Добавянето на включено време (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
+msgstr "Включените времена са от същия часови пояс от стартовото време, но те ​​могат да имат различно време"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
-msgstr ""
+msgstr "Дата на събитие"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
-msgstr ""
+msgstr "Преглед"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
-msgstr ""
+msgstr "Отиване"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
-msgstr ""
+msgstr "Нов"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr ""
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Една седмица назад"
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-#, fuzzy
-msgid "Today"
-msgstr "Днес"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Един ден назад"
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr ""
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Един ден напред"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Една седмица напред"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
-msgstr ""
+msgstr "Обновяване"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
-msgstr ""
+msgstr "Затваряне"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
-msgstr ""
+msgstr "Неизвестно"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
-msgstr ""
+msgstr "       Ден, който да се показва"
 
-#: ../src/day-view.c:935
-#, fuzzy
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
-msgstr "XFCalendar"
+msgstr "Orage - показване на ден"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
-msgstr ""
+msgstr "Всички дни"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
-msgstr ""
+msgstr "Време"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
-msgstr ""
+msgstr "Не са избрани редове"
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
-msgstr ""
+msgstr "Кликнете на реда, за да го изберете и след това го копирайте тук"
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
+msgstr "Вие ще премахнете напълно всички\nизбрани срещи."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Да, премахни елемента"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Назад"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Напред"
+
+#: ../src/event-list.c:1189
 msgid "Find"
-msgstr ""
+msgstr "Намери"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
-msgstr ""
+msgstr "Преглед на ден"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr ""
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Разширено показване на дните:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "само първото повтарящо се"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Отметнете това, ако искате да видите само първото повтарящо се събитие. По подразбиране се показват всички.\nИмайте предвид, че се показват всички спешни събития.\nИмайте предвид, че повтарящите се събития могат да се показват по- рано, ако изберете само първото."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "също и старите"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Отметнете това, ако искате да виждате и старите събития. Ако не зададете „само първото“, списъкът ще бъде много дълъг.\nИмайте предвид, че повтарящите се събития, могат да се появят по- рано, ако изберете „само първото“."
+
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
-msgstr ""
+msgstr "Записите в дневника започват с:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
-msgstr ""
+msgstr "Търсене"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
-msgstr ""
+msgstr "Търсене на текст"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
-msgstr ""
+msgstr "Знамена"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
-msgstr ""
+msgstr "Заглавие"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr ""
+msgstr "Кликнете два пъти за да ги редактирате.\n\nФлагове за:\n\t 1. Аларма: n=без аларма\n\t\t A=Алармата е зададена P=Зададена е постоянна аларма\n\t 2. Повторение: n=без повторение\n\t\t H=Всеки час D=Всеки ден W=Всяка седмица M=Всеки месец Y=Всяка година\n\t 3. Тип: f=свободно B=Заето\n\t 4. Намира се във файл:\n\t\tO=Orage A=Архив F=Външен\n\t 5. Тип на назначение:\n\t\tE=Събитие T=Задача J=Дневник"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
-msgstr ""
+msgstr "\tПрегледът е завършен, преместване в архивен файл."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
-msgstr ""
+msgstr "Архивирането не е включено. Излизане."
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
-msgstr ""
+msgstr "Период на архивиране: %d месец(а)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr ""
+msgstr "\tАрхивиране на събития, които са по- стари от: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
-msgstr ""
+msgstr "Uid архивиране: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
-msgstr ""
+msgstr "\tVTODO не е завършен, не е архивиран"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr ""
+msgstr "\tПовторение. Край на година: %04d, месец: %02d, ден: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
-msgstr ""
+msgstr "Архивирането е завършено\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
-msgstr ""
+msgstr "Стартиране на премахването на архив."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
-msgstr ""
+msgstr "\tФАЗА 1: нулиране на повтарящите се срещи"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
-msgstr ""
+msgstr "\tФАЗА 2: възстановяване на архивираните срещи"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
-msgstr ""
+msgstr "Премахването на архива е приключено\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
-msgstr ""
+msgstr "Orage аларма по подразбиране"
+
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Създаване на списък с аларми от основният Orage файл:"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Създаване на списък с аларми за външен файл: %s (%s)"
+
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr " Добавени са %d аларми. Зададени са %d събития."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
+msgstr "\tНамерени %d аларми, от тях активни: %d (Търсени %d повтарящи се аларми)."
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
-msgstr ""
+msgstr "Стартиране на предварителна обработка на внесен файл"
 
 #: ../src/ical-expimp.c:158
 msgid "... Patched DCREATED to be CREATED."
-msgstr ""
+msgstr "... Поправено DCREATED в CREATED."
 
 #: ../src/ical-expimp.c:197
 msgid "... Patched timezone to Orage format."
-msgstr ""
+msgstr "... Часовият пояс е поправен във формат Orage."
 
 #: ../src/ical-expimp.c:206
 msgid "Import file preprocessing done"
-msgstr ""
+msgstr "Предварителната обработка на внесения файл е завършена."
 
-#: ../src/interface.c:284
-#, fuzzy
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Намерена е външна актуализация на файл %s."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Обновяване на алармите и календара от външен файл с актуализация."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
-msgstr "XFCalendar"
+msgstr "Файлове с календари"
 
 #: ../src/interface.c:631
 msgid "Current foreign files"
-msgstr ""
+msgstr "Текущи външни файлове"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
-msgstr ""
+msgstr "САМО ЧЕТЕНЕ"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
-msgstr ""
+msgstr "САМО ЗАПИС"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
-msgstr ""
+msgstr "***** Няма външни файлове *****"
+
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Неуспех при добавянето на външен файл"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage може да поддържа само 10 външни файла. Лимитът е изчерпан."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Името на файла е празно."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Името е празно."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Файлът не съществува."
 
-#: ../src/interface.c:974
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Същото име на файл вече съществува в Orage."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Същото име вече съществува в Orage."
+
+#: ../src/interface.c:965
 msgid "Import/export"
-msgstr ""
+msgstr "Внасяне/изнасяне"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
-msgstr ""
+msgstr "Внасяне"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
-msgstr ""
+msgstr "Четене от файл:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
+msgstr "Разделяне на имената на файловете със запетайка(,).\n ПОЯСНЕНИЕ: запетайка не се допуска в имената на файловете за Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
-msgstr ""
+msgstr "Изнасяне"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
-msgstr ""
+msgstr "Запис във файл:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
-msgstr ""
+msgstr "Избор"
 
-#: ../src/interface.c:1037
-#, fuzzy
+#: ../src/interface.c:1028
 msgid "All appointments"
-msgstr "Среща"
+msgstr "Всички срещи"
 
-#: ../src/interface.c:1050
-#, fuzzy
+#: ../src/interface.c:1041
 msgid "Named appointments: "
-msgstr "Среща"
+msgstr "Задаване имена на срещите:"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
+msgstr "Имайте предвид, че се четат само основните файлове със срещи.\nАрхивните и вътрешните събития не могат да се изнасят."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
+msgstr "Имайте предвид, че се четат само основните файлове със срещи.\nВъншните събития не могат да се изнасят."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
-msgstr ""
+msgstr "Можете лесно да влачите тези събития от списъка."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
-msgstr ""
+msgstr "Orage събития UID, разделени със запетайки."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
-msgstr ""
+msgstr "Архивиране"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
-msgstr ""
+msgstr "Архивиране сега (време за съхранение: %d месеца)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
-msgstr ""
+msgstr "Времето за съхранение на архива може да бъде променено от настройките"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
-msgstr ""
+msgstr "Възстановяване на архива сега"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
+msgstr "Възстановяване на всички архивирани събития в основният Orage файл и премахване на архивният файл.\nТова се използва, например, при изнасяне и преместване на Orage събития\nна други системи."
 
-#: ../src/interface.c:1118
-#, fuzzy
+#: ../src/interface.c:1109
 msgid "Orage files"
-msgstr "Предпочитания"
+msgstr "Orage файлове"
 
-#: ../src/interface.c:1125
-#, fuzzy
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
-msgstr "XFCalendar"
+msgstr "Основен файл на Orage календара"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "XFCalendar"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Текущ файл:"
 
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr ""
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Нов файл:"
 
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr ""
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Настройки на действие:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
-msgstr ""
+msgstr "Преименуване"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
+msgstr "Преименуване само на вътрешните Orage файлове.\nТова не засяга цялата вътрешна файлова система.\nНов файл трябва да съществува."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
-msgstr ""
+msgstr "Копиране"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
+msgstr "Текущият файл е копиран и е останал непроменен на старото си място."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
-msgstr ""
+msgstr "Преместване"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
-msgstr ""
+msgstr "Текущият файл е копиран и е премахнат от старото си място."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
-msgstr ""
+msgstr "Архивен файл"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
-msgstr ""
+msgstr "Външни файлове"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
-msgstr ""
+msgstr "Добавяне на нов външен файл"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
-msgstr ""
+msgstr "Външен файл:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr ""
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Видимо име:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
-msgstr ""
+msgstr "Само четене"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Задайте това, ако искате да сте сигурни, че тези файлове няма никога да бъдат променени от Orage.\nИмайте предвид, че промяната на външните файлове може да ги направи несъвместими с оригиналният инструмент, oткъдето са взети!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Това вътрешно име се показва на потребителя, вместо името на файла."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
-msgstr ""
+msgstr "Обмен на данни - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
+msgstr "\tТова е %s версия %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
+msgstr "\tРазпространява се съгласно условията на GNU General Public License.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
+msgstr "\tОкомплектован с GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
+msgstr "използва се GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
-msgstr ""
+msgstr "\tИзползва се DBUS за внасяне.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
+msgstr "\tНе се използва DBUS. Внасянето работи частично.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
-msgstr ""
+msgstr "\tИзползва се libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
-msgstr ""
+msgstr "\tНе се използва libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
-msgstr ""
+msgstr "\tИзползване се автоматично архивиране.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
-msgstr ""
+msgstr "\tНе се използва архивиране.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
-msgstr ""
+msgstr "\tИзползване на системна библиотека libical.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
+msgstr "\tИзползване на локална версия на Orage библиотека libical.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
+msgstr "Използване: orage [опции] [файлове]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
-msgstr ""
+msgstr "Опции:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
+msgstr "--version (-v) \t\tпоказване версия на orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
+msgstr "--help (-h) \t\tпоказване на този текст\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
+msgstr "--preferences (-p) \tпоказване на опциите на формата\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
+msgstr "--toggle (-t) \t\tпоказване/скриване на orage\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) файл [RW] [име] \tдобавяне на външен файл\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
+msgstr "--remove-foreign (-r) файл \tпремахване на външен файл\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--export (-e) ФАЙЛ [СРЕЩА...] \tизнасяне на данните от срещите от Orage във файл\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
-msgstr ""
+msgstr "files=ical файлове за зареждане в orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
-msgstr ""
+msgstr "\tdbus не е включен в orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
+msgstr "\tбез dbus [файлове] и опции на външни файлове(-a & -r) могат да се използват само, когато е стартиран orage \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
+msgstr "\nНепозната опция %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
-msgstr ""
+msgstr "Обмен на данни"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
-msgstr ""
+msgstr "Редактиране"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
-msgstr ""
+msgstr "Преглед на избраните данни"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
-msgstr ""
+msgstr "Преглед на избраната седмица"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
-msgstr ""
+msgstr "Избор на днешна дата"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Предпочитания"
+msgstr "Показване на световно време"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
-msgstr "_Помощ"
+msgstr "Помощ"
+
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Няма зададено заглавие"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr "Местоположение: %s\n"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n Бележка:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
-msgstr ""
+msgstr "Никога"
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:495
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
+" Done:\t%s%s"
+msgstr "Заглавие: %s\n%s Начало:\t%s\n Изчакване:\t%s\n Готово:\t%s%s"
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Заглавие: %s\n%s Начало:\t%s\n Край:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
-msgstr ""
+msgstr "<b>Направи:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
-msgstr ""
+msgstr "<b>Събития за %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
-msgstr ""
+msgstr "<b>Събития за %s - %s:</b>"
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:492
 msgid "Main settings"
-msgstr "Настройки"
+msgstr "Основни настройки"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
-msgstr ""
+msgstr "Часова зона"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
-msgstr ""
+msgstr "Вие трябва винаги за задавате вашата местна часова зона."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
-msgstr ""
+msgstr "Период за съхранение на архив (месеци)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
-msgstr ""
+msgstr "(0 = да не се архивира)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
+msgstr "Архивирането се използва за съхранение на данни за време и място при обработката на събитие."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
-msgstr ""
+msgstr "Звукова команда"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
+msgstr "Тази команда дава възможност на обвивката да възпроизведе звука в алармата."
+
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Прозорец на календра"
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Настройки"
-
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
-msgstr "Затваряне на прозореца"
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Визуални детайли на календара"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
-msgstr ""
+msgstr "Показване на рамки"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
-msgstr ""
-
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr ""
+msgstr "Показване на меню"
 
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
-msgstr ""
+msgstr "Показване на дните от седмицата"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
-msgstr ""
+msgstr "Показване на седмица"
 
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr ""
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Показване на месец и година"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Информационни кутии на календара"
 
 #: ../src/parameters.c:660
+msgid "Show todo list"
+msgstr "Показване на списък със задачи"
+
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
-msgstr ""
+msgstr "Да се показва денят в прозореца със събития"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
-msgstr ""
+msgstr "0 = да не се показва списъкът с всички събития"
+
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Видимост на календара"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
-msgstr ""
+msgstr "Показване на всички работни места"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
-msgstr ""
+msgstr "Винаги отгоре"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
-msgstr ""
+msgstr "Показване в лентата на задачите"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
-msgstr ""
+msgstr "Показване в превключвателя на работните места"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
-msgstr ""
+msgstr "Показване в областта за уведомяване"
 
-#: ../src/parameters.c:739
-#, fuzzy
+#: ../src/parameters.c:738
 msgid "Calendar start"
-msgstr "XFCalendar"
+msgstr "Стартиране на календара"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
-msgstr ""
+msgstr "Показване"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
-msgstr ""
+msgstr "Скриване"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
-msgstr ""
-
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr ""
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Затваряне на прозореца"
-
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr ""
+msgstr "Минимизиране"
 
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "Отваряне в прозореца на календара"
 
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr ""
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Избор на днешна дата"
 
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Избор на предишно избраната дата"
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Денят от календара да се показва при двойно кликване"
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
-msgstr ""
+msgstr "Показване на дните"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
-msgstr ""
+msgstr "Списък със събития"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr ""
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Допълнителни настройки"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Прозорец на списъка със събития"
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
-msgstr ""
+msgstr "Разширено показване на дните в списъка със събития"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
-msgstr ""
+msgstr "Това е просто стойност по подразбиране, вие може да я актуализирате от прозореца на списъка със събития."
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Показване само на първото повтарящо се събитие"
 
-#: ../src/parameters.c:921
-msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Ден, видим в прозореца, като първи ден"
 
-#: ../src/parameters.c:938
-#, fuzzy
-msgid "Orage Preferences"
-msgstr "Предпочитания"
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Първи ден от седмицата"
 
-#: ../src/parameters.c:1050
-msgid "First Orage start. Searching default timezone."
-msgstr ""
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Избор на ден"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Използване на динамична икона в системният поднос"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Използване на динамична икона"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Динамичната икона показва текущият месец и ден от месеца."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
+msgid "Use wakeup timer"
+msgstr "Използване на таймер за събуждане"
+
+#: ../src/parameters.c:973
+msgid ""
+"Use this timer if Orage has problems waking up properly after suspend or "
+"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "Използвайте този таймер, ако възникнат проблеми с Orage след събуждане на системата от хибернация или приспиване. (Например, не се обновяват иконите или не се задейства алармата)."
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Външен файл за визуалната аларма"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Прозорец на Orage"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Известие"
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Винаги спирай при затваряне"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Винаги спирай"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "По подразбиране, Orage остава работеща във фонов режим при затваряне. Тази опция задава на Orage да спира и да не остава стартирана във фонов режим при затваряне."
+
+#: ../src/parameters.c:1045
+msgid "Orage Preferences"
+msgstr "Настройки на Orage"
+
+#: ../src/parameters.c:1157
+msgid "First Orage start. Searching default timezone."
+msgstr "Първо стартиране на Orage. Търсене на часова зона по подразбиране."
+
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
-msgstr ""
+msgstr "Часова зона по подразбиране: %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
-msgstr ""
+msgstr "Часова зона по подразбиране не е открита, моля, задайте я ръчно."
 
 #: ../src/reminder.c:562
-#, fuzzy
 msgid "Reminder "
-msgstr "Напомня"
+msgstr "Напомняне"
 
 #: ../src/reminder.c:591
 msgid "Open"
-msgstr ""
+msgstr "Отваряне"
 
-#: ../src/reminder.c:722
-#, fuzzy
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
-msgstr "Напомня"
+msgstr "Напомняния - Orage"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Отлагане"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
+msgstr "Напомняне отново след определеното време"
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
-msgstr ""
+msgstr "Следваща активна аларма:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
+msgstr "\n%02d d %02d h %02d min до: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
+msgstr "\nНе са намерени активни аларми"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
-msgstr ""
+msgstr "Африка"
 
 #: ../src/timezone_names.c:37
 msgid "Africa/Abidjan"
-msgstr ""
+msgstr "Африка/Абиджан"
 
 #: ../src/timezone_names.c:38
 msgid "Africa/Accra"
-msgstr ""
+msgstr "Африка/Акра"
 
 #: ../src/timezone_names.c:39
 msgid "Africa/Addis_Ababa"
-msgstr ""
+msgstr "Африка/Адис-Абеба"
 
 #: ../src/timezone_names.c:40
 msgid "Africa/Algiers"
-msgstr ""
+msgstr "Африка/Алжир"
 
 #: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr ""
+msgid "Africa/Asmara"
+msgstr "Африка/Асмара"
 
 #: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr ""
+msgid "Africa/Asmera"
+msgstr "Африка/Асмера"
 
 #: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr ""
+msgid "Africa/Bamako"
+msgstr "Африка/Бамако"
 
 #: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr ""
+msgid "Africa/Bangui"
+msgstr "Африка/Банги"
 
 #: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr ""
+msgid "Africa/Banjul"
+msgstr "Африка/Банжул"
 
 #: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr ""
+msgid "Africa/Bissau"
+msgstr "Африка/Бисау"
 
 #: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr ""
+msgid "Africa/Blantyre"
+msgstr "Африка/Блантир"
 
 #: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr ""
+msgid "Africa/Brazzaville"
+msgstr "Африка/Бразавил"
 
 #: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr ""
+msgid "Africa/Bujumbura"
+msgstr "Африка/Бужумбура"
 
 #: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr ""
+msgid "Africa/Cairo"
+msgstr "Африка/Кайро"
 
 #: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr ""
+msgid "Africa/Casablanca"
+msgstr "Африка/Казабланка"
 
 #: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr ""
+msgid "Africa/Ceuta"
+msgstr "Африка/Сеута"
 
 #: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr ""
+msgid "Africa/Conakry"
+msgstr "Африка/Конакри"
 
 #: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr ""
+msgid "Africa/Dakar"
+msgstr "Африка/Дакар"
 
 #: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr ""
+msgid "Africa/Dar_es_Salaam"
+msgstr "Африка/Дар-ес-Салам"
 
 #: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr ""
+msgid "Africa/Djibouti"
+msgstr "Африка/Джибути"
 
 #: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr ""
+msgid "Africa/Douala"
+msgstr "Африка/Дуала"
 
 #: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr ""
+msgid "Africa/El_Aaiun"
+msgstr "Африка/Ел-Аюн"
 
 #: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr ""
+msgid "Africa/Freetown"
+msgstr "Африка/Фритаун"
 
 #: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr ""
+msgid "Africa/Gaborone"
+msgstr "Африка/Габороне"
 
 #: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr ""
+msgid "Africa/Harare"
+msgstr "Африка/Хараре"
 
 #: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr ""
+msgid "Africa/Juba"
+msgstr "Африка/Джуба"
 
 #: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr ""
+msgid "Africa/Johannesburg"
+msgstr "Африка/Йоханесбург"
 
 #: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr ""
+msgid "Africa/Kampala"
+msgstr "Африка/Кампала"
 
 #: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr ""
+msgid "Africa/Khartoum"
+msgstr "Африка/Хартум"
 
 #: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr ""
+msgid "Africa/Kigali"
+msgstr "Африка/Кигали"
 
 #: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr ""
+msgid "Africa/Kinshasa"
+msgstr "Африка/Киншаса"
 
 #: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr ""
+msgid "Africa/Lagos"
+msgstr "Африка/Лагос"
 
 #: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr ""
+msgid "Africa/Libreville"
+msgstr "Африка/Либревил"
 
 #: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr ""
+msgid "Africa/Lome"
+msgstr "Африка/Ломе"
 
 #: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr ""
+msgid "Africa/Luanda"
+msgstr "Африка/Луанда"
 
 #: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr ""
+msgid "Africa/Lubumbashi"
+msgstr "Африка/Лубумбаши"
 
 #: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr ""
+msgid "Africa/Lusaka"
+msgstr "Африка/Лусака"
 
 #: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr ""
+msgid "Africa/Malabo"
+msgstr "Африка/Малабо"
 
 #: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr ""
+msgid "Africa/Maputo"
+msgstr "Африка/Мапуту"
 
 #: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr ""
+msgid "Africa/Maseru"
+msgstr "Африка/Масеру"
 
 #: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr ""
+msgid "Africa/Mbabane"
+msgstr "Африка/Мбабане"
 
 #: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr ""
+msgid "Africa/Mogadishu"
+msgstr "Африка/Могадишо"
 
 #: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr ""
+msgid "Africa/Monrovia"
+msgstr "Африка/Монровия"
 
 #: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr ""
+msgid "Africa/Nairobi"
+msgstr "Африка/Найроби"
 
 #: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr ""
+msgid "Africa/Ndjamena"
+msgstr "Африка/Нджамена"
 
 #: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr ""
+msgid "Africa/Niamey"
+msgstr "Африка/Ниамей"
 
 #: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr ""
+msgid "Africa/Nouakchott"
+msgstr "Африка/Нуакшот"
 
 #: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr ""
+msgid "Africa/Ouagadougou"
+msgstr "Африка/Уагадугу"
 
 #: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr ""
+msgid "Africa/Porto-Novo"
+msgstr "Африка/Порто-Ново"
 
 #: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr ""
+msgid "Africa/Sao_Tome"
+msgstr "Африка/Сао Томе"
 
 #: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr ""
+msgid "Africa/Timbuktu"
+msgstr "Африка/Тимбукту"
 
 #: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr ""
+msgid "Africa/Tripoli"
+msgstr "Африка/Триполи"
 
 #: ../src/timezone_names.c:89
-msgid "America"
-msgstr ""
+msgid "Africa/Tunis"
+msgstr "Африка/Тунис"
 
 #: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr ""
+msgid "Africa/Windhoek"
+msgstr "Африка/Виндхук"
 
 #: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr ""
+msgid "America"
+msgstr "Америка"
 
 #: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr ""
+msgid "America/Adak"
+msgstr "Америка/Адак"
 
 #: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr ""
+msgid "America/Anchorage"
+msgstr "Америка/Анкоридж"
 
 #: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr ""
+msgid "America/Anguilla"
+msgstr "Америка/Ангила"
 
 #: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr ""
+msgid "America/Antigua"
+msgstr "Америка/Антигуа"
 
 #: ../src/timezone_names.c:96
-msgid "America/Argentina/Catamarca"
-msgstr ""
+msgid "America/Araguaina"
+msgstr "Америка/Арагуайна"
 
 #: ../src/timezone_names.c:97
-msgid "America/Argentina/Cordoba"
-msgstr ""
+msgid "America/Argentina/Buenos_Aires"
+msgstr "Америка/Аржентина/Буенос-Айрес"
 
 #: ../src/timezone_names.c:98
-msgid "America/Argentina/Jujuy"
-msgstr ""
+msgid "America/Argentina/Catamarca"
+msgstr "Америка/Аржентина/Катамарка"
 
 #: ../src/timezone_names.c:99
-msgid "America/Argentina/Mendoza"
-msgstr ""
+msgid "America/Argentina/ComodRivadavia"
+msgstr "Америка/Аржентина/ Комодоро Ривадавия"
 
 #: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr ""
+msgid "America/Argentina/Cordoba"
+msgstr "Америка/Аржентина/Кордоба"
 
 #: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr ""
+msgid "America/Argentina/Jujuy"
+msgstr "Америка/Аржентина/Жужуй"
 
 #: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr ""
+msgid "America/Argentina/La_Rioja"
+msgstr "Америка/Аржентина/Ла Риойа"
 
 #: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr ""
+msgid "America/Argentina/Mendoza"
+msgstr "Америка/Аржентина/Мендоза"
 
 #: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr ""
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "Америка/Аржентина/Рио Галегос"
 
 #: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr ""
+msgid "America/Argentina/Salta"
+msgstr "Америка/Аржентина/Салта"
 
 #: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr ""
+msgid "America/Argentina/San_Juan"
+msgstr "Америка/Аржентина/Сан Жуан"
 
 #: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr ""
+msgid "America/Argentina/San_Luis"
+msgstr "Америка/Аржентина/Сан Луис"
 
 #: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr ""
+msgid "America/Argentina/Tucuman"
+msgstr "Америка/Аржентина/Тукуман"
 
 #: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr ""
+msgid "America/Argentina/Ushuaia"
+msgstr "Америка/Аржентина/Ушуая"
 
 #: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr ""
+msgid "America/Aruba"
+msgstr "Америка/Аруба"
 
 #: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr ""
+msgid "America/Asuncion"
+msgstr "Америка/Асунсион"
 
 #: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr ""
+msgid "America/Atikokan"
+msgstr "Америка/Атикокан"
 
 #: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr ""
+msgid "America/Atka"
+msgstr "Америка/Атка"
 
 #: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr ""
+msgid "America/Bahia"
+msgstr "Америка/Байя"
 
 #: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr ""
+msgid "America/Bahia_Banderas"
+msgstr "Америка/Байя Бандерас"
 
 #: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr ""
+msgid "America/Barbados"
+msgstr "Америка/Барбадос"
 
 #: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr ""
+msgid "America/Belem"
+msgstr "Америка/Белен"
 
 #: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr ""
+msgid "America/Belize"
+msgstr "Америка/Белиз"
 
 #: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr ""
+msgid "America/Blanc-Sablon"
+msgstr "Америка/Бланк-Саблон"
 
 #: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr ""
+msgid "America/Boa_Vista"
+msgstr "Америка/Боа-Виста"
 
 #: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr ""
+msgid "America/Bogota"
+msgstr "Америка/Богота"
 
 #: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr ""
+msgid "America/Boise"
+msgstr "Америка/Бойсе"
 
 #: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr ""
+msgid "America/Buenos_Aires"
+msgstr "Америка/Буенос-Айрес"
 
 #: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr ""
+msgid "America/Cambridge_Bay"
+msgstr "Америка/Кембридж-Бей"
 
 #: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr ""
+msgid "America/Campo_Grande"
+msgstr "Америка/Кампо Гранде"
 
 #: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr ""
+msgid "America/Cancun"
+msgstr "Америка/Канкун"
 
 #: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr ""
+msgid "America/Caracas"
+msgstr "Америка/Каракас"
 
 #: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr ""
+msgid "America/Catamarca"
+msgstr "Америка/Катамарка"
 
 #: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr ""
+msgid "America/Cayenne"
+msgstr "Америка/Кайен"
 
 #: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr ""
+msgid "America/Cayman"
+msgstr "Америка/Каймани"
 
 #: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr ""
+msgid "America/Chicago"
+msgstr "Америка/Чикаго"
 
 #: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr ""
+msgid "America/Chihuahua"
+msgstr "Америка/Чихуахуа"
 
 #: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr ""
+msgid "America/Coral_Harbour"
+msgstr "Америка/Корал Харбър"
 
 #: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr ""
+msgid "America/Cordoba"
+msgstr "Америка/Кордоба"
 
 #: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr ""
+msgid "America/Costa_Rica"
+msgstr "Америка/Коста-Рика"
 
 #: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr ""
+msgid "America/Creston"
+msgstr "Америка/Крестън"
 
 #: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr ""
+msgid "America/Cuiaba"
+msgstr "Америка/Куйаба"
 
 #: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr ""
+msgid "America/Curacao"
+msgstr "Америка/Куракао"
 
 #: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr ""
+msgid "America/Danmarkshavn"
+msgstr "Америка/Данмаркшавн"
 
 #: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr ""
+msgid "America/Dawson"
+msgstr "Америка/Доусън"
 
 #: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr ""
+msgid "America/Dawson_Creek"
+msgstr "Америка/Доусън Крийк"
 
 #: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr ""
+msgid "America/Denver"
+msgstr "Америка/Денвър"
 
 #: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr ""
+msgid "America/Detroit"
+msgstr "Америка/Детройт"
 
 #: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr ""
+msgid "America/Dominica"
+msgstr "Америка/Доминиканска република"
 
 #: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr ""
+msgid "America/Edmonton"
+msgstr "Америка/Едмънтън"
 
 #: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr ""
+msgid "America/Ensenada"
+msgstr "Америка/Енсенада"
 
 #: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr ""
+msgid "America/Eirunepe"
+msgstr "Америка/Ейрунепе"
 
 #: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr ""
+msgid "America/El_Salvador"
+msgstr "Америка/Ел Салвадор"
 
 #: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr ""
+msgid "America/Fortaleza"
+msgstr "Америка/Форталеза"
 
 #: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr ""
+msgid "America/Fort_Wayne"
+msgstr "Америка/Порт Уeйн"
 
 #: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr ""
+msgid "America/Glace_Bay"
+msgstr "Америка/Глейс-Бей"
 
 #: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr ""
+msgid "America/Godthab"
+msgstr "Америка/Готхоб"
 
 #: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr ""
+msgid "America/Goose_Bay"
+msgstr "Америка/Гус-Бей"
 
 #: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr ""
+msgid "America/Grand_Turk"
+msgstr "Америка/Гранд Тюрк"
 
 #: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr ""
+msgid "America/Grenada"
+msgstr "Америка/Гренада"
 
 #: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr ""
+msgid "America/Guadeloupe"
+msgstr "Америка/Гуаделупа"
 
 #: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr ""
+msgid "America/Guatemala"
+msgstr "Америка/Гуатемала"
 
 #: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr ""
+msgid "America/Guayaquil"
+msgstr "Америка/Гуаякил"
 
 #: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr ""
+msgid "America/Guyana"
+msgstr "Америка/Гайана"
 
 #: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr ""
+msgid "America/Halifax"
+msgstr "Америка/Халифакс"
 
 #: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr ""
+msgid "America/Havana"
+msgstr "Америка/Хавана"
 
 #: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr ""
+msgid "America/Hermosillo"
+msgstr "Америка/Ермосильо"
 
 #: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr ""
+msgid "America/Indiana/Indianapolis"
+msgstr "Америка/Индиана/Индианаполис"
 
 #: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr ""
+msgid "America/Indiana/Knox"
+msgstr "Америка/Индиана/Нокс"
 
 #: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr ""
+msgid "America/Indiana/Marengo"
+msgstr "Америка/Индиана/Маренго"
 
 #: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr ""
+msgid "America/Indiana/Petersburg"
+msgstr "Америка/Индиана/Петерсбург"
 
 #: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr ""
+msgid "America/Indiana/Tell_City"
+msgstr "Америка/Индиана/Тел Сити"
 
 #: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr ""
+msgid "America/Indiana/Vevay"
+msgstr "Америка/Индиана/Вевей"
 
 #: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr ""
+msgid "America/Indiana/Vincennes"
+msgstr "Америка/Индиана/Винсенс"
 
 #: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr ""
+msgid "America/Indiana/Winamac"
+msgstr "Америка/Индиана/Уинамак"
 
 #: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr ""
+msgid "America/Indianapolis"
+msgstr "Америка/Индианаполис"
 
 #: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr ""
+msgid "America/Inuvik"
+msgstr "Амеркиа/Инувик"
 
 #: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr ""
+msgid "America/Iqaluit"
+msgstr "Америка/Иквалюит"
 
 #: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr ""
+msgid "America/Jamaica"
+msgstr "Америка/Ямайка"
 
 #: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr ""
+msgid "America/Jujuy"
+msgstr "Америка/Жужуй"
 
 #: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr ""
+msgid "America/Juneau"
+msgstr "Америка/Джуно"
 
 #: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr ""
+msgid "America/Kentucky/Louisville"
+msgstr "Америка/Кентъки/Луисвил"
 
 #: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr ""
+msgid "America/Kentucky/Monticello"
+msgstr "Америка/Кентъки/Монтичело"
 
 #: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr ""
+msgid "America/Knox_IN"
+msgstr "Америка/Нокс"
 
 #: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr ""
+msgid "America/Kralendijk"
+msgstr "Америка/Краленджуик"
 
 #: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr ""
+msgid "America/La_Paz"
+msgstr "Америка/Ла-Пас"
 
 #: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr ""
+msgid "America/Lima"
+msgstr "Америка/Лима"
 
 #: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr ""
+msgid "America/Los_Angeles"
+msgstr "Америка/Лос Анджелис"
 
 #: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr ""
+msgid "America/Louisville"
+msgstr "Америка/Луисвил"
 
 #: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr ""
+msgid "America/Lower_Princes"
+msgstr "Америка/Лавър Принцес"
 
 #: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr ""
+msgid "America/Maceio"
+msgstr "Америка/Масейо"
 
 #: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr ""
+msgid "America/Managua"
+msgstr "Америка/Манагуа"
 
 #: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr ""
+msgid "America/Manaus"
+msgstr "Америка/Манаус"
 
 #: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr ""
+msgid "America/Marigot"
+msgstr "Америка/Мариго"
 
 #: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr ""
+msgid "America/Martinique"
+msgstr "Америка/Мартиника"
 
 #: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr ""
+msgid "America/Matamoros"
+msgstr "Америка/Матаморос"
 
 #: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr ""
+msgid "America/Mazatlan"
+msgstr "Америка/Мазатлан"
 
 #: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr ""
+msgid "America/Mendoza"
+msgstr "Америка/Мендоза"
 
 #: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr ""
+msgid "America/Menominee"
+msgstr "Амеркиа/Меномини"
 
 #: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr ""
+msgid "America/Merida"
+msgstr "Америка/Мерида"
 
 #: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr ""
+msgid "America/Metlakatla"
+msgstr "Америка/Метлакатла"
 
 #: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr ""
+msgid "America/Mexico_City"
+msgstr "Америка/Мексико Сити"
 
 #: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr ""
+msgid "America/Miquelon"
+msgstr "Америка/Микелон"
 
 #: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr ""
+msgid "America/Moncton"
+msgstr "Америка/Монстън"
 
 #: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr ""
+msgid "America/Monterrey"
+msgstr "Америка/Монтерей"
 
 #: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr ""
+msgid "America/Montevideo"
+msgstr "Америка/Монтевидео"
 
 #: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr ""
+msgid "America/Montreal"
+msgstr "Америка/Монреал"
 
 #: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr ""
+msgid "America/Montserrat"
+msgstr "Америка/Монтсерат"
 
 #: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr ""
+msgid "America/Nassau"
+msgstr "Америка/Насау"
 
 #: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr ""
+msgid "America/New_York"
+msgstr "Америка/Ню Йорк"
 
 #: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr ""
+msgid "America/Nipigon"
+msgstr "Америка/Нипигон"
 
 #: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr ""
+msgid "America/Nome"
+msgstr "Америка/Ном"
 
 #: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr ""
+msgid "America/North_Dakota/Beulah"
+msgstr "Америка/Северна Дакота/Бюлах"
 
 #: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr ""
+msgid "America/North_Dakota/Center"
+msgstr "Америка/Дакота/Централна"
 
 #: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr ""
+msgid "America/North_Dakota/New_Salem"
+msgstr "Америка/Северна Дакота/Нщ Сейлъм"
 
 #: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr ""
+msgid "America/Noronha"
+msgstr "Америка/Норона"
 
 #: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr ""
+msgid "America/Ojinaga"
+msgstr "Америка/Оджинага"
 
 #: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr ""
+msgid "America/Panama"
+msgstr "Америка/Панама"
 
 #: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr ""
+msgid "America/Pangnirtung"
+msgstr "Америка/Пангниртунг"
 
 #: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr ""
+msgid "America/Paramaribo"
+msgstr "Америка/Парамарибо"
 
 #: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr ""
+msgid "America/Phoenix"
+msgstr "Америка/Феникс"
 
 #: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr ""
+msgid "America/Port-au-Prince"
+msgstr "Америка/Порт-о-Пренс"
 
 #: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr ""
+msgid "America/Port_of_Spain"
+msgstr "Америка/Порт-оф-Спейн"
 
 #: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr ""
+msgid "America/Porto_Acre"
+msgstr "Америка/Порто Акре"
 
 #: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr ""
+msgid "America/Porto_Velho"
+msgstr "Америка/Порто Вело"
 
 #: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr ""
+msgid "America/Puerto_Rico"
+msgstr "Америка/Пуерто Рико"
 
 #: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr ""
+msgid "America/Rainy_River"
+msgstr "Америка/Рейни Ривър"
 
 #: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr ""
+msgid "America/Rankin_Inlet"
+msgstr "Америка/Ренкин Инлет"
 
 #: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr ""
+msgid "America/Recife"
+msgstr "Америка/Ресифе"
 
 #: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr ""
+msgid "America/Regina"
+msgstr "Америка/Регина"
 
 #: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr ""
+msgid "America/Resolute"
+msgstr "Америка/Резолюте"
 
 #: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr ""
+msgid "America/Rio_Branco"
+msgstr "Америка/Рио Бранко"
 
 #: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr ""
+msgid "America/Rosario"
+msgstr "Америка/Розарио"
 
 #: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr ""
+msgid "America/Santa_Isabel"
+msgstr "Америка/Санта Изабел"
 
 #: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr ""
+msgid "America/Santarem"
+msgstr "Америка/Сантарем"
 
 #: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr ""
+msgid "America/Santiago"
+msgstr "Америка/Сантяго"
 
 #: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr ""
+msgid "America/Santo_Domingo"
+msgstr "Америка/Санто-Доминго"
 
 #: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr ""
+msgid "America/Sao_Paulo"
+msgstr "Америка/Сан-Паулу"
 
 #: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr ""
+msgid "America/Scoresbysund"
+msgstr "Америка/Скорсбисънд"
 
 #: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr ""
+msgid "America/Shiprock"
+msgstr "Америка/Шипрок"
 
 #: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr ""
+msgid "America/Sitka"
+msgstr "Америка/Ситка"
 
 #: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr ""
+msgid "America/St_Barthelemy"
+msgstr "Америка/Сейнт Бартелеми"
 
 #: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr ""
+msgid "America/St_Johns"
+msgstr "Америка/Сейнт-Джонс"
 
 #: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr ""
+msgid "America/St_Kitts"
+msgstr "Америка/Сейнт-Китс"
 
 #: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr ""
+msgid "America/St_Lucia"
+msgstr "Америка/Сейнт-Люсия"
 
 #: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr ""
+msgid "America/St_Thomas"
+msgstr "Америка/Сейнт-Томас"
 
 #: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr ""
+msgid "America/St_Vincent"
+msgstr "Америка/Сейнт-Винсент"
 
 #: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr ""
+msgid "America/Swift_Current"
+msgstr "Америка/Суифт Кюрент"
 
 #: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr ""
+msgid "America/Tegucigalpa"
+msgstr "Америка/Тегусигалпа"
 
 #: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr ""
+msgid "America/Thule"
+msgstr "Америка/Туле"
 
 #: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr ""
+msgid "America/Thunder_Bay"
+msgstr "Америка/Тандър-Бей"
 
 #: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr ""
+msgid "America/Tijuana"
+msgstr "Америка/Тихуана"
 
 #: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr ""
+msgid "America/Toronto"
+msgstr "Америка/Торонто"
 
 #: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr ""
+msgid "America/Tortola"
+msgstr "Америка/Тортола"
 
 #: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr ""
+msgid "America/Vancouver"
+msgstr "Америка/Ванкувър"
 
 #: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr ""
+msgid "America/Virgin"
+msgstr "Америка/Вирджински острови"
 
 #: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr ""
+msgid "America/Whitehorse"
+msgstr "Америка/Уайтхорс"
 
 #: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr ""
+msgid "America/Winnipeg"
+msgstr "Америка/Уинипег"
 
 #: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr ""
+msgid "America/Yakutat"
+msgstr "Америка/Якутат"
 
 #: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr ""
+msgid "America/Yellowknife"
+msgstr "Америка/Йелоунайф"
 
 #: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr ""
+msgid "Antarctica"
+msgstr "Антарктика"
 
 #: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr ""
+msgid "Antarctica/Casey"
+msgstr "Антарктика/Кейси"
 
 #: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr ""
+msgid "Antarctica/Davis"
+msgstr "Антарктика/Дейвис"
 
 #: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr ""
+msgid "Antarctica/DumontDUrville"
+msgstr "Антарктика/Дюмон-д'Юрвил"
 
 #: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr ""
+msgid "Antarctica/Macquarie"
+msgstr "Америка/Ситка"
 
 #: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr ""
+msgid "Antarctica/Mawson"
+msgstr "Антарктика/Моусън"
 
 #: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr ""
+msgid "Antarctica/McMurdo"
+msgstr "Антарктика/Мак-Мердо"
 
 #: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr ""
+msgid "Antarctica/Palmer"
+msgstr "Антарктика/Палмър"
 
 #: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr ""
+msgid "Antarctica/Rothera"
+msgstr "Антарктика/Родера"
 
 #: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr ""
+msgid "Antarctica/South_Pole"
+msgstr "Антарктика/Южен полюс"
 
 #: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr ""
+msgid "Antarctica/Syowa"
+msgstr "Антарктика/Сева"
 
 #: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr ""
+msgid "Antarctica/Vostok"
+msgstr "Антарктика/Восток"
 
 #: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr ""
+msgid "Arctic"
+msgstr "Арктика"
 
 #: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr ""
+msgid "Arctic/Longyearbyen"
+msgstr "Арктика/Лонгиърбийн"
 
 #: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr ""
+msgid "Asia"
+msgstr "Азия"
 
 #: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr ""
+msgid "Asia/Aden"
+msgstr "Азия/Аден"
 
 #: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr ""
+msgid "Asia/Almaty"
+msgstr "Азия/Алмати"
 
 #: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr ""
+msgid "Asia/Amman"
+msgstr "Азия/Аман"
 
 #: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr ""
+msgid "Asia/Anadyr"
+msgstr "Азия/Анадир"
 
 #: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr ""
+msgid "Asia/Aqtau"
+msgstr "Азия/Актау"
 
 #: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr ""
+msgid "Asia/Aqtobe"
+msgstr "Азия/Актюбинск"
 
 #: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr ""
+msgid "Asia/Ashgabat"
+msgstr "Азия/Ашхабад"
 
 #: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr ""
+msgid "Asia/Ashkhabad"
+msgstr "Азия/Ашхабад"
 
 #: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr ""
+msgid "Asia/Baghdad"
+msgstr "Азия/Багдад"
 
 #: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr ""
+msgid "Asia/Bahrain"
+msgstr "Азия/Бахрейн"
 
 #: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr ""
+msgid "Asia/Baku"
+msgstr "Азия/Баку"
 
 #: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr ""
+msgid "Asia/Bangkok"
+msgstr "Азия/Бангкок"
 
 #: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr ""
+msgid "Asia/Beirut"
+msgstr "Азия/Бейрут"
 
 #: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr ""
+msgid "Asia/Bishkek"
+msgstr "Азия/Бишкек"
 
 #: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr ""
+msgid "Asia/Brunei"
+msgstr "Азия/Бруней"
 
 #: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr ""
+msgid "Asia/Calcutta"
+msgstr "Азия/Калкута"
 
 #: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr ""
+msgid "Asia/Choibalsan"
+msgstr "Азия/Чойбалсан"
 
 #: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr ""
+msgid "Asia/Chongqing"
+msgstr "Азия/Чунцин"
 
 #: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr ""
+msgid "Asia/Chungking"
+msgstr "Азия/Чунцин"
 
 #: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr ""
+msgid "Asia/Colombo"
+msgstr "Азия/Коломбо"
 
 #: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr ""
+msgid "Asia/Dacca"
+msgstr "Азия/Дака"
 
 #: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr ""
+msgid "Asia/Damascus"
+msgstr "Азия/Дамаск"
 
 #: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr ""
+msgid "Asia/Dhaka"
+msgstr "Азия/Дака"
 
 #: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr ""
+msgid "Asia/Dili"
+msgstr "Азия/Дили"
 
 #: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr ""
+msgid "Asia/Dubai"
+msgstr "Азия/Дубай"
 
 #: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr ""
+msgid "Asia/Dushanbe"
+msgstr "Азия/Душанбе"
 
 #: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr ""
+msgid "Asia/Gaza"
+msgstr "Азия/Газа"
 
 #: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr ""
+msgid "Asia/Harbin"
+msgstr "Азия/Харбин"
 
 #: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr ""
+msgid "Asia/Hebron"
+msgstr "Азия/Хеброн"
 
 #: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr ""
+msgid "Asia/Hong_Kong"
+msgstr "Азия/Хонг-Конг"
 
 #: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr ""
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Азия/Хошимин"
 
 #: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr ""
+msgid "Asia/Hovd"
+msgstr "Азия/Ховд"
 
 #: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr ""
+msgid "Asia/Irkutsk"
+msgstr "Азия/Иркутск"
 
 #: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr ""
+msgid "Asia/Istanbul"
+msgstr "Азия/Истамбул"
 
 #: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr ""
+msgid "Asia/Jakarta"
+msgstr "Азия/Джакарта"
 
 #: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr ""
+msgid "Asia/Jayapura"
+msgstr "Азия/Джайпур"
 
 #: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr ""
+msgid "Asia/Jerusalem"
+msgstr "Азия/Йерусалим"
 
 #: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr ""
+msgid "Asia/Kabul"
+msgstr "Азия/Кабул"
 
 #: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr ""
+msgid "Asia/Kamchatka"
+msgstr "Азия/Камчатка"
 
 #: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr ""
+msgid "Asia/Karachi"
+msgstr "Азия/Карачи"
 
 #: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr ""
+msgid "Asia/Kashgar"
+msgstr "Азия/Кашгар"
 
 #: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr ""
+msgid "Asia/Kathmandu"
+msgstr "Азия/Катманду"
 
 #: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr ""
+msgid "Asia/Katmandu"
+msgstr "Азия/Катманду"
 
 #: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr ""
+msgid "Asia/Khandyga"
+msgstr "Азия/Хандига"
 
 #: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr ""
+msgid "Asia/Kolkata"
+msgstr "Азия/Колката"
 
 #: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr ""
+msgid "Asia/Krasnoyarsk"
+msgstr "Азия/Красноярск"
 
 #: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr ""
+msgid "Asia/Kuala_Lumpur"
+msgstr "Азия/Куала-Лумпур"
 
 #: ../src/timezone_names.c:318
+msgid "Asia/Kuching"
+msgstr "Азия/Кучинг"
+
+#: ../src/timezone_names.c:319
+msgid "Asia/Kuwait"
+msgstr "Азия/Кувейт"
+
+#: ../src/timezone_names.c:320
+msgid "Asia/Macao"
+msgstr "Азия/Макао"
+
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Азия/Макао"
+
+#: ../src/timezone_names.c:322
+msgid "Asia/Magadan"
+msgstr "Азия/Магадан"
+
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Азия/Макасар"
+
+#: ../src/timezone_names.c:324
+msgid "Asia/Manila"
+msgstr "Азия/Манила"
+
+#: ../src/timezone_names.c:325
+msgid "Asia/Muscat"
+msgstr "Азия/Маскат"
+
+#: ../src/timezone_names.c:326
+msgid "Asia/Nicosia"
+msgstr "Азия/Никозия"
+
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Азия/Новокузнетск"
+
+#: ../src/timezone_names.c:328
+msgid "Asia/Novosibirsk"
+msgstr "Азия/Новосибирск"
+
+#: ../src/timezone_names.c:329
+msgid "Asia/Omsk"
+msgstr "Азия/Омск"
+
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Азия/Урал"
+
+#: ../src/timezone_names.c:331
+msgid "Asia/Phnom_Penh"
+msgstr "Азия/Пномпен"
+
+#: ../src/timezone_names.c:332
+msgid "Asia/Pontianak"
+msgstr "Азия/Понтианак"
+
+#: ../src/timezone_names.c:333
+msgid "Asia/Pyongyang"
+msgstr "Азия/Пхенян"
+
+#: ../src/timezone_names.c:334
+msgid "Asia/Qatar"
+msgstr "Азия/Катар"
+
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Азия/Qyzylorda"
+
+#: ../src/timezone_names.c:336
+msgid "Asia/Rangoon"
+msgstr "Азия/Рангун"
+
+#: ../src/timezone_names.c:337
+msgid "Asia/Riyadh"
+msgstr "Азия/Рияд"
+
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Азия/Риад87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Азия/Риад88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Азия/Риад89"
+
+#: ../src/timezone_names.c:341
+msgid "Asia/Saigon"
+msgstr "Азия/Сайгон"
+
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Азия/Сахалин"
+
+#: ../src/timezone_names.c:343
+msgid "Asia/Samarkand"
+msgstr "Азия/Самарканд"
+
+#: ../src/timezone_names.c:344
+msgid "Asia/Seoul"
+msgstr "Азия/Сеул"
+
+#: ../src/timezone_names.c:345
+msgid "Asia/Shanghai"
+msgstr "Азия/Шанхай"
+
+#: ../src/timezone_names.c:346
+msgid "Asia/Singapore"
+msgstr "Азия/Сингапур"
+
+#: ../src/timezone_names.c:347
+msgid "Asia/Taipei"
+msgstr "Азия/Тайпей"
+
+#: ../src/timezone_names.c:348
+msgid "Asia/Tashkent"
+msgstr "Азия/Ташкент"
+
+#: ../src/timezone_names.c:349
+msgid "Asia/Tbilisi"
+msgstr "Азия/Тбилиси"
+
+#: ../src/timezone_names.c:350
+msgid "Asia/Tehran"
+msgstr "Азия/Техеран"
+
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Азия/Тел Авив"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Азия/Тхинпху"
+
+#: ../src/timezone_names.c:353
+msgid "Asia/Thimphu"
+msgstr "Азия/Тхимпху"
+
+#: ../src/timezone_names.c:354
+msgid "Asia/Tokyo"
+msgstr "Азия/Токио"
+
+#: ../src/timezone_names.c:355
+msgid "Asia/Ujung_Pandang"
+msgstr "Азия/Уджунг Панданг"
+
+#: ../src/timezone_names.c:356
+msgid "Asia/Ulaanbaatar"
+msgstr "Азия/Улан-Батор"
+
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Азия/Улан Батор"
+
+#: ../src/timezone_names.c:358
+msgid "Asia/Urumqi"
+msgstr "Азия/Урумчи"
+
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Азия/Уст-Нера"
+
+#: ../src/timezone_names.c:360
+msgid "Asia/Vientiane"
+msgstr "Азия/Виентян"
+
+#: ../src/timezone_names.c:361
+msgid "Asia/Vladivostok"
+msgstr "Азия/Владивосток"
+
+#: ../src/timezone_names.c:362
+msgid "Asia/Yakutsk"
+msgstr "Азия/Якутск"
+
+#: ../src/timezone_names.c:363
+msgid "Asia/Yekaterinburg"
+msgstr "Азия/Екатеринбург"
+
+#: ../src/timezone_names.c:364
+msgid "Asia/Yerevan"
+msgstr "Азия/Ереван"
+
+#: ../src/timezone_names.c:365
+msgid "Atlantic"
+msgstr "Атлантически океан"
+
+#: ../src/timezone_names.c:366
+msgid "Atlantic/Azores"
+msgstr "Атлантически океан/Азорски острови"
+
+#: ../src/timezone_names.c:367
+msgid "Atlantic/Bermuda"
+msgstr "Атлантически океан/Бермуди"
+
+#: ../src/timezone_names.c:368
+msgid "Atlantic/Canary"
+msgstr "Атлантически океан/Канарски острови"
+
+#: ../src/timezone_names.c:369
+msgid "Atlantic/Cape_Verde"
+msgstr "Атлантически океан/Зелени нос"
+
+#: ../src/timezone_names.c:370
+msgid "Atlantic/Faeroe"
+msgstr "Атлантически океан/Фарерски острови"
+
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Атлантически океан/Faroe"
+
+#: ../src/timezone_names.c:372
+msgid "Atlantic/Jan_Mayen"
+msgstr "Атлантически океан/Ян-Майен"
+
+#: ../src/timezone_names.c:373
+msgid "Atlantic/Madeira"
+msgstr "Атлантически океан/Мадейра"
+
+#: ../src/timezone_names.c:374
+msgid "Atlantic/Reykjavik"
+msgstr "Атлантически океан/Рейкявик"
+
+#: ../src/timezone_names.c:375
+msgid "Atlantic/South_Georgia"
+msgstr "Атлантически океан/Южна Джорджия"
+
+#: ../src/timezone_names.c:376
+msgid "Atlantic/St_Helena"
+msgstr "Атлантически океан/Св. Елена"
+
+#: ../src/timezone_names.c:377
+msgid "Atlantic/Stanley"
+msgstr "Атлантически океан/Стенли"
+
+#: ../src/timezone_names.c:378
+msgid "Australia"
+msgstr "Австралия"
+
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Австралия/ACT"
+
+#: ../src/timezone_names.c:380
+msgid "Australia/Adelaide"
+msgstr "Австралия/Аделаида"
+
+#: ../src/timezone_names.c:381
+msgid "Australia/Brisbane"
+msgstr "Австралия/Брисбейн"
+
+#: ../src/timezone_names.c:382
+msgid "Australia/Broken_Hill"
+msgstr "Австралия/Броукин-Хил"
+
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Австралия/Кюри"
+
+#: ../src/timezone_names.c:384
+msgid "Australia/Darwin"
+msgstr "Австралия/Дарвин"
+
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Австралия/Еукла"
+
+#: ../src/timezone_names.c:386
+msgid "Australia/Hobart"
+msgstr "Австралия/Хобарт"
+
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr "Австралия/Линдеман"
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr "Австралия/Лорд-Хау"
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "Австралия/Мелбърн"
+
+#: ../src/timezone_names.c:390
 msgid "Australia/Perth"
-msgstr ""
+msgstr "Австралия/Перт"
+
+#: ../src/timezone_names.c:391
+msgid "Australia/Sydney"
+msgstr "Австралия/Сидни"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Бразилия"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Бразилия/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Бразилия/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Бразилия/Изток"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Бразилия/Запад"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Канада"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Канада/Атлантически океан"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Канада/Централна"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Канада/Източен Саскачеван"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Канада/Източна"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Канада/Планинска"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Канада/Нюфлаундленд"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Канада/Тихия океан"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Канада/Саскачеван"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Канада/Юкон"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Чили"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Чили/Континентална част"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Чили/Източен Айсланд"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
 
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr ""
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Гринуич"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Универсален"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Зулу"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:446
 msgid "Europe"
-msgstr ""
+msgstr "Европа"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
-msgstr ""
+msgstr "Европа/Амстердам"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
-msgstr ""
+msgstr "Европа/Андора"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
-msgstr ""
+msgstr "Европа/Атина"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
-msgstr ""
+msgstr "Европа/Белфаст"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
-msgstr ""
+msgstr "Европа/Белград"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
-msgstr ""
+msgstr "Европа/Берлин"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
-msgstr ""
+msgstr "Европа/Братислава"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
-msgstr ""
+msgstr "Европа/Брюксел"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
-msgstr ""
+msgstr "Европа/Букорещ"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
-msgstr ""
+msgstr "Европа/Будапеща"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Европа/Бюсинген"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
-msgstr ""
+msgstr "Европа/Кишинев"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
-msgstr ""
+msgstr "Европа/Копенхаген"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
-msgstr ""
+msgstr "Европа/Дъблин"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
-msgstr ""
+msgstr "Европа/Гибралтар"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Европа/Гърнси"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
-msgstr ""
+msgstr "Европа/Хелзинки"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Европа/Остров Ман"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
-msgstr ""
+msgstr "Европа/Истамбул"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Европа/Джърси"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
-msgstr ""
+msgstr "Европа/Калининград"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
-msgstr ""
+msgstr "Европа/Киев"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
-msgstr ""
+msgstr "Европа/Лисабон"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
-msgstr ""
+msgstr "Европа/Любляна"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
-msgstr ""
+msgstr "Европа/Лондон"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
-msgstr ""
+msgstr "Европа/Люксембург"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
-msgstr ""
+msgstr "Европа/Мадрид"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
-msgstr ""
+msgstr "Европа/Малта"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Европа/Мариехамн"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
-msgstr ""
+msgstr "Европа/Минск"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
-msgstr ""
+msgstr "Европа/Монако"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
-msgstr ""
+msgstr "Европа/Москва"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
-msgstr ""
+msgstr "Европа/Никозия"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
-msgstr ""
+msgstr "Европа/Осло"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
-msgstr ""
+msgstr "Европа/Париж"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Европа/Подгорица"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
-msgstr ""
+msgstr "Европа/Прага"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
-msgstr ""
+msgstr "Европа/Рига"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
-msgstr ""
+msgstr "Европа/Рим"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
-msgstr ""
+msgstr "Европа/Самара"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
-msgstr ""
+msgstr "Европа/Сан-Марино"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
-msgstr ""
+msgstr "Европа/Сараево"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
-msgstr ""
+msgstr "Европа/Симферопол"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
-msgstr ""
+msgstr "Европа/Скопие"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
-msgstr ""
+msgstr "Европа/София"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
-msgstr ""
+msgstr "Европа/Стокхолм"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
-msgstr ""
+msgstr "Европа/Талин"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
-msgstr ""
+msgstr "Европа/Тирана"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Европа/Тираспол"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
-msgstr ""
+msgstr "Европа/Ужгород"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
-msgstr ""
+msgstr "Европа/Вадуц"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
-msgstr ""
+msgstr "Европа/Ватикана"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
-msgstr ""
+msgstr "Европа/Виена"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
-msgstr ""
+msgstr "Европа/Вилнюс"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Европа/Волгоград"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
-msgstr ""
+msgstr "Европа/Варшава"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
-msgstr ""
+msgstr "Европа/Загреб"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
-msgstr ""
+msgstr "Европа/Запорожие"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
-msgstr ""
+msgstr "Европа/Цюрих"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
-msgstr ""
+msgstr "Индийски океан"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
-msgstr ""
+msgstr "Индийски океан/Антананариву"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
-msgstr ""
+msgstr "Индийски океан/Чагос"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
-msgstr ""
+msgstr "Индийски океан/о-в Коледа"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
-msgstr ""
+msgstr "Индийски океан/о-в Кокос"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
-msgstr ""
+msgstr "Индийски океан/Коморские острови"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
-msgstr ""
+msgstr "Индийски океан/Кергелен"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
-msgstr ""
+msgstr "Индийски океан/Мае"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
-msgstr ""
+msgstr "Индийски океан/Малдиви"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
-msgstr ""
+msgstr "Индийски океан/Маврикий"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
-msgstr ""
+msgstr "Индийски океан/Майорка"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
-msgstr ""
+msgstr "Индийски океан/Реюниън"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Мексико"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Мексико/Байя Норте"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Мексико/Байя Сур"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Мексико/Основен"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Средният изток"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Средният изток/Риад87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Средният изток/Риад88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Средният изток/Риад89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
-msgstr ""
+msgstr "Тихия океан"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
-msgstr ""
+msgstr "Тихия океан/Апия"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
-msgstr ""
+msgstr "Тихия океан/Оуклънд"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
-msgstr ""
+msgstr "Тихия океан/Чатъм"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Тихият океан/Чуук"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
-msgstr ""
+msgstr "Тихия океан/о-в Пасха"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
-msgstr ""
+msgstr "Тихия океан/Ефате"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
-msgstr ""
+msgstr "Тихия океан/Ендербъри"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
-msgstr ""
+msgstr "Тихия океан/Факаофо"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
-msgstr ""
+msgstr "Тихия океан/Фиджи"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
-msgstr ""
+msgstr "Тихия океан/Фунафути"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
-msgstr ""
+msgstr "Тихия океан/Галапагос"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
-msgstr ""
+msgstr "Тихия океан/Гамбие"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
-msgstr ""
+msgstr "Тихия океан/Гуадалканал"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
-msgstr ""
+msgstr "Тихия океан/Гуам"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
-msgstr ""
+msgstr "Тихия океан/Хонолулу"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
-msgstr ""
+msgstr "Тихия океан/Джонстън"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
-msgstr ""
+msgstr "Тихия океан/Киритимати"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
-msgstr ""
+msgstr "Тихия океан/Косрае"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
-msgstr ""
+msgstr "Тихия океан/Куаджалейн"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
-msgstr ""
+msgstr "Тихия океан/Маджуро"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
-msgstr ""
+msgstr "Тихия океан/Маркизки острови"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
-msgstr ""
+msgstr "Тихия океан/Мидуей"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
-msgstr ""
+msgstr "Тихия океан/Науру"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
-msgstr ""
+msgstr "Тихия океан/Ниуе"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
-msgstr ""
+msgstr "Тихия океан/Норфолк"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
-msgstr ""
+msgstr "Тихия океан/Нумеа"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
-msgstr ""
+msgstr "Тихия океан/Паго-Паго"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
-msgstr ""
+msgstr "Тихия океан/Палау"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
-msgstr ""
+msgstr "Тихия океан/Питкерн"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Тихият океан/Помпей"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
-msgstr ""
+msgstr "Тихия океан/Понапе"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
-msgstr ""
+msgstr "Тихия океан/Порт-Морсби"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
-msgstr ""
+msgstr "Тихия океан/Раротонга"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
-msgstr ""
+msgstr "Тихия океан/Сайпан"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Тихият океан/Самоа"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
-msgstr ""
+msgstr "Тихия океан/Таити"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
-msgstr ""
+msgstr "Тихия океан/Тарава"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
-msgstr ""
+msgstr "Тихия океан/Тонгатапу"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
-msgstr ""
+msgstr "Тихия океан/Трук"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
-msgstr ""
+msgstr "Тихия океан/Уейк"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
-msgstr ""
+msgstr "Тихия океан/Уолис"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
-msgstr ""
+msgstr "Тихия океан/Яп. о-ви"
+
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "САЩ"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "САЩ/Аляска"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "САЩ/Алеутия"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "САЩ/Аризона"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "САЩ/Център"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "САЩ/Изток"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "САЩ/Изток-Индиана"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "САЩ/Хавай"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "САЩ/Индиана-Старк"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "САЩ/Мичиган"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "САЩ/Монтана"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "САЩ/Тихият океан"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "САЩ/Тихият океан-Нов"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "САЩ/Самоа"
 
 #: ../src/tray_icon.c:469
-#, fuzzy
 msgid "New appointment"
-msgstr "Среща"
+msgstr "Ново събитие"
 
 #: ../src/tray_icon.c:485
 msgid "About Orage"
-msgstr ""
+msgstr "Относно Orage"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
 msgid "Orage Panel Clock"
-msgstr ""
+msgstr "Часовник за панела Orage"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
 msgid "Show time and date?"
-msgstr ""
+msgstr "Показване на час и дата?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-#, fuzzy
-msgid "Calendar"
-msgstr "XFCalendar"
+msgid "Orage preferences"
+msgstr "Настройки на Orage"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Предпочитания"
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr "Настройки на календара на Xfce 4 (Orage)"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Предпочитания"
+msgid "Orage Calendar Preferences"
+msgstr "Настройки на келендара Orage"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr ""
-
-#: ../xfcalendar.desktop.in.h:2
-#, fuzzy
-msgid "Desktop calendar"
-msgstr "Относно XFCalendar"
-
 #: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "XFCalendar"
-
-#~ msgid "Warning"
-#~ msgstr "Внимание"
-
-#, fuzzy
-#~ msgid "Modify Preferences"
-#~ msgstr "Предпочитания"
-
-#, fuzzy
-#~ msgid "Monday"
-#~ msgstr "Днес"
-
-#, fuzzy
-#~ msgid "Tuesday"
-#~ msgstr "Днес"
-
-#, fuzzy
-#~ msgid "Wednesday"
-#~ msgstr "Днес"
-
-#, fuzzy
-#~ msgid "Thursday"
-#~ msgstr "Днес"
-
-#, fuzzy
-#~ msgid "Friday"
-#~ msgstr "Днес"
-
-#, fuzzy
-#~ msgid "Sunday"
-#~ msgstr "Днес"
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "Днес"
-
-#, fuzzy
-#~ msgid "Calendar Files"
-#~ msgstr "XFCalendar"
-
-#, fuzzy
-#~ msgid "Calendar borders"
-#~ msgstr "XFCalendar"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Ще премахнете цялата информация·\n"
-#~ "асоциирана с тази дата."
-
-#~ msgid "Clear"
-#~ msgstr "Изчиства"
+msgid "Calendar"
+msgstr "Календар"
 
-#~ msgid "This should not happen"
-#~ msgstr "Това не трябва да се случва"
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr "Календар Orage"
 
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Не мога да създам MCS канал"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Календар за работният плот"
diff -Nru orage-4.8.3/po/bn_IN.po orage-4.12.1/po/bn_IN.po
--- orage-4.8.3/po/bn_IN.po	2012-01-03 12:01:00.000000000 +0000
+++ orage-4.12.1/po/bn_IN.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,3651 +0,0 @@
-# Translation of orage to Bengali INDIA(bn_IN).
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Runa Bhattacharjee <runab@redhat.com>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2005-09-14 01:40+0900\n"
-"Last-Translator: Runa Bhattacharjee <runab@redhat.com>\n"
-"Language-Team: Bangla INDIA <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Generator: KBabel 1.9.1\n"
-
-#: ../globaltime/globaltime.c:100
-msgid "Raising GlobalTime window..."
-msgstr ""
-
-#: ../globaltime/globaltime.c:102
-msgid "GlobalTime window raise failed"
-msgstr ""
-
-#. ********** timezone tooltip **********
-#: ../globaltime/globaltime.c:277
-#, c-format
-msgid ""
-"%s\n"
-"click to modify clock"
-msgstr ""
-
-#: ../globaltime/globaltime.c:386
-msgid "Localtime"
-msgstr ""
-
-#: ../globaltime/globaltime.c:464
-msgid ""
-"button 1 to change preferences \n"
-"button 2 to adjust time of clocks"
-msgstr ""
-
-#: ../globaltime/globaltime.c:480
-msgid "adjust to change hour"
-msgstr ""
-
-#: ../globaltime/globaltime.c:496
-msgid ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
-msgid "NEW"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:289
-msgid "NEW COPY"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:310
-msgid "Not possible to delete the last clock."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:516
-msgid "update this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
-msgid "add new empty clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:526
-msgid "add new clock using this clock as model"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:531
-msgid "delete this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:539
-msgid "move this clock first"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:544
-msgid "move this clock left"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:549
-msgid "move this clock right"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:554
-msgid "move this clock last"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:562
-msgid "set the timezone of this clock to be local timezone"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
-msgid "close window and exit"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:590
-#, fuzzy
-msgid "Globaltime preferences "
-msgstr "পছন্দসমূহ"
-
-#. -----------------------HEADING-------------------------------------------
-#: ../globaltime/gt_prefs.c:603
-msgid "Clock Parameters"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:607
-msgid "Name of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:613
-msgid "enter name of clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:616
-msgid "Timezone of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:643
-msgid "Text Formatting"
-msgstr ""
-
-#. ------------------------background-------------------------
-#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
-msgid "Background color:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:656
-msgid "Click to change background colour for clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
-#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
-#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
-#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
-#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
-msgid "Use default"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
-#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
-#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
-msgid "Cross this to use default instead of selected value"
-msgstr ""
-
-#. ------------------------foreground-------------------------
-#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
-msgid "Foreground (=text) color:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:688
-msgid "Click to change foreground colour for clock"
-msgstr ""
-
-#. ------------------------name font-------------------------
-#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
-msgid "Font for name of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:720
-msgid "Click to change font for clock name"
-msgstr ""
-
-#. ------------------------time font-------------------------
-#: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
-msgid "Font for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:753
-msgid "Click to change font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:780
-msgid "Underline name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:810
-msgid "Underline time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:850
-msgid "Text Default Formatting"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:863
-msgid "Click to change default background colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
-msgid "Cross this to use system default instead of selected color"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:896
-msgid "Click to change default text colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:929
-msgid "Click to change default font for clock name"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
-msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:963
-msgid "Click to change default font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:990
-msgid "Underline for name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:1004
-msgid "Underline for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1027
-#, fuzzy
-msgid "update preferences"
-msgstr "পছন্দসমূহ"
-
-#: ../globaltime/gt_prefs.c:1062
-#, fuzzy
-msgid "Globaltime Preferences"
-msgstr "পছন্দসমূহ"
-
-#. -----------------------HEADING--------------------------------------
-#: ../globaltime/gt_prefs.c:1073
-#, fuzzy
-msgid "General Preferences"
-msgstr "পছন্দসমূহ"
-
-#: ../globaltime/gt_prefs.c:1077
-msgid "Decorations:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1078
-#, fuzzy
-msgid "Standard"
-msgstr "Calendar"
-
-#: ../globaltime/gt_prefs.c:1083
-msgid "Use normal decorations"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1094
-msgid "Do not show window decorations (borders)"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1100
-msgid "Clock size:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1101
-msgid "Equal"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1106
-msgid "All clocks have same size"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1111
-#, fuzzy
-msgid "Varying"
-msgstr "সতর্কবাণী"
-
-#: ../globaltime/gt_prefs.c:1116
-msgid "Clock sizes vary"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1122
-msgid "Local timezone:"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:101
-#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
-msgid " Other"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:156
-#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
-#, c-format
-msgid "%d hour %d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:159
-#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, c-format
-msgid "%d hour"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:161
-#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, c-format
-msgid "%d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:167
-#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
-msgid "backward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:170
-#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-msgid "forward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:194
-#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
-msgid "not changed"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:195
-#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
-msgid "not changing"
-msgstr ""
-
-#. location
-#: ../globaltime/timezone_selection.c:247
-#: ../globaltime/timezone_selection.c:252
-#: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
-#: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
-msgid "Location"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:258
-#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
-msgid "GMT Offset"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:264
-#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
-msgid "Previous/Next Change"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:269
-#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
-msgid "Country"
-msgstr ""
-
-#. We are actually setting the g_par parameter. In other words
-#. we are setting the global default timezone for Orage. This is
-#. done very seldom and we do not want to allow "floating" here.
-#. This test is ugly, but it is not worth an extra parameter.
-#. this is normal appointment
-#: ../globaltime/timezone_selection.c:299
-#: ../globaltime/timezone_selection.c:309
-#: ../panel-plugin/timezone_selection.c:300
-#: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
-#: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
-msgid "Pick timezone"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:302
-#: ../globaltime/timezone_selection.c:312
-#: ../panel-plugin/timezone_selection.c:303
-#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
-#: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
-msgid "Change mode"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:303
-#: ../globaltime/timezone_selection.c:313
-#: ../globaltime/timezone_selection.c:352
-#: ../panel-plugin/timezone_selection.c:304
-#: ../panel-plugin/timezone_selection.c:314
-#: ../panel-plugin/timezone_selection.c:353 ../src/timezone_selection.c:320
-#: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
-#: ../src/timezone_selection.c:379
-msgid "UTC"
-msgstr ""
-
-#. NOTE: this exists only if ical timezones are being used
-#: ../globaltime/timezone_selection.c:304
-#: ../globaltime/timezone_selection.c:357
-#: ../panel-plugin/timezone_selection.c:305
-#: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
-#: ../src/timezone_selection.c:384
-msgid "floating"
-msgstr ""
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "পছন্দসমূহ"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
-msgid "Orage Globaltime"
-msgstr "Calendar"
-
-#: ../globaltime/globaltime.desktop.in.h:3
-msgid "Show clocks from different countries"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:224
-msgid "Appearance"
-msgstr ""
-
-#. show frame
-#: ../panel-plugin/oc_config.c:229
-msgid "Show _frame"
-msgstr ""
-
-#. foreground color
-#: ../panel-plugin/oc_config.c:239
-msgid "set foreground _color:"
-msgstr ""
-
-#. background color
-#: ../panel-plugin/oc_config.c:253
-msgid "set _background color:"
-msgstr ""
-
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
-msgid "set _height:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:277
-msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:282
-msgid "set _width:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:293
-msgid "Note that you can not change the width of vertical panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:316
-msgid "Clock Options"
-msgstr ""
-
-#. timezone
-#: ../panel-plugin/oc_config.c:326
-msgid "set timezone to:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:347
-#, c-format
-msgid "Line %d:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:357
-msgid "Enter any valid strftime function parameter."
-msgstr ""
-
-#. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
-msgid "Tooltip:"
-msgstr ""
-
-#. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
-msgid "fix time after suspend/hibernate"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:415
-msgid ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:432
-msgid ""
-"This program uses strftime function to get time.\n"
-"Use any valid code to get time in the format you prefer.\n"
-"Some common codes are:\n"
-"\t%A = weekday\t\t\t%B = month\n"
-"\t%c = date & time\t\t%R = hour & minute\n"
-"\t%V = week number\t\t%Z = timezone in use\n"
-"\t%H = hours \t\t\t\t%M = minute\n"
-"\t%X = local time\t\t\t%x = local date"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:457
-#, fuzzy
-msgid "Orage clock Preferences"
-msgstr "পছন্দসমূহ"
-
-#. no lines yet
-#. TRANSLATORS: Use format characters from strftime(3)
-#. * to get the proper string for your locale.
-#. * I used these:
-#. * %A  : full weekday name
-#. * %d  : day of the month
-#. * %B  : full month name
-#. * %Y  : four digit year
-#. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
-msgid "%A %d %B %Y/%V"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:40
-msgid "Maintainer"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:47
-#, fuzzy
-msgid "Manage your time with Orage"
-msgstr "Xfce4-র সাহায্যে সুষ্ঠুরূপে সময় পরিচালনা করুন"
-
-#. if (gtk_toggle_button_get_active(
-#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
-#. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
-msgid "End"
-msgstr ""
-
-#: ../src/appointment.c:333
-msgid "Due"
-msgstr ""
-
-#: ../src/appointment.c:493 ../src/mainbox.c:783
-msgid "Orage"
-msgstr ""
-
-#. to avoid timing problems when updating entry
-#. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
-msgid "Select a file..."
-msgstr ""
-
-#: ../src/appointment.c:680
-msgid "Sound Files"
-msgstr ""
-
-#: ../src/appointment.c:687 ../src/interface.c:290
-msgid "All Files"
-msgstr ""
-
-#: ../src/appointment.c:739
-#, fuzzy
-msgid "The appointment information has been modified."
-msgstr ""
-"\n"
-"তথ্য পরিবর্তিত হয়েছে।\n"
-" আপনি কি অগ্রসর হতে ইচ্ছুক ?\n"
-
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
-msgid "Do you want to continue?"
-msgstr ""
-
-#: ../src/appointment.c:767
-msgid "The end of this appointment is earlier than the beginning."
-msgstr ""
-
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-msgid "Not set"
-msgstr ""
-
-#: ../src/appointment.c:1193
-msgid "This appointment will be permanently removed."
-msgstr ""
-
-#: ../src/appointment.c:1692
-msgid "This appointment does not exist."
-msgstr ""
-
-#: ../src/appointment.c:1693
-msgid "It was probably removed, please refresh your screen."
-msgstr ""
-
-#: ../src/appointment.c:1995
-#, fuzzy
-msgid "Current categories"
-msgstr "Calendar"
-
-#: ../src/appointment.c:2010
-msgid "Add new category with color"
-msgstr ""
-
-#: ../src/appointment.c:2014
-msgid "Category:"
-msgstr ""
-
-#: ../src/appointment.c:2045
-msgid "Colors of categories - Orage"
-msgstr ""
-
-#: ../src/appointment.c:2092
-msgid " *** COPY ***"
-msgstr ""
-
-#: ../src/appointment.c:2353
-#, fuzzy
-msgid "New appointment - Orage"
-msgstr "নির্ধারিত কর্ম"
-
-#. File menu stuff
-#. ********* File menu *********
-#. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
-msgid "_File"
-msgstr "ফাইল (_F)"
-
-#: ../src/appointment.c:2388
-msgid "Sav_e and close"
-msgstr ""
-
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
-msgid "D_uplicate"
-msgstr ""
-
-#: ../src/appointment.c:2589
-msgid "Save"
-msgstr ""
-
-#: ../src/appointment.c:2591
-msgid "Save and close"
-msgstr ""
-
-#: ../src/appointment.c:2596
-msgid "Revert"
-msgstr ""
-
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
-msgid "Duplicate"
-msgstr ""
-
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
-msgid "Delete"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Free"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Busy"
-msgstr ""
-
-#: ../src/appointment.c:2625
-msgid "General"
-msgstr ""
-
-#. type
-#: ../src/appointment.c:2631
-msgid "Type "
-msgstr ""
-
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
-msgid "Event"
-msgstr ""
-
-#: ../src/appointment.c:2636
-msgid ""
-"Event that will happen sometime. For example:\n"
-"Meeting or birthday or TV show."
-msgstr ""
-
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-#, fuzzy
-msgid "Todo"
-msgstr "আজ"
-
-#: ../src/appointment.c:2642
-msgid ""
-"Something that you should do sometime. For example:\n"
-"Wash your car or test new version of Orage."
-msgstr ""
-
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
-msgid "Journal"
-msgstr ""
-
-#: ../src/appointment.c:2649
-msgid ""
-"Make a note that something happened. For example:\n"
-"Remark that your mother called or first snow came."
-msgstr ""
-
-#. title
-#: ../src/appointment.c:2656
-msgid "Title "
-msgstr ""
-
-#: ../src/appointment.c:2671
-msgid "All day event"
-msgstr ""
-
-#. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
-msgid "Start"
-msgstr ""
-
-#: ../src/appointment.c:2697
-msgid "Set      "
-msgstr ""
-
-#: ../src/appointment.c:2718
-msgid "Duration"
-msgstr ""
-
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
-#, fuzzy
-msgid "days"
-msgstr "আজ"
-
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
-msgid "hours"
-msgstr ""
-
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
-msgid "mins"
-msgstr ""
-
-#. Availability (only for EVENT)
-#: ../src/appointment.c:2738
-msgid "Availability"
-msgstr ""
-
-#. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
-msgid "Completed"
-msgstr ""
-
-#: ../src/appointment.c:2749
-msgid "Done"
-msgstr ""
-
-#. categories
-#: ../src/appointment.c:2770
-msgid "Categories"
-msgstr ""
-
-#: ../src/appointment.c:2782
-msgid ""
-"This is special category, which can be used to color this appointment in "
-"list views."
-msgstr ""
-
-#: ../src/appointment.c:2787
-msgid "update colors for categories."
-msgstr ""
-
-#. priority
-#: ../src/appointment.c:2793
-msgid "Priority"
-msgstr ""
-
-#. note
-#: ../src/appointment.c:2803
-msgid "Note"
-msgstr ""
-
-#: ../src/appointment.c:2824
-msgid ""
-"These shorthand commands take effect immediately:\n"
-"    <D> inserts current date in local date format\n"
-"    <T> inserts time and\n"
-"    <DT> inserts date and time.\n"
-"\n"
-"These are converted only later when they are seen:\n"
-"    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before Start"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before End"
-msgstr ""
-
-#: ../src/appointment.c:2896
-msgid "After Start"
-msgstr ""
-
-#: ../src/appointment.c:2896
-msgid "After End"
-msgstr ""
-
-#: ../src/appointment.c:2903
-msgid "Alarm"
-msgstr ""
-
-#. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-msgid "Alarm time"
-msgstr ""
-
-#: ../src/appointment.c:2933
-msgid ""
-"Often you want to get alarm:\n"
-" 1) before Event start\n"
-" 2) before Todo end\n"
-" 3) after Todo start"
-msgstr ""
-
-#: ../src/appointment.c:2938
-msgid "Persistent alarm"
-msgstr ""
-
-#: ../src/appointment.c:2940
-msgid ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
-msgstr ""
-
-#. **** Audio Alarm ****
-#: ../src/appointment.c:2949
-msgid "Sound"
-msgstr ""
-
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
-msgid "Use"
-msgstr ""
-
-#: ../src/appointment.c:2955
-msgid "Select this if you want audible alarm"
-msgstr ""
-
-#: ../src/appointment.c:2972
-msgid "Repeat alarm sound"
-msgstr ""
-
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
-msgid "times"
-msgstr ""
-
-#: ../src/appointment.c:3004
-msgid "sec interval"
-msgstr ""
-
-#. **** Display Alarm ****
-#: ../src/appointment.c:3014
-msgid "Visual"
-msgstr ""
-
-#: ../src/appointment.c:3018
-msgid "Use Orage window"
-msgstr ""
-
-#: ../src/appointment.c:3020
-msgid "Select this if you want Orage window alarm"
-msgstr ""
-
-#: ../src/appointment.c:3032
-msgid "Use notification"
-msgstr ""
-
-#: ../src/appointment.c:3034
-msgid "Select this if you want notification alarm"
-msgstr ""
-
-#: ../src/appointment.c:3040
-msgid "Set timeout"
-msgstr ""
-
-#: ../src/appointment.c:3043
-msgid "Select this if you want notification to expire automatically"
-msgstr ""
-
-#: ../src/appointment.c:3054
-msgid "0 = system default expiration time"
-msgstr ""
-
-#: ../src/appointment.c:3059
-msgid "seconds"
-msgstr ""
-
-#. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
-msgid "Procedure"
-msgstr ""
-
-#: ../src/appointment.c:3076
-msgid "Select this if you want procedure or script alarm"
-msgstr ""
-
-#: ../src/appointment.c:3082
-msgid ""
-"You must enter all escape etc characters yourself.\n"
-"This string is just given to shell to process.\n"
-"The following special commands are replaced at run time:\n"
-"\t<&T>  appointment title\n"
-"\t<&D>  appointment description\n"
-"\t<&AT> alarm time\n"
-"\t<&ST> appointment start time\n"
-"\t<&ET> appointment end time"
-msgstr ""
-
-#: ../src/appointment.c:3094
-msgid "Test this alarm by raising it now"
-msgstr ""
-
-#: ../src/appointment.c:3101
-msgid "<b>Default alarm</b>"
-msgstr ""
-
-#: ../src/appointment.c:3109
-msgid "Store current settings as default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3114
-msgid "Set current settings from default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Daily"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Weekly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Monthly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Yearly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Hourly"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Mon"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Tue"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Wed"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Thu"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Fri"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Sat"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Sun"
-msgstr ""
-
-#: ../src/appointment.c:3183
-msgid "Recurrence"
-msgstr ""
-
-#. complexity
-#: ../src/appointment.c:3189
-msgid "Complexity"
-msgstr ""
-
-#: ../src/appointment.c:3192
-msgid "Basic"
-msgstr ""
-
-#: ../src/appointment.c:3198
-msgid "Advanced"
-msgstr ""
-
-#: ../src/appointment.c:3202
-msgid "Use this if you want regular repeating event"
-msgstr ""
-
-#: ../src/appointment.c:3204
-msgid ""
-"Use this if you need complex times like:\n"
-" Every Saturday and Sunday or \n"
-" First Tuesday every month"
-msgstr ""
-
-#. frequency
-#: ../src/appointment.c:3211
-msgid "Frequency"
-msgstr ""
-
-#: ../src/appointment.c:3217
-msgid "Each"
-msgstr ""
-
-#: ../src/appointment.c:3224
-msgid "occurrence"
-msgstr ""
-
-#: ../src/appointment.c:3228
-msgid ""
-"Limit frequency to certain interval.\n"
-" For example: Every third day:\n"
-" Frequency = Daily and Interval = 3"
-msgstr ""
-
-#: ../src/appointment.c:3274
-msgid "Limit"
-msgstr ""
-
-#: ../src/appointment.c:3276
-msgid "Repeat forever"
-msgstr ""
-
-#: ../src/appointment.c:3282
-msgid "Repeat "
-msgstr ""
-
-#: ../src/appointment.c:3298
-msgid "Repeat until "
-msgstr ""
-
-#. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-#, fuzzy
-msgid "Weekdays"
-msgstr "আজ"
-
-#: ../src/appointment.c:3323
-msgid "Which day"
-msgstr ""
-
-#: ../src/appointment.c:3331
-msgid ""
-"Specify which weekday for monthly and yearly events.\n"
-" For example:\n"
-" Second Wednesday each month:\n"
-"\tFrequency = Monthly,\n"
-"\tWeekdays = check only Wednesday,\n"
-"\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-
-#. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
-msgid "TODO base"
-msgstr ""
-
-#: ../src/appointment.c:3352
-msgid ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
-msgstr ""
-
-#: ../src/appointment.c:3354
-msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-
-#. exceptions
-#: ../src/appointment.c:3361
-msgid "Exceptions"
-msgstr ""
-
-#: ../src/appointment.c:3374
-msgid ""
-"Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
-"Remove by clicking the data."
-msgstr ""
-
-#: ../src/appointment.c:3379
-msgid "Add excluded date (-)"
-msgstr ""
-
-#: ../src/appointment.c:3381
-msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-
-#: ../src/appointment.c:3387
-msgid "Add included time (+)"
-msgstr ""
-
-#: ../src/appointment.c:3389
-msgid ""
-"Included times have same timezone than start time, but they may have "
-"different time"
-msgstr ""
-
-#. calendars showing the action days
-#: ../src/appointment.c:3406
-msgid "Action dates"
-msgstr ""
-
-#. ********* View menu *********
-#. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
-msgid "_View"
-msgstr ""
-
-#. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
-msgid "_Go"
-msgstr ""
-
-#: ../src/day-view.c:319 ../src/event-list.c:1110
-msgid "New"
-msgstr ""
-
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr ""
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "আজ"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr ""
-
-#: ../src/day-view.c:333 ../src/event-list.c:1128
-msgid "Refresh"
-msgstr ""
-
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
-msgid "Close"
-msgstr ""
-
-#: ../src/day-view.c:454
-msgid "Unknown"
-msgstr ""
-
-#: ../src/day-view.c:704
-msgid "       Number of days to show"
-msgstr ""
-
-#: ../src/day-view.c:935
-#, fuzzy
-msgid "Orage - day view"
-msgstr "Calendar"
-
-#. date only appointment
-#: ../src/event-list.c:190
-msgid "All day"
-msgstr ""
-
-#: ../src/event-list.c:580 ../src/event-list.c:1281
-msgid "Time"
-msgstr ""
-
-#: ../src/event-list.c:748
-msgid "No rows have been selected."
-msgstr ""
-
-#: ../src/event-list.c:749
-msgid "Click a row to select it and after that you can copy it."
-msgstr ""
-
-#: ../src/event-list.c:918
-msgid ""
-"You will permanently remove all\n"
-"selected appointments."
-msgstr ""
-
-#: ../src/event-list.c:1130
-msgid "Find"
-msgstr ""
-
-#: ../src/event-list.c:1137
-msgid "Dayview"
-msgstr ""
-
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr ""
-
-#: ../src/event-list.c:1201
-msgid "Journal entries starting from:"
-msgstr ""
-
-#: ../src/event-list.c:1221
-msgid "Search"
-msgstr ""
-
-#: ../src/event-list.c:1224
-msgid "Search text "
-msgstr ""
-
-#: ../src/event-list.c:1289
-msgid "Flags"
-msgstr ""
-
-#: ../src/event-list.c:1297
-msgid "Title"
-msgstr ""
-
-#: ../src/event-list.c:1323
-msgid ""
-"Double click line to edit it.\n"
-"\n"
-"Flags in order:\n"
-"\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
-"\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
-"\t 3. Type: f=free B=Busy\n"
-"\t 4. Located in file:\n"
-"\t\tO=Orage A=Archive F=Foreign\n"
-"\t 5. Appointment type:\n"
-"\t\tE=Event T=Todo J=Journal"
-msgstr ""
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr ""
-
-#. remove since it has ended
-#: ../src/ical-archive.c:267
-msgid "\tRecur ended, moving to archive file."
-msgstr ""
-
-#: ../src/ical-archive.c:329
-msgid "Archiving not enabled. Exiting"
-msgstr ""
-
-#: ../src/ical-archive.c:347
-#, c-format
-msgid "Archiving threshold: %d month(s)"
-msgstr ""
-
-#. yy mon day
-#: ../src/ical-archive.c:350
-#, c-format
-msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr ""
-
-#: ../src/ical-archive.c:377
-#, c-format
-msgid "Archiving uid: %s"
-msgstr ""
-
-#. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
-msgid "\tVTODO not complete; not archived"
-msgstr ""
-
-#. it is recurrent event
-#: ../src/ical-archive.c:388
-#, c-format
-msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr ""
-
-#: ../src/ical-archive.c:405
-msgid "Archiving done\n"
-msgstr ""
-
-#. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
-msgid "Starting archive removal."
-msgstr ""
-
-#: ../src/ical-archive.c:422
-msgid "\tPHASE 1: reset recurring appointments"
-msgstr ""
-
-#. PHASE 2: go through archive file and add everything back to base orage.
-#. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
-msgid "\tPHASE 2: return archived appointments"
-msgstr ""
-
-#: ../src/ical-archive.c:470
-msgid "Archive removal done\n"
-msgstr ""
-
-#: ../src/ical-code.c:932
-msgid "Orage default alarm"
-msgstr ""
-
-#: ../src/ical-code.c:3115
-#, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-
-#: ../src/ical-code.c:3117
-#, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-
-#: ../src/ical-expimp.c:123
-msgid "Starting import file preprocessing"
-msgstr ""
-
-#: ../src/ical-expimp.c:158
-msgid "... Patched DCREATED to be CREATED."
-msgstr ""
-
-#: ../src/ical-expimp.c:197
-msgid "... Patched timezone to Orage format."
-msgstr ""
-
-#: ../src/ical-expimp.c:206
-msgid "Import file preprocessing done"
-msgstr ""
-
-#: ../src/interface.c:284
-#, fuzzy
-msgid "Calendar files"
-msgstr "Calendar"
-
-#: ../src/interface.c:631
-msgid "Current foreign files"
-msgstr ""
-
-#: ../src/interface.c:643
-msgid "READ ONLY"
-msgstr ""
-
-#: ../src/interface.c:645
-msgid "READ WRITE"
-msgstr ""
-
-#: ../src/interface.c:663
-msgid "***** No foreign files *****"
-msgstr ""
-
-#: ../src/interface.c:974
-msgid "Import/export"
-msgstr ""
-
-#: ../src/interface.c:981
-msgid "Import"
-msgstr ""
-
-#: ../src/interface.c:986
-msgid "Read from file:"
-msgstr ""
-
-#: ../src/interface.c:1003
-msgid ""
-"Separate filenames with comma(,).\n"
-" NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-
-#: ../src/interface.c:1008
-msgid "Export"
-msgstr ""
-
-#: ../src/interface.c:1013
-msgid "Write to file:"
-msgstr ""
-
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
-msgid "Select"
-msgstr "আজকের তারিখ নির্বাচন করুন (_T)"
-
-#: ../src/interface.c:1037
-#, fuzzy
-msgid "All appointments"
-msgstr "নির্ধারিত কর্ম"
-
-#: ../src/interface.c:1050
-#, fuzzy
-msgid "Named appointments: "
-msgstr "নির্ধারিত কর্ম"
-
-#: ../src/interface.c:1062
-msgid ""
-"Note that only main file appointments are read.\n"
-"Archived and Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1065
-msgid ""
-"Note that only main file appointments are read.\n"
-"Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1068
-msgid "You can easily drag these from event-list window."
-msgstr ""
-
-#: ../src/interface.c:1070
-msgid "Orage appointment UIDs separated by commas."
-msgstr ""
-
-#: ../src/interface.c:1076
-msgid "Archive"
-msgstr ""
-
-#: ../src/interface.c:1084
-#, c-format
-msgid "Archive now (threshold: %d months)"
-msgstr ""
-
-#: ../src/interface.c:1094
-msgid "You can change archive threshold in parameters"
-msgstr ""
-
-#: ../src/interface.c:1101
-msgid "Revert archive now"
-msgstr ""
-
-#: ../src/interface.c:1107
-msgid ""
-"Return all archived events into main orage file and remove arch file.\n"
-"This is useful for example when doing export and moving orage\n"
-"appointments to another system."
-msgstr ""
-
-#: ../src/interface.c:1118
-#, fuzzy
-msgid "Orage files"
-msgstr "পছন্দসমূহ"
-
-#: ../src/interface.c:1125
-#, fuzzy
-msgid "Orage main calendar file"
-msgstr "Calendar"
-
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "Calendar"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr ""
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr ""
-
-#: ../src/interface.c:1156 ../src/interface.c:1222
-msgid "Rename"
-msgstr ""
-
-#: ../src/interface.c:1160
-msgid ""
-"Orage internal file rename only.\n"
-"Does not touch external filesystem at all.\n"
-"New file must exist."
-msgstr ""
-
-#: ../src/interface.c:1164 ../src/interface.c:1227
-msgid "Copy"
-msgstr ""
-
-#: ../src/interface.c:1168
-msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-
-#: ../src/interface.c:1172 ../src/interface.c:1232
-msgid "Move"
-msgstr ""
-
-#: ../src/interface.c:1176
-msgid "Current file is moved and vanishes from the old place."
-msgstr ""
-
-#: ../src/interface.c:1190
-msgid "Archive file"
-msgstr ""
-
-#: ../src/interface.c:1254
-msgid "Foreign files"
-msgstr ""
-
-#: ../src/interface.c:1261
-msgid "Add new foreign file"
-msgstr ""
-
-#: ../src/interface.c:1266
-msgid "Foreign file:"
-msgstr ""
-
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr ""
-
-#: ../src/interface.c:1286
-msgid "Read only"
-msgstr ""
-
-#: ../src/interface.c:1294
-msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-
-#: ../src/interface.c:1308
-msgid "Exchange data - Orage"
-msgstr ""
-
-#: ../src/main.c:268
-#, c-format
-msgid ""
-"\tThis is %s version %s\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:270
-#, c-format
-msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
-
-#: ../src/main.c:271
-#, c-format
-msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
-
-#: ../src/main.c:273
-#, c-format
-msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
-
-#: ../src/main.c:276
-#, c-format
-msgid "\tUsing DBUS for import.\n"
-msgstr ""
-
-#: ../src/main.c:278
-#, c-format
-msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
-
-#: ../src/main.c:281
-#, c-format
-msgid "\tUsing libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:283
-#, c-format
-msgid "\tNot using libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:286
-#, c-format
-msgid "\tUsing automatic archiving.\n"
-msgstr ""
-
-#: ../src/main.c:288
-#, c-format
-msgid "\tNot using archiving.\n"
-msgstr ""
-
-#: ../src/main.c:291
-#, c-format
-msgid "\tUsing operating system package libical.\n"
-msgstr ""
-
-#: ../src/main.c:293
-#, c-format
-msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
-
-#: ../src/main.c:306
-#, c-format
-msgid ""
-"Usage: orage [options] [files]\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:307
-#, c-format
-msgid "Options:\n"
-msgstr ""
-
-#: ../src/main.c:308
-#, c-format
-msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
-
-#: ../src/main.c:309
-#, c-format
-msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
-
-#: ../src/main.c:310
-#, c-format
-msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
-
-#: ../src/main.c:311
-#, c-format
-msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
-
-#: ../src/main.c:312
-#, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:313
-#, c-format
-msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:314
-#, c-format
-msgid ""
-"--export (-e) file [appointment...] \texport appointments from Orage to "
-"file\n"
-msgstr ""
-
-#: ../src/main.c:316
-#, c-format
-msgid "files=ical files to load into orage\n"
-msgstr ""
-
-#: ../src/main.c:318
-#, c-format
-msgid "\tdbus not included in orage. \n"
-msgstr ""
-
-#: ../src/main.c:319
-#, c-format
-msgid ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
-msgstr ""
-
-#: ../src/main.c:511
-#, c-format
-msgid ""
-"\n"
-"Unknown option %s\n"
-"\n"
-msgstr ""
-
-#: ../src/mainbox.c:287
-msgid "_Exchange data"
-msgstr ""
-
-#. Edit menu
-#: ../src/mainbox.c:298
-msgid "_Edit"
-msgstr ""
-
-#: ../src/mainbox.c:308
-msgid "View selected _date"
-msgstr ""
-
-#: ../src/mainbox.c:311
-msgid "View selected _week"
-msgstr ""
-
-#: ../src/mainbox.c:317
-msgid "Select _Today"
-msgstr "আজকের তারিখ নির্বাচন করুন (_T)"
-
-#: ../src/mainbox.c:323
-#, fuzzy
-msgid "Show _Globaltime"
-msgstr "পছন্দসমূহ"
-
-#. Help menu
-#: ../src/mainbox.c:327
-msgid "_Help"
-msgstr "সহায়িকা (_H)"
-
-#: ../src/mainbox.c:448
-msgid "Never"
-msgstr ""
-
-#: ../src/mainbox.c:453
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:460
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:546
-msgid "<b>To do:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:582
-#, c-format
-msgid "<b>Events for %s:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:593
-#, c-format
-msgid "<b>Events for %s - %s:</b>"
-msgstr ""
-
-#: ../src/parameters.c:522
-#, fuzzy
-msgid "Main settings"
-msgstr "ক্যালেন্ডারের বৈশিষ্ট্যাবলী (_S)"
-
-#: ../src/parameters.c:528
-msgid "Timezone"
-msgstr ""
-
-#: ../src/parameters.c:543
-msgid "You should always define your local timezone."
-msgstr ""
-
-#: ../src/parameters.c:552
-msgid "Archive threshold (months)"
-msgstr ""
-
-#: ../src/parameters.c:562
-msgid "(0 = no archiving)"
-msgstr ""
-
-#: ../src/parameters.c:565
-msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-
-#: ../src/parameters.c:574
-msgid "Sound command"
-msgstr ""
-
-#: ../src/parameters.c:589
-msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "ক্যালেন্ডারের বৈশিষ্ট্যাবলী (_S)"
-
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
-msgstr "উইন্ডো বন্ধ করুন (_C)"
-
-#: ../src/parameters.c:618
-msgid "Show borders"
-msgstr ""
-
-#: ../src/parameters.c:625
-#, fuzzy
-msgid "Show menu"
-msgstr "প্রদর্শন করা হবে"
-
-#: ../src/parameters.c:632
-#, fuzzy
-msgid "Show month and year"
-msgstr "যার মধ্যে প্রদর্শিত হবে..."
-
-#: ../src/parameters.c:639
-#, fuzzy
-msgid "Show day names"
-msgstr "প্রদর্শন করা হবে"
-
-#: ../src/parameters.c:646
-#, fuzzy
-msgid "Show week numbers"
-msgstr "প্রদর্শন করা হবে"
-
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr ""
-
-#: ../src/parameters.c:660
-msgid "Number of days to show in event window"
-msgstr ""
-
-#: ../src/parameters.c:666
-msgid "0 = do not show event list at all"
-msgstr ""
-
-#: ../src/parameters.c:676
-msgid "Show on all desktops"
-msgstr ""
-
-#: ../src/parameters.c:683
-msgid "Keep on top"
-msgstr ""
-
-#: ../src/parameters.c:690
-#, fuzzy
-msgid "Show in taskbar"
-msgstr "যার মধ্যে প্রদর্শিত হবে..."
-
-#: ../src/parameters.c:697
-#, fuzzy
-msgid "Show in pager"
-msgstr "যার মধ্যে প্রদর্শিত হবে..."
-
-#: ../src/parameters.c:704
-#, fuzzy
-msgid "Show in systray"
-msgstr "যার মধ্যে প্রদর্শিত হবে..."
-
-#: ../src/parameters.c:739
-#, fuzzy
-msgid "Calendar start"
-msgstr "Calendar"
-
-#: ../src/parameters.c:744
-msgid "Show"
-msgstr "প্রদর্শন করা হবে"
-
-#: ../src/parameters.c:756
-msgid "Hide"
-msgstr "লুকিয়ে ফেলা হবে"
-
-#: ../src/parameters.c:768
-msgid "Minimized"
-msgstr ""
-
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr ""
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "উইন্ডো বন্ধ করুন (_C)"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "আজকের তারিখ নির্বাচন করুন (_T)"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr ""
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
-
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr ""
-
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr ""
-
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr ""
-
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr ""
-
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
-
-#: ../src/parameters.c:921
-msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-
-#: ../src/parameters.c:938
-#, fuzzy
-msgid "Orage Preferences"
-msgstr "পছন্দসমূহ"
-
-#: ../src/parameters.c:1050
-msgid "First Orage start. Searching default timezone."
-msgstr ""
-
-#: ../src/parameters.c:1069
-#, c-format
-msgid "Default timezone set to %s."
-msgstr ""
-
-#: ../src/parameters.c:1072
-msgid "Default timezone not found, please, set it manually."
-msgstr ""
-
-#: ../src/reminder.c:562
-#, fuzzy
-msgid "Reminder "
-msgstr "স্মরণীয় বিষয়"
-
-#: ../src/reminder.c:591
-msgid "Open"
-msgstr ""
-
-#: ../src/reminder.c:722
-#, fuzzy
-msgid "Reminder - Orage"
-msgstr "স্মরণীয় বিষয়"
-
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
-
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-
-#: ../src/reminder.c:1099
-msgid "Next active alarms:"
-msgstr ""
-
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
-#, c-format
-msgid ""
-"\n"
-"%02d d %02d h %02d min to: %s"
-msgstr ""
-
-#: ../src/reminder.c:1166
-#, c-format
-msgid ""
-"\n"
-"No active alarms found"
-msgstr ""
-
-#: ../src/timezone_names.c:36
-msgid "Africa"
-msgstr ""
-
-#: ../src/timezone_names.c:37
-msgid "Africa/Abidjan"
-msgstr ""
-
-#: ../src/timezone_names.c:38
-msgid "Africa/Accra"
-msgstr ""
-
-#: ../src/timezone_names.c:39
-msgid "Africa/Addis_Ababa"
-msgstr ""
-
-#: ../src/timezone_names.c:40
-msgid "Africa/Algiers"
-msgstr ""
-
-#: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr ""
-
-#: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr ""
-
-#: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr ""
-
-#: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr ""
-
-#: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr ""
-
-#: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr ""
-
-#: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr ""
-
-#: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr ""
-
-#: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr ""
-
-#: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr ""
-
-#: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr ""
-
-#: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr ""
-
-#: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr ""
-
-#: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr ""
-
-#: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr ""
-
-#: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr ""
-
-#: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr ""
-
-#: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr ""
-
-#: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr ""
-
-#: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr ""
-
-#: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr ""
-
-#: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr ""
-
-#: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr ""
-
-#: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr ""
-
-#: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr ""
-
-#: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr ""
-
-#: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr ""
-
-#: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr ""
-
-#: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr ""
-
-#: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr ""
-
-#: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr ""
-
-#: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr ""
-
-#: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr ""
-
-#: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr ""
-
-#: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr ""
-
-#: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr ""
-
-#: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr ""
-
-#: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr ""
-
-#: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr ""
-
-#: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr ""
-
-#: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr ""
-
-#: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr ""
-
-#: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr ""
-
-#: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr ""
-
-#: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr ""
-
-#: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr ""
-
-#: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr ""
-
-#: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr ""
-
-#: ../src/timezone_names.c:89
-msgid "America"
-msgstr ""
-
-#: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr ""
-
-#: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr ""
-
-#: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr ""
-
-#: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr ""
-
-#: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr ""
-
-#: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:96
-msgid "America/Argentina/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:97
-msgid "America/Argentina/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:98
-msgid "America/Argentina/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:99
-msgid "America/Argentina/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr ""
-
-#: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr ""
-
-#: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr ""
-
-#: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr ""
-
-#: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr ""
-
-#: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr ""
-
-#: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr ""
-
-#: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr ""
-
-#: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr ""
-
-#: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr ""
-
-#: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr ""
-
-#: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr ""
-
-#: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr ""
-
-#: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr ""
-
-#: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr ""
-
-#: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr ""
-
-#: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr ""
-
-#: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr ""
-
-#: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr ""
-
-#: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr ""
-
-#: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr ""
-
-#: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr ""
-
-#: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr ""
-
-#: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr ""
-
-#: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr ""
-
-#: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr ""
-
-#: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr ""
-
-#: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr ""
-
-#: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr ""
-
-#: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr ""
-
-#: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr ""
-
-#: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr ""
-
-#: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr ""
-
-#: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr ""
-
-#: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr ""
-
-#: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr ""
-
-#: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr ""
-
-#: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr ""
-
-#: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr ""
-
-#: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr ""
-
-#: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr ""
-
-#: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr ""
-
-#: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr ""
-
-#: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr ""
-
-#: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr ""
-
-#: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr ""
-
-#: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr ""
-
-#: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr ""
-
-#: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr ""
-
-#: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr ""
-
-#: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr ""
-
-#: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr ""
-
-#: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr ""
-
-#: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr ""
-
-#: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr ""
-
-#: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr ""
-
-#: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr ""
-
-#: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr ""
-
-#: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr ""
-
-#: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr ""
-
-#: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr ""
-
-#: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr ""
-
-#: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr ""
-
-#: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr ""
-
-#: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr ""
-
-#: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr ""
-
-#: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr ""
-
-#: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr ""
-
-#: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr ""
-
-#: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr ""
-
-#: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr ""
-
-#: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr ""
-
-#: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr ""
-
-#: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr ""
-
-#: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr ""
-
-#: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr ""
-
-#: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr ""
-
-#: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr ""
-
-#: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr ""
-
-#: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr ""
-
-#: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr ""
-
-#: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr ""
-
-#: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr ""
-
-#: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr ""
-
-#: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr ""
-
-#: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr ""
-
-#: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr ""
-
-#: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr ""
-
-#: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr ""
-
-#: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr ""
-
-#: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr ""
-
-#: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr ""
-
-#: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr ""
-
-#: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr ""
-
-#: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr ""
-
-#: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr ""
-
-#: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr ""
-
-#: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr ""
-
-#: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr ""
-
-#: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr ""
-
-#: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr ""
-
-#: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr ""
-
-#: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr ""
-
-#: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr ""
-
-#: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr ""
-
-#: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr ""
-
-#: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr ""
-
-#: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr ""
-
-#: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr ""
-
-#: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr ""
-
-#: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr ""
-
-#: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr ""
-
-#: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr ""
-
-#: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr ""
-
-#: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr ""
-
-#: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr ""
-
-#: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr ""
-
-#: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr ""
-
-#: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr ""
-
-#: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr ""
-
-#: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr ""
-
-#: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr ""
-
-#: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr ""
-
-#: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr ""
-
-#: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr ""
-
-#: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr ""
-
-#: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr ""
-
-#: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr ""
-
-#: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr ""
-
-#: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr ""
-
-#: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr ""
-
-#: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr ""
-
-#: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr ""
-
-#: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr ""
-
-#: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr ""
-
-#: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr ""
-
-#: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr ""
-
-#: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr ""
-
-#: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr ""
-
-#: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr ""
-
-#: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr ""
-
-#: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr ""
-
-#: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr ""
-
-#: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr ""
-
-#: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr ""
-
-#: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr ""
-
-#: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr ""
-
-#: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr ""
-
-#: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr ""
-
-#: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr ""
-
-#: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr ""
-
-#: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr ""
-
-#: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr ""
-
-#: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr ""
-
-#: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr ""
-
-#: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr ""
-
-#: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr ""
-
-#: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr ""
-
-#: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr ""
-
-#: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr ""
-
-#: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr ""
-
-#: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr ""
-
-#: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr ""
-
-#: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr ""
-
-#: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr ""
-
-#: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr ""
-
-#: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr ""
-
-#: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr ""
-
-#: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr ""
-
-#: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr ""
-
-#: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr ""
-
-#: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr ""
-
-#: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr ""
-
-#: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr ""
-
-#: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr ""
-
-#: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr ""
-
-#: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr ""
-
-#: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr ""
-
-#: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr ""
-
-#: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr ""
-
-#: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr ""
-
-#: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr ""
-
-#: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr ""
-
-#: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr ""
-
-#: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr ""
-
-#: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr ""
-
-#: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr ""
-
-#: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr ""
-
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr ""
-
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr ""
-
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr ""
-
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr ""
-
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr ""
-
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr ""
-
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr ""
-
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr ""
-
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr ""
-
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr ""
-
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr ""
-
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr ""
-
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr ""
-
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr ""
-
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr ""
-
-#: ../src/timezone_names.c:320
-msgid "Europe"
-msgstr ""
-
-#: ../src/timezone_names.c:321
-msgid "Europe/Amsterdam"
-msgstr ""
-
-#: ../src/timezone_names.c:322
-msgid "Europe/Andorra"
-msgstr ""
-
-#: ../src/timezone_names.c:323
-msgid "Europe/Athens"
-msgstr ""
-
-#: ../src/timezone_names.c:324
-msgid "Europe/Belfast"
-msgstr ""
-
-#: ../src/timezone_names.c:325
-msgid "Europe/Belgrade"
-msgstr ""
-
-#: ../src/timezone_names.c:326
-msgid "Europe/Berlin"
-msgstr ""
-
-#: ../src/timezone_names.c:327
-msgid "Europe/Bratislava"
-msgstr ""
-
-#: ../src/timezone_names.c:328
-msgid "Europe/Brussels"
-msgstr ""
-
-#: ../src/timezone_names.c:329
-msgid "Europe/Bucharest"
-msgstr ""
-
-#: ../src/timezone_names.c:330
-msgid "Europe/Budapest"
-msgstr ""
-
-#: ../src/timezone_names.c:331
-msgid "Europe/Chisinau"
-msgstr ""
-
-#: ../src/timezone_names.c:332
-msgid "Europe/Copenhagen"
-msgstr ""
-
-#: ../src/timezone_names.c:333
-msgid "Europe/Dublin"
-msgstr ""
-
-#: ../src/timezone_names.c:334
-msgid "Europe/Gibraltar"
-msgstr ""
-
-#: ../src/timezone_names.c:335
-msgid "Europe/Helsinki"
-msgstr ""
-
-#: ../src/timezone_names.c:336
-msgid "Europe/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:337
-msgid "Europe/Kaliningrad"
-msgstr ""
-
-#: ../src/timezone_names.c:338
-msgid "Europe/Kiev"
-msgstr ""
-
-#: ../src/timezone_names.c:339
-msgid "Europe/Lisbon"
-msgstr ""
-
-#: ../src/timezone_names.c:340
-msgid "Europe/Ljubljana"
-msgstr ""
-
-#: ../src/timezone_names.c:341
-msgid "Europe/London"
-msgstr ""
-
-#: ../src/timezone_names.c:342
-msgid "Europe/Luxembourg"
-msgstr ""
-
-#: ../src/timezone_names.c:343
-msgid "Europe/Madrid"
-msgstr ""
-
-#: ../src/timezone_names.c:344
-msgid "Europe/Malta"
-msgstr ""
-
-#: ../src/timezone_names.c:345
-msgid "Europe/Minsk"
-msgstr ""
-
-#: ../src/timezone_names.c:346
-msgid "Europe/Monaco"
-msgstr ""
-
-#: ../src/timezone_names.c:347
-msgid "Europe/Moscow"
-msgstr ""
-
-#: ../src/timezone_names.c:348
-msgid "Europe/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:349
-msgid "Europe/Oslo"
-msgstr ""
-
-#: ../src/timezone_names.c:350
-msgid "Europe/Paris"
-msgstr ""
-
-#: ../src/timezone_names.c:351
-msgid "Europe/Prague"
-msgstr ""
-
-#: ../src/timezone_names.c:352
-msgid "Europe/Riga"
-msgstr ""
-
-#: ../src/timezone_names.c:353
-msgid "Europe/Rome"
-msgstr ""
-
-#: ../src/timezone_names.c:354
-msgid "Europe/Samara"
-msgstr ""
-
-#: ../src/timezone_names.c:355
-msgid "Europe/San_Marino"
-msgstr ""
-
-#: ../src/timezone_names.c:356
-msgid "Europe/Sarajevo"
-msgstr ""
-
-#: ../src/timezone_names.c:357
-msgid "Europe/Simferopol"
-msgstr ""
-
-#: ../src/timezone_names.c:358
-msgid "Europe/Skopje"
-msgstr ""
-
-#: ../src/timezone_names.c:359
-msgid "Europe/Sofia"
-msgstr ""
-
-#: ../src/timezone_names.c:360
-msgid "Europe/Stockholm"
-msgstr ""
-
-#: ../src/timezone_names.c:361
-msgid "Europe/Tallinn"
-msgstr ""
-
-#: ../src/timezone_names.c:362
-msgid "Europe/Tirane"
-msgstr ""
-
-#: ../src/timezone_names.c:363
-msgid "Europe/Uzhgorod"
-msgstr ""
-
-#: ../src/timezone_names.c:364
-msgid "Europe/Vaduz"
-msgstr ""
-
-#: ../src/timezone_names.c:365
-msgid "Europe/Vatican"
-msgstr ""
-
-#: ../src/timezone_names.c:366
-msgid "Europe/Vienna"
-msgstr ""
-
-#: ../src/timezone_names.c:367
-msgid "Europe/Vilnius"
-msgstr ""
-
-#: ../src/timezone_names.c:368
-msgid "Europe/Warsaw"
-msgstr ""
-
-#: ../src/timezone_names.c:369
-msgid "Europe/Zagreb"
-msgstr ""
-
-#: ../src/timezone_names.c:370
-msgid "Europe/Zaporozhye"
-msgstr ""
-
-#: ../src/timezone_names.c:371
-msgid "Europe/Zurich"
-msgstr ""
-
-#: ../src/timezone_names.c:372
-msgid "Indian"
-msgstr ""
-
-#: ../src/timezone_names.c:373
-msgid "Indian/Antananarivo"
-msgstr ""
-
-#: ../src/timezone_names.c:374
-msgid "Indian/Chagos"
-msgstr ""
-
-#: ../src/timezone_names.c:375
-msgid "Indian/Christmas"
-msgstr ""
-
-#: ../src/timezone_names.c:376
-msgid "Indian/Cocos"
-msgstr ""
-
-#: ../src/timezone_names.c:377
-msgid "Indian/Comoro"
-msgstr ""
-
-#: ../src/timezone_names.c:378
-msgid "Indian/Kerguelen"
-msgstr ""
-
-#: ../src/timezone_names.c:379
-msgid "Indian/Mahe"
-msgstr ""
-
-#: ../src/timezone_names.c:380
-msgid "Indian/Maldives"
-msgstr ""
-
-#: ../src/timezone_names.c:381
-msgid "Indian/Mauritius"
-msgstr ""
-
-#: ../src/timezone_names.c:382
-msgid "Indian/Mayotte"
-msgstr ""
-
-#: ../src/timezone_names.c:383
-msgid "Indian/Reunion"
-msgstr ""
-
-#: ../src/timezone_names.c:384
-msgid "Pacific"
-msgstr ""
-
-#: ../src/timezone_names.c:385
-msgid "Pacific/Apia"
-msgstr ""
-
-#: ../src/timezone_names.c:386
-msgid "Pacific/Auckland"
-msgstr ""
-
-#: ../src/timezone_names.c:387
-msgid "Pacific/Chatham"
-msgstr ""
-
-#: ../src/timezone_names.c:388
-msgid "Pacific/Easter"
-msgstr ""
-
-#: ../src/timezone_names.c:389
-msgid "Pacific/Efate"
-msgstr ""
-
-#: ../src/timezone_names.c:390
-msgid "Pacific/Enderbury"
-msgstr ""
-
-#: ../src/timezone_names.c:391
-msgid "Pacific/Fakaofo"
-msgstr ""
-
-#: ../src/timezone_names.c:392
-msgid "Pacific/Fiji"
-msgstr ""
-
-#: ../src/timezone_names.c:393
-msgid "Pacific/Funafuti"
-msgstr ""
-
-#: ../src/timezone_names.c:394
-msgid "Pacific/Galapagos"
-msgstr ""
-
-#: ../src/timezone_names.c:395
-msgid "Pacific/Gambier"
-msgstr ""
-
-#: ../src/timezone_names.c:396
-msgid "Pacific/Guadalcanal"
-msgstr ""
-
-#: ../src/timezone_names.c:397
-msgid "Pacific/Guam"
-msgstr ""
-
-#: ../src/timezone_names.c:398
-msgid "Pacific/Honolulu"
-msgstr ""
-
-#: ../src/timezone_names.c:399
-msgid "Pacific/Johnston"
-msgstr ""
-
-#: ../src/timezone_names.c:400
-msgid "Pacific/Kiritimati"
-msgstr ""
-
-#: ../src/timezone_names.c:401
-msgid "Pacific/Kosrae"
-msgstr ""
-
-#: ../src/timezone_names.c:402
-msgid "Pacific/Kwajalein"
-msgstr ""
-
-#: ../src/timezone_names.c:403
-msgid "Pacific/Majuro"
-msgstr ""
-
-#: ../src/timezone_names.c:404
-msgid "Pacific/Marquesas"
-msgstr ""
-
-#: ../src/timezone_names.c:405
-msgid "Pacific/Midway"
-msgstr ""
-
-#: ../src/timezone_names.c:406
-msgid "Pacific/Nauru"
-msgstr ""
-
-#: ../src/timezone_names.c:407
-msgid "Pacific/Niue"
-msgstr ""
-
-#: ../src/timezone_names.c:408
-msgid "Pacific/Norfolk"
-msgstr ""
-
-#: ../src/timezone_names.c:409
-msgid "Pacific/Noumea"
-msgstr ""
-
-#: ../src/timezone_names.c:410
-msgid "Pacific/Pago_Pago"
-msgstr ""
-
-#: ../src/timezone_names.c:411
-msgid "Pacific/Palau"
-msgstr ""
-
-#: ../src/timezone_names.c:412
-msgid "Pacific/Pitcairn"
-msgstr ""
-
-#: ../src/timezone_names.c:413
-msgid "Pacific/Ponape"
-msgstr ""
-
-#: ../src/timezone_names.c:414
-msgid "Pacific/Port_Moresby"
-msgstr ""
-
-#: ../src/timezone_names.c:415
-msgid "Pacific/Rarotonga"
-msgstr ""
-
-#: ../src/timezone_names.c:416
-msgid "Pacific/Saipan"
-msgstr ""
-
-#: ../src/timezone_names.c:417
-msgid "Pacific/Tahiti"
-msgstr ""
-
-#: ../src/timezone_names.c:418
-msgid "Pacific/Tarawa"
-msgstr ""
-
-#: ../src/timezone_names.c:419
-msgid "Pacific/Tongatapu"
-msgstr ""
-
-#: ../src/timezone_names.c:420
-msgid "Pacific/Truk"
-msgstr ""
-
-#: ../src/timezone_names.c:421
-msgid "Pacific/Wake"
-msgstr ""
-
-#: ../src/timezone_names.c:422
-msgid "Pacific/Wallis"
-msgstr ""
-
-#: ../src/timezone_names.c:423
-msgid "Pacific/Yap"
-msgstr ""
-
-#: ../src/tray_icon.c:469
-#, fuzzy
-msgid "New appointment"
-msgstr "নির্ধারিত কর্ম"
-
-#: ../src/tray_icon.c:485
-msgid "About Orage"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-msgid "Orage Panel Clock"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
-msgid "Show time and date?"
-msgstr "যার মধ্যে প্রদর্শিত হবে..."
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Calendar"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "পছন্দসমূহ"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "পছন্দসমূহ"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Xfce 4 ক্যালেন্ডার অ্যাপ্লিকেশনের বৈশিষ্ট্য"
-
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "ডেস্কটপ ক্যালেন্ডার"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "Calendar"
-
-#~ msgid "Contributor"
-#~ msgstr "যোগদানকারী"
-
-#~ msgid "Warning"
-#~ msgstr "সতর্কবাণী"
-
-#, fuzzy
-#~ msgid "Select always today"
-#~ msgstr "আজকের তারিখ নির্বাচন করুন (_T)"
-
-#, fuzzy
-#~ msgid "Modify Preferences"
-#~ msgstr "পছন্দসমূহ"
-
-#, fuzzy
-#~ msgid "Show event list"
-#~ msgstr "যার মধ্যে প্রদর্শিত হবে..."
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Xfce 4 ক্যালেন্ডারের বৈশিষ্ট্যাবলী"
-
-#, fuzzy
-#~ msgid "Monday"
-#~ msgstr "আজ"
-
-#, fuzzy
-#~ msgid "Tuesday"
-#~ msgstr "আজ"
-
-#, fuzzy
-#~ msgid "Wednesday"
-#~ msgstr "আজ"
-
-#, fuzzy
-#~ msgid "Thursday"
-#~ msgstr "আজ"
-
-#, fuzzy
-#~ msgid "Friday"
-#~ msgstr "আজ"
-
-#, fuzzy
-#~ msgid "Sunday"
-#~ msgstr "আজ"
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "আজ"
-
-#, fuzzy
-#~ msgid "Calendar Files"
-#~ msgstr "Calendar"
-
-#, fuzzy
-#~ msgid "Calendar borders"
-#~ msgstr "Calendar"
-
-#, fuzzy
-#~ msgid "Hidden"
-#~ msgstr "লুকিয়ে ফেলা হবে"
-
-#~ msgid "Core developer"
-#~ msgstr "কোর ডিভেলপার"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "এই দিনের সাথে যুক্ত সমস্ত \n"
-#~ "তথ্য মুছে যাবে।"
-
-#, fuzzy
-#~ msgid "Clear"
-#~ msgstr "Calendar"
-
-#~ msgid "This should not happen"
-#~ msgstr "এই প্রতিক্রিয়া স্বাভাবিক নয়"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "MCS ক্লায়েন্ট চ্যানেল নির্মাণ করা যায়নি"
diff -Nru orage-4.8.3/po/ca.po orage-4.12.1/po/ca.po
--- orage-4.8.3/po/ca.po	2012-01-03 12:01:01.000000000 +0000
+++ orage-4.12.1/po/ca.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,29 +1,23 @@
-# translation of ca.po to Catalan
-# Catalan translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-#
-# Carles Muñoz Gorriz <carlesmu@internuatas.org>, 2003-2004, 2006, 2010-2011.
-# 2008-2010.
-# Pau Rul·lan Ferragut <paurullan@bulma.net> 2005, 2006.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Carles Muñoz Gorriz <carlesmu@internuatas.org>, 2003-2004, 2006, 2010-2011, 2013
+# Pau Rul·lan Ferragut <paurullan@bulma.net> 2005, 2006
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2011-12-18 16:41+0100\n"
-"Last-Translator: Carles Muñoz Gorriz <carlesmu@internautas.org>\n"
-"Language-Team: Catalan\n"
+"POT-Creation-Date: 2013-11-18 18:30+0100\n"
+"PO-Revision-Date: 2013-11-19 15:56+0000\n"
+"Last-Translator: Xfce <transifex@xfce.org>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/xfce/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: Catalan\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Country: SPAIN\n"
-"X-Generator: KBabel 1.11.2\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -39,9 +33,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"clic per modificar el rellotge"
+msgstr "%s\nclic per modificar el rellotge"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -51,9 +43,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"botó 1 per canviar les preferències \n"
-"botó 2 per ajustar l'hora del rellotge"
+msgstr "botó 1 per canviar les preferències \nbotó 2 per ajustar l'hora del rellotge"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -62,9 +52,7 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"ajusteu per canviar el minut. Feu clic-dret a les fletxes per canviar només "
-"1 minut."
+msgstr "ajusteu per canviar el minut. Feu clic-dret a les fletxes per canviar només 1 minut."
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -213,9 +201,7 @@
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
-"Marqueu-lo per emprar el color per defecte del sistema en lloc del "
-"seleccionat"
+msgstr "Marqueu-lo per emprar el color per defecte del sistema en lloc del seleccionat"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
@@ -227,9 +213,7 @@
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"Marqueu-lo per emprar la font per defecte del sistema in lloc de la "
-"seleccionada"
+msgstr "Marqueu-lo per emprar la font per defecte del sistema in lloc de la seleccionada"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -345,7 +329,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2771
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Ubicació"
@@ -406,18 +390,18 @@
 msgid "floating"
 msgstr "Flotant"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Hora global"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Hora global d'Orage"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "Mostra els rellotges de diferents països"
 
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Hora global"
+
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
 msgstr "Aparença"
@@ -444,8 +428,7 @@
 
 #: ../panel-plugin/oc_config.c:277
 msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
-"Tingueu en compte que no podeu canviar l'alçada dels quadres horitzontals"
+msgstr "Tingueu en compte que no podeu canviar l'alçada dels quadres horitzontals"
 
 #: ../panel-plugin/oc_config.c:282
 msgid "set _width:"
@@ -453,8 +436,7 @@
 
 #: ../panel-plugin/oc_config.c:293
 msgid "Note that you can not change the width of vertical panels"
-msgstr ""
-"Tingueu en compte que no podeu canviar l'amplada dels quadres verticals"
+msgstr "Tingueu en compte que no podeu canviar l'amplada dels quadres verticals"
 
 #: ../panel-plugin/oc_config.c:316
 msgid "Clock Options"
@@ -491,12 +473,7 @@
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Només us cal això si empreu suspensions o hibernacions curtes (menys de 5 "
-"hores) i l'hora que es mostra no ensenya els segons. Si es donen aquestes "
-"circumstàncies, i no marqueu aquesta opció, pot passar que el rellotge "
-"d'Orage mostri un hora no prou acurada. (Marcant-la evita que les funcions "
-"de desament de la CPU i les interrupcions funcionin.)"
+msgstr "Només us cal això si empreu suspensions o hibernacions curtes (menys de 5 hores) i l'hora que es mostra no ensenya els segons. Si es donen aquestes circumstàncies, i no marqueu aquesta opció, pot passar que el rellotge d'Orage mostri un hora no prou acurada. (Marcant-la evita que les funcions de desament de la CPU i les interrupcions funcionin.)"
 
 #: ../panel-plugin/oc_config.c:432
 msgid ""
@@ -508,15 +485,7 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Aquest programa usa la funció «strftime» per obtenir l'hora.\n"
-"Feu servir qualsevol codi vàlid per obtenir l'hora en el formar \n"
-"que preferiu.Alguns del codis més habituals són:\n"
-"\t%A = dia de la setmana\t\t\t%B = mes\n"
-"\t%c = data i hora\t\t\t\t%R = hora i minuts\n"
-"\t%V = Número de la setmana dins l'any\t%Z = Fus horari actual\n"
-"\t%H = Hores\t\t\t\t\t%M = minuts\n"
-"\t%X = Hora local\t\t\t\t%x = Data local"
+msgstr "Aquest programa usa la funció «strftime» per obtenir l'hora.\nFeu servir qualsevol codi vàlid per obtenir l'hora en el formar \nque preferiu.Alguns del codis més habituals són:\n\t%A = dia de la setmana\t\t\t%B = mes\n\t%c = data i hora\t\t\t\t%R = hora i minuts\n\t%V = Número de la setmana dins l'any\t%Z = Fus horari actual\n\t%H = Hores\t\t\t\t\t%M = minuts\n\t%X = Hora local\t\t\t\t%x = Data local"
 
 #: ../panel-plugin/oc_config.c:457
 msgid "Orage clock Preferences"
@@ -531,7 +500,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
@@ -547,7 +516,7 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2800
 msgid "End"
 msgstr "Final"
 
@@ -555,13 +524,13 @@
 msgid "Due"
 msgstr "Motiu"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Seleccioneu un fitxer…"
 
@@ -569,227 +538,273 @@
 msgid "Sound Files"
 msgstr "Fitxers de so"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Tots els fitxers"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "S'ha modificada la cita."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1282 ../src/event-list.c:921
 msgid "Do you want to continue?"
 msgstr "Voleu continuar?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr ""
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr ""
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "Aquesta cita acaba abans de començar."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1918
 msgid "Not set"
 msgstr "No establert"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1220
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1221
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1231
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1232
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1281
 msgid "This appointment will be permanently removed."
 msgstr "La cità s'esborrarà permanentment."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1283 ../src/event-list.c:922
+msgid "No, cancel the removal"
+msgstr ""
+
+#: ../src/appointment.c:1284
+msgid "Yes, remove it"
+msgstr ""
+
+#: ../src/appointment.c:1373 ../src/appointment.c:1388 ../src/day-view.c:457
+#: ../src/event-list.c:980
+msgid "Pick the date"
+msgstr "Seleccioneu una data"
+
+#: ../src/appointment.c:1375 ../src/appointment.c:1390 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:982 ../src/event-list.c:1132
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Avui"
+
+#: ../src/appointment.c:1798
 msgid "This appointment does not exist."
 msgstr "Aquesta cita no existeix."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1799
 msgid "It was probably removed, please refresh your screen."
 msgstr "És probable que s'hagi esborrat, actualitzeu la pantalla."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2100
 msgid "Current categories"
 msgstr "Categories actuals"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2115
 msgid "Add new category with color"
 msgstr "Afegeix una nova categoria amb color"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2119
 msgid "Category:"
 msgstr "Categoria:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2150
 msgid "Colors of categories - Orage"
 msgstr "Colors de les categories - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2196
 msgid " *** COPY ***"
 msgstr "*** CÒPIA ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2461
 msgid "New appointment - Orage"
 msgstr "Nova cita - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2491 ../src/day-view.c:279 ../src/event-list.c:1033
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Fitxer"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2497
 msgid "Sav_e and close"
 msgstr "D_esa i tanca"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2510 ../src/event-list.c:1039
 msgid "D_uplicate"
 msgstr "D_uplica"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2697
 msgid "Save"
 msgstr "Desa"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2699
 msgid "Save and close"
 msgstr "Desa i tanca"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2704
 msgid "Revert"
 msgstr "Desfés"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2706 ../src/event-list.c:1123
 msgid "Duplicate"
 msgstr "Duplica"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2711 ../src/event-list.c:1125
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Free"
 msgstr "Lliure"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Busy"
 msgstr "Ocupat"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2733
 msgid "General"
 msgstr "General"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2739
 msgid "Type "
 msgstr "Tipus"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2741 ../src/event-list.c:1176
 msgid "Event"
 msgstr "Esdeveniment"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2744
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Esdeveniment que succeirà algunes vegades. Per exemple:\n"
-"Reunió, aniversari o programa de televisió."
+msgstr "Esdeveniment que succeirà algunes vegades. Per exemple:\nReunió, aniversari o programa de televisió."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2747 ../src/event-list.c:1196
 msgid "Todo"
 msgstr "Pendent de fer"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2750
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Coses que fareu algunes vegades. Per exemple:\n"
-"Netejar el cotxe o provar una nova versió d'«Orage»."
+msgstr "Coses que fareu algunes vegades. Per exemple:\nNetejar el cotxe o provar una nova versió d'«Orage»."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2753 ../src/event-list.c:1209
 msgid "Journal"
 msgstr "Periòdic"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2757
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Fer una nota d'alguna cosa que ha succeït. Per exemple:Marcar que la vostra "
-"mare va trucar quan les primeres nevades van caure."
+msgstr "Fer una nota d'alguna cosa que ha succeït. Per exemple:Marcar que la vostra mare va trucar quan les primeres nevades van caure."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2764
 msgid "Title "
 msgstr "Títol "
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2779
 msgid "All day event"
 msgstr "Tot el dia"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2785 ../src/appointment.c:3446 ../src/day-view.c:801
 msgid "Start"
 msgstr "Inici"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2805
 msgid "Set      "
 msgstr "Estableix"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2826
 msgid "Duration"
 msgstr "Duració"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2830 ../src/appointment.c:3020 ../src/reminder.c:758
 msgid "days"
 msgstr "dies"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2832 ../src/appointment.c:3022 ../src/reminder.c:760
 msgid "hours"
 msgstr "hores"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2834 ../src/appointment.c:3024 ../src/reminder.c:762
 msgid "mins"
 msgstr "minuts"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2846
 msgid "Availability"
 msgstr "Disponibilitat"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2854 ../src/appointment.c:3452
 msgid "Completed"
 msgstr "Completat"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2857
 msgid "Done"
 msgstr "Fet"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2878
 msgid "Categories"
 msgstr "Categories"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2890
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Aquesta és una categoria especial, es pot emprar per colorejar  aquesta cita "
-"en les vistes de llista."
+msgstr "Aquesta és una categoria especial, es pot emprar per colorejar  aquesta cita en les vistes de llista."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2895
 msgid "update colors for categories."
 msgstr "Actualitza els colors de les categories."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2901
 msgid "Priority"
 msgstr "Prioritat"
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2911
 msgid "Note"
 msgstr "Nota"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2932
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -798,141 +813,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"Aquest ordres tenen efecte inmediat:\n"
-"    <D> insereix la data actual en el format local\n"
-"    <T> insereix l'hora i\n"
-"    <DT> insereix la data i hora.\n"
-"\n"
-"Aquestes es converteixen després, quan es mostrin:\n"
-"    <&Ynnnn> es tradueix com l'any menys «nnnn».\n"
-"(e.g.: El podeu emprar com recordatoris d'aniversaris per que us digui "
-"quants anys compleix.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Aquest ordres tenen efecte inmediat:\n    <D> insereix la data actual en el format local\n    <T> insereix l'hora i\n    <DT> insereix la data i hora.\n\nAquestes es converteixen després, quan es mostrin:\n    <&Ynnnn> es tradueix com l'any menys «nnnn».\n(e.g.: El podeu emprar com recordatoris d'aniversaris per que us digui quants anys compleix.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before Start"
 msgstr "Abans de començar"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before End"
 msgstr "Abans d'acabar"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After Start"
 msgstr "Després d'iniciar"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After End"
 msgstr "Després d'acabar"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3011
 msgid "Alarm"
 msgstr "Alarma"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3017
 msgid "Alarm time"
 msgstr "Temps d'alarma"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3041
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Sovint voldreu activar l'alarma:\n"
-" 1) abans que un esdeveniment comenci\n"
-" 2) abans que algun pendent de fer acabi\n"
-" 3) després que algun pendent de fer acabi"
+msgstr "Sovint voldreu activar l'alarma:\n 1) abans que un esdeveniment comenci\n 2) abans que algun pendent de fer acabi\n 3) després que algun pendent de fer acabi"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3046
 msgid "Persistent alarm"
 msgstr "Alarma persistent"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3048
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Seleccioneu-lo si voleu que «Orage» us ho recordi fins hi tot si no estava "
-"actiu quan l'alarma s'havia d'activar."
+msgstr "Seleccioneu-lo si voleu que «Orage» us ho recordi fins hi tot si no estava actiu quan l'alarma s'havia d'activar."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3057
 msgid "Sound"
 msgstr "So"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3061 ../src/appointment.c:3181
 msgid "Use"
 msgstr "Empra"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3063
 msgid "Select this if you want audible alarm"
 msgstr "Seleccioneu-lo si voleu que l'alarma sigui audible"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3080
 msgid "Repeat alarm sound"
 msgstr "Repeteix ĺ'alarma sonora"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3096 ../src/appointment.c:3395
 msgid "times"
 msgstr "vegades"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3112
 msgid "sec interval"
 msgstr "Interval en segons"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3122
 msgid "Visual"
 msgstr "Visible"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3126
 msgid "Use Orage window"
 msgstr "Empra la finestra d'«Orage»"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3128
 msgid "Select this if you want Orage window alarm"
 msgstr "Seleccioneu-lo si voleu una finestra d'«Orage» amb l'alarma"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3140
 msgid "Use notification"
 msgstr "Empra notificació"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3142
 msgid "Select this if you want notification alarm"
 msgstr "Seleccioneu-lo si voleu notificació de l'alarma"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3148
 msgid "Set timeout"
 msgstr "Fixeu el tems d'aturada"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3150
 msgid "Select this if you want notification to expire automatically"
 msgstr "Seleccioneu-lo si voleu que la notificació caduqui automàticament"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3161
 msgid "0 = system default expiration time"
 msgstr "0 = temps de caducitat per defecte del sistema"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3166
 msgid "seconds"
 msgstr "segons"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3177
 msgid "Procedure"
 msgstr "Procediment"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3183
 msgid "Select this if you want procedure or script alarm"
-msgstr ""
-"Seleccioneu-lo si voleu un procediment o seqüència d'ordres per l'larma"
+msgstr "Seleccioneu-lo si voleu un procediment o seqüència d'ordres per l'larma"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3189
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -942,164 +940,150 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
-"Cal que entreu tots els caràcters alterats. Aquest\n"
-"text és només per l'intèrpret. Les següents ordres\n"
-"especials es substitueixen en temps d'execució:\n"
-"\t<&T>  títol de la cita\n"
-"\t<&D>  descripció de la cita\n"
-"\t<&AT> hora de l'alarma\n"
-"\t<&ST> inici de la cita\n"
-"\t<&ET> final de la cita"
+msgstr "Cal que entreu tots els caràcters alterats. Aquest\ntext és només per l'intèrpret. Les següents ordres\nespecials es substitueixen en temps d'execució:\n\t<&T>  títol de la cita\n\t<&D>  descripció de la cita\n\t<&AT> hora de l'alarma\n\t<&ST> inici de la cita\n\t<&ET> final de la cita"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3201
 msgid "Test this alarm by raising it now"
 msgstr "Comproveu l'alarma provant-la ara"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3208
 msgid "<b>Default alarm</b>"
 msgstr "<b>Alarma per defecte</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3216
 msgid "Store current settings as default alarm"
 msgstr "Desa els els paràmetres actuals com els de l'alarma per defecte"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3221
 msgid "Set current settings from default alarm"
 msgstr "Estableix els paràmetres actuals com els de l'alarma per defecte"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "None"
 msgstr "Cap"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Daily"
 msgstr "Diàriament"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Weekly"
 msgstr "Setmanalment"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Monthly"
 msgstr "Mensualment"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Yearly"
 msgstr "Anualment"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Hourly"
 msgstr "Cada hora"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Mon"
 msgstr "Dil"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Tue"
 msgstr "Dim"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Wed"
 msgstr "Dic"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Thu"
 msgstr "Dij"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Fri"
 msgstr "Div"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sat"
 msgstr "Dis"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sun"
 msgstr "Diu"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3290
 msgid "Recurrence"
 msgstr "Periodicitat"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3296
 msgid "Complexity"
 msgstr "Complexitat"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3299
 msgid "Basic"
 msgstr "Bàsic"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3305
 msgid "Advanced"
 msgstr "Avançat"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3309
 msgid "Use this if you want regular repeating event"
 msgstr "Empreu-lo si voleu un esdeveniment que es repeteixi regularment"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3311
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Empreu-lo si us calen formes complexes, com per exemple:\n"
-" Cada dissabte i diumenge o \n"
-" Primer dijous de cada mes"
+msgstr "Empreu-lo si us calen formes complexes, com per exemple:\n Cada dissabte i diumenge o \n Primer dijous de cada mes"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3317
 msgid "Frequency"
 msgstr "Freqüència"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3323
 msgid "Each"
 msgstr "Cada"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3330
 msgid "occurrence"
 msgstr "ocurrència"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3334
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Limita la freqüència d'alguns intervals.\n"
-" Per exemple: Cada tercer dia:\n"
-" Freqüència = Diària i Interval = 3"
+msgstr "Limita la freqüència d'alguns intervals.\n Per exemple: Cada tercer dia:\n Freqüència = Diària i Interval = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3379
 msgid "Limit"
 msgstr "Límit"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3381
 msgid "Repeat forever"
 msgstr "Repeteix per sempre"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3387
 msgid "Repeat "
 msgstr "Repeteix"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3403
 msgid "Repeat until "
 msgstr "Repeteix fins"
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3416
 msgid "Weekdays"
 msgstr "Dies de la setmana"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3428
 msgid "Which day"
 msgstr "Quin dia"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3436
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1107,128 +1091,108 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Especifiqueu quin dia de la setmana pels esdeveniments mensuals i anuals.\n"
-" Per exemple:\n"
-" Segon dimecres de cada mes:\n"
-"\tFreqüència = Mensualment,\n"
-"\tDies de la setmana = marca només Dimecres,\n"
-"\tQuin dia = seleccioneu 2 després del Dimecres"
+msgstr "Especifiqueu quin dia de la setmana pels esdeveniments mensuals i anuals.\n Per exemple:\n Segon dimecres de cada mes:\n\tFreqüència = Mensualment,\n\tDies de la setmana = marca només Dimecres,\n\tQuin dia = seleccioneu 2 després del Dimecres"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3443
 msgid "TODO base"
 msgstr "Pendent de fer - base"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3456
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"Pendent de fer torna a succeir regularment iniciant-se a l'hora d'inici i "
-"repetint-se després de cada interval independentment de si es va completar "
-"la darrera vegada"
-
-#: ../src/appointment.c:3354
-msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"La recurrència dels pendents de fer es basa en períodes sencers i es "
-"repeteix després de l'interval contant-lo des de el darrer cop que es va "
-"completar.\n"
-"(Tingueu en compte que no podeu canviar res respecte a l'historial del "
-"pendent de fer des de la darrera ocurrència fins a cada una de les seves "
-"finalitzacions.)"
+msgstr "Pendent de fer torna a succeir regularment iniciant-se a l'hora d'inici i repetint-se després de cada interval independentment de si es va completar la darrera vegada"
+
+#: ../src/appointment.c:3458
+msgid ""
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "La recurrència dels pendents de fer es basa en períodes sencers i es repeteix després de l'interval contant-lo des de el darrer cop que es va completar.\n(Tingueu en compte que no podeu canviar res respecte a l'historial del pendent de fer des de la darrera ocurrència fins a cada una de les seves finalitzacions.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3464
 msgid "Exceptions"
 msgstr "Excepcions"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3477
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"Afegiu més dades d'excepció fent clic als dies del calendari.\n"
-"L'excepció pot ser d'exclusió (-) o d'inclusió (+) depenent de la selecció.\n"
-"La podeu treure fent clic a la data."
+msgstr "Afegiu més dades d'excepció fent clic als dies del calendari.\nL'excepció pot ser d'exclusió (-) o d'inclusió (+) depenent de la selecció.\nLa podeu treure fent clic a la data."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3482
 msgid "Add excluded date (-)"
 msgstr "Afegeix un data d'exclusió (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3484
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr "Els dies exclosos són dies sencers on la cita no succeeix."
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3490
 msgid "Add included time (+)"
 msgstr "Afegeix una hora d'inclusió (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3492
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"Les hores d'inclusió tenen el mateix fus horari que la hora d'inici, però "
-"poden ser una hora diferent"
+msgstr "Les hores d'inclusió tenen el mateix fus horari que la hora d'inici, però poden ser una hora diferent"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3509
 msgid "Action dates"
 msgstr "Dades d'accions"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1056 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Visualitza"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1075
 msgid "_Go"
 msgstr "_Vés"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1121
 msgid "New"
 msgstr "Nou"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Enrere"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr ""
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Avui"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Endavant"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1139
 msgid "Refresh"
 msgstr "Actualitza"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1146 ../src/interface.c:834
 msgid "Close"
 msgstr "Tanca"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "       Nombre de dies a mostrar"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - vista diària"
 
@@ -1237,171 +1201,166 @@
 msgid "All day"
 msgstr "Tot el dia"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:583 ../src/event-list.c:1292
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:751
 msgid "No rows have been selected."
 msgstr "No s'ha seleccionat cap filera."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:752
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Feu clic en una fila per seleccionar-lo i després el podreu copiar."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:920
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
+msgstr "Esborrareu de forma permanent totes\nles cites seleccionades."
+
+#: ../src/event-list.c:923
+msgid "Yes, remove them"
 msgstr ""
-"Esborrareu de forma permanent totes\n"
-"les cites seleccionades."
 
 #: ../src/event-list.c:1130
+msgid "Back"
+msgstr "Enrere"
+
+#: ../src/event-list.c:1134
+msgid "Forward"
+msgstr "Endavant"
+
+#: ../src/event-list.c:1141
 msgid "Find"
 msgstr "Cerca"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1148
 msgid "Dayview"
 msgstr "Vista diària"
 
-#: ../src/event-list.c:1170
+#: ../src/event-list.c:1181
 msgid "Extra days to show "
 msgstr "Dies extres a mostrar"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1212
 msgid "Journal entries starting from:"
 msgstr "Entrades periòdiques començant per:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1232
 msgid "Search"
 msgstr "Cerca"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1235
 msgid "Search text "
 msgstr "Cerca el text"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1300
 msgid "Flags"
 msgstr "Etiquetes"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1308
 msgid "Title"
 msgstr "Títol"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1334
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
-"Doble clic a la línia per editar-lo.\n"
-"\n"
-"Etiquetes en ordre:\n"
-"\t 1. Alarma: n=cap alarma\n"
-"\t\t A=Alarma visual S=també alarma sonara\n"
-"\t 2. Periodicitat: n=sense periodicitat\n"
-"\t\t D=Diàriament W=Setmanalment M=Mensualment Y=Anualment\n"
-"\t 3. Tipus: f=lliure B=Ocupat\n"
-"\t 4. En el fitxer:\n"
-"\t\tO=Orage A=Arxiu F=Forà\n"
-"\t 5. Tipus de cita:\n"
-"\t\tE=Esdeveniment T=Pendent de fer J=Periòdic"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Seleccioneu una data"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tRepetició finalitzada, movent-lo a l'arxiu."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Arxivament no habilitat. Eixint"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Llindar de temps de per l'arxivament de cites: %d mesos"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tEsdeveniments d'arxiu, els quals són més antics que %04d-%02d-%02d"
 
-# En el contexte crec que la millor traducció de Archives és «arx[iu] de
-# cites»
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Uid de l'arxiu de cites: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tPendent de fer no completat; no s'ha arxivat"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tRepetint-se. Fi l'any: %04d, mes: %02d, day: %02d"
 
-# En el contexte crec que la millor traducció de Archives és «arx[iu] de
-# cites»
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Arxivament de cites acabat.\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Iniciant l'eliminació de l'arxiu de cites."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tFASE 1: netejant cites recursives"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tFASE 2: recuperant cites arxivades."
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "S'ha esborrat el fitxer de cites\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Alarma per defecte d'«Orage»"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
+msgid "Created alarm list for foreign file: %s (%s)"
 msgstr ""
-"Construeix una llista d'alarmes: Afegides %d alarmes. Processades %d "
-"esdeveniments."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr ""
+
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tS'han trobat %d alarmes de les quals %d estan actives. (Cercades %d "
-"alarmes recurrents)."
+msgstr "\tS'han trobat %d alarmes de les quals %d estan actives. (Cercades %d alarmes recurrents)."
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1419,7 +1378,16 @@
 msgid "Import file preprocessing done"
 msgstr "Procés d'importar fitxer fet"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Fitxers de calendari"
 
@@ -1427,620 +1395,667 @@
 msgid "Current foreign files"
 msgstr "Fitxers forans actuals"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "NOMÉS LECTURA"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "LECTURA I ESCRIPTURA"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Cap fitxer forà *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr ""
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Importa/exporta"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Importa"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Llegeix del fitxer:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Separeu els nom de fitxers mitjançant comes (,).\n"
-"Noteu que la coma no és un caràcter vàlid de fitxers a l'«Orage»."
+msgstr "Separeu els nom de fitxers mitjançant comes (,).\nNoteu que la coma no és un caràcter vàlid de fitxers a l'«Orage»."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Exporta"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Desa al fitxer;"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Selecciona"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Totes les cites"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Cites amb nom:"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Noteu que tant sols el fitxer principal de cites es llegeix.\n"
-"Els esdeveniments arxivats o foranis no s'exporten."
+msgstr "Noteu que tant sols el fitxer principal de cites es llegeix.\nEls esdeveniments arxivats o foranis no s'exporten."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Noteu que tant sols el fitxer principal de cites es llegeix.\n"
-"Els esdeveniments forans no s'exporten."
+msgstr "Noteu que tant sols el fitxer principal de cites es llegeix.\nEls esdeveniments forans no s'exporten."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "Podeu arrossegar-lo des de la finestra amb la llista d'esdeveniments."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "UIDs de cites d'«orage» separades per comes."
 
-# En el contexte crec que la millor traducció de Archives és «arx[iu] de
-# cites»
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Arxiu de cites"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Arxiva les cites ara (llindar: %d mesos)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Podeu canviar el llindar de l'arxiu en els paràmetres"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Recupera l'arxiu ara"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Torna tots els esdeveniments arxivats al fitxer principal d'«Orage»\n"
-"i esborra'l. Això és útil quan, per exemple, exporteu o moveu cites\n"
-"d'«Orage» a algun altre sistema."
+msgstr "Torna tots els esdeveniments arxivats al fitxer principal d'«Orage»\ni esborra'l. Això és útil quan, per exemple, exporteu o moveu cites\nd'«Orage» a algun altre sistema."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "fitxers d'Orage"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Calendari principal d'Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Fitxer actual"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Fitxer nou"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Opcions d'accions"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr ""
+
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Canvia el nom"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Tant sols canvia el nom del fitxer intern d'«Orage».\n"
-"No modifica el sistema de fitxers extern de cap manera.\n"
-"Cal que el fitxer nou existeixi."
+msgstr "Tant sols canvia el nom del fitxer intern d'«Orage».\nNo modifica el sistema de fitxers extern de cap manera.\nCal que el fitxer nou existeixi."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Copia"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr "El fitxer actual es copia i es manté sense modificar-se al lloc antic."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Mou"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "El fitxer actual es mou i desapareix del lloc antic."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Fitxer de l'arxiu de cites"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Fitxer forans"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Afegeix nous fitxers forans"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Fitxer forà:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Opcions"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Només lectura"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Estableix-lo si voleu estar segurs que Orage mai modifica el fitxer.\n"
-"Noteu que si es modifica un fitxer forà aquest pot acabar sent incompatible "
-"amb l'aplicació original."
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Estableix-lo si voleu estar segurs que Orage mai modifica el fitxer.\nNoteu que si es modifica un fitxer forà aquest pot acabar sent incompatible amb l'aplicació original."
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Intercanvi de dades - «Orage»"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tAixò és «%s» versió %s\n"
-"\n"
+msgstr "\tAixò és «%s» versió %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tDistribuït sota la llicència «GNU General Public License».\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tCompilat mitjançant «GTK+-%d.%d.%d», "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "emprant GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tEmprant «DBUS» per importar.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tNo emprant «DBUS». Importar funcionar parcialment.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tEmprant «libnotify».\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tNo emprant «libnotify».\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tEmprant arxivament automàtic.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tNo emprant arxivament.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tEmprant el paquet del sistema operatiu «libical».\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tEmprant la versió local d'Orage de «libical».\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Ús: orage [opcions] [fitxers]\n"
-"\n"
+msgstr "Ús: orage [opcions] [fitxers]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Opcions:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tmostra la versió d'«orage»\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tmostra aquest text.\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p)\tmostra les preferències\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\tFes «orage» visible/invisible.\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) file [RW] \tafegeix un fitxer forà.\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) file \ttreu un fitxer forà\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
 msgstr "--export (-e) fitxer [cita…] \texporta cites d'Orage a un fitxer\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "files=fitxers «ical» a carregar a «orage»\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\t«dbus» no inclòs a «orage». \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tsense dbus [fitxers] ni opcions de fitxers forans (-a i -r) només es pot "
-"emprar quan s'inicia «orage» \n"
+msgstr "\tsense dbus [fitxers] ni opcions de fitxers forans (-a i -r) només es pot emprar quan s'inicia «orage» \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Opció desconeguda «%s»\n"
-"\n"
+msgstr "\nOpció desconeguda «%s»\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Intercanvia dades"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Visualitza la _data seleccionada"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Mostra la _setmana seleccionada"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Seleccioneu _avui"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
 msgstr "Hora _global"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "A_juda"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr ""
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr ""
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr ""
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Mai"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
-"Títol: %s\n"
-" Localització: %s\n"
-" Inici:\t%s\n"
-" Fi:\t%s\n"
-" Nota:\n"
-"%s"
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
-"Títol: %s\n"
-" Localització: %s\n"
-" Inici:\t%s\n"
-" Fi:\t%s\n"
-" Nota:\n"
-"%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Pendent de fer:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Esdeveniments per %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>Esdeveniments per %s - %s:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:486
 msgid "Main settings"
 msgstr "Configuració principal"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:492
 msgid "Timezone"
 msgstr "Fus horari"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:507
 msgid "You should always define your local timezone."
 msgstr "CSempra s'ha de definir el fus horari local."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:515
 msgid "Archive threshold (months)"
 msgstr "Llindar de l'arxiu de cites (mesos)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:525
 msgid "(0 = no archiving)"
 msgstr "(0 = no arxivar)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:528
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Arxivament s'empra per desar hores i llocs quan es manipulen esdeveniments."
+msgstr "Arxivament s'empra per desar hores i llocs quan es manipulen esdeveniments."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:536
 msgid "Sound command"
 msgstr "Ordre per sons"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:551
 msgid "This command is given to shell to make sound in alarms."
 msgstr "Aquesta ordre s'empra per executar sons i alarmes."
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "Mostra la configuració"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Finestra principal del calendari"
+#: ../src/parameters.c:590
+msgid "Calendar window"
+msgstr ""
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:597
+msgid "Calendar visual details"
+msgstr ""
+
+#: ../src/parameters.c:603
 msgid "Show borders"
 msgstr "Mostra les vores"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:608
 msgid "Show menu"
 msgstr "Mostra el menú"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Mostra mes i any"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:616
 msgid "Show day names"
 msgstr "Mostra els noms dels dies"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:621
 msgid "Show week numbers"
 msgstr "Mostra els números de les setmanes"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:629
+msgid "Show month and year"
+msgstr "Mostra mes i any"
+
+#: ../src/parameters.c:649
+msgid "Calendar info boxes"
+msgstr ""
+
+#: ../src/parameters.c:654
 msgid "Show todo list"
 msgstr "Mostra la llista del pendent de fer"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:661
 msgid "Number of days to show in event window"
 msgstr "Nombre de dies a mostrar a la finestra d'esdeveniments"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:667
 msgid "0 = do not show event list at all"
 msgstr "0 = no mostra cap llista d'esdeveniments"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:680
+msgid "Calendar visibility"
+msgstr ""
+
+#: ../src/parameters.c:685
 msgid "Show on all desktops"
 msgstr "Mostra a tots els escriptoris"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:690
 msgid "Keep on top"
 msgstr "Mostra al damunt"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:698
 msgid "Show in taskbar"
 msgstr "Mostra a la barra de tasques"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:703
 msgid "Show in pager"
 msgstr "Mostra al paginador"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:711
 msgid "Show in systray"
 msgstr "Mostra a la safata del sistema"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:732
 msgid "Calendar start"
 msgstr "Inici del calendari"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:737
 msgid "Show"
 msgstr "Mostra"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:749
 msgid "Hide"
 msgstr "Oculta"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:761
 msgid "Minimized"
 msgstr "Minimitzada"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr "Configuració addicional"
-
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr "Obrir en la finestra del calendari"
-
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "Ves a avui"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr "Selecciona la data triada anteriorament"
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "Empra una icona dinàmica a l'àrea de notificació"
+#: ../src/parameters.c:781
+msgid "On calendar window open"
+msgstr ""
 
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "Empra icona dinàmica"
+#: ../src/parameters.c:786
+msgid "Select today's date"
+msgstr ""
 
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "La icona dinàmica mostra el mes actual i el dia del mes."
+#: ../src/parameters.c:799
+msgid "Select previously selected date"
+msgstr ""
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Mostra el calendari principal amb doble clic"
+#: ../src/parameters.c:817
+msgid "Calendar day double click shows"
+msgstr ""
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:822
 msgid "Days view"
 msgstr "Dies mostrats"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:834
 msgid "Event list"
 msgstr "Llista d'esdeveniments"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr "Finestra de llista d'esdeveniments"
+#: ../src/parameters.c:856
+msgid "Extra settings"
+msgstr "Configuració addicional"
+
+#: ../src/parameters.c:863
+msgid "Event list window extra days"
+msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:868
 msgid "Number of extra days to show in event list"
 msgstr "Nombre de dies extres a mostrar en el llistat d'esdeveniments"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:876
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
+msgstr "Aquest només és el valor per defecte, podeu canviar-lo en la finestra de la llista d'esdeveniments."
+
+#: ../src/parameters.c:886
+msgid "Day view window default first day"
+msgstr ""
+
+#: ../src/parameters.c:891
+msgid "First day of week"
 msgstr ""
-"Aquest només és el valor per defecte, podeu canviar-lo en la finestra de la "
-"llista d'esdeveniments."
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:904
+msgid "Selected day"
+msgstr ""
+
+#: ../src/parameters.c:922
+msgid "Use dynamic tray icon"
+msgstr "Empra una icona dinàmica a l'àrea de notificació"
+
+#: ../src/parameters.c:927
+msgid "Use dynamic icon"
+msgstr "Empra icona dinàmica"
+
+#: ../src/parameters.c:933
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "La icona dinàmica mostra el mes actual i el dia del mes."
+
+#: ../src/parameters.c:941 ../src/parameters.c:946
 msgid "Use wakeup timer"
 msgstr "Empra el rellotge despertador"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:952
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "Empreu aquest rellotge si Orage té problemes arrancant després de suspendre o hibernar. (Per exemple, la icona de la safata de missatges no es refresquen o no sonen les alarmes.)"
+
+#: ../src/parameters.c:961
+msgid "Foreign file default visual alarm"
+msgstr ""
+
+#: ../src/parameters.c:966
+msgid "Orage window"
+msgstr ""
+
+#: ../src/parameters.c:979
+msgid "Notify notification"
+msgstr ""
+
+#: ../src/parameters.c:997
+msgid "Always quit when asked to close"
+msgstr ""
+
+#: ../src/parameters.c:1002
+msgid "Always quit"
+msgstr ""
+
+#: ../src/parameters.c:1008
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
 msgstr ""
-"Empreu aquest rellotge si Orage té problemes arrancant després de suspendre "
-"o hibernar. (Per exemple, la icona de la safata de missatges no es "
-"refresquen o no sonen les alarmes.)"
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1024
 msgid "Orage Preferences"
 msgstr "Preferències Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1136
 msgid "First Orage start. Searching default timezone."
 msgstr "Primera arrancada d'Orage. Cercant el fus horari per defecte."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1155
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Fus horari per defecte fixat a %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1158
 msgid "Default timezone not found, please, set it manually."
 msgstr "Fus horari per defecte no trobat. Informeu-lo manualment."
 
@@ -2052,41 +2067,35 @@
 msgid "Open"
 msgstr "Obre"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Recordatori - Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr ""
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "Recorda-m'ho un altre cop després del temps especificat"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-"Pitgeu <Executa> per recordar-m'ho un altre cop desés del temps especificat:"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Següent alarma activa:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d d %02d h %02d min per: %s"
+msgstr "\n%02d d %02d h %02d min per: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"No s'ha trobat cap alarma activa"
+msgstr "\nNo s'ha trobat cap alarma activa"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -3657,269 +3666,26 @@
 msgstr "Mostra l'hora i la data?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Calendari"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Preferències del calendari d'Orage"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Preferències d'Orage"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Paràmetres de l'aplicació de calendari de Xfce 4 (Orage)"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Calendari d'escriptori"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Preferències del calendari d'Orage"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Calendari"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Calendari Orage"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Títol: %s\n"
-#~ " Inici:\t%s\n"
-#~ " Motiu:\t%s\n"
-#~ " Fet:\t%s\n"
-#~ "Nota:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Heu d'introduir tots els caràcters, incloent els d'escapament.\n"
-#~ "Aquesta cadena tant sols és per cridar l'intèrpret d'ordres."
-
-#~ msgid "Orage clock"
-#~ msgstr "Rellotge «Orage»"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Creador, mantenidor retirat"
-
-#~ msgid "Contributor"
-#~ msgstr "Contribuïdor"
-
-#~ msgid "Info"
-#~ msgstr "Informació"
-
-#~ msgid "Warning"
-#~ msgstr "Avís"
-
-#~ msgid "Error"
-#~ msgstr "Error"
-
-#~ msgid "Display"
-#~ msgstr "Pantalla"
-
-#~ msgid "Set sticked"
-#~ msgstr "Mostra'l omnipresent"
-
-#~ msgid "Select always today"
-#~ msgstr "Seleccioneu sempre avui"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Quan es mostra el calendari principal, coŀloca sempre el punter al dia "
-#~ "seleccionat o al anterior."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Acabant el mode d'ajustament d'hora"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Iniciant el mode d'ajustament d'hora"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "ajustament per canviar els minuts"
-
-#~ msgid "Vary"
-#~ msgstr "Variable"
-
-#~ msgid "Select timezone"
-#~ msgstr "Seleccioneu un fus horari"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Modifica el rellotge"
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "entreu el fus horari del rellotge, \n"
-#~ "(qualsevol valor TZ vàlid)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Modificació de les preferències"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Introduïu el fus horari local. (s'empra per mostrar si l'hora és prèvia "
-#~ "(-) o posterior (+) a la data al afegir +/- després de l'hora)"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr "Informeu un fus horari (=TZ) vàlid o trieu-lo de la llista."
-
-#~ msgid "show line _1:"
-#~ msgstr "Mostra la línia _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "Mostra la línia _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "Mostra la línia _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Propietats"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "No s'ha pogut executar «orage -p»"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> inseriu la data actual en el format local.\n"
-#~ "<T> inseriu l'hora i\n"
-#~ "<DT> inseriu data i hora."
-
-#~ msgid "Show event list"
-#~ msgstr "Mostra la llista d'esdeveniments"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = empra icones estàtiques)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Icones dinàmiques per mostrar el dia i mes actual. Tant sols es mostra a "
-#~ "la safata del sistema. Si la safata del sistema és massa petita per mides "
-#~ "d'icones dinàmiques, Orage canviarà automàticament a icones estàtiques."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Paràmetres de calendari"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Paràmetres del calendari de Xfce 4"
-
-#~ msgid ""
-#~ "Set this if you want to make sure that this file is never modified by "
-#~ "Orage."
-#~ msgstr ""
-#~ "Marqueu-lo si voleu estar segurs que aquest fitxer mai el modificarà "
-#~ "l'«Orage»."
-
-#~ msgid "Not defined"
-#~ msgstr "No definit"
-
-#~ msgid "Monday"
-#~ msgstr "Dilluns"
-
-#~ msgid "Tuesday"
-#~ msgstr "Dimarts"
-
-#~ msgid "Wednesday"
-#~ msgstr "Dimecres"
-
-#~ msgid "Thursday"
-#~ msgstr "Dijous"
-
-#~ msgid "Friday"
-#~ msgstr "Divendres"
-
-#~ msgid "Saturday"
-#~ msgstr "Dissabte"
-
-#~ msgid "Sunday"
-#~ msgstr "Diumenge"
-
-#~ msgid "Ical week start day"
-#~ msgstr "Inici de la setmana"
-
-#~ msgid ""
-#~ "This is used in some weekly repeating appointment rules. Just set it to "
-#~ "the start day of the week for your country and forget it."
-#~ msgstr ""
-#~ "Això s'empra en algunes de les regles de cites setmanals. Inicialitza'l "
-#~ "al dia de la setmana de la teva regió i oblidat."
-
-#~ msgid "Days"
-#~ msgstr "dies"
-
-#~ msgid "normal"
-#~ msgstr "General"
-
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%d/%m/%Y"
-
-#~ msgid "Calendar Files"
-#~ msgstr "Fitxers de calendari"
-
-#~ msgid "Calendar borders"
-#~ msgstr "Vores del calendari"
-
-#~ msgid "Hidden"
-#~ msgstr "Oculta"
-
-#~ msgid "3 months"
-#~ msgstr "3 mesos"
-
-#~ msgid "6 months"
-#~ msgstr "6 mesos"
-
-#~ msgid "1 year"
-#~ msgstr "1 any"
-
-#~ msgid "Application"
-#~ msgstr "Aplicació"
-
-#~ msgid "Button Label|Orage"
-#~ msgstr ""
-#~ "Calendari\n"
-#~ "«Orage»"
-
-#~ msgid "Core developer"
-#~ msgstr "Desenvolupadors principals"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "S'esborrarà tota la informació \n"
-#~ "associada amb aquesta data."
-
-#~ msgid "Clear"
-#~ msgstr "Neteja"
-
-#~ msgid "uid"
-#~ msgstr "uid"
-
-#~ msgid "This should not happen"
-#~ msgstr "Això no hauria de succeir"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "No s'ha pogut crear el client per MCS"
-
-#~ msgid "Open archive file..."
-#~ msgstr "Obre fitxer de cites…"
-
-#~ msgid "Close archive file"
-#~ msgstr "Tanca el fitxer de cites"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Calendari d'escriptori"
diff -Nru orage-4.8.3/po/ChangeLog orage-4.12.1/po/ChangeLog
--- orage-4.8.3/po/ChangeLog	2010-12-17 15:34:06.000000000 +0000
+++ orage-4.12.1/po/ChangeLog	1970-01-01 00:00:00.000000000 +0000
@@ -1,1564 +0,0 @@
-2009-08-07  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated.
-
-2009-07-25  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated.
-
-2009-07-17  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation reworked.
-
-2009-07-09  Mike Massonnet <mmassonnet@xfce.org>
-
-	* ast.po: Asturian translation added (Marcos).
-
-2009-06-15  Mike Massonnet <mmassonnet@xfce.org>
-
-	* zh_CN.po: Simplified Chinese update (Hunt Xu)
-
-2009-05-29  Mike Massonnet <mmassonnet@xfce.org>
-
-	* ur_PK.po: Urdu Pakistan translation update (Muhammad Ali Makki)
-	* ur.po: Urdu translation update (Muhammad Ali Makki)
-
-2009-05-11  Mike Massonnet <mmassonnet@xfce.org>
-
-	* lv.po: Latvian translation update (Rihards Prieditis)
-
-2009-04-25 Og Maciel <ogmaciel@gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-	* POTFILES.in: Updated.
-
-2009-04-22  Mișu Moldovan  <dumol@xfce.org>
-
-	* ro.po: Romanian translation update
-
-2009-04-20  Mike Massonnet <mmassonnet@xfce.org>
-
-	* gl.po: Galician translation update (Leandro Regueiro)
-	* pt.po: Portuguese translation update (Nuno Miguel)
-
-2009-04-16  Mike Massonnet <mmassonnet@xfce.org>
-
-	* gl.po: Galician translation update (Leandro Regueiro)
-
-2009-04-13  Mike Massonnet <mmassonnet@xfce.org>
-
-	* de.po: German translation update (Fabian Nowak)
-
-2009-03-29  Maximilian Schleiss <maximilian@xfce.org>
-
-	* es.po: Spanish translation update (Abel Martín)
-	* it.po: Italian translation update (Cristian Marchi)
-
-2009-03-27  Maximilian Schleiss <maximilian@xfce.org>
-
-	* gl.po: Galician translation update (Leandro Regueiro)
-
-2009-03-19  Masato Hashimoto <cabezon.hashimoto@gmail.com>
-
-	* ja.po: Japanese translation update (Masato Hashimoto)
-
-2009-03-14  Maximilian Schleiss <maximilian@xfce.org>
-
-	* gl.po: Galician translation update (Leandro Regueiro)
-
-2009-03-05  Mike Massonnet <mmassonnet@xfce.org>
-
-	* pt.po: Renamed pt_PT.po to pt.po (bug #4574)
-	* nb.po: Renamed nb_NO.po to nb.po (bug #4574)
-
-2009-03-01  Maximilian Schleiss <maximilian@xfce.org>
-
-	* es.po: Spanish translation update (Abel Martín)
-	* pl.po: Polish translation update (Piotr Sokół)
-
-2009-01-24  Maximilian Schleiss <maximilian@xfce.org>
-
-	* zh_CN.po: Simplified Chinese translation update (Chris K. Zhang)
-
-2009-02-22  Mike Massonnet <mmassonnet@xfce.org>
-
-	* ru.po: Update Russian translation (Ilya Shestopalov)
-
-2009-02-20  Maximilian Schleiss <maximilian@xfce.org>
-
-	* gl.po: Galician translation update (Leandro Regueiro)
-	* it.po: Italian translation udpate (Fabio Riga)
-
-2009-02-07  Maximilian Schleiss <maximilian@xfce.org>
-
-	* pl.po: Polish translation update (Piotr Sokół)
-
-2009-01-25  Jari Rahkonen <jari.rahkonen@pp1.inet.fi>
-
-	* fi.po: Update Finnish translation.
-
-2009-01-21  Maximilian Schleiss <maximilian@xfce.org>
-
-	* zh_CN.po: Simplified Chinese translation update (Chris K. Zhang)
-
-2009-01-19  Maximilian Schleiss <maximilian@xfce.org>
-
-	* nb_NO.po: Norwegian Bokmal translation update (Terje Uriansrud)
-
-2009-01-18  Maximilian Schleiss <maximilian@xfce.org>
-
-	* ja.po: Japanese translation update (Masato Hashimoto)
-
-2009-01-04  Maximilian Schleiss <maximilian@xfce.org>
-
-	* fr.po: French translation update
-	* pl.po: Polish translation update (Piotr Sokół)
-
-2008-12-31  Michal Várady <miko.vaji@gmail.com>
-
-	* cs.po: Czech translation fixed
-
-2008-12-25  Maximilian Schleiss <maximilian@xfce.org>
-
-	* id.po: Indonesian translation update (Andhika Padmawan)
-
-2008-12-20  Alexander Toresson <eulex@xfce.org>
-
-	* sv.po: Swedish translation update (Daniel Nylander)
-
-2008-12-07  Piarres Beobide <pi@beobide.net>
-
-        * eu.po: Basque translation update
-
-2008-11-30 Lars Nielsen <lars@mit-web.dk>
-
-	* da.po: Updated danish translation (Per Kongstad)
-
-2008-11-26 Og Maciel <ogmaciel@gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation.
-
-2008-11-25  Maximilian Schleiss <maximilian@xfce.org>
-
-	* es.po: Spanish translation update (Abel Martín)
-
-2008-11-23  Maximilian Schleiss <maximilian@xfce.org>
-
-	* ja.po: Japanese translation update (Masato Hashimoto)
-	* uk.po: Ukrainian translation udpate (Dmitry Nikitin)
-
-2008-11-21  Michal Várady <miko.vaji@gmail.com>
-
-	* cs.po: Czech translation updated
-
-2008-11-18  Maximilian Schleiss <maximilian@xfce.org>
-
-	* nb_NO: Norwegian Bokmal translation update (Terje Uriansrud)
-	* sq.po: Albanian translation update (Besnik Bleta)
-
-2008-11-16  Maximilian Schleiss <maximilian@xfce.org>
-
-	* ca.po: Catalan translation udpate (Carles Muñoz Gorriz)
-	* de.po: German translation update (Fabian Nowak)
-	* es.po: Spanish translation update (Abel Martín)
-
-2008-11-15  Eren Türkay <erenturkay@xfce.org>
-
-        * tr.po: Turkish translation update (Gökmen Görgen)
-
-2008-11-11  Piarres Beobide <pi@beobide.net>
-
-        * eu.po: Basque translation update
-
-2008-11-10  Maximilian Schleiss <maximilian@xfce.org>
-
-	* ku.po; LINGUAS: Kurdish translation added (Erdal Ronahi)
-
-2008-11-02  Maximilian Schleiss <maximilian@xfce.org>
-
-	* es.po: Spanish translation update (Abel Martín)
-
-2008-10-30 Piarres Beobide <pi@beobide.net>
-
-        * eu.po: Basque translation update
-
-2008-10-29  Maximilian Schleiss <maximilian@xfce.org>
-
-	* ja.po: Japanese translation udpate (Masato Hashimoto)
-
-2008-10-29  Maximilian Schleiss <maximilian@xfce.org>
-
-	* es.po: Spanish translation update (Abel Martin)
-	* ja.po: Japanese translation udpate (Masato Hashimoto)
-	* ru.po: Russian translation update (Nikita Belobrov)
-	* sq.po: Albanian translation update (Besnik Bleta)
-
-2008-10-19 Lars Nielsen <lars@mit-web.dk>
-
-	* da.po: Danish translation update
-
-2008-10-18  Maximilian Schleiss <maximilian@xfce.org>
-
-	* es.po: Spanish translation update (Abel Martin)
-	* id.po: Indonesian translation update (Andhika Padmawan)
-	* nb_NO.po: Norwegian Bokmal translation update (Terje Uriansrud)
-
-2008-10-17 Lars Nielsen <lars@mit-web.dk>
-
-	* da.po: Danish translation update
-
-2008-10-10  Maximilian Schleiss <maximilian@xfce.org>
-
-	* fr.po: French translation update
-
-2008-10-05  Maximilian Schleiss <maximilian@xfce.org>
-
-	* et.po: Estonian translation update (Kristjan Siimson)
-	* fr.po: French translation update
-	* id.po: Indonesian translation update (Andhika Padmawan)
-
-2008-09-30 Og Maciel <ogmaciel@gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation by Fábio Nogueira.
-
-2008-08-29  Maximilian Schleiss <maximilian@xfce.org>
-
-	* de.po: German translation updated (Fabian Nowak)
-	* ko.po: Korean translation updated (ByungHyun Choi)
-
-2009-08-29  Eren Türkay <erenturkay@xfce.org>
-
-	* tr.po: Turkish translation updated (Gökmen Görgen <gkmngrgn@gmail.com>)
-
-2008-08-10  Maximilian Schleiss <maximilian@xfce.org>
-
-	* ko.po: Korean translation updated (ByungHyun Choi)
-	* pl.po: Polish translation updated (Piotr Maliński)
-
-2008-06-26  Maximilian Schleiss <maximilian@xfce.org>
-
-	* gl.po: Galician translation updated (Leandro Regueiro)
-
-2008-06-22  Mike Massonnet <mmassonnet@xfce.org>
-
-	* id.po, LINGUAS: Add Indonesian translation (Andhika Padmawan)
-
-2008-05-27	Mike Massonnet <mmassonnet@xfce.org>
-
-	* de.po: Update German translation (Nico Schümann)
-
-2008-05-13	Mike Massonnet <mmassonnet@xfce.org>
-
-	* en_GB.po: Update translation (Jeff Bailes)
-
-2008-05-08  Og Maciel <ogmaciel@gnome.org>
-
-    * pt_BR.po: Updated Brazilian Portuguese translation
-
-2008-04-12  Mike Massonnet <mmassonnet@xfce.org>
-
-    * lv.po: Update Latvian translation (Rihards Prieditis <rprieditis@gmail.com>)
-
-2008-03-18	Mike Massonnet <mmassonnet@xfce.org>
-
-	* pt_PT.po: Update Portuguese translation by Nuno Miguel
-
-2008-03-18	Mike Massonnet <mmassonnet@xfce.org>
-
-	* ca.po: Update Catalan translation by Carles Muñoz Gorriz
-	<carlesmu@ya.com>
-
-2008-03-05	Mike Massonnet <mmassonnet@xfce.org>
-
-	* am.po: Update Amharic translation
-
-2008-02-15	Mike Massonnet <mmassonnet@xfce.org>
-
-	* fr.po: Translated the strings from the main interface
-
-2008-01-20  Maximilian Schleiss <maximilian@xfce.org>
-
-	* ca.po: Catalan translation update
-	by Carles Muñoz Gorriz <carlesmu@internautas.org>
-
-2008-01-07  Maximilian Schleiss <maximilian@xfce.org>
-
-	* nb_NO.po: Norwegian Bokmal translation update
-	by Christian Lomsdalen <christian@vindstille.net>
-
-2007-12-23  Jean-François Wauthy <pollux@xfce.org>
-
-	* pt_PT.po: Updated Portuguese translations by Nuno Miguel
-	<nunis@netcabo.pt>
-
-2007-12-02	Maximilian Schleiss <maximilian@xfce.org>
-
-	* de.po: German translation update
-	by Fabian Nowak <timstery@arcor.de>
-
-2007-11-17	Mike Massonnet <mmassonnet@xfce.org>
-
-	* fr.po: Rename the name in the desktop entry files with consistency
-
-2007-11-15	Mike Massonnet <mmassonnet@xfce.org>
-
-	* ur.po, LINGUAS: Add Urdu translation by ﻢﺤﻣﺩ ﻊﻠﻳ ﺎﻠﻤﻜﻳ
-	makki.ma@gmail.com
-
-2007-11-11  Mike Massonnet <mmassonnet@xfce.org>
-
-	* lv.po: Update translations by RPrieditis <RPrieditis@inbox.lv>
-
-2007-10-06  Mike Massonnet <mmassonnet@xfce.org>
-
-	* lv.po: Add translations by RPrieditis <RPrieditis@inbox.lv>
-
-2007-10-02  Moritz Heiber <moe@xfce.org>
-	* de.po: Fix seemingly untested German translation
-	* am.po: Remove erroneous executable bit
-
-2007-10-01  Mike Massonnet <mmassonnet@xfce.org>
-
-	* de.po: Update translation by Nico Schümann
-	<nico.schuemann@googlemail.com>
-
-2007-09-25  Mike Massonnet <mmassonnet@xfce.org>
-
-	* ko.po: Update translation by ByungHyun Choi
-	<byunghyun.choi@debianusers.org>
-
-2007-09-20  Mike Massonnet <mmassonnet@xfce.org>
-
-	* nb_NO.po: Update translation by Terje Uriansrud <ter@operamail.com>
-
-2007-09-17  Alexander Nyakhaychyk <nyakhaychyk@gmail.com>
-
-	* be.po: Updated Belarusian translation
-
-2007-09-06  Maximilian Schleiss <maximilian@xfce.org>
-
-	* am.po: Added a long waiting Amharic translation
-	by Tegegne Tefera <tefera@mekuria.com>
-
-2007-07-14  Daichi Kawahata <daichi@xfce.org>
-
-	* ja.po: Updated Japanese translations.
-
-2007-07-04  Maximilian Schleiss <maximilian@xfce.org>
-
-	* pt_PT.po: European Portuguese translation update
-	by Nuno Miguel <nunis@netcabo.pt>
-
-2007-06-29  Maximilian Schleiss <maximilian@xfce.org>
-
-	* pt_PT.po: European Portuguese translation update
-	by Nuno Miguel <nunis@netcabo.pt>
-
-2007-06-20  Maximilian Schleiss <maximilian@xfce.org>
-
-	* en_GB: British English translation updated
-	by Jeff Bailes <thepizzaking@gmail.com>
-
-2007-06-11  Maximilian Schleiss <maximilian@xfce.org>
-
-	* de.po: Updated the German translation
-	by Nico Schümann <nico@prog.nico22.de>
-
-2006-08-27  Jean-François Wauthy <pollux@xfce.org>
-
-	* cs.po: Updated Czech translations
-	* ka.po: Add Georgian translations
-
-2006-08-24  Jean-François Wauthy <pollux@xfce.org>
-
-	* gl.po: Updated Galician translations
-	* pl.po: Updated Polish translations
-	
-2006-08-20  Jean-François Wauthy <pollux@xfce.org>
-
-	* gl.po: Add Galician translations
-
-2006-08-19  Jean-François Wauthy <pollux@xfce.org>
-
-	* fr.po: Updated French translations by Max Schleiss
-
-2006-08-19  Hydonsingore Cia <hydonsingore@educities.edu.tw>
-
-	* zh_TW.po: Update traditional Chinese translations.
-
-2006-08-18  Piarres Beobide <pi@beobide.net>
-
-	* eu.po: Basque translation update.
-
-2006-08-15  Jean-François Wauthy <pollux@xfce.org>
-
-	* fr.po: Updated French translations by Gerald Barre <g.barre@free.fr>
-
-2006-07-15  Jean-François Wauthy <pollux@xfce.org>
-
-	* cs.po: Updated Czech translations by Michal Varady
-	<miko.vaji@gmail.com>
-
-2006-07-11  Sylvain Vedrenne <gnu_sylvain@xfce.org>
-
-	* eo.po: Updated Esperanto translations thanks to 
-	Jarbas Araujo <jarbasaraujojr@yahoo.com.br>
-
-2006-06-12  Hydonsingore Cia <hydonsingore@educities.edu.tw>
-
-	* zh_TW.po: Modify the translator's e-mail address.
-
-2006-06-05  Adriano Winter Bess  <adriano@xfce.org>
-
-	* pt_BR.po: Updated brazilian portuguese translations.
-
-2006-06-04  Daichi Kawahata <daichi@xfce.org>
-
-	* fr.po: Updated French translations by Gerald Barre
-	  <g.barre@free.fr>.
-	* orage.pot, *.po: Updated.
-
-2006-06-03  Alexander Toresson <alexander.toresson@gmail.com>
-
-	* sv.po: Updated Swedish translation.
-
-2006-05-23  Hydonsingore Cia <hydonsingore@mail.educities.edu.tw>
-
-	* zh_TW.po: Correct the strings containing Button Label in
-	  traditional Chinese translations.
-
-2006-05-21  Daichi Kawahata <daichi@xfce.org>
-
-	* pl.po: Updated Polish translations by Szymon Kalasz
-	  <szymon_maestro@gazeta.pl>.
-
-2006-05-13  Pau Rul-lan Ferragut <paurullan@bulma.net>
-
-	* ca.po: updated catalan translation.
-
-2006-05-13  Daichi Kawahata <daichi@xfce.org>
-
-	* pl.po: Updated Polish translations by Szymon Kalasz
-	  <szymon_maestro@gazeta.pl>.
-
-2006-05-12  Stavros Giannouris <stavrosg2002@freemail.gr>
-
-	* el.po: Greek translation update.
-
-2006-05-07  Daichi Kawahata <daichi@xfce.org>
-
-	* cs.po: Updated Czech translations by Michal Varady
-	  <miko.vaji@gmail.com>.
-	* pl.po: Updated Polish translations by Piotr Malinski
-	  <admin@rk.edu.pl>.
-	* orage.pot, *.po: Updated.
-
-2006-05-05  Daichi Kawahata <daichi@xfce.org>
-
-	* sk.po: Updated Slovak translations by Roman Moravcik
-	  <roman.moravcik@gmail.com>.
-	* orage.pot, *.po: Bump.
-
-2006-05-05  Yuval Tanny <tanai@int.gov.il>
-
-	* he.po: Updated Hebrew translation.
-
-2006-05-05  Daichi Kawahata <daichi@xfce.org>
-
-	* ja.po: Updated Japanese translations.
-
-2006-05-03  Piarres Beobide <pi@beobide.net>
-
-	* eu.po: Basque translation update.
-
-2006-05-02  Hydonsingore Cia <hydonsingore@mail.educities.edu.tw>
-
-	* zh_TW.po: traditional Chinese minor update after disscusion
-	  with Cosmo Chene <cosmolax@gmail.com>.
-
-2006-05-02  Daichi Kawahata <daichi@xfce.org>
-
-	* ChangeLog: Removed timestamps so that a translator isn't
-	  bothered: "Then, what time is it now in UTC?"
-
-2006-05-02  Hydonsingore Cia <hydonsingore@mail.educities.edu.tw>
-
-	* zh_TW.po: Updated traditional Chinese translations by
-	  Cosmo Chene <cosmolax@gmail.com>.
-
-2006-05-02  Daichi Kawahata <daichi@xfce.org>
-
-	* pl.po: Updated Polish translations by Piotr Malinski
-	  <admin@rk.edu.pl>.
-
-2006-05-01  Szervac Attila <sas@321.hu>
-
-	* hu.po: hu trunk: xffm+cal updates
-
-2006-05-01  Jari Rahkonen <jari.rahkonen@pp2.inet.fi>
-
-	* fi.po: Finnish translations updated.
-
-2006-05-01  Daichi Kawahata <daichi@xfce.org>
-
-	* ru.po: Updated Russian translations by
-	  Andrey Fedoseev <andrey.fedoseev@gmail.com>,
-	  Maxim Zenin <webmechanics@gmail.com>,
-	  Sergey Fedoseev <fedoseev.sergey@gmail.com>.
-
-2006-04-30  Daichi Kawahata <daichi@xfce.org>
-
-	* pl.po: Updated Polish translations by Piotr Malinski
-	  <admin@rk.edu.pl>.
-
-2006-04-30  Pau Rullan Ferragut <paurullan@bulma.net>
-
-	* ca.po: [i18n] catalan xfcalendar and mousepad updates
-	  work done by Carles Muñoz Gorriz <carlesmu@internautas.org>
-
-2006-04-30  Daichi Kawahata <daichi@xfce.org>
-
-	* ja.po: Updated Japanese translations.
-	* POTFILES.in, orage.pot, *.po: Updated.
-	* ja.po: Updated Japanese translations.
-
-2006-04-29  Stavros Giannouris <stavrosg2002@freemail.gr>
-
-	* el.po: Greek translation update
-
-2006-04-29  Daichi Kawahata <daichi@xfce.org>
-
-	* vi.po: Updated Vietnamese translations by Phan Vinh Thinh
-	  <teppi@vnlinux.org>.
-
-2006-04-28  Yuval Tanny <tanai@int.gov.il>
-
-	* he.po: Hebrew translation update.
-
-2006-04-27  Jari Rahkonen <jari.rahkonen@pp2.inet.fi>
-
-	* fi.po: Finnish translation updated.
-
-2006-04-27  Szervac Attila <sas@321.hu>
-
-	* hu.po: hu trunk: cal update
-
-2006-04-27  Juha Kautto <juha@xfce.org>
-
-	* fi.po: testing
-	* fi.po: typo
-	* POTFILES.in, orage.pot, *.po: adding panel-plugin translations
-	  strings
-
-2006-04-26  Peeter Vois <peeter.vois@proekspert.ee>
-
-	* et.po:
-
-2006-04-25  Szervac Attila <sas@321.hu>
-
-	* hu.po: hu trunk: Thunar & cal update
-
-2006-04-23  Stavros Giannouris <stavrosg2002@freemail.gr>
-
-	* el.po: Greek translation update.
-
-2006-04-23  Daichi Kawahata <daichi@xfce.org>
-
-	* ru.po: Updated Russian translations by Sergey Fedoseev
-	  <fedoseev.sergey@gmail.com>.
-
-2006-04-23  Szervac Attila <sas@321.hu>
-
-	* hu.po: hu trunk: cal, desktop, mcs-plugins & panel updates
-
-2006-04-23  Daichi Kawahata <daichi@xfce.org>
-
-	* nl.po: Updated Dutch translations by Stephan Arts
-	  <psybsd@gmail.com>.
-
-2006-04-22  Szervac Attila <sas@321.hu>
-
-	* hu.po: hu trunk: some thunar & orage updates
-
-2006-04-22  Daichi Kawahata <daichi@xfce.org>
-
-	* orage.pot, *.po: Updated.
-
-2006-04-22  Szervac Attila <sas@321.hu>
-
-	* hu.po: hu trunk: some wm & orage updates
-
-2006-04-21  Yuval Tanny <tanai@int.gov.il>
-
-	* he.po: Hebrew translations update.
-
-2006-04-19  Jari Rahkonen <jari.rahkonen@pp2.inet.fi>
-
-	* fi.po: Updated Finnish translations.
-
-2006-04-18  Daichi Kawahata <daichi@xfce.org>
-
-	* et.po: Updated Estonian translations by Peeter Vois
-	  <Peeter.Vois@proekspert.ee>.
-
-2006-04-16  Benedikt Meurer <benny@xfce.org>
-
-	* orage.pot: Update for 4.4beta1.
-
-2006-04-16  Daichi Kawahata <daichi@xfce.org>
-
-	* ru.po: Updated Russian translations by Andrey Fedoseev
-	  <andrey.fedoseev@gmail.com>.
-
-2006-04-15  Daichi Kawahata <daichi@xfce.org>
-
-	* *.po: Bump, etc.
-	* ru.po: Updated Russian translations by Andrey Fedoseev
-	  <andrey.fedoseev@gmail.com>.
-	* orage.pot, *.po: Updated.
-
-2006-04-14  Szervac Attila <sas@321.hu>
-
-	* hu.po: hu trunk: continents....
-
-2006-04-14  Szervac Attila <sas@321.hu>
-
-	* hu.po: hu trunk: continents....
-
-2006-04-13  Daichi Kawahata <daichi@xfce.org>
-
-	* pl.po: A minor fix by Piotr Malinski <riklaunim@gmail.com>.
-
-2006-04-13  Szervac Attila <sas@321.hu>
-
-	* hu.po: hu: calendar, appfinder, icon-theme & panel updates
-
-2006-04-01  Stavros Giannouris <stavrosg2002@freemail.gr>
-
-	* el.po: Greek translations update & polish by Stathis Kamperis
-	  <ekamperi@auth.gr>
-
-2006-03-30  Daichi Kawahata <daichi@xfce.org>
-
-	* vi.po: Updated Vietnamese translations by Phan Vinh Thinh
-	  <teppi@vnlinux.org>.
-
-2006-03-27  Daichi Kawahata <daichi@xfce.org>
-
-	* ru.po: Updated Russian translations by
-	  Andrey Fedoseev <andrey.fedoseev@gmail.com>,
-	  Sergey Fedoseev <fedoseev.sergey@gmail.com>.
-
-2006-03-27  Daichi Kawahata <daichi@xfce.org>
-
-	* orage.pot, *.po: Updated.
-
-2006-03-19  Pau Rullan Ferragut <paurullan@bulma.net>
-
-	* ca.po: [i18n] catalan seems a lot of work but they all are
-	  fuzzy
-
-2006-03-19  Daichi Kawahata <daichi@xfce.org>
-
-	* pl.po: Updated Polish translations by Piotr Malinski
-	  <admin@rk.edu.pl>.
-
-2006-03-18  Daichi Kawahata <daichi@xfce.org>
-
-	* ru.po: Updated Russian translations by
-	  Andrey Fedoseev <andrey.fedoseev@gmail.com>,
-	  Sergey Fedoseev <fedoseev.sergey@gmail.com>.
-
-2006-03-16  Sylvain Vedrenne <gnu_sylvain@xfce.org>
-
-	* eo.po: Esperanto translations updated.
-	* eo.po: Esperanto translations update. Partially completed (some
-	  town names will be improved in the near future).
-
-2006-03-11  Daichi Kawahata <daichi@xfce.org>
-
-	* ja.po: Updated Japanese transliterations etc.
-
-2006-03-10  Daichi Kawahata <daichi@xfce.org>
-
-	* ja.po: Updated Japanese transliterations.
-
-2006-03-08  Daichi Kawahata <daichi@xfce.org>
-
-	* ja.po: Updated Japanese transliterations.
-	* fi.po: Updated Finnish translations by Jari Rahkonen
-	  <jari.rahkonen@pp2.inet.fi>.
-
-2006-03-08  Daichi Kawahata <daichi@xfce.org>
-
-	* orage.pot, *.po: Updated.
-
-2006-03-07  Stavros Giannouris <stavrosg2002@freemail.gr>
-
-	* el.po: Greek translation update.
-
-2006-03-06  Piarres Beobide <pi@beobide.net>
-
-	* eu.po: Basque trasnlation update.
-
-2006-03-06  Juha Kautto <juha@xfce.org>
-
-	* fi.po:
-	  1) fi translations for africa timezones
-	  2) make repeat end selections insensitive if repeat is not
-	  selected.
-
-2006-03-05  Daichi Kawahata <daichi@xfce.org>
-
-	* ja.po: Updated Japanese transliterations.
-	* *.po: Bump.
-
-2006-03-04  Juha Kautto <juha@xfce.org>
-
-	* orage.pot, *.po: Added timezone translations.
-
-2006-03-04  Daichi Kawahata <daichi@xfce.org>
-
-	* orage.pot, *.po: Updated.
-
-2006-03-02  Daichi Kawahata <daichi@xfce.org>
-
-	* et.po: Updated Estonian translations by Peeter Vois
-	  <Peeter.Vois@mail.ee>.
-
-2006-02-16  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* zh_CN.po: updated zh_CN translations.
-
-2006-02-14  Adriano Winter Bess <awbess@gmail.com>
-
-	* pt_BR.po: Updated pt_BR translations for orage.
-
-2006-02-13  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* vi.po: updated VI translations.
-
-2006-02-05  Yuval Tanny <tanai@int.gov.il>
-
-	* he.po: Update Hebrew translations.
-
-2006-02-05  Stavros Giannouris <stavrosg2002@freemail.gr>
-
-	* el.po: Updated Greek translations.
-
-2006-02-01  Daichi Kawahata <daichi@xfce.org>
-
-	* nl.po: Updated Dutch translations by Vincent Tunru
-	  <imnotb@gmail.com>.
-
-2006-01-29  Daichi Kawahata <daichi@xfce.org>
-
-	* ja.po: Updated Japanese translations.
-	* orage.pot, *.po: Updated.
-
-2006-01-27  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* vi.po: update VI translations
-
-2006-01-22  Juha Kautto <juha@xfce.org>
-
-	* POTFILES.in, orage.pot, *.po: new literals.
-	* fi.po: fi translation fixes: remove #, fuzzy lines after
-	  translation
-
-2006-01-17  Pau Rullan Ferragut <paurullan@bulma.net>
-
-	* ca.po: catalan translation for Orage
-
-2006-01-17  Hydonsingore Cia <hydonsingore@mail.educities.edu.tw>
-
-	* zh_TW.po: Update xfcalendar zh_TW translation.
-
-2006-01-16  Juha Kautto <juha@xfce.org>
-
-	* POTFILES.in, orage.pot, *.po: updated translation files and
-	  fi translation.
-
-2006-01-15  Piarres Beobide <pi@beobide.net>
-
-	* eu.po: Basque translation update
-
-2006-01-13  Daichi Kawahata <daichi@xfce.org>
-
-	* pl.po: Updated Polish translations by Piotr Malinski
-	  <riklaunim@gmail.com>.
-
-2006-01-08  Pau Rullan Ferragut <paurullan@bulma.net>
-
-	* ca.po: little heading fixing
-
-2006-01-08  Daichi Kawahata <daichi@xfce.org>
-
-	* ja.po: Updated Japanese translations.
-
-2006-01-07  Daichi Kawahata <daichi@xfce.org>
-
-	* *.po: Updated copyright information.
-
-2006-01-05  Stavros Giannouris <stavrosg2002@freemail.gr>
-
-	* el.po: Updated Greek translation.
-
-2006-01-01  Daichi Kawahata <daichi@xfce.org>
-
-	* ja.po: Updated Japanese translations.
-
-2006-01-01  Daichi Kawahata <daichi@xfce.org>
-
-	* ja.po: Updated Japanese translations.
-
-2006-01-01  Daichi Kawahata <daichi@xfce.org>
-
-	* POTFILES.in, orage.pot, *.po: Updated.
-
-2005-12-20  Daichi Kawahata <daichi@xfce.org>
-
-	* *.po: Updated.
-
-2005-12-11  Stavros Giannouris <stavrosg2002@freemail.gr>
-
-	* el.po: Updated Greek translations.
-
-2005-12-10  Daichi Kawahata <daichi@xfce.org>
-
-	* orage.pot, *.po: Updated.
-
-2005-12-07  Piarres Beobide <pi@beobide.net>
-
-	* eu.po: Updated Basque translation.
-
-2005-11-22  Daichi Kawahata <daichi@xfce.org>
-
-	* ja.po: Updated Japanese translations.
-
-2005-11-22  Daichi Kawahata <daichi@xfce.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translations by Adriano
-	  Winter Bess <awbess@gmail.com>.
-
-2005-11-21  Daichi Kawahata <daichi@xfce.org>
-
-	* ja.po: Updated Japanese translations.
-
-2005-11-21  Daichi Kawahata <daichi@xfce.org>
-
-	* orage.pot, *.po: Updated.
-
-2005-11-21  Stavros Giannouris <stavrosg2002@freemail.gr>
-
-	* el.po: * Updated Greek translation.
-
-2005-11-21  Daichi Kawahata <daichi@xfce.org>
-
-	* POTFILES.in: Updated POTFILES.in files.
-
-2005-10-30  Daichi Kawahata <daichi@xfce.org>
-
-	* orage.pot: Added again, because it requires for translators who
-	  are grabbing PO files from `trunk-po' module, without POT file,
-	  it's hard to create initial PO file from command line (e.g.
-	  msginit) or with GUI tools (e.g. KBabel, poEdit).
-
-2005-10-29  Daichi Kawahata <daichi@xfce.org>
-
-	* eo.po: Removed executable attribute.
-
-2005-10-29  Sylvain Vedrenne <sylvain.vedrenne@free.fr>
-
-	* eo.po: Esperanto translation for Trunk module xfcalendar.
-
-2005-10-27  Pau Rullan Ferragut <paurullan@bulma.net>
-
-	* ca.po: begin process to 4.4 work autotranslation of most of the
-	  actual po -- paurullan@bulma.net , ca translator
-
-2005-10-23  Piarres Beobide <pi@beobide.net>
-
-	* eu.po: Basque translation update.
-
-2005-10-21  Alex Dupre <ale@FreeBSD.org>
-
-	* it.po: Update Italian translations and add missing accelerator
-	  keys.
-
-2005-10-21  Daichi Kawahata <daichi@xfce.org>
-
-	* *.po: Updated with the latest POT file.
-
-2005-10-16  Daichi Kawahata <daichi@xfce.org>
-
-	* *.po: Updated.
-
-2005-10-15  Daichi Kawahata <daichi@xfce.org>
-
-	* *.po: Updated.
-
-2005-10-11  Daichi Kawahata <daichi@xfce.org>
-
-	* et.po: Changed an address.
-
-2005-10-09  Daichi Kawahata <daichi@xfce.org>
-
-	* de.po: Updated German translations by Fabian Nowak
-	  <timystery@arcor.de>.
-
-2005-10-07  Daichi Kawahata <daichi@xfce.org>
-
-	* it.po, sk.po: Misc. changes.
-
-2005-10-07  Daichi Kawahata <daichi@xfce.org>
-
-	* hy.po, it.po, sk.po, zh_CN.po: Misc. changes.
-
-2005-10-07  Hydonsingore Cia <hydonsingore@mail.educities.edu.tw>
-
-	* zh_TW.po: Update Orage zh_TW translation
-
-2005-10-07  Daichi Kawahata <daichi@xfce.org>
-
-	* *.po: Updated. Discarded obsolete translations.
-
-2005-10-06  Stavros Giannouris <stavrosg2002@freemail.gr>
-
-	* el.po: Minor updates & polishing for the Greek translations
-
-2005-10-05  Daichi Kawahata <daichi@xfce.org>
-
-	* *.po: Updated.
-
-2005-10-04  Stavros Giannouris <stavrosg2002@freemail.gr>
-
-	* el.po: Minor changes and updates in el translations
-
-2005-10-01  Hydonsingore Cia <hydonsingore@mail.educities.edu.tw>
-
-	* zh_TW.po: Update Orage zh_TW translations
-
-2005-09-30  Daichi Kawahata <daichi@xfce.org>
-
-	* xfcalendar.pot: Removed unnecessary file.
-
-2005-09-30  Daichi Kawahata <daichi@xfce.org>
-
-	* *.po: Updated with the latest POT file.
-
-2005-09-24  Daichi Kawahata <daichi@xfce.org>
-
-	* ja.po: Updated some translations.
-
-2005-09-22  Hydonsingore Cia <hydonsingore@mail.educities.edu.tw>
-
-	* zh_TW.po: Update zh_TW translations
-
-2005-09-20  Alex Dupre <ale@FreeBSD.org>
-
-	* it.po: Update IT translations.
-
-2005-09-16  Juraj Brosz <juro@jurajbrosz.info>
-
-	* sk.po: Update sk_SK translation
-
-2005-09-13  Daichi Kawahata <daichi@xfce.org>
-
-	* *.po: Congratulations on official release. Updated.
-	  Modified initial comment strings, etc.
-
-2005-09-09  Daichi Kawahata <daichi@xfce.org>
-
-	* zh_TW.po: Changed translator's representation in spelling by
-	  the request.
-
-2005-08-29  Daichi Kawahata <daichi@xfce.org>
-
-	* ja.po: Changed responsible period for previous translator.
-
-2005-08-18  Daichi Kawahata <daichi@xfce.org>
-
-	* ja.po: Updated Japanese translations.
-
-2005-08-17  Daichi Kawahata <daichi@xfce.org>
-
-	* bg.po, en_GB.po, es.po, nb_NO.po, nl.po, zh_CN.po: Fixed errors.
-	  Converted local charset to UTF-8. Added fallback address.
-	  Modified initial comment strings.
-
-2005-08-13  Daichi Kawahata <daichi@xfce.org>
-
-	* fi.po: Updated Finnish translations by Jari Rahkonen
-	  <jari.rahkonen@pp2.inet.fi>.
-
-2005-08-11  Stavros Giannouris <stavrosg2002@freemail.gr>
-
-	* el.po: Some corrections.
-
-2005-08-06  Stavros Giannouris <stavrosg2002@freemail.gr>
-
-	* el.po: Initial addition of Greek language files for xfcalendar
-	  in trunk.
-
-2005-08-04  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* hy.po: add some HY translations
-
-2005-07-19  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* ja.po: update JA translations
-
-2005-07-04  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* ko.po: update KO translations
-
-2005-06-29  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* zh_TW.po: update zh_TW translations
-
-2005-06-12  Juha Kautto <juha@xfce.org>
-
-	* POTFILES.in: fix make dist
-
-2005-05-31  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* ja.poo: update JA translations
-
-2005-05-14  Olivier Fourdan <fourdan@xfce.org>
-
-	* ChangeLog: Update ChangeLog
-
-2005-05-06  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* bn_IN.po, mr.po: add MR and bn_IN translations (thanks sofar)
-
-2005-05-04  Olivier Fourdan <fourdan@xfce.org>
-
-	* ChangeLog: Update ChangeLog
-
-2005-04-06  Jens Luedicke <jens.luedicke@gmail.com>
-
-	* .cvsignore: remove .cvsignore cruft
-
-2005-03-07  Edscott Wilson Garcia <edscott@xfce.org>
-
-	* es.po: translation gaps
-
-2005-03-07  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* gu.po: update GU translations
-
-2005-03-05  Benedikt Meurer <benny@xfce.org>
-
-	* .cvsignore: Add more files here.
-
-2005-03-05  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* pl.po: update PL translations
-
-2005-02-21  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* ja.po: update JA translations
-
-2005-02-13  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* ko.po: update KO translations (with a big delay)
-
-2005-02-01  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* zh_CN.po: update zh_CN translations
-
-2005-01-27  Benedikt Meurer <benny@xfce.org>
-
-	* ChangeLog, Makefile.in.in, POTFILES.in, ar.gmo, ar.po, az.gmo,
-	  az.po, be.gmo, be.po, bg.gmo, bg.po, ca.gmo, ca.po, cs.gmo,
-	  cs.po, de.gmo, de.po, en_GB.gmo, en_GB.po, es.gmo, es.po,
-	  et.gmo, et.po, eu.gmo, eu.po, fa.gmo, fa.po, fi.gmo, fi.po,
-	  fr.gmo, fr.po, gu.gmo, gu.po, he.gmo, he.po, hi.gmo, hi.po,
-	  it.gmo, it.po, ja.gmo, ja.po, ko.gmo, ko.po, lt.gmo, lt.po,
-	  ms.gmo, ms.po, nb_NO.gmo, nb_NO.po, nl.gmo, nl.po, pa.gmo,
-	  pa.po, pl.gmo, pl.po, pt_BR.gmo, pt_BR.po, pt_PT.gmo, pt_PT.po,
-	  ro.gmo, ro.po, ru.gmo, ru.po, sk.gmo, sk.po, sv.gmo, sv.po,
-	  ta.gmo, ta.po, tr.gmo, tr.po, uk.gmo, uk.po, vi.gmo, vi.po,
-	  xfcalendar.pot, zh_CN.gmo, zh_CN.po, zh_TW.gmo, zh_TW.po:
-	  Removed auto-generated files. Use intltool for the .desktop
-	  files translations.
-
-2005-01-22  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* ar.gmo, az.gmo, be.gmo, bg.gmo, ca.gmo, cs.gmo, de.gmo,
-	  en_GB.gmo, es.gmo, et.gmo, eu.gmo, fa.gmo, fi.gmo, fi.po,
-	  fr.gmo, gu.gmo, he.gmo, hi.gmo, it.gmo, ja.gmo, ko.gmo, lt.gmo,
-	  ms.gmo, nb_NO.gmo, nl.gmo, pa.gmo, pl.gmo, pt_BR.gmo, pt_PT.gmo,
-	  ro.gmo, ru.gmo, sk.gmo, sv.gmo, ta.gmo, tr.gmo, uk.gmo, vi.gmo,
-	  zh_CN.gmo, zh_TW.gmo: update FI translations
-
-2005-01-21  Mickael 'Korbinus' Graf <korbinus@xfce.org>
-
-	* ar.po, az.po, be.po, bg.po, ca.po, cs.po, de.po, en_GB.po,
-	  es.po, et.po, eu.po, fa.po, fi.po, fr.po, gu.po, he.po, hi.po,
-	  it.po, ja.po, ko.po, lt.po, ms.po, nb_NO.po, nl.po, pa.po,
-	  pl.po, pt_BR.po, pt_PT.po, ro.po, ru.po, sk.po, sv.po, ta.po,
-	  tr.po, uk.po, vi.po, xfcalendar.pot, zh_CN.po, zh_TW.po:
-	  Updating xfcalendar.pot
-
-2005-01-08  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* ru.gmo, ru.po: update RU translations
-
-2005-01-06  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* uk.gmo, uk.po: update UK translations
-
-2005-01-05  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* he.gmo, he.po: update HE translations
-
-2005-01-02  Olivier Fourdan <fourdan@xfce.org>
-
-	* xfcalendar.pot: Update version
-
-2004-12-23  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* et.gmo, et.po: update ET translations
-
-2004-12-22  Benedikt Meurer <benny@xfce.org>
-
-	* cs.gmo: Fix make distcheck.
-
-2004-12-21  Brian Tarricone <kelnos@xfce.org>
-
-	* cs.po: add/update czech translations
-
-2004-12-20  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* nb_NO.gmo, nb_NO.po, no.gmo, no.po: rename NO pofiles to no_NB
-
-2004-12-15  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* zh_TW.gmo, zh_TW.po: update ZH_TW translations
-
-2004-12-14  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* ko.gmo, ro.gmo, ro.po: add RO translations
-
-2004-12-13  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* ko.po: update KO translations
-
-2004-12-05  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* en_GB.gmo, en_GB.po: add en_GB translations
-
-2004-12-05  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* ko.gmo, ko.po: update KO translations
-
-2004-11-28  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* tr.gmo, tr.po: update TR translations
-
-2004-11-26  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* ko.gmo, ko.po: update KO translations
-
-2004-11-12  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* pt_BR.gmo, pt_BR.po: update pt_BR translations
-
-2004-11-05  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* fi.gmo, fi.po: update FI translations
-
-2004-11-02  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* ta.gmo, ta.po: update TA translations
-
-2004-10-30  Olivier Fourdan <fourdan@xfce.org>
-
-	* xfcalendar.pot: Global update for 4.1.91 (Xfce 4.2 beta 2)
-
-2004-10-30  Jasper Huijsmans <jasper@xfce.org>
-
-	* nl.gmo, nl.po: Update a few nl translations
-
-2004-10-30  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* lt.gmo, lt.po: update LT translations
-
-2004-10-28  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* he.gmo, he.po: update HE translations
-
-2004-10-13  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* ar.gmo, az.gmo, be.gmo, bg.gmo, ca.gmo, cs.gmo, de.gmo, es.gmo,
-	  et.gmo, eu.gmo, fi.gmo, fi.po, fr.gmo, gu.gmo, he.gmo, hi.gmo,
-	  it.gmo, ja.gmo, ko.gmo, lt.gmo, ms.gmo, nl.gmo, no.gmo, pa.gmo,
-	  pl.gmo, pt_BR.gmo, ru.gmo, sk.gmo, sv.gmo, ta.gmo, tr.gmo,
-	  vi.gmo, zh_CN.gmo, zh_TW.gmo: update FI translations
-
-2004-10-11  Benedikt Meurer <benny@xfce.org>
-
-	* ar.po, az.po, be.po, bg.po, ca.po, cs.po, de.po, es.po, et.po,
-	  eu.po, fr.po, gu.po, he.po, hi.po, it.po, ja.po, ko.po, lt.po,
-	  ms.po, nl.po, no.po, pa.po, pl.po, pt_BR.po, ru.po, sk.po,
-	  sv.po, ta.po, tr.po, vi.po, zh_CN.po, zh_TW.po: update-po for
-	  Moe.
-
-2004-10-10  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* pt_PT.gmo, pt_PT.po: update pt_PT translations
-
-2004-10-09  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* fa.gmo, fa.po, fa_IR.gmo, fa_IR.po: update FA translations
-
-2004-10-09  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* es.gmo: Punjabi translations update from
-	  jaswinderlinux@netscape.net
-
-2004-10-08  Edscott Wilson Garcia <edscott@xfce.org>
-
-	* es.po: translation updates.
-
-2004-10-03  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* pa.gmo, pa.po: Punjabi translations (PA) from
-	  jaswinderlinux@netscape.net
-
-2004-10-02  Olivier Fourdan <fourdan@xfce.org>
-
-	* xfcalendar.pot: Update all files for 4.2 beta 1
-
-2004-09-30  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* it.gmo, it.po: updated Italian translations from Luca Marrocco
-	  <buildup@libero.it>
-
-2004-09-29  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* zh_TW.gmo, zh_TW.po: updated zh_TW translations from Ambrose Li
-	  <acli@ada.dhs.org>
-
-2004-09-29  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* zh_CN.gmo, zh_CN.po: updated zh_CN translations from yongtao
-	  yang <yongtao.yang@gmail.com>
-
-2004-09-23  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* gu.gmo, gu.po, nl.gmo: add Gujarati translations (GU) from
-	  Ankit Patel <ankit@redhat.com>
-
-2004-09-23  Jasper Huijsmans <jasper@xfce.org>
-
-	* nl.po: Better translation
-
-2004-09-21  Jasper Huijsmans <jasper@xfce.org>
-
-	* ar.gmo, ar.po, az.gmo, az.po, be.gmo, be.po, bg.gmo, bg.po,
-	  ca.gmo, ca.po, cs.gmo, cs.po, de.gmo, de.po, es.gmo, es.po,
-	  et.gmo, et.po, eu.gmo, eu.po, fa_IR.gmo, fa_IR.po, fr.gmo,
-	  fr.po, he.gmo, he.po, hi.gmo, hi.po, it.gmo, it.po, ja.gmo,
-	  ja.po, ko.gmo, ko.po, lt.gmo, lt.po, ms.gmo, ms.po, nl.gmo,
-	  nl.po, no.gmo, no.po, pl.gmo, pl.po, pt_BR.gmo, pt_BR.po,
-	  ru.gmo, ru.po, sk.gmo, sk.po, sv.gmo, sv.po, ta.gmo, ta.po,
-	  tr.gmo, tr.po, vi.gmo, vi.po, zh_CN.gmo, zh_CN.po, zh_TW.gmo,
-	  zh_TW.po: Run make update-po at Moe's request.
-
-2004-09-20  Olivier Fourdan <fourdan@xfce.org>
-
-	* xfcalendar.pot: Fix make dist
-
-2004-09-18  Moritz Heiber <moe@xfce.org>
-
-	* de.po: Translation fixes
-
-2004-09-18  Moritz Heiber <moe@xfce.org>
-
-	* de.po: Slightly modified
-
-2004-09-18  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* de.gmo, eu.gmo, eu.po: update EU translations
-
-2004-09-18  Moritz Heiber <moe@xfce.org>
-
-	* de.po: Got ya!
-
-2004-09-18  Moritz Heiber <moe@xfce.org>
-
-	* de.po: Updating these for alpha release. Not yet finished .. but
-	  I'm just too tired to continue. Needs extensive spell checking
-	  and approvement (Note to myself: Write mail to the list!).
-
-2004-09-16  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* be.gmo, be.po: add BE translations from Ales Nyakhaychyk
-	  <nab@mail.by>
-
-2004-09-10  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* he.gmo, he.po: HE translations update from Yuval Tanny
-	  <tanai@int.gov.il>
-
-2004-09-09  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* vi.gmo, vi.po: update VI translations
-
-2004-09-06  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* et.gmo, et.po: ET translations from Peeter Vois
-	  <Peeter.Vois@proekspert.ee>
-
-2004-08-29  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* az.gmo, az.po: AZ translations update from Metin Amiroff
-	  <metin@karegen.com>
-
-2004-08-28  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* sk.gmo, sk.po: add Slovak translations from Juraj Brosz
-	  <juro@jurajbrosz.info>
-
-2004-08-25  Olivier Fourdan <fourdan@xfce.org>
-
-	* POTFILES.in, ar.gmo, ar.po, az.gmo, az.po, bg.gmo, bg.po,
-	  ca.gmo, ca.po, cs.gmo, cs.po, de.gmo, de.po, es.gmo, es.po,
-	  eu.gmo, eu.po, fa_IR.gmo, fa_IR.po, fr.gmo, fr.po, he.gmo,
-	  he.po, hi.gmo, hi.po, it.gmo, it.po, ja.gmo, ja.po, ko.gmo,
-	  ko.po, lt.gmo, lt.po, ms.gmo, ms.po, nl.gmo, nl.po, no.gmo,
-	  no.po, pl.gmo, pl.po, pt_BR.gmo, pt_BR.po, ru.gmo, ru.po,
-	  sv.gmo, sv.po, ta.gmo, ta.po, tr.gmo, tr.po, xfcalendar.pot,
-	  zh_CN.gmo, zh_CN.po, zh_TW.gmo, zh_TW.po: Fix "make dist"
-
-2004-08-25  Jasper Huijsmans <jasper@xfce.org>
-
-	* nl.po: Update dutch translations, only po files for now
-
-2004-08-24  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* ru.gmo, ru.po: RU translations update from Anthony Ivanoff
-	  <a-i@bk.ru>
-
-2004-08-15  Olivier Fourdan <fourdan@xfce.org>
-
-	* POTFILES.in, ar.gmo, ar.po, az.gmo, az.po, bg.gmo, bg.po,
-	  ca.gmo, ca.po, cs.gmo, cs.po, de.gmo, de.po, es.gmo, es.po,
-	  eu.gmo, eu.po, fa_IR.gmo, fa_IR.po, fr.gmo, fr.po, hi.gmo,
-	  hi.po, it.gmo, it.po, ja.gmo, ja.po, ko.gmo, ko.po, lt.gmo,
-	  lt.po, ms.gmo, ms.po, nl.gmo, nl.po, no.gmo, no.po, pl.gmo,
-	  pl.po, pt_BR.gmo, pt_BR.po, ru.gmo, ru.po, sv.gmo, sv.po,
-	  ta.gmo, ta.po, tr.gmo, tr.po, xfcalendar.pot, zh_CN.gmo,
-	  zh_CN.po, zh_TW.gmo, zh_TW.po: French po updates
-
-2004-08-14  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* he.gmo, he.po: Hebrew translations from Yuval Tanny
-	  <tanai@int.gov.il>
-
-2004-07-23  Benedikt Meurer <benny@xfce.org>
-
-	* ar.gmo, ar.po, az.gmo, az.po, bg.gmo, bg.po, ca.gmo, ca.po,
-	  cs.gmo, cs.po, de.gmo, de.po, es.gmo, es.po, eu.gmo, eu.po,
-	  fa_IR.gmo, fa_IR.po, fr.gmo, fr.po, hi.gmo, hi.po, it.gmo,
-	  it.po, ja.gmo, ja.po, ko.gmo, ko.po, lt.gmo, lt.po, ms.gmo,
-	  ms.po, nl.gmo, nl.po, no.gmo, no.po, pl.gmo, pl.po, pt_BR.gmo,
-	  pt_BR.po, ru.gmo, ru.po, sv.gmo, sv.po, ta.gmo, ta.po, tr.gmo,
-	  tr.po, xfcalendar.pot, zh_CN.gmo, zh_CN.po, zh_TW.gmo, zh_TW.po:
-	  update-po.
-
-2004-06-13  Jean-Francois Wauthy <pollux@xfce.org>
-
-	* lt.gmo, lt.po: Updated lt translations from Mantas Zapolskas
-
-2004-05-03  Olivier Fourdan <fourdan@xfce.org>
-
-	* zh_TW.gmo, zh_TW.po: Update zh_TW translations from umm
-	  <umm@pchome.com.tw>
-
-2004-04-12  Danny Milosavljevic <dannym@xfce.org>
-
-	* ca.gmo, ca.po: Update catalan translations by Carles Munoz
-	  Gorriz
-
-2004-03-15  Olivier Fourdan <fourdan@xfce.org>
-
-	* ar.gmo, ar.po, bg.gmo, bg.po, it.gmo, it.po: Add/update i18n
-	  for: Bulgarian from Miroslav Yordanov <miordanov@i-space.org>
-	  and Peter Slavov <peshka@i-space.org> Italian from Alex Dupre
-	  <ale@FreeBSD.org> Arabic from Saleh Hathal
-	  <hathalsal@hotmail.com>
-
-2004-02-17  Jasper Huijsmans <jasper@xfce.org>
-
-	* ms.gmo, ms.po: Update Malay translations
-
-2004-02-11  Jasper Huijsmans <jasper@xfce.org>
-
-	* eu.gmo, eu.po: Add Basque (eu) translations
-
-2004-01-29  Jasper Huijsmans <jasper@xfce.org>
-
-	* fa_IR.gmo, fa_IR.po: Update Persian translations
-
-2004-01-21  Jasper Huijsmans <jasper@xfce.org>
-
-	* es.gmo, es.po, fa_IR.gmo, fa_IR.po, ja.gmo, ja.po, ko.gmo,
-	  ko.po, pt_BR.gmo, pt_BR.po, zh_CN.gmo, zh_CN.po: Translations
-	  added/updated for spanish, persian, japanese, korean, brasilian
-	  and chinese
-
-2004-01-06  Olivier Fourdan <fourdan@xfce.org>
-
-	* az.gmo, az.po, ca.gmo, ca.po, cs.gmo, cs.po, de.gmo, de.po,
-	  fr.gmo, fr.po, hi.gmo, hi.po, it.gmo, it.po, ko.gmo, ko.po,
-	  ms.gmo, ms.po, nl.gmo, nl.po, no.gmo, no.po, pl.gmo, pl.po,
-	  ru.gmo, ru.po, sv.gmo, sv.po, ta.gmo, ta.po, tr.gmo, tr.po,
-	  xfcalendar.pot, zh_CN.gmo, zh_CN.po, zh_TW.po: Clean-up a bit
-	  of the mess in head
-
-2004-01-03  Mickael 'Korbinus' Graf <korbinus@xfce.org>
-
-	* pl.gmo, pl.po: Update Polish translations
-
-2003-12-29  Olivier Fourdan <fourdan@xfce.org>
-
-	* nl.gmo, nl.po, no.gmo, no.po: Fix missing CHARSET in potfiles
-
-2003-12-29  Jasper Huijsmans <jasper@xfce.org>
-
-	* no.gmo, no.po, tr.gmo, tr.po: Update Norwegian and Turkish
-	  translations
-
-2003-12-27  Jasper Huijsmans <jasper@xfce.org>
-
-	* pl.gmo, pl.po: Update Polish translations
-
-2003-12-15  Jasper Huijsmans <jasper@xfce.org>
-
-	* az.gmo, az.po: Add Azerbaijani translations
-
-2003-12-01  Mickael 'Korbinus' Graf <korbinus@xfce.org>
-
-	* it.gmo, it.po: Add italian translation (yepee)
-
-2003-12-01  Jasper Huijsmans <jasper@xfce.org>
-
-	* ca.po: Update catalan translations
-
-2003-11-25  Mickael 'Korbinus' Graf <korbinus@xfce.org>
-
-	* sv.po: Swedish translation updated
-
-2003-11-17  Mickael 'Korbinus' Graf <korbinus@xfce.org>
-
-	* fr.gmo, fr.po: French translation updated
-
-2003-11-17  Mickael 'Korbinus' Graf <korbinus@xfce.org>
-
-	* fr.gmo, fr.po: French translation updated
-
-2003-11-17  Mickael 'Korbinus' Graf <korbinus@xfce.org>
-
-	* POTFILES.in, ca.gmo, ca.po, cs.gmo, cs.po, de.gmo, de.po,
-	  fr.gmo, fr.po, hi.gmo, hi.po, ko.gmo, ko.po, ms.gmo, ms.po,
-	  nl.gmo, nl.po, ru.gmo, ru.po, sv.gmo, sv.po, ta.gmo, ta.po,
-	  tr.gmo, tr.po, xfcalendar.pot, zh_CN.gmo, zh_CN.po, zh_TW.gmo,
-	  zh_TW.po: Update of translated files
-
-2003-11-14  Moritz Heiber <moe@xfce.org>
-
-	* de.po: Here we go for the German translation update afternoon ;-)
-
-2003-11-10  Jasper Huijsmans <jasper@xfce.org>
-
-	* se.gmo, se.po, sv.gmo, sv.po: Oops, swedish is sv ...
-
-2003-11-10  Jasper Huijsmans <jasper@xfce.org>
-
-	* se.gmo, se.po: Add swedish translations
-
-2003-11-09  Jasper Huijsmans <jasper@xfce.org>
-
-	* cs.gmo, cs.po: Add Check translations
-
-2003-11-02  Olivier Fourdan <fourdan@xfce.org>
-
-	* hi.gmo, hi.po: Add hi.po
-
-2003-10-22  Jasper Huijsmans <jasper@xfce.org>
-
-	* zh_TW.gmo, zh_TW.po: Add missing po/gmo files
-
-2003-10-15  Jasper Huijsmans <jasper@xfce.org>
-
-	* ko.gmo, ko.po: Add missing ko.po
-
-2003-09-27  Jasper Huijsmans <jasper@xfce.org>
-
-	* ta.gmo, ta.po: Update tamil translation
-
-2003-09-02  Jasper Huijsmans <jasper@xfce.org>
-
-	* ms.gmo, ms.po: Add malaysian translations
-
-2003-08-18  Mickael 'Korbinus' Graf <korbinus@xfce.org>
-
-	* fr.gmo, fr.po: Add french translation
-
-2003-08-10  Jasper Huijsmans <jasper@xfce.org>
-
-	* zh_CN.gmo, zh_CN.po: Update chinese translations
-
-2003-08-07  Jasper Huijsmans <jasper@xfce.org>
-
-	* ca.gmo, ca.po: Update catalan translations
-
-2003-07-30  Jasper Huijsmans <jasper@xfce.org>
-
-	* ru.gmo, ru.po: Add russian translations
-
-2003-07-18  Jasper Huijsmans <jasper@xfce.org>
-
-	* nl.gmo, nl.po, tr.gmo, tr.po: Update turkish translations
-
-2003-07-13  Benedikt Meurer <benny@xfce.org>
-
-	* de.gmo, de.po: Updated german translation. Thanks to Moritz
-	  Heiber.
-
-2003-07-13  Benedikt Meurer <benny@xfce.org>
-
-	* ca.gmo, ca.po, de.gmo, de.po, xfcalendar.pot, zh_CN.gmo,
-	  zh_CN.po: Fixed i18n weirdness, pointed out by Moritz Heiber
-
-2003-07-13  Benedikt Meurer <benny@xfce.org>
-
-	* xfcalendar.pot: Even more gtk+-2.0 fixes.
-
-2003-07-11  Jasper Huijsmans <jasper@xfce.org>
-
-	* zh_CN.gmo, zh_CN.po: Update Chinese translations (2)
-
-2003-07-08  Olivier Fourdan <fourdan@xfce.org>
-
-	* Makefile.in.in: Don't perform an update-po on make dist as it
-	  causes far too much trouble
-
-2003-07-07  Jasper Huijsmans <jasper@xfce.org>
-
-	* ca.gmo, ca.po: Update catalan translations
-
-2003-07-06  Benedikt Meurer <benny@xfce.org>
-
-	* de.po: Added session client code.
-
-2003-07-03  Benedikt Meurer <benny@xfce.org>
-
-	* ChangeLog, Makefile.in.in, POTFILES.in, de.gmo, de.po,
-	  xfcalendar.pot: Initial revision
-
diff -Nru orage-4.8.3/po/cs.po orage-4.12.1/po/cs.po
--- orage-4.8.3/po/cs.po	2012-01-03 12:01:01.000000000 +0000
+++ orage-4.12.1/po/cs.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,23 +1,42 @@
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Lukáš Konarovský <daeltar@daeltar.org>, 2003.
-# Alois Nespor <Alois.Nespor@seznam.cz>, 2004.
-# Michal Várady <miko.vaji@gmail.com>, 2006-2011.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Alois Nespor <Alois.Nespor@seznam.cz>, 2004
+# Alois Nešpor <info@aloisnespor.info>, 2013
+# hsn <kolar.radim@gmail.com>, 2013
+# Lukáš Konarovský <daeltar@daeltar.org>, 2003
+# Michal Várady <miko.vaji@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2011-12-18 11:58+0100\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2014-10-28 23:25+0000\n"
 "Last-Translator: Michal Várady <miko.vaji@gmail.com>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/xfce-apps/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"X-Poedit-Language: Czech\n"
-"X-Poedit-Country: CZECH REPUBLIC\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "bez podtržení"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "jednoduché"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "dvojité"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "nízké"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -33,9 +52,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"klikněte pro změnu času"
+msgstr "%s\nklikněte pro změnu času"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -45,9 +62,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"tlačítkem 1 změníte nastavení \n"
-"tlačítkem 2 nastavíte čas"
+msgstr "tlačítkem 1 změníte nastavení \ntlačítkem 2 nastavíte čas"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -56,9 +71,11 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"nastavením změníte minutu. Pro změnu pouze o jednu minutu klikněte na šipky "
-"s tlačítkem 2 ."
+msgstr "nastavením změníte minutu. Pro změnu pouze o jednu minutu klikněte na šipky s tlačítkem 2 ."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Globální čas"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -260,6 +277,10 @@
 msgid "Use normal decorations"
 msgstr "Použít běžné dekorace"
 
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Neopakovat"
+
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
 msgstr "Nezobrazovat dekorace (okraje) oken"
@@ -335,7 +356,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Umístění"
@@ -394,99 +415,110 @@
 #: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
 #: ../src/timezone_selection.c:384
 msgid "floating"
-msgstr "plovoucí"
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Globální čas"
+msgstr "nezávislý na čas. pásmu"
 
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Globální čas aplikace Orage"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
-msgstr "Zobrazovat čas jiných zemí"
+msgstr "Zobrazit čas jiných zemí"
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Globální čas"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Bez otočení"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Otočit doleva"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Otočit doprava"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "Vzhled"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
-msgstr "Zobrazovat _rámeček"
+msgstr "Zobrazit _rámeček"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
 msgstr "n_astavit barvu popředí:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
 msgstr "na_stavit barvu pozadí"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
 msgstr "nastavte _výšku:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
 msgstr "Výšku vodorovných panelů nelze změnit"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
 msgstr "na_stavte šířku:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
 msgstr "Šířku svislých panelů nelze změnit"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Zobrazovat řádky _svisle"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "Možnosti hodin"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
 msgstr "nastavit časové pásmo na:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "Řádek %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
 msgstr "Vložte platný parametr funkce strftime."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
 msgstr "Tip:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
 msgstr "opravit nastavení času po přechodu z režimu spánku nebo hibernace"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Tuto akci je nutné provést pouze v případě krátkodobě přepnutí do režimu "
-"spánku nebo hibernace a v případě, že viditelný čas neobsahuje sekundy. Za "
-"těchto podmínek je možné, že hodiny aplikace Orage zobrazují čas nepřesně, "
-"dokud nevyberete tuto volbu. (Vybráním této volby bráníte správné činnosti "
-"úsporných vlastností procesoru.)"
+msgstr "Tuto akci je nutné provést pouze v případě krátkodobě přepnutí do režimu spánku nebo hibernace a v případě, že viditelný čas neobsahuje sekundy. Za těchto podmínek je možné, že hodiny aplikace Orage zobrazují čas nepřesně, dokud nevyberete tuto volbu. (Vybráním této volby bráníte správné činnosti úsporných vlastností procesoru.)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -496,21 +528,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Tento program používá ke získání času funkci strftime.\n"
-"Pro získání času v požadované podobě použijte platný kód.\n"
-"Přehled základních kódů:\n"
-"\t%A = den v týdnu\t\t\t%B = měsíc\n"
-"\t%c = datum a čas\t\t%R = hodina a minuta\n"
-"\t%V = číslo týdne\t\t%Z = použité časové pásmo\n"
-"\t%H = hodin \t\t\t\t%M = minuta\n"
-"\t%X = místní čas\t\t\t%x = místní datum"
+msgstr "Tento program používá ke získání času funkci strftime.\nPro získání času v požadované podobě použijte platný kód.\nPřehled základních kódů:\n\t%A = den v týdnu\t\t\t%B = měsíc\n\t%c = datum a čas\t\t%R = hodina a minuta\n\t%V = číslo týdne\t\t%Z = použité časové pásmo\n\t%H = hodin \t\t\t\t%M = minuta\n\t%X = místní čas\t\t\t%x = místní datum"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
 msgstr "Nastavení hodin aplikace Orage"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -519,8 +542,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
 msgstr "%A, %d. %B %Y, %V. týden"
 
@@ -535,21 +557,21 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Konec"
 
 #: ../src/appointment.c:333
 msgid "Due"
-msgstr "Kvůli"
+msgstr "Termín dokončení"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage - kalendář"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Vyberte soubor..."
 
@@ -557,227 +579,281 @@
 msgid "Sound Files"
 msgstr "Zvukové soubory"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Všechny soubory"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Informace o schůzce byla změněna."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovat?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Ne, nenechat"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Ano, ignorovat změny a odejít"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "Čas konce schůzky je zadán na dřívější dobu než její začátek."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "Nenastaveno"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Přidat schůzku do tohoto souboru."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Výchozí soubor aplikace Orage"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Přidání schůzky se nezdařilo"
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Při přidávání schůzky došlo k chybě. Více podrobností naleznete v souboru záznamu."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Aktualizace schůzky se nezdařila"
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Více podrobností naleznete v souboru záznamu. (Možná byl soubor aktualizován externě z aplikace Orage3)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
 msgstr "Tato schůzka bude trvale odebrána."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Ne, zrušit odstranění"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Ano, odstranit jej"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Zvolte datum"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Dnes"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "Tato schůzka neexistuje."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
 msgstr "Bylo pravděpodobně odebráno, aktualizujte obrazovku."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Aktuální kategorie"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Přidat novou barevnou kategorii"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Kategorie:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Barvy kategorií - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr " *** KOPIE ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "Nová schůzka - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Soubor"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "Uložit _a zavřít"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "D_uplikovat"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
-msgstr "Ulož_it"
+msgstr "Uložit"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Uložit a zavřít"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Obnovit původní"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Duplikovat"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Smazat"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Dostupný"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Zaneprázdněný"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Hlavní"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Typ "
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
-msgstr "Událost"
+msgstr "Události"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Událost, která nastane. Například:\n"
-"Schůzka, narozeniny nebo televizní pořad."
+msgstr "Událost, která nastane. Například:\nSchůzka, narozeniny nebo televizní pořad."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "Úkoly"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Něco, co byste měli udělat. Například:\n"
-"Umyjte si auto nebo otestujte novou verzi aplikace Orage."
+msgstr "Něco, co byste měli v budoucnu udělat. Například:\nUmyjte si auto nebo otestujte novou verzi aplikace Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Žurnál"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Zapište si, co se stalo. Například:\n"
-"Poznamenejte si, že volala matka, nebo padal sníh."
+msgstr "Zapište si, co se stalo. Například:\nPoznamenejte si, že volala matka, nebo padal sníh."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Titulek"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "Celodenní událost"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Začátek"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Nastavit"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
-msgstr "Trvání"
+msgstr "Délka"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "dnů"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "hodin"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "minut"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Dostupnost"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Dokončeno"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "Hotovo"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Kategorie"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Toto je speciální kategorie, kterou lze použít k obarvení této schůzky v "
-"pohledu na jejich seznam."
+msgstr "Toto je speciální kategorie, kterou lze použít k obarvení této schůzky v pohledu na jejich seznam."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "aktualizovat barvy kategorií."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "Priorita"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Nastavíte-li tuto hodnotu na 8 nebo vyšší, schůzka se nezobrazí v oknech seznamů.\nTuto vlastnost můžete využít pro uspořádání svých oken seznamů, je však poté obtížnější schůzku najít.\n(Výstrahy se nadále budou spouštět běžným způsobem.)\n(Existuje nedokumentovaná parametr, takže výchozí limit 8 můžete měnit.)"
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Poznámka"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -786,140 +862,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"Tyto zjednodušené příkazy pracují okamžitě:\n"
-"    <D> vkládá současné datum ve formátu místního data\n"
-"    <T> vkládá čas a \n"
-"    <DT> vkládá datum a čas.\n"
-"\n"
-"Tyto hodnoty se později konvertují pouze pokud se:\n"
-"    <&Ynnnn> překládá na současný rok minus nnnn.\n"
-"(Tuto vlastnost lze použít například pro připomenutí narozenin a informaci o "
-"věku osoby.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Tyto zjednodušené příkazy pracují okamžitě:\n    <D> vkládá současné datum ve formátu místního data\n    <T> vkládá čas a \n    <DT> vkládá datum a čas.\n\nTyto hodnoty se později konvertují pouze pokud se:\n    <&Ynnnn> překládá na současný rok minus nnnn.\n(Tuto vlastnost lze použít například pro připomenutí narozenin a informaci o věku osoby.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
-msgstr "Před zahájením"
+msgstr "před zahájením"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
-msgstr "Před ukončením"
+msgstr "před ukončením"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
-msgstr "Po začátku"
+msgstr "po zahájení"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
-msgstr "Po ukončení"
+msgstr "po ukončení"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Výstraha"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Čas výstrahy"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Kdy chcete být upozorněni:\n"
-" 1) před začátkem události\n"
-" 2) před dokončením úkolu\n"
-" 3) po dokončení úkolu"
+msgstr "Kdy chcete být upozorněni:\n 1) před zahájením události\n 2) před dokončením úkolu\n 3) po dokončení úkolu"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr "Trvalá výstraha"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Vyberte tuto možnost, chcete-li, aby vám aplikace Orage připomněla událost, "
-"i když v tu dobu nebyla aktivní"
+msgstr "Vyberte tuto možnost, chcete-li, aby vám aplikace Orage připomněla událost, i když v tu dobu nebyla aktivní"
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "Použít"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
 msgstr "Chcete-li povolit akustickou výstrahu, vyberte tuto možnost"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "Opakovat výstražný zvuk"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "krát"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "sekundový interval"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "Vizuální"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Použít okno aplikace Orage"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
 msgstr "Chcete-li povolit výstrahu oknem aplikace Orage, vyberte tuto možnost"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Používat oznámení"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
 msgstr "Chcete-li povolit oznámení o výstraze, vyberte tuto možnost"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "Nastavit dobu vypršení"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
 msgstr "Chcete-li, aby oznámení automaticky vypršelo, vyberte tuto možnost"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 = výchozí systémová doba vypršení"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "sekund"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Procedura"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
 msgstr "Chcete-li spustit proceduru nebo skript výstrahy, vyberte tuto možnost"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -929,165 +989,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
-"Je nutné vložit všechny escape znaky ručně.\n"
-"Tento řetězec bude předán shellu ke zpracování.\n"
-"Za běhu budou nahrazeny tyto speciální příkazy:\n"
-"\t<&T>  titulek schůzky\n"
-"\t<&D>  popis schůzky\n"
-"\t<&AT> čas upozornění\n"
-"\t<&ST> zahájení schůzky\n"
-"\t<&ET> ukončení schůzky"
+msgstr "Všechny escape znaky je nutné vložit ručně.\nTento řetězec bude předán shellu ke zpracování.\nZa běhu budou nahrazeny tyto speciální příkazy:\n\t<&T>  titulek schůzky\n\t<&D>  popis schůzky\n\t<&AT> čas upozornění\n\t<&ST> zahájení schůzky\n\t<&ET> ukončení schůzky"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
 msgstr "Vyzkoušet tuto výstrahu nyní"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "<b>Výchozí výstraha</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
 msgstr "Uložit současné nastavení jako výchozí výstrahu"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
 msgstr "Použít výchozí výstrahu jako aktuální nastavení"
 
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Neopakovat"
-
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Denně"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Týdně"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Měsíčně"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Ročně"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
 msgstr "Každou hodinu"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Po"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Út"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "St"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Čt"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Pá"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "So"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "Ne"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Opakování"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Složitost"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Základní"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Pokročilá"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "Chcete-li opakující se událost, použijte tuto volbu"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Použijte tuto volbu, chcete-li nastait složitější časové udaje, jako "
-"například:\n"
-" Každou sobotu a neděli nebo \n"
-" První úterý v měsíci"
+msgstr "Použijte tuto volbu, chcete-li nastait složitější časové udaje, jako například:\n Každou sobotu a neděli nebo \n První úterý v měsíci"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Četnost"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Každý"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "opakování"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Omezení četnosti na určitý interval.\n"
-" Například: Každý třetí den:\n"
-" Četnost = denně a Interval = 3"
+msgstr "Omezení četnosti na určitý interval.\n Například: Každý třetí den:\n Četnost = denně a Interval = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Omezení"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Opakovat donekonečna"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Opakovat "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Opakovat do "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Dny v týdnu"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "Vyberte den"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1095,292 +1136,297 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Upřesněte den v týdnu pro měsíční a roční události.\n"
-" Například:\n"
-" Druhá středa v každém měsíci:\n"
-"\tČetnost = měsíčně,\n"
-"\tDny v týdnu = zaškrtněte pouze středu,\n"
-"\tVyberte den = vyberte 2 z číslic pod středou"
+msgstr "Upřesněte den v týdnu pro měsíční a roční události.\n Například:\n Druhá středa v každém měsíci:\n\tČetnost = měsíčně,\n\tDny v týdnu = zaškrtněte pouze středu,\n\tVyberte den = vyberte 2 z číslic pod středou"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr "Seznam úkolů TODO"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"Seznam úkolů TODO opakovaně začíná v čase zahájení a opakuje se v každém "
-"intervalu, bez ověření zda byl dokončen"
+msgstr "Seznam úkolů TODO opakovaně začíná v čase zahájení a opakuje se v každém intervalu, bez ověření zda byl dokončen"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"Opakování seznamu úkolů TODO je založeno na čase dokončení a opakuje se po "
-"intervalu vypočítaném z předchozího času dokončení.\n"
-"(Historii seznamu úkolů TODO nelze vypsat, protože opakování úkolu se mění "
-"po každém dokončení.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "Opakování seznamu úkolů TODO je založeno na čase dokončení a opakuje se po intervalu vypočítaném z předchozího času dokončení.\n(Historii seznamu úkolů TODO nelze vypsat, protože opakování úkolu se mění po každém dokončení.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "Výjimky"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"Více dnů s výjimkami přidáte kliknutím na dny v kalendáři níže.\n"
-"Výjimkou je vyjmutí (-) nebo zahrnutí (+) v závislosti na výběru.\n"
-"Vyjmete je kliknutím na data."
+msgstr "Více dnů s výjimkami přidáte kliknutím na dny v kalendáři níže.\nVýjimkou je vyjmutí (-) nebo zahrnutí (+) v závislosti na výběru.\nVyjmete je kliknutím na data."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr "Přidat vyjmuté datum (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr "Vyjmuté dny jsou celé dny, ve kterých není naplánována žádná schůzka"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
 msgstr "Přidat zahrnutý čas (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"Zahrnuté časy jsou ve stejné časové zóně jako počáteční čas, ale mohou mít "
-"jiný čas"
+msgstr "Zahrnuté časy jsou ve stejné časové zóně jako počáteční čas, ale mohou mít jiný čas"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
 msgstr "Data akcí"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Zobrazit"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "_Přejít"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Nový"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Zpět"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Dnes"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Vpřed"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Zpět o jeden týden"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Zpět o jeden den"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Vpřed o jeden den"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Vpřed o jeden týden"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Aktualizovvat"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Zavřít"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Neznámá"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
-msgstr "       Počet zobrazovaných dní"
+msgstr "       Počet zobrazených dní"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - pohled na den"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Celý den"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Čas"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "Nevybrali jste žádné řádky."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Kliknutím vyberete řádek, poté jej můžete zkopírovat."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"Tímto trvale odstraníte všechny\n"
-"vybrané schůzky."
+msgstr "Tímto trvale odstraníte všechny\nvybrané schůzky."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Ano, odstranit je"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Zpět"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Vpřed"
+
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Najít"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
-msgstr "Přehled dne"
+msgstr "Přehled více dnů"
+
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Zobrazit položky pro tento počet následujících dní:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "opakovat pouze první"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Zaškrtněte tuto volbu, pokud chcete vidět pouze první z opakovaných událostí. Ve výchozím stavu ve zobrazují všechny.\nZobrazuje také urgence.\nOpakované události se mohou objevit v seznamu dříve, protože se zobrazuje pouze první výskyt."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "také staré"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Dny navíc pro zobrazení"
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Zaškrtněte tuto volbu, pokud chcete vidět také staré události. Tuto možnost lze vybrat pouze pokud je povolena volba \"pouze první opakující se položku\", aby se zabránilo tvorbě příliš dlouhých seznamů.\nVýběr následujících dní navíc stále určuje, zda jsou vypisovány novější schůzky."
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "Položky žurnálu počínaje od:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Hledat"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "Hledat text"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Příznaky"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Titulek"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Pro úpravu klikněte na řádek dvojitě.\n"
-"\n"
-"Příznaky v pořadí:\n"
-"\t 1. Výstraha: n=bez výstrahy\n"
-"\t\tA=vizuální výstraha S=včetně akustické výstrahy\n"
-"\t 2. Opakování: n=bez opakování\n"
-"\t\t D=Denně W=Týdně M=Měsíčně Y=Ročně\n"
-"\t 3. Typ: f=dostupný B=Zaneprázdněný\n"
-"\t 4. Umístěno v souboru:\n"
-"\t\tO=Orage A=Archiv F=Externí\n"
-"\t 5. Typ schůzky:\n"
-"\t\tE=Událost T=Úkoly J=Žurnál"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Zvolte datum"
+msgstr "Editace se provádí dvojklikem na řádek.\n\nPříznaky v pořadí:\n\t 1. Budík: n=žádný budík\n\t\t A=Budík je nastaven P=Trvalý budík je nastaven\n\t 2. Opakování: n=bez opakování\n\t\t H=Po hodinách D=Denně W=Týdení M=Měsíční Y=Roční\n\t 3. Typ: f=volno B=obsazeno\n\t 4. Umístění v souboru:\n\t\tO=Orage A=Archiv F=Cizí\n\t 5. Typ akce:\n\t\tE=Událost T=Úkol J=Žurnál"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tOpakování skončilo, přesunuje se do archivního souboru."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Archivování není povoleno. Ukončuje se..."
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Práh archivu: %d měsíců"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tArchivují se události, které předcházejí datu %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Archivuje se uid: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tVTODO není dokončeno a nebylo archivováno"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tOpakující se. Poslední rok: %04d, měsíc: %02d, den: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Archivování dokončeno\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Zahajování odebrání archivu."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tFÁZE 1: obnovení opakujících se schůzek do původního stavu"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tFÁZE 2: vrácení archivovaných schůzek"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Odebrání archivu dokončeno\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Výchozí výstraha Orage"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Seznam výstrah pro hlavní soubor aplikace byl vytvořen:"
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Seznam výstrah pro externí soubor byl vytvořen: %s (%s)"
+
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "Sestavit seznam výstrah: Přidáno %d výstrah. Zpracováno %d výstrah."
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "⇥Přidáno %d výstrah. Zpracování %d událostí."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tBylo nalezeno %d výstrah, z nichž %d je aktivních. (Bylo prohledáno %d "
-"opakujících se výstrah.)"
+msgstr "\tBylo nalezeno %d výstrah, z nichž %d je aktivních. (Bylo prohledáno %d opakujících se výstrah.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1398,7 +1444,16 @@
 msgid "Import file preprocessing done"
 msgstr "Předzpracování importu souboru bylo dokončeno"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Došlo k vnější aktualizaci souboru %s."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Z důvodu vnější aktualizace souboru se obnovují výstrahy a kalendář."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Soubory kalendáře"
 
@@ -1406,626 +1461,670 @@
 msgid "Current foreign files"
 msgstr "Aktuální externí soubory"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "POUZE PRO ČTENÍ"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "PRO ČTENÍ I ZÁPIS"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Žádné externí soubory *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Přidání externího souboru se nezdařilo"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage dokáže pracovat pouze s 10 externími soubory. Limit byl dosažen."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Název souboru je prázdný."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Název je prázdný."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Soubor neexistuje."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "V aplikaci Orage již existuje soubor se shodným názvem."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "V aplikaci Orage již tento název existuje."
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Import a export"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Import"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Načíst ze souboru:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Názvy souborů oddělte čárkami.\n"
-" POZNÁMKA: Čárka není platným znakem v názvech souborů aplikace Orage."
+msgstr "Názvy souborů oddělte čárkami.\n POZNÁMKA: Čárka není platným znakem v názvech souborů aplikace Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Export"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Zapsat do souboru:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Vybrat"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Všechny schůzky"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Pojmenované schůzky:"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Načítají se pouze schůzky z hlavního souboru.\n"
-"Archivované a externí události se neexportují."
+msgstr "Načítají se pouze schůzky z hlavního souboru.\nArchivované a externí události se neexportují."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Načítají se pouze schůzky z hlavního souboru.\n"
-"Externí události se neexportují."
+msgstr "Načítají se pouze schůzky z hlavního souboru.\nExterní události se neexportují."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "Tyto položky můžete jednoduše přetáhnout z okna seznamu událostí."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "Čísla schůzek UID aplikace Orage oddělená čárkami."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Archiv"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Okamžitá archivace (práh: %d měsíců)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Práh archivu můžete změnit v parametrech."
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Obnovení archivu do původního stavu"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Vrátí všechny archivované události do hlavního souboru aplikace\n"
-"Orage a odebere soubor archivu. Tato funkce je užitečná například\n"
-"při exportu a přesunu schůzek na jiný systém."
+msgstr "Vrátí všechny archivované události do hlavního souboru aplikace\nOrage a odebere soubor archivu. Tato funkce je užitečná například\npři exportu a přesunu schůzek na jiný systém."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Soubory aplikace Orage"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Hlavní soubor kalendáře aplikace Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Aktuální soubor"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Nový soubor"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Dostupné akce"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Aktuální soubor:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Nový soubor:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Dostupné akce:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Přejmenování interního souboru aplikace Orage.\n"
-"Nezasahuje do vnějšího systémů souborů.\n"
-"Nový soubor již musí existovat."
+msgstr "Přejmenování interního souboru aplikace Orage.\nNezasahuje do vnějšího systémů souborů.\nNový soubor již musí existovat."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-"Aktuální soubor se zkopíruje a\n"
-"v původním umístění zůstane nezměněn."
+msgstr "Aktuální soubor se zkopíruje a\nv původním umístění zůstane nezměněn."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Přesunout"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
-msgstr ""
-"Aktuální soubor se přesune a\n"
-"z původního umístění bude vymazán."
+msgstr "Aktuální soubor se přesune a\nz původního umístění bude vymazán."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Soubor archivu"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Externí soubory"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Přidat nový externí soubor"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Externí soubor:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Možnosti"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Viditelný název:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Pouze pro čtení"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Tuto možnost nastavte, chcete-li si být jisti, že tento aplikace Orage tento "
-"soubor nikdy nepozmění.\n"
-"Zapamatujte si, že pozměněním externích souborů je můžete učinit "
-"nekompatibilními s původními nástroji, v nichž byly vytvořeny!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Tuto možnost nastavte, chcete-li si být jisti, že tento aplikace Orage tento soubor nikdy nepozmění.\nZapamatujte si, že pozměněním externích souborů je můžete učinit nekompatibilními s původními nástroji, v nichž byly vytvořeny!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Místo názvu souboru se uživateli zobrazí tento interní název."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Správa datových souborů - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tToto je %s verze %s\n"
-"\n"
+msgstr "\tToto je %s verze %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tVydáno pod podmínkami licence GNU General Public Licence.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tZkompilováno proti knihovnám GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "používá knihovny GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tPoužívá DBUS pro import.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tPoužívání DBUS není zapnuto. Import bude pracovat pouze částečně.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tPoužívá se knihovna libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tNepoužívá se knihovna libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tPoužívá se automatické archivování.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tBez archivace.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tPoužívá se systémový balíček libical.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tPoužívá se místní verze Orage balíčku libical.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Použití: orage [volby] [soubory]\n"
-"\n"
+msgstr "Použití: orage [volby] [soubory]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Možnosti:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tzobrazí verzi aplikace orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tzobrazí tento text\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \tzobrazí formulář možnosti\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
-"--toggle (-t) \t\tpřepne aplikaci orage do viditelného nebo neviditelného "
-"stavu\n"
+msgstr "--toggle (-t) \t\tpřepne aplikaci orage do viditelného nebo neviditelného stavu\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) soubor [RW] \tpřidá externí soubor\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) soubor [RW] [název] \tpřidá externí soubor\n\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr "--remove-foreign (-r) soubor \todebere externí soubor\n"
+msgstr "--remove-foreign (-r) soubor       odebere externí soubor\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
-"--export (-e) soubor [schůzka...] \texportuje schůzky z aplikace Orage do "
-"souboru\n"
+msgstr "--export (-e) soubor [schůzka...]  exportuje schůzky z aplikace Orage do souboru\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "soubory=soubory typu ical pro načtení do aplikace orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
-msgstr "\tv aplikace orage nebyla sestavena s podporou dbus. \n"
+msgstr "\taplikace orage byla sestavena bez podpory sběrnice dbus. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tbez podpory dbus se mohou [soubory] a volby externích souborů (-a a -r) "
-"použít pouze při spouštění aplikace orage \n"
+msgstr "\tbez podpory sběrnice dbus je možné [soubory] a volby externích souborů (-a a -r) použít pouze při spouštění aplikace orage \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Neznámá volba %s\n"
-"\n"
+msgstr "\nNeznámá volba %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Správa datových souborů"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Upravit"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Zobrazit vybrané _datum"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Zobrazit vybraný _týden"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "_Přejít na dnešní den"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
 msgstr "Zobrazit _globální čas"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Bez názvu"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr "Umístění: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n Poznámka:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Nikdy"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Název: %s\n"
-" Místo: %s\n"
-" Začátek:\t%s\n"
-" Konec:\t%s\n"
-"Poznámka:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "Název: %s\n%s Začátek:\t%s\nTermín:\t%s\nDokončeno:\t%s%s"
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Název: %s\n"
-" Místo: %s\n"
-" Začátek:\t%s\n"
-" Konec:\t%s\n"
-"Poznámka:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Název: %s\n%s Začátek:\t%s\n Konec:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Úkoly:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Události pro %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>Události pro %s - %s:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "Hlavní nastavení"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Časové pásmo"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "Vždy byste měli definovat místní časové pásmo."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "Práh archivu (v měsících)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = bez archivace)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
 msgstr "Archivace se používá pro úsporu času a místa při zpracování událostí."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Příkaz pro přehrání zvuku"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
 msgstr "Tento příkaz je předán shellu za účelem přehrání zvuku výstrah."
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "Zobrazit nastavení"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Hlavní okno kalendáře"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Okno kalendáře"
+
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Podrobnosti zobrazení kalendáře"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
-msgstr "Zobrazovat okraje"
+msgstr "Zobrazit okraje"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
-msgstr "Zobrazovat nabídku"
-
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Zobrazovat měsíc a rok"
+msgstr "Zobrazit nabídku"
 
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
-msgstr "Zobrazovat názvy dnů"
+msgstr "Zobrazit názvy dnů"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
-msgstr "Zobrazovat čísla týdnů"
+msgstr "Zobrazit čísla týdnů"
 
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr "Zobrazovat seznam úkolů"
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Zobrazit měsíc a rok"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Informační okna kalendáře"
 
 #: ../src/parameters.c:660
+msgid "Show todo list"
+msgstr "Zobrazit seznam úkolů"
+
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
 msgstr "Počet dní ke zobrazení v okně událostí"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
 msgstr "0 = nezobrazovat seznam událostí"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Viditelnost kalendáře"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
 msgstr "Zobrazit na všech pracovních plochách"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
 msgstr "Vždy navrchu"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
-msgstr "Zobrazovat v panelu úloh"
+msgstr "Zobrazit v panelu úloh"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
-msgstr "Zobrazovat v přepínači ploch"
+msgstr "Zobrazit v přepínači ploch"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
-msgstr "Zobrazovat v systémové oblasti"
+msgstr "Zobrazit v systémové oblasti"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "Stav kalendáře po spuštění"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Zobrazený"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Skrytý"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Minimalizovaný"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr "Další nastavení"
-
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
 msgstr "Při otevření okna kalendáře"
 
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "Vybrat dnešní datum"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr "Vybrat předchozí zvolené datum"
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "Používat dynamickou ikonu v oznamovací oblasti"
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "Používat dynamické ikony"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "Dynamická ikona zobrazuje aktuální měsíc a den v měsíci."
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Dvojité kliknutí v hlavním kalendáři zobrazí"
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Vyberte dnešní datum"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Označit předchozí vybrané datum"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Dvojité kliknutí na den v kalendáři zobrazí"
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
 msgstr "Pohled na dny"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
 msgstr "Seznam událostí"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Další nastavení"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
 msgstr "Okno seznamu událostí"
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
-msgstr "Počet zbývajících dní ke zobrazení v seznau událostí"
+msgstr "Počet zbývajících dní ke zobrazení v seznamu událostí"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
-msgstr ""
-"Toto je pouze výchozí hodnota, kterou můžete změnit v okně seznamu "
-"aktuálních událostí."
+msgstr "Toto je pouze výchozí hodnota, kterou můžete změnit v okně seznamu aktuálních událostí."
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Zobrazovat pouze první opakující se položku"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Výchozí první den okna denního pohledu"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "První den v týdnu"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Vybraný den"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Používat dynamickou ikonu v oznamovací oblasti"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Používat dynamické ikony"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Dynamická ikona zobrazuje aktuální měsíc a den v měsíci."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
 msgstr "Použít budík"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-"Tento časovač použijte pouze pokud nastanou potíže s aplikací Orage po "
-"uspání nebo hibernaci. (Například pokud se ikona v systémové oblasti "
-"nepřekresluje nebo se nespouštějí výstrahy.)"
+msgstr "Tento časovač použijte pouze pokud nastanou potíže s aplikací Orage po uspání nebo hibernaci. (Například pokud se ikona v systémové oblasti nepřekresluje nebo se nespouštějí výstrahy.)"
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Vizuální výstraha výchozího cizího souboru"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Okno aplikace Orage"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Používat oznámení"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Při ukončit při žádosti o ukončení"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Vždy ukončit"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Ve výchozím stavu zůstavá aplikace Orage po žádosti o uzavření otevřená v pozadí. Tato volba mění chování aplikace Orage tak, že se po žádosti o uzavření ukončí."
+
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Nastavení aplikace Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
 msgstr "První spuštění aplikace Orage. Vyhledávání výchozího časového pásma."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Výchozí časové pásmo nastaveno na %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
 msgstr "Výchozí časové pásmo nebylo nalezeno, nastavte jej ručně."
 
@@ -2037,40 +2136,35 @@
 msgid "Open"
 msgstr "Otevřít"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Upomínka - Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Odložit"
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "Opětovně připomenout po zadaném čase"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr "Stiskněte <Spustit> pro opětovné připomenutí po zadaném čase:"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Následující aktivní výstrahy:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d d %02d h %02d minut do: %s"
+msgstr "\n%02d d %02d h %02d minut do: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Nenalezeny žádné aktivní výstrahy"
+msgstr "\nNenalezeny žádné aktivní výstrahy"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2093,1537 +2187,2229 @@
 msgstr "Afrika/Alžír"
 
 #: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
+msgid "Africa/Asmara"
 msgstr "Afrika/Asmara"
 
 #: ../src/timezone_names.c:42
+msgid "Africa/Asmera"
+msgstr "Afrika/Asmara"
+
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "Afrika/Banjul"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "Afrika/Káhira"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca (Dár al-Bajdá)"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "Afrika/Conakry"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_Salaam"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "Afrika/Džibútí"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "Afrika/Douala"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Aaiún"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "Afrika/Freetown"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaborone"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "Afrika/Džuba"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johannesburg"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "Afrika/Khartoum"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinshasa"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "Afrika/Libreville"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbashi"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "Afrika/Mogadiisho"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovia"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "Afrika/N'Djamena"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamey"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nouakchott"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ouagadougou"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tarábulus (Tripolis)"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "Afrika/Windhoek"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "Amerika"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "Amerika/Anchorage"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "Amerika/Anguilla"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "Amerika/Antigua"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "Amerika/Araguaina"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "Amerika/Argentina/Buenos_Aires"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "America/Argentina/Catamarca"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "Amerika/Argentina/Comodoro_Rivadavia"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "America/Argentina/Cordoba"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "America/Argentina/Jujuy"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "Amerika/Argentina/La_Rioja"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "America/Argentina/Mendoza"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "Amerika/Argentina/Rio_Gallegos"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "Amerika/Argentina/Salta"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "Amerika/Argentina/San_Juan"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "Amerika/Argentina/San_Luis"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "Amerika/Argentina/Tucumán"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "Amerika/Argentina/Ushuaia"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "Amerika/Asunción"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "Amerika/Atikokan"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "Amerika/Atka"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "Amerika/Bahia"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "Amerika/Bahia_Banderas"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "Amerika/Blanc-Sablon"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "Amerika/Bogotá"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "Amerika/Boise"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Cambridge_Bay"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "Amerika/Campo_Grande"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "Amerika/Cancun"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "Amerika/Caracas"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "Amerika/Catamarca"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "Amerika/Cayenne"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "Amerika/Cayman"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "Amerika/Chicago"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "Amerika/Chihuahua"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "Amerika/Coral_Harbour"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "Amerika/Cordoba"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "Amerika/Kostarika"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "Amerika/Creston"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "Amerika/Cuiaba"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "Amerika/Curacao"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "Amerika/Danmarkshavn"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "Amerika/Dawson"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Dawson_Creek"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "Amerika/Dominika"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "Amerika/Ensenada"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "Amerika/Eirunepe"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "Amerika/Fort_Wayne"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glace_Bay"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "Amerika/Godthab"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "Amerika/Goose_Bay"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grand_Turk"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "Amerika/Guadeloupe"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "Amerika/Guatemala"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "Amerika/Guayaquil"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "Amerika/Guyana"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "Amerika/Halifax"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosillo"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indiana/Indianapolis"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indiana/Knox"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indiana/Marengo"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "Amerika/Indiana/Petersburg"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "Amerika/Indiana/Tell_City"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indiana/Vevay"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "Amerika/Indiana/Vincennes"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "Amerika/Indiana/Winamac"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "Amerika/Indianapolis"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "Amerika/Iqaluit"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "Amerika/Jamajka"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "Amerika/Jujuy"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "Amerika/Juneau"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentucky/Louisville"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentucky/Monticello"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "Amerika/Knox_IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "Amerika/Kralendijk"
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "Amerika/La_Paz"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Angeles"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "Amerika/Louisville"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "Amerika/Lower_Princes"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "Amerika/Maceio"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "Amerika/Managua"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "Amerika/Marigot"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "Amerika/Martinique"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "Amerika/Matamoros"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "Amerika/Mazatlan"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "Amerika/Menominee"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "Amerika/Metlakatla"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "Amerika/Mexiko"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "Amerika/Miquelon"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "Amerika/Moncton"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "Amerika/Monterrey"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "Amerika/Montserrat"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "Amerika/Nome"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "Amerika/Severní_Dakota/Beulah"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "Amerika/Severní_Dakota/Center"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "Amerika/Severní_Dakota/New_Salem"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "Amerika/Noronha"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "Amerika/Ojinaga"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "Amerika/Phoenix"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Port-au-Prince"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_of_Spain"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "Amerika/Porto_Acre"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "Amerika/Porto_Velho"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Puerto_Rico"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "Amerika/Rainy_River"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Rankin_Inlet"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "Amerika/Recife"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "Amerika/Resolute"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branco"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "Amerika/Rosario"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "Amerika/Santa_Isabel"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "Amerika/Santarem"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "Amerika/Santiago"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo_Domingo"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao_Paulo"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "Amerika/Scoresbysund"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "Amerika/Shiprock"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "Amerika/Sitka"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "Amerika/Svatý_Bartoloměj"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "Amerika/St_Johns"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
-msgstr "Amerika/St_Kitts"
+msgstr "Amerika/Sv._Kryštof"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "Amerika/Sv._Lucie"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "Amerika/St_Thomas"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "Amerika/Sv._Vincenc"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "Amerika/Swift_Current"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegucigalpa"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "Amerika/Thule"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Thunder_Bay"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "Amerika/Tijuana"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "Amerika/Toronto"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "Amerika/Vancouver"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "Amerika/Virgin"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "Amerika/Whitehorse"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "Amerika/Winnipeg"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "Amerika/Yakutat"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "Amerika/Yellowknife"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Antarktida"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Antarktida/Casey"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Antarktida/Davis"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktida/DumontDUrville"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Antarktida/Macquarie"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Antarktida/Mawson"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Antarktida/McMurdo"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Antarktida/Palmer"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Antarktida/Rothera"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Antarktida/Jižní_Pól"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "Antarktida/Syowa"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Antarktida/Vostok"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Arktida"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Arktida/Longyearbyen"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Asie"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Asie/Adan"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Asie/Alma-Ata"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Asie/Ammán"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Asie/Anadyr"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Asie/Aktau"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Asie/Aktjubinsk"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "Asie/Ašchabat"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Asie/Ašchabad"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "Asie/Baghdád"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Asie/Bahrajn"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Asie/Baku"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Asie/Bangkok_(Krungthep)"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Asie/Bejrút"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Asie/Biškek"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Asie/Brunej"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Asie/Kalkata"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Asie/Čojbalsan"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "Asie/Čchung-čching"
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "Asie/Čchung-Čching"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Asie/Kolamba"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Asie/Dháka"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "Asie/Dimašk_aš-Šám"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Asie/Dháka"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Asie/Dili"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Asie/Dubaj"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Asie/Dušanbe"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Asie/Gaza"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Asie/Cha-Er-Pin_(Charbin)"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Asie/Hebron"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Asie/Hongkong"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Asie/Ho_Či_Minovo_Město"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Asie/Chovd"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Asie/Irkutsk"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Asie/Istanbul"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Asie/Jakarta"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Asie/Džajpur"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Asie/jeruzalém"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Asie/Kábul"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Asie/Kamčatka"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Asie/Karáčí"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Asie/Kašgar"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Asie/Káthmándú"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Asie/Káthmándú"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Asie/Chandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Asie/Kalkata"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Asie/Krasnojarsk"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asie/Kuala_Lumpur"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Asie/Kuching"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Asie/Kuvajt"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Asie/Macao"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Asie/Macao"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Asie/Magadan"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Asie/Makassar"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Asie/Manila"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Asie/Maskat"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Asie/Nicosia_(Lefkosia)"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Asie/Novokuzněck"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Asie/Novosibirsk"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Asie/Omsk"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Asie/Uralsk"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Asie/Phnompenh"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Asie/Pontianak"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Asie/Pchjongjang"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Asie/Katar"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Asie/Kyzylorda"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Asie/Yankoun"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Asie/Rijád"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Asie/Rijád87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Asie/Rijád88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Asie/Rijád89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Asie/Saigon_(Ho_Chi_Minhovo město)"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Asie/Sachalin"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Asie/Samarkand"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Asie/Soul"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Asie/Šanghaj"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Asie/Singapur"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Asie/Tchaj-Pej"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Asie/Taškent"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Asie/Tbilisi"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Asie/Teherán"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Asie/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Asie/Thimphu"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Asie/Thimphu"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Asie/Tokio"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "Asie/Ujung_Pandang"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Asie/Ulánbátar"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Asie/Ulánbátar"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Asie/Urumči_(Wu-Lu-Mu-Čchi)"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Asie/Usť-Něra"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Asie/Vientiane"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Asie/Vladivostok"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Asie/Jakutsk"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Asie/Jekatěrinburg_(Sverdlovsk)"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Asie/Jerevan"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Atlantský oceán"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Atlantský oceán/Azory"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Atlantský oceán/Bermudy"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Atlantský oceán/Kanárské_ostrovy"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantský oceán/Kapverdy"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "Atlantský oceán/Faerské_ostrovy"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlantik/Faerské_ostrovy"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantský oceán/Jan_Mayen"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "Atlantský oceán/Madeira"
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantský oceán/Reykjavík"
 
-#: ../src/timezone_names.c:306
+#: ../src/timezone_names.c:375
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantský oceán/Jižní_Georgie"
 
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr "Jižní Georgie/Sv._Helena"
+#: ../src/timezone_names.c:376
+msgid "Atlantic/St_Helena"
+msgstr "Jižní Georgie/Sv._Helena"
+
+#: ../src/timezone_names.c:377
+msgid "Atlantic/Stanley"
+msgstr "Jižní Georgie/Stanley_(Falklandy)"
+
+#: ../src/timezone_names.c:378
+msgid "Australia"
+msgstr "Austrálie"
+
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Austrálie/ACT"
+
+#: ../src/timezone_names.c:380
+msgid "Australia/Adelaide"
+msgstr "Austrálie/Adelaide"
+
+#: ../src/timezone_names.c:381
+msgid "Australia/Brisbane"
+msgstr "Austrálie/Brisbane"
+
+#: ../src/timezone_names.c:382
+msgid "Australia/Broken_Hill"
+msgstr "Austrálie/Broken_Hill"
+
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Austrálie/Currie"
+
+#: ../src/timezone_names.c:384
+msgid "Australia/Darwin"
+msgstr "Austrálie/Darwin"
+
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Austrálie/Eucla"
+
+#: ../src/timezone_names.c:386
+msgid "Australia/Hobart"
+msgstr "Austrálie/Hobart"
+
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr "Austrálie/Lindeman"
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr "Austrálie/ostrov_lorda_Howa"
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "Austrálie/Melbourne"
+
+#: ../src/timezone_names.c:390
+msgid "Australia/Perth"
+msgstr "Austrálie/Perth"
+
+#: ../src/timezone_names.c:391
+msgid "Australia/Sydney"
+msgstr "Austrálie/Sydney"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brazílie"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brazílie/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brazílie/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brazílie/Východ"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brazílie/Západ"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Kanada/Atlantik"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Kanada/Střed"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Kanada/Východ-Saskatchewan"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Kanada/Východní"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Kanada/Horský"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Kanada/Nový_Foundland"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Kanada/Pacifik"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Kanada/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Kanada/Yukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Chile"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Chile/Vnitrozemský"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Chile/VýchodníOstrovní"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Ostatní"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Ostatní/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Ostatní/GMT+0"
 
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr "Jižní Georgie/Stanley_(Falklandy)"
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Ostatní/GMT+1"
 
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr "Austrálie"
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Ostatní/GMT+10"
 
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr "Austrálie/Adelaide"
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Ostatní/GMT+11"
 
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr "Austrálie/Brisbane"
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Ostatní/GMT+12"
 
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr "Austrálie/Broken_Hill"
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Ostatní/GMT+2"
 
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr "Austrálie/Darwin"
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Ostatní/GMT+3"
 
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr "Austrálie/Hobart"
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Ostatní/GMT+4"
 
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr "Austrálie/Lindeman"
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Ostatní/GMT+5"
 
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr "Austrálie/ostrov_lorda_Howa"
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Ostatní/GMT+6"
 
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr "Austrálie/Melbourne"
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Ostatní/GMT+7"
 
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr "Austrálie/Perth"
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Ostatní/GMT+8"
 
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr "Austrálie/Sydney"
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Ostatní/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Ostatní/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Ostatní/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Ostatní/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Ostatní/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Ostatní/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Ostatní/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Ostatní/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Ostatní/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Ostatní/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Ostatní/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Ostatní/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Ostatní/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Ostatní/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Ostatní/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Ostatní/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Ostatní/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Ostatní/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Ostatní/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Ostatní/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Ostatní/Univerzální"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Ostatní/Zulu"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Evropa"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "Evropa/Amsterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Evropa/Andorra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Evropa/Atény"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Evropa/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Evropa/Bělehrad"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Evropa/Berlín"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Evropa/Bratislava"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Evropa/Brusel"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Evropa/Bukurešť"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Evropa/Budapešť"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Evropa/Busingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Evropa/Kišiněv"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Evropa/Kodaň"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "Evropa/Dublin"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Evropa/Gibraltar"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Evropa/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Evropa/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Evropa/Ostrov_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Evropa/Istanbul"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Evropa/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Evropa/Kaliningrad"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Evropa/Kijev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Evropa/Lisabon"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "Evropa/Lublaň (Ljubljana)"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Evropa/Londýn"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Evropa/Lucemburk"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Evropa/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Evropa/Malta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Evropa/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Evropa/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Evropa/Monako"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Evropa/Moskva"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "Evropa/Nicosia (Leukósia)"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Evropa/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Evropa/Paříž"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Evropa/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Evropa/Praha"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Evropa/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Evropa/Řím"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Evropa/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Evropa/San_Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Evropa/Sarajevo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "Evropa/Simferopoľ"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "Evropa/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Evropa/Sofie"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Evropa/Stockholm"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Evropa/Tallinn"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Evropa/Tirana"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Evropa/Tiraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "Evropa/Užhorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Evropa/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Evropa/Vatikán"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Evropa/Vídeň"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "Evropa/Vilnius"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Evropa/Volgograd"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "Evropa/Varšava"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Evropa/Záhřeb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "Evropa/Zaporož'je"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "Evropa/Curych"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Indický_oceán"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "Indický_oceán/Antanánarive"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "Indický_oceán/Čagoské_ostrovy"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "Indický_oceán/Vánoční_ostrov"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "Indický_oceán/Kokosové_ostrovy"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "Indický_oceán/Komory"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "Indický_oceán/Kergueleny"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "Indický_oceán/Mahé"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "Indický_oceán/Maledivy"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "Indický_oceán/Mauritius"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "Indický_oceán/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "Indický_oceán/Réunion"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Mexiko"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Mexiko/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Mexiko/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Mexiko/Obecný"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Střední východ"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Střední východ/Rijád87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Střední východ/Rijád88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Střední východ/Rijád89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Tichý oceán"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "Tichý oceán/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Tichý oceán/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Tichý oceán/Chathamské_ostrovy"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Pacifik/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "Tichý oceán/Velikonoční_ostrov"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "Tichý oceán/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "Tichý oceán/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Tichý oceán/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "Tichý oceán/Fidži"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Tichý oceán/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Tichý oceán/Galapágy"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Tichý oceán/Gambierovy_ostrovy"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "Tichý oceán/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Tichý oceán/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Tichý oceán/Honolulu"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Tichý oceán/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "Tichý oceán/Vánoční ostrov"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "Tichý oceán/Kusaie"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "Tichý oceán/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Tichý oceán/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Tichý oceán/Markézy"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Tichý oceán/Midwayské_ostrovy"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Tichý oceán/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Tichý oceán/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Tichý oceán/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "Tichý oceán/Nouméa"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Tichý oceán/Pago_Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Tichý oceán/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "Tichý oceán/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Pacifik/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "Tichý oceán/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Tichý oceán/Port_Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Tichý oceán/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Tichý oceán/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pacifik/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Tichý oceán/Tahiti"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Tichý oceán/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Tichý oceán/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Tichý oceán/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Tichý oceán/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Tichý oceán/Wallisovy_ostrovy"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "Tichý oceán/Yap"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "USA"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "USA/Aljaška"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "USA/Aleutské_ostrovy"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "USA/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "USA/Střední"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "USA/Východní"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "USA/Východní_Indiana"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "USA/Havajské_ostrovy"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "USA/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "USA/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "USA/Horský"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "USA/Pacifik"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "USA/Pacifik-Nový"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "USA/Samoa"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "Nová schůzka"
@@ -3634,279 +4420,33 @@
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
 msgid "Orage Panel Clock"
-msgstr "Hodiny Orage na panel "
+msgstr "Hodiny aplikace Orage na panel"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
 msgid "Show time and date?"
-msgstr "Zobrazovat datum a čas?"
+msgstr "Zobrazit datum a čas?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Kalendář"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Nastavení kalendáře Orage"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Nastavení aplikace Orage"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Nastavení Kalendáře pro Xfce 4 (Orage)"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Kalendář pracovního prostředí"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Nastavení kalendáře Orage"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Kalendář"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Kalendář Orage"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Název: %s\n"
-#~ " Začátek:\t%s\n"
-#~ " Během:\t%s\n"
-#~ " Hotovo:\t%s\n"
-#~ "Poznámka:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Všechny znaky ESC musíte vyplnit ručně.\n"
-#~ " Tento řetězec je pro zpracování předán shellu"
-
-#~ msgid "Orage clock"
-#~ msgstr "Hodiny Orage"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Původní autor, dřívější správce"
-
-#~ msgid "Contributor"
-#~ msgstr "Přispěvatel"
-
-#~ msgid "Info"
-#~ msgstr "Informace"
-
-#~ msgid "Warning"
-#~ msgstr "Varování"
-
-#~ msgid "Error"
-#~ msgstr "Chyba"
-
-#~ msgid "Display"
-#~ msgstr "Zobrazení"
-
-#~ msgid "Set sticked"
-#~ msgstr "Přilepit"
-
-#~ msgid "Select always today"
-#~ msgstr "Vždy vybrat dnešní den"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Při zobrazení hlavního kalendáře bude ukazatel nastaven na dříve vybraný "
-#~ "den nebo vždy na dnešní den."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Režim nastavení koncového času"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Režim nastavení počátečního času"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "nastavením změníte minutu"
-
-#~ msgid "Vary"
-#~ msgstr "Proměnlivý"
-
-#~ msgid "Select timezone"
-#~ msgstr "Vyberte časové pásmo"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Změnit hodiny"
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "vložte časové pásmo hodin,\n"
-#~ "(=jakýkoli platný kód ČP)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Změnit nastavení"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Vložte místní časové pásmo. (Používá se pro zjištění, zda je čas "
-#~ "předchozího (-) nebo následujícího data (+), přidáním znaménka + nebo - "
-#~ "za datum)"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr ""
-#~ "Nastavte hodnotu platného časového pásma (=TZ) nebo jej zvolte v seznamu."
-
-#~ msgid "show line _1:"
-#~ msgstr "ukázat řádek _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "ukázat řádek _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "ukázat řádek _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Vlastnosti"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Spuštění příkazu 'orage -p' se nezdařilo"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> vkládá aktuální čas v místním formátu.\n"
-#~ "<T> vkládá čas a\n"
-#~ "<DT> vkládá datum a čas."
-
-#~ msgid "Show event list"
-#~ msgstr "Zobrazovat seznam událostí"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = použít statickou ikonu)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Dynamická ikona zobrazuje den a měsíc. Je viditelná pouze v systémové "
-#~ "oblasti. Pokud je systémová oblast pro umístění ikony příliš malá, "
-#~ "aplikace Orage automaticky změní ikonu na statickou."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Nastavení kalendáře"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Nastavení kalendáře Xfce 4"
-
-#~ msgid ""
-#~ "Set this if you want to make sure that this file is never modified by "
-#~ "Orage."
-#~ msgstr ""
-#~ "Nastavte tuto možnost, chcete-li aplikaci Orage zabránit změně dat v "
-#~ "tomto souboru."
-
-#~ msgid "Not defined"
-#~ msgstr "Nedefinováno"
-
-#~ msgid "Monday"
-#~ msgstr "Pondělí"
-
-#~ msgid "Tuesday"
-#~ msgstr "Úterý"
-
-#~ msgid "Wednesday"
-#~ msgstr "Středa"
-
-#~ msgid "Thursday"
-#~ msgstr "Čtvrtek"
-
-#~ msgid "Friday"
-#~ msgstr "Pátek"
-
-#~ msgid "Saturday"
-#~ msgstr "Sobota"
-
-#~ msgid "Sunday"
-#~ msgstr "Neděle"
-
-#~ msgid "Ical week start day"
-#~ msgstr "První den týdne pro Ical"
-
-#~ msgid ""
-#~ "This is used in some weekly repeating appointment rules. Just set it to "
-#~ "the start day of the week for your country and forget it."
-#~ msgstr ""
-#~ "Používá se v některých pravidlech pro opakované schůzky. Zvolte první den "
-#~ "týdne podle odpovídajících standardů vaší země."
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "dnů"
-
-#, fuzzy
-#~ msgid "normal"
-#~ msgstr "Hlavní"
-
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%d. %m %Y"
-
-#, fuzzy
-#~ msgid "Calendar Files"
-#~ msgstr "Soubory kalendáře"
-
-#~ msgid "Calendar borders"
-#~ msgstr "Okraje kalendáře"
-
-#~ msgid "Hidden"
-#~ msgstr "Skryté"
-
-#~ msgid "3 months"
-#~ msgstr "Tři měsíce"
-
-#~ msgid "6 months"
-#~ msgstr "Šest měsíců"
-
-#~ msgid "1 year"
-#~ msgstr "Jeden rok"
-
-#~ msgid "Application"
-#~ msgstr "Aplikace"
-
-#~ msgid "Button Label|Orage"
-#~ msgstr "Orage - kalendář"
-
-#~ msgid "Core developer"
-#~ msgstr "Hlavní vývojář"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Tímto odstraníte všechny informace \n"
-#~ "asociované s vybraným datem."
-
-#~ msgid "Clear"
-#~ msgstr "Vyčistit"
-
-#~ msgid "uid"
-#~ msgstr "uid"
-
-#~ msgid "This should not happen"
-#~ msgstr "Toto by se nemělo stát"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Nelze vytvořit kanál MSC klienta"
-
-#~ msgid "Open archive file..."
-#~ msgstr "Otevřít archiv..."
-
-#~ msgid "Close archive file"
-#~ msgstr "Zavřít archiv"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Kalendář pracovního prostředí"
diff -Nru orage-4.8.3/po/da.po orage-4.12.1/po/da.po
--- orage-4.8.3/po/da.po	2012-01-03 12:01:01.000000000 +0000
+++ orage-4.12.1/po/da.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,3802 +0,0 @@
-# Danish translations for xfcalendar package.
-# Copyright (C) 2003-2005 Mickaël Graf and The Xfce development team.
-# This file is distributed under the same license as the xfcalendar package.
-# Jesper Berth <bigsanta@berthit.dk>, 2005.
-# Per Kongstad <p_kongstad@op.pl>, 2008, 2010.
-msgid ""
-msgstr ""
-"Project-Id-Version: xfcalendar 4.7.5.7\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2010-01-01 21:32+0100\n"
-"Last-Translator: Per Kongstad <p_kongstad@op.pl>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
-"X-Poedit-Language: Danish\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Country: DENMARK\n"
-
-#: ../globaltime/globaltime.c:100
-msgid "Raising GlobalTime window..."
-msgstr "Hæver globaltidsvindue..."
-
-#: ../globaltime/globaltime.c:102
-msgid "GlobalTime window raise failed"
-msgstr "Kunne ikke hæve globaltidsvindue"
-
-#. ********** timezone tooltip **********
-#: ../globaltime/globaltime.c:277
-#, c-format
-msgid ""
-"%s\n"
-"click to modify clock"
-msgstr ""
-"%s\n"
-"klik for at ændre uret"
-
-#: ../globaltime/globaltime.c:386
-msgid "Localtime"
-msgstr "Lokaltid"
-
-#: ../globaltime/globaltime.c:464
-msgid ""
-"button 1 to change preferences \n"
-"button 2 to adjust time of clocks"
-msgstr ""
-"knap 1 til at ændre indstillinger \n"
-"knap 2 til at justere tiden af urene"
-
-#: ../globaltime/globaltime.c:480
-msgid "adjust to change hour"
-msgstr "justér time"
-
-#: ../globaltime/globaltime.c:496
-msgid ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"justèr for at ændre minut. Klik på pilene med knap 2 for at ændre kun med et "
-"minut."
-
-#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
-msgid "NEW"
-msgstr "NY"
-
-#: ../globaltime/gt_prefs.c:289
-msgid "NEW COPY"
-msgstr "NY KOPI"
-
-#: ../globaltime/gt_prefs.c:310
-msgid "Not possible to delete the last clock."
-msgstr "Det er Ikke muligt at slette sidste ur."
-
-#: ../globaltime/gt_prefs.c:516
-msgid "update this clock"
-msgstr "opdatèr dette ur"
-
-#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
-msgid "add new empty clock"
-msgstr "tilføj nyt tomt ur"
-
-#: ../globaltime/gt_prefs.c:526
-msgid "add new clock using this clock as model"
-msgstr "tilføj nyt ur med dette som skabelon"
-
-#: ../globaltime/gt_prefs.c:531
-msgid "delete this clock"
-msgstr "slet dette ur"
-
-#: ../globaltime/gt_prefs.c:539
-msgid "move this clock first"
-msgstr "placér dette ur forrest"
-
-#: ../globaltime/gt_prefs.c:544
-msgid "move this clock left"
-msgstr "flyt dette ur til venstre"
-
-#: ../globaltime/gt_prefs.c:549
-msgid "move this clock right"
-msgstr "placér dette ur bagerst"
-
-#: ../globaltime/gt_prefs.c:554
-msgid "move this clock last"
-msgstr "flyt dette ur sidst"
-
-#: ../globaltime/gt_prefs.c:562
-msgid "set the timezone of this clock to be local timezone"
-msgstr "indstil tidszonen af dette ur til at blive lokaltidszone"
-
-#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
-msgid "close window and exit"
-msgstr "luk vindue og afslut"
-
-#: ../globaltime/gt_prefs.c:590
-msgid "Globaltime preferences "
-msgstr "Globale tidsindstillinger "
-
-#. -----------------------HEADING-------------------------------------------
-#: ../globaltime/gt_prefs.c:603
-msgid "Clock Parameters"
-msgstr "Urindstillinger"
-
-#: ../globaltime/gt_prefs.c:607
-msgid "Name of the clock:"
-msgstr "Urets navn:"
-
-#: ../globaltime/gt_prefs.c:613
-msgid "enter name of clock"
-msgstr "angiv urets navn"
-
-#: ../globaltime/gt_prefs.c:616
-msgid "Timezone of the clock:"
-msgstr "Urets tidszone:"
-
-#: ../globaltime/gt_prefs.c:643
-msgid "Text Formatting"
-msgstr "Tekstformatering"
-
-#. ------------------------background-------------------------
-#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
-msgid "Background color:"
-msgstr "Baggrundsfarve:"
-
-#: ../globaltime/gt_prefs.c:656
-msgid "Click to change background colour for clock"
-msgstr "Klik for at ændre urets baggrundsfarve"
-
-#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
-#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
-#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
-#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
-#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
-msgid "Use default"
-msgstr "Brug standard"
-
-#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
-#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
-#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
-msgid "Cross this to use default instead of selected value"
-msgstr "Flag denne for at bruge standard fremfor valgte værdi"
-
-#. ------------------------foreground-------------------------
-#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
-msgid "Foreground (=text) color:"
-msgstr "Forgrundsfarve (=tekst):"
-
-#: ../globaltime/gt_prefs.c:688
-msgid "Click to change foreground colour for clock"
-msgstr "Klik for at ændre urets forgrundsfarve"
-
-#. ------------------------name font-------------------------
-#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
-msgid "Font for name of clock:"
-msgstr "Skrifttype for urets navn:"
-
-#: ../globaltime/gt_prefs.c:720
-msgid "Click to change font for clock name"
-msgstr "Klik for at ændre skrifttype for urets navn"
-
-#. ------------------------time font-------------------------
-#: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
-msgid "Font for time of clock:"
-msgstr "Skrifttype for urets tid:"
-
-#: ../globaltime/gt_prefs.c:753
-msgid "Click to change font for clock time"
-msgstr "Klik for at ændre skrifttype for urets tid"
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:780
-msgid "Underline name of clock:"
-msgstr "Understreg urets navn:"
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:810
-msgid "Underline time of clock:"
-msgstr "Understreg tid på uret:"
-
-#: ../globaltime/gt_prefs.c:850
-msgid "Text Default Formatting"
-msgstr "Tekst standardformatering"
-
-#: ../globaltime/gt_prefs.c:863
-msgid "Click to change default background colour for clocks"
-msgstr "Klik for at ændre urenes standardbaggrundsfarve"
-
-#: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
-msgid "Cross this to use system default instead of selected color"
-msgstr "Afkryds denne for at bruge systemstandardfarve fremfor valgte farve"
-
-#: ../globaltime/gt_prefs.c:896
-msgid "Click to change default text colour for clocks"
-msgstr "Klik for at ændr urenes standardfarve"
-
-#: ../globaltime/gt_prefs.c:929
-msgid "Click to change default font for clock name"
-msgstr "Klik for at ændre urnavns standardskrifttype"
-
-#: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
-msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"Afkryds denne for brug af systemstandardskrifttype fremfor valgte skrifttype"
-
-#: ../globaltime/gt_prefs.c:963
-msgid "Click to change default font for clock time"
-msgstr "Klik for at ændre urets tidsstandardskrifttype"
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:990
-msgid "Underline for name of clock:"
-msgstr "Understreg urets navn:"
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:1004
-msgid "Underline for time of clock:"
-msgstr "Understreg urets tid:"
-
-#: ../globaltime/gt_prefs.c:1027
-msgid "update preferences"
-msgstr "opdatér indstillinger"
-
-#: ../globaltime/gt_prefs.c:1062
-msgid "Globaltime Preferences"
-msgstr "Globale tidsindstillinger"
-
-#. -----------------------HEADING--------------------------------------
-#: ../globaltime/gt_prefs.c:1073
-msgid "General Preferences"
-msgstr "Generelle Indstillinger"
-
-#: ../globaltime/gt_prefs.c:1077
-msgid "Decorations:"
-msgstr "Dekorationer:"
-
-#: ../globaltime/gt_prefs.c:1078
-msgid "Standard"
-msgstr "Standard"
-
-#: ../globaltime/gt_prefs.c:1083
-msgid "Use normal decorations"
-msgstr "Brug standarddekorationer"
-
-#: ../globaltime/gt_prefs.c:1094
-msgid "Do not show window decorations (borders)"
-msgstr "Vis ikke vinduesdekorationer (rammer)"
-
-#: ../globaltime/gt_prefs.c:1100
-msgid "Clock size:"
-msgstr "Urets størrelse:"
-
-#: ../globaltime/gt_prefs.c:1101
-msgid "Equal"
-msgstr "Lig med"
-
-#: ../globaltime/gt_prefs.c:1106
-msgid "All clocks have same size"
-msgstr "Alle ure har samme størrelse"
-
-#: ../globaltime/gt_prefs.c:1111
-msgid "Varying"
-msgstr "Varierende"
-
-#: ../globaltime/gt_prefs.c:1116
-msgid "Clock sizes vary"
-msgstr "Urene har varierende størrelser"
-
-#: ../globaltime/gt_prefs.c:1122
-msgid "Local timezone:"
-msgstr "Lokal tidszone:"
-
-#: ../globaltime/timezone_selection.c:101
-#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
-msgid " Other"
-msgstr "Anden"
-
-#: ../globaltime/timezone_selection.c:156
-#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
-#, c-format
-msgid "%d hour %d mins"
-msgstr "%d time %d minutter"
-
-#: ../globaltime/timezone_selection.c:159
-#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, c-format
-msgid "%d hour"
-msgstr "%d timer"
-
-#: ../globaltime/timezone_selection.c:161
-#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, c-format
-msgid "%d mins"
-msgstr "%d minutter"
-
-#: ../globaltime/timezone_selection.c:167
-#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
-msgid "backward"
-msgstr "tilbage"
-
-#: ../globaltime/timezone_selection.c:170
-#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-msgid "forward"
-msgstr "fremad"
-
-#: ../globaltime/timezone_selection.c:194
-#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
-msgid "not changed"
-msgstr "uændret"
-
-#: ../globaltime/timezone_selection.c:195
-#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
-msgid "not changing"
-msgstr "uden ændring"
-
-#. location
-#: ../globaltime/timezone_selection.c:247
-#: ../globaltime/timezone_selection.c:252
-#: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
-#: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
-msgid "Location"
-msgstr "Sted"
-
-#: ../globaltime/timezone_selection.c:258
-#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
-msgid "GMT Offset"
-msgstr "Forskudt i forhold til GMT"
-
-#: ../globaltime/timezone_selection.c:264
-#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
-msgid "Previous/Next Change"
-msgstr "Forrige/næste ændring"
-
-#: ../globaltime/timezone_selection.c:269
-#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
-msgid "Country"
-msgstr "Land"
-
-#. We are actually setting the g_par parameter. In other words
-#. we are setting the global default timezone for Orage. This is
-#. done very seldom and we do not want to allow "floating" here.
-#. This test is ugly, but it is not worth an extra parameter.
-#. this is normal appointment
-#: ../globaltime/timezone_selection.c:299
-#: ../globaltime/timezone_selection.c:309
-#: ../panel-plugin/timezone_selection.c:300
-#: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
-#: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
-msgid "Pick timezone"
-msgstr "Vælg tidszone"
-
-#: ../globaltime/timezone_selection.c:302
-#: ../globaltime/timezone_selection.c:312
-#: ../panel-plugin/timezone_selection.c:303
-#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
-#: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
-msgid "Change mode"
-msgstr "Ændr tilstand"
-
-#: ../globaltime/timezone_selection.c:303
-#: ../globaltime/timezone_selection.c:313
-#: ../globaltime/timezone_selection.c:352
-#: ../panel-plugin/timezone_selection.c:304
-#: ../panel-plugin/timezone_selection.c:314
-#: ../panel-plugin/timezone_selection.c:353 ../src/timezone_selection.c:320
-#: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
-#: ../src/timezone_selection.c:379
-msgid "UTC"
-msgstr "UTC"
-
-#. NOTE: this exists only if ical timezones are being used
-#: ../globaltime/timezone_selection.c:304
-#: ../globaltime/timezone_selection.c:357
-#: ../panel-plugin/timezone_selection.c:305
-#: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
-#: ../src/timezone_selection.c:384
-msgid "floating"
-msgstr "flydende"
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Global tid"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-msgid "Orage Globaltime"
-msgstr "Orage global tid"
-
-#: ../globaltime/globaltime.desktop.in.h:3
-msgid "Show clocks from different countries"
-msgstr "Viser klokken for forskellige lande"
-
-#: ../panel-plugin/oc_config.c:224
-msgid "Appearance"
-msgstr "Udseende"
-
-#. show frame
-#: ../panel-plugin/oc_config.c:229
-msgid "Show _frame"
-msgstr "Vis _ramme"
-
-#. foreground color
-#: ../panel-plugin/oc_config.c:239
-msgid "set foreground _color:"
-msgstr "indstil _forgrundsfarve:"
-
-#. background color
-#: ../panel-plugin/oc_config.c:253
-msgid "set _background color:"
-msgstr "indstil _baggrundsfarve:"
-
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
-msgid "set _height:"
-msgstr "indstil _højde:"
-
-#: ../panel-plugin/oc_config.c:277
-msgid "Note that you can not change the height of horizontal panels"
-msgstr "Bemærk, at du ikke kan ændre højden af vandrette paneler"
-
-#: ../panel-plugin/oc_config.c:282
-msgid "set _width:"
-msgstr "indstil b_redde:"
-
-#: ../panel-plugin/oc_config.c:293
-msgid "Note that you can not change the width of vertical panels"
-msgstr "Bemærk, at du ikke kan ændre bredden af lodrette paneler"
-
-#: ../panel-plugin/oc_config.c:316
-msgid "Clock Options"
-msgstr "Ur-indstillinger"
-
-#. timezone
-#: ../panel-plugin/oc_config.c:326
-msgid "set timezone to:"
-msgstr "indstil tidszone til:"
-
-#: ../panel-plugin/oc_config.c:347
-#, c-format
-msgid "Line %d:"
-msgstr "Linje %d:"
-
-#: ../panel-plugin/oc_config.c:357
-msgid "Enter any valid strftime function parameter."
-msgstr "Angiv en gyldigt strftime funktionstilvalg."
-
-#. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
-msgid "Tooltip:"
-msgstr "Værktøjstips:"
-
-#. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
-msgid "fix time after suspend/hibernate"
-msgstr "korrigér tid efter hvile/dvale"
-
-#: ../panel-plugin/oc_config.c:415
-msgid ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
-msgstr ""
-"Du har kun brug for denne, hvis du bruger i kort tid (mindre end 5 timer) "
-"hvile eller dvale og dit synlige ur ikke indeholder sekunder. Under disse "
-"omstændigheder er det muligt, at Orageuret viser tiden upræcist med mindre "
-"du har denne indstilling valgt. (Denne indstilling gør, at processor- og "
-"interrupt-sparemuligheder ikke fungerer.)"
-
-#: ../panel-plugin/oc_config.c:432
-msgid ""
-"This program uses strftime function to get time.\n"
-"Use any valid code to get time in the format you prefer.\n"
-"Some common codes are:\n"
-"\t%A = weekday\t\t\t%B = month\n"
-"\t%c = date & time\t\t%R = hour & minute\n"
-"\t%V = week number\t\t%Z = timezone in use\n"
-"\t%H = hours \t\t\t\t%M = minute\n"
-"\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Dette program bruger strftime funktionen til at få tiden.\n"
-"Brug en gyldig kode for at få tiden i det format du foretrækker.\n"
-"Nogle almindelige gyldige er:\n"
-"\t%A = ugedag\t\t\t%B = måned\n"
-"\t%c = dato & tid\t\t%R = time & minut\n"
-"\t%V = ugenummer\t\t%Z = tidszone i brug\n"
-"\t%H = timer \t\t\t\t%M = minut\n"
-"\t%X = lokal tidt\t\t%x = lokal dato"
-
-#: ../panel-plugin/oc_config.c:457
-msgid "Orage clock Preferences"
-msgstr "Orage-urindstillinger"
-
-#. no lines yet
-#. TRANSLATORS: Use format characters from strftime(3)
-#. * to get the proper string for your locale.
-#. * I used these:
-#. * %A  : full weekday name
-#. * %d  : day of the month
-#. * %B  : full month name
-#. * %Y  : four digit year
-#. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
-msgid "%A %d %B %Y/%V"
-msgstr "%A %d %B %Y/%V"
-
-#: ../src/about-xfcalendar.c:40
-msgid "Maintainer"
-msgstr "Vedligeholder"
-
-#: ../src/about-xfcalendar.c:47
-msgid "Manage your time with Orage"
-msgstr "Styr din tid med Orage"
-
-#. if (gtk_toggle_button_get_active(
-#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
-#. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
-msgid "End"
-msgstr "Slut"
-
-#: ../src/appointment.c:333
-msgid "Due"
-msgstr "Forfald"
-
-#: ../src/appointment.c:493 ../src/mainbox.c:783
-msgid "Orage"
-msgstr "Orage"
-
-#. to avoid timing problems when updating entry
-#. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
-msgid "Select a file..."
-msgstr "Vælg en fil..."
-
-#: ../src/appointment.c:680
-msgid "Sound Files"
-msgstr "Lydfiler"
-
-#: ../src/appointment.c:687 ../src/interface.c:290
-msgid "All Files"
-msgstr "Alle filer"
-
-#: ../src/appointment.c:739
-msgid "The appointment information has been modified."
-msgstr "AftaleInformation er blevet ændret."
-
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
-msgid "Do you want to continue?"
-msgstr "Ønsker du at fortsætte?"
-
-#: ../src/appointment.c:767
-msgid "The end of this appointment is earlier than the beginning."
-msgstr "Slutning af denne aftale er tidligere end begyndelsen."
-
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-msgid "Not set"
-msgstr "Ikke sat"
-
-#: ../src/appointment.c:1193
-msgid "This appointment will be permanently removed."
-msgstr "Aftalen vil blive fjernet for bestandig."
-
-#: ../src/appointment.c:1692
-msgid "This appointment does not exist."
-msgstr "Aftalen findes ikke."
-
-#: ../src/appointment.c:1693
-msgid "It was probably removed, please refresh your screen."
-msgstr "Den er sikkert blevet fjernet, venligst opfrisk din skærm."
-
-#: ../src/appointment.c:1995
-msgid "Current categories"
-msgstr "Aktuelle kategorier"
-
-#: ../src/appointment.c:2010
-msgid "Add new category with color"
-msgstr "Tilføj ny kategori med farve"
-
-#: ../src/appointment.c:2014
-msgid "Category:"
-msgstr "Kategori:"
-
-#: ../src/appointment.c:2045
-msgid "Colors of categories - Orage"
-msgstr "Kategorifarver - Orage"
-
-#: ../src/appointment.c:2092
-msgid " *** COPY ***"
-msgstr " *** KOPIÉR ***"
-
-#: ../src/appointment.c:2353
-msgid "New appointment - Orage"
-msgstr "Ny aftale - Orage"
-
-#. File menu stuff
-#. ********* File menu *********
-#. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
-msgid "_File"
-msgstr "_Fil"
-
-#: ../src/appointment.c:2388
-msgid "Sav_e and close"
-msgstr "_Gem og afslut"
-
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
-msgid "D_uplicate"
-msgstr "D_uplikér"
-
-#: ../src/appointment.c:2589
-msgid "Save"
-msgstr "Gem"
-
-#: ../src/appointment.c:2591
-msgid "Save and close"
-msgstr "Gem og afslut"
-
-#: ../src/appointment.c:2596
-msgid "Revert"
-msgstr "Forkast"
-
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
-msgid "Duplicate"
-msgstr "Duplikér"
-
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
-msgid "Delete"
-msgstr "Slet"
-
-#: ../src/appointment.c:2621
-msgid "Free"
-msgstr "Fri"
-
-#: ../src/appointment.c:2621
-msgid "Busy"
-msgstr "Optaget"
-
-#: ../src/appointment.c:2625
-msgid "General"
-msgstr "Generel"
-
-#. type
-#: ../src/appointment.c:2631
-msgid "Type "
-msgstr "Type "
-
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
-msgid "Event"
-msgstr "Begivenhed"
-
-#: ../src/appointment.c:2636
-msgid ""
-"Event that will happen sometime. For example:\n"
-"Meeting or birthday or TV show."
-msgstr ""
-"Begivenhed som vil ske engang. Eksempelvis:\n"
-"Møde, fødselsdag eller TV-show."
-
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-msgid "Todo"
-msgstr "Gøremål"
-
-#: ../src/appointment.c:2642
-msgid ""
-"Something that you should do sometime. For example:\n"
-"Wash your car or test new version of Orage."
-msgstr ""
-"Noget som du skal gøre fra tid til anden. Eksempelvis:\n"
-"Vaske din bil eller teste en ny version af Orage."
-
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
-msgid "Journal"
-msgstr "Historik"
-
-#: ../src/appointment.c:2649
-msgid ""
-"Make a note that something happened. For example:\n"
-"Remark that your mother called or first snow came."
-msgstr ""
-"Oprette et notat om noget som skete. Eksempelvis:\n"
-"Bemærkning, at din moder ringede eller den første sne faldt."
-
-#. title
-#: ../src/appointment.c:2656
-msgid "Title "
-msgstr "Titel "
-
-#: ../src/appointment.c:2671
-msgid "All day event"
-msgstr "Heldagsbegivenhed"
-
-#. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
-msgid "Start"
-msgstr "Begynd"
-
-#: ../src/appointment.c:2697
-msgid "Set      "
-msgstr "Indstil      "
-
-#: ../src/appointment.c:2718
-msgid "Duration"
-msgstr "Varighed"
-
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
-msgid "days"
-msgstr "dage"
-
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
-msgid "hours"
-msgstr "timer"
-
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
-msgid "mins"
-msgstr "minutter"
-
-#. Availability (only for EVENT)
-#: ../src/appointment.c:2738
-msgid "Availability"
-msgstr "Tilrådighed"
-
-#. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
-msgid "Completed"
-msgstr "Færdiggjort"
-
-#: ../src/appointment.c:2749
-msgid "Done"
-msgstr "Udført"
-
-#. categories
-#: ../src/appointment.c:2770
-msgid "Categories"
-msgstr "Kategorier"
-
-#: ../src/appointment.c:2782
-msgid ""
-"This is special category, which can be used to color this appointment in "
-"list views."
-msgstr ""
-"Dette er en særlig kategori, som kan bruges til at farvegive denne aftale i "
-"listevisninger."
-
-#: ../src/appointment.c:2787
-msgid "update colors for categories."
-msgstr "opdatér faver for kategorier."
-
-#. priority
-#: ../src/appointment.c:2793
-msgid "Priority"
-msgstr "Prioritet"
-
-#. note
-#: ../src/appointment.c:2803
-msgid "Note"
-msgstr "Notat"
-
-#: ../src/appointment.c:2824
-msgid ""
-"These shorthand commands take effect immediately:\n"
-"    <D> inserts current date in local date format\n"
-"    <T> inserts time and\n"
-"    <DT> inserts date and time.\n"
-"\n"
-"These are converted only later when they are seen:\n"
-"    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"Disse korte kommandoer træder i kraft øjeblikkeligt:\n"
-"    <D> indsæt nuværende data i lokalt datoformat\n"
-"    <T> indsætter tid og\n"
-"    <DT> indsætter dato og tid.\n"
-"\n"
-"Disse er konverteret senere hvis de bliver observeret:\n"
-"    <&Ynnnn> bliver oversat til nuværende år minus nnnn.\n"
-"(Dette kan eksempelvis blive brugt i påmindelser til fødselsdage for at "
-"informere om personens alder.)"
-
-#: ../src/appointment.c:2895
-msgid "Before Start"
-msgstr "Før start"
-
-#: ../src/appointment.c:2895
-msgid "Before End"
-msgstr "Før afslutning"
-
-#: ../src/appointment.c:2896
-msgid "After Start"
-msgstr "Efter start"
-
-#: ../src/appointment.c:2896
-msgid "After End"
-msgstr "Efter afslutning"
-
-#: ../src/appointment.c:2903
-msgid "Alarm"
-msgstr "Alarm"
-
-#. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-msgid "Alarm time"
-msgstr "Alarm tid"
-
-#: ../src/appointment.c:2933
-msgid ""
-"Often you want to get alarm:\n"
-" 1) before Event start\n"
-" 2) before Todo end\n"
-" 3) after Todo start"
-msgstr ""
-"Hvor ofte ønskes alarm:\n"
-" 1) før begivenhedsstart\n"
-" 2) før gøremål afslutning\n"
-" 3) efter gøremålstart"
-
-#: ../src/appointment.c:2938
-msgid "Persistent alarm"
-msgstr "Vedvarende alarm"
-
-#: ../src/appointment.c:2940
-msgid ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
-msgstr ""
-"Vælg denne hvis du ønsker Orage skal påminde dig, selv om den ikke har været "
-"aktiv, på alarmtidspunktet."
-
-#. **** Audio Alarm ****
-#: ../src/appointment.c:2949
-msgid "Sound"
-msgstr "Lyd"
-
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
-msgid "Use"
-msgstr "Brug"
-
-#: ../src/appointment.c:2955
-msgid "Select this if you want audible alarm"
-msgstr "Vælg denne hvis du ønsker lydalarm"
-
-#: ../src/appointment.c:2972
-msgid "Repeat alarm sound"
-msgstr "Gentag alarmlyd"
-
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
-msgid "times"
-msgstr "antal"
-
-#: ../src/appointment.c:3004
-msgid "sec interval"
-msgstr "sekundinterval"
-
-#. **** Display Alarm ****
-#: ../src/appointment.c:3014
-msgid "Visual"
-msgstr "Visuel"
-
-#: ../src/appointment.c:3018
-msgid "Use Orage window"
-msgstr "Brug Orage vindue"
-
-#: ../src/appointment.c:3020
-msgid "Select this if you want Orage window alarm"
-msgstr "Vælg denne hvis du ønsker Orage vinduesalarm"
-
-#: ../src/appointment.c:3032
-msgid "Use notification"
-msgstr "Brug besked"
-
-#: ../src/appointment.c:3034
-msgid "Select this if you want notification alarm"
-msgstr "Vælg denne for alarm-besked"
-
-#: ../src/appointment.c:3040
-msgid "Set timeout"
-msgstr "Indstil tidsafbrud"
-
-#: ../src/appointment.c:3043
-msgid "Select this if you want notification to expire automatically"
-msgstr "Vælg denne hvis du ønsker at beskeden udløber automatisk"
-
-#: ../src/appointment.c:3054
-msgid "0 = system default expiration time"
-msgstr "0 = systemstandard udløbstid"
-
-#: ../src/appointment.c:3059
-msgid "seconds"
-msgstr "sekunder"
-
-#. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
-msgid "Procedure"
-msgstr "Procedure"
-
-#: ../src/appointment.c:3076
-msgid "Select this if you want procedure or script alarm"
-msgstr "Vælg denne hvis du ønsker procedure- eller skriptalarm"
-
-#: ../src/appointment.c:3082
-msgid ""
-"You must enter all escape etc characters yourself.\n"
-"This string is just given to shell to process.\n"
-"The following special commands are replaced at run time:\n"
-"\t<&T>  appointment title\n"
-"\t<&D>  appointment description\n"
-"\t<&AT> alarm time\n"
-"\t<&ST> appointment start time\n"
-"\t<&ET> appointment end time"
-msgstr ""
-"Du skal indtaste alle escape osv. selvf.\n"
-"Denne streng bliver bare videregivet til skallen for eksekvering.\n"
-"De følgende specialkommendoer bliver erstattet under kørsel:\n"
-"\t<&T>  Aftaletitel\n"
-"\t<&D>  aftalebesrkivelse\n"
-"\t<&AT> alarmtid\n"
-"\t<&ST> aftale starttidspunkt\n"
-"\t<&ET> aftale sluttidspunkt"
-
-#: ../src/appointment.c:3094
-msgid "Test this alarm by raising it now"
-msgstr "Afprøv denne alarm ved at fremvise den nu"
-
-#: ../src/appointment.c:3101
-msgid "<b>Default alarm</b>"
-msgstr "<b>Standardalarm</b>"
-
-#: ../src/appointment.c:3109
-msgid "Store current settings as default alarm"
-msgstr "Gem denne indstilling som standardalarm"
-
-#: ../src/appointment.c:3114
-msgid "Set current settings from default alarm"
-msgstr "Indstil nuværende indstilling fra standardalarm"
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Ingen"
-
-#: ../src/appointment.c:3176
-msgid "Daily"
-msgstr "Daglig"
-
-#: ../src/appointment.c:3176
-msgid "Weekly"
-msgstr "Ugentlig"
-
-#: ../src/appointment.c:3176
-msgid "Monthly"
-msgstr "Månedlig"
-
-#: ../src/appointment.c:3176
-msgid "Yearly"
-msgstr "Årlig"
-
-#: ../src/appointment.c:3176
-msgid "Hourly"
-msgstr "Hver time"
-
-#: ../src/appointment.c:3178
-msgid "Mon"
-msgstr "Man"
-
-#: ../src/appointment.c:3178
-msgid "Tue"
-msgstr "Tir"
-
-#: ../src/appointment.c:3178
-msgid "Wed"
-msgstr "Ons"
-
-#: ../src/appointment.c:3178
-msgid "Thu"
-msgstr "Tor"
-
-#: ../src/appointment.c:3178
-msgid "Fri"
-msgstr "Fre"
-
-#: ../src/appointment.c:3178
-msgid "Sat"
-msgstr "Lør"
-
-#: ../src/appointment.c:3178
-msgid "Sun"
-msgstr "Søn"
-
-#: ../src/appointment.c:3183
-msgid "Recurrence"
-msgstr "Gentagelse"
-
-#. complexity
-#: ../src/appointment.c:3189
-msgid "Complexity"
-msgstr "Kompleksitet"
-
-#: ../src/appointment.c:3192
-msgid "Basic"
-msgstr "Basis"
-
-#: ../src/appointment.c:3198
-msgid "Advanced"
-msgstr "Avanceret"
-
-#: ../src/appointment.c:3202
-msgid "Use this if you want regular repeating event"
-msgstr "Brug denne hvis du ønsker simpel gentagelsesbegivenhed"
-
-#: ../src/appointment.c:3204
-msgid ""
-"Use this if you need complex times like:\n"
-" Every Saturday and Sunday or \n"
-" First Tuesday every month"
-msgstr ""
-"Brug denne hvis du bruger komplekse tider som:\n"
-" Hver lørdag og søndag eller  \n"
-" første tirsdag hver måned"
-
-#. frequency
-#: ../src/appointment.c:3211
-msgid "Frequency"
-msgstr "Frekvens"
-
-#: ../src/appointment.c:3217
-msgid "Each"
-msgstr "Hver"
-
-#: ../src/appointment.c:3224
-msgid "occurrence"
-msgstr "gentagelse"
-
-#: ../src/appointment.c:3228
-msgid ""
-"Limit frequency to certain interval.\n"
-" For example: Every third day:\n"
-" Frequency = Daily and Interval = 3"
-msgstr ""
-"Begræns frekvens til bestemt interval.\n"
-" Eksempel: Hver tredje dag:\n"
-" Frekvens= Daglig og interval = 3"
-
-#: ../src/appointment.c:3274
-msgid "Limit"
-msgstr "Begrænsning"
-
-#: ../src/appointment.c:3276
-msgid "Repeat forever"
-msgstr "Gentag altid"
-
-#: ../src/appointment.c:3282
-msgid "Repeat "
-msgstr "Gentag "
-
-#: ../src/appointment.c:3298
-msgid "Repeat until "
-msgstr "Gentag indtil "
-
-#. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-msgid "Weekdays"
-msgstr "Ugedage"
-
-#: ../src/appointment.c:3323
-msgid "Which day"
-msgstr "Hvilken dag"
-
-#: ../src/appointment.c:3331
-msgid ""
-"Specify which weekday for monthly and yearly events.\n"
-" For example:\n"
-" Second Wednesday each month:\n"
-"\tFrequency = Monthly,\n"
-"\tWeekdays = check only Wednesday,\n"
-"\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Angiv hvilken ugedag for månedlige og årlige begivenheder.\n"
-" For eksempel:\n"
-" Anden onsdag hver måned:\n"
-"\tFrekvens = månedlig,\n"
-"\tugedage = tjek kun onsdage,\n"
-"\thvilken dag = vælg 2 fra nummeret under onsdag"
-
-#. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
-msgid "TODO base"
-msgstr "Base til OPGAVER"
-
-#: ../src/appointment.c:3352
-msgid ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
-msgstr ""
-"OPGAVE gentages normalt med starttidspunkt og gentages efter hvert interval "
-"uanset hvornår den sidst blev afsluttet"
-
-#: ../src/appointment.c:3354
-msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"OPGAVE gentages er baseret på afsluttet tid og gentages igen efter interval "
-"fra sidst afsluttet tid.\n"
-"(Bemærk, at du ikke kan udlede noget omkring historikken af OPGAVEN eftersom "
-"gentagelsesbasen ændres efter hver afslutning.)"
-
-#. exceptions
-#: ../src/appointment.c:3361
-msgid "Exceptions"
-msgstr "Undtagelser"
-
-#: ../src/appointment.c:3374
-msgid ""
-"Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
-"Remove by clicking the data."
-msgstr ""
-"Føj flere undtagelselsesdatoer til ved at klikke på kalenderdage forneden:\n"
-"Undtagelse er enten udelukkelse(-) eller medtagelse(+) afhængig af "
-"markeringen.\n"
-"Fjern ved at klikke på datoen."
-
-#: ../src/appointment.c:3379
-msgid "Add excluded date (-)"
-msgstr "Tilføj udelukket dato (-)"
-
-#: ../src/appointment.c:3381
-msgid "Excluded days are full days where this appointment is not happening"
-msgstr "Udelukkede dage er hele dage hvor denne aftale ikke sker"
-
-#: ../src/appointment.c:3387
-msgid "Add included time (+)"
-msgstr "Tilføj inkludér tid (+)"
-
-#: ../src/appointment.c:3389
-msgid ""
-"Included times have same timezone than start time, but they may have "
-"different time"
-msgstr ""
-"Inkluderet tid har samme tidszone som starttid, men de kan forskellig tid"
-
-#. calendars showing the action days
-#: ../src/appointment.c:3406
-msgid "Action dates"
-msgstr "Handlingsdatoer"
-
-#. ********* View menu *********
-#. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
-msgid "_View"
-msgstr "_Vis"
-
-#. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
-msgid "_Go"
-msgstr "_Gå til"
-
-#: ../src/day-view.c:319 ../src/event-list.c:1110
-msgid "New"
-msgstr "Ny"
-
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Tilbage"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "I dag"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Fremad"
-
-#: ../src/day-view.c:333 ../src/event-list.c:1128
-msgid "Refresh"
-msgstr "Opfrisk"
-
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
-msgid "Close"
-msgstr "Afslut"
-
-#: ../src/day-view.c:454
-msgid "Unknown"
-msgstr "Ukendt"
-
-#: ../src/day-view.c:704
-msgid "       Number of days to show"
-msgstr "       Antal dage som skal vises"
-
-#: ../src/day-view.c:935
-msgid "Orage - day view"
-msgstr "Orage - dagsvisning"
-
-#. date only appointment
-#: ../src/event-list.c:190
-msgid "All day"
-msgstr "Hele dagen"
-
-#: ../src/event-list.c:580 ../src/event-list.c:1281
-msgid "Time"
-msgstr "Tid"
-
-#: ../src/event-list.c:748
-msgid "No rows have been selected."
-msgstr "Ingen rækker er markeret."
-
-#: ../src/event-list.c:749
-msgid "Click a row to select it and after that you can copy it."
-msgstr "Klik en række for at vælge og derefter kan du kopiere denne."
-
-#: ../src/event-list.c:918
-msgid ""
-"You will permanently remove all\n"
-"selected appointments."
-msgstr ""
-"Du vil for bestandig fjerne alle\n"
-"valgte aftaler."
-
-#: ../src/event-list.c:1130
-msgid "Find"
-msgstr "Find"
-
-#: ../src/event-list.c:1137
-msgid "Dayview"
-msgstr "Dagsvisning"
-
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Ekstra dage til visning "
-
-#: ../src/event-list.c:1201
-msgid "Journal entries starting from:"
-msgstr "Historikposter begyndende fra:"
-
-#: ../src/event-list.c:1221
-msgid "Search"
-msgstr "Søg"
-
-#: ../src/event-list.c:1224
-msgid "Search text "
-msgstr "Søgetekst "
-
-#: ../src/event-list.c:1289
-msgid "Flags"
-msgstr "Flag"
-
-#: ../src/event-list.c:1297
-msgid "Title"
-msgstr "Titel"
-
-#: ../src/event-list.c:1323
-msgid ""
-"Double click line to edit it.\n"
-"\n"
-"Flags in order:\n"
-"\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
-"\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
-"\t 3. Type: f=free B=Busy\n"
-"\t 4. Located in file:\n"
-"\t\tO=Orage A=Archive F=Foreign\n"
-"\t 5. Appointment type:\n"
-"\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Dobbeltklik på linje for redigering.\n"
-"\n"
-"Flag i ordenen:\n"
-"\t 1. Alarm: n=ingen alarm\n"
-"\t\t A=visuel alarm S=også lydalarm\n"
-"\t 2. Gentagelser: n=ingen gentagelse\n"
-"\t\t D=dagligt W=ugentligt M=månedligt Y=årligt\n"
-"\t 3. Type: f=fri B=Optaget\n"
-"\t 4. Lokaliseret i fil:\n"
-"\t\tO=Orage A=arkiv F=eksternt\n"
-"\t 5. Aftaletype:\n"
-"\t\tE=Begivenhed T=Gøremål J=historik"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Vælg datoen"
-
-#. remove since it has ended
-#: ../src/ical-archive.c:267
-msgid "\tRecur ended, moving to archive file."
-msgstr "\tGentagelse udløbet, Flytter til arkivfil."
-
-#: ../src/ical-archive.c:329
-msgid "Archiving not enabled. Exiting"
-msgstr "Arkivering er ikke aktiveret. Afslutter"
-
-#: ../src/ical-archive.c:347
-#, c-format
-msgid "Archiving threshold: %d month(s)"
-msgstr "Arkiveringsgrænse: %d måned(er)"
-
-#. yy mon day
-#: ../src/ical-archive.c:350
-#, c-format
-msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr "\tArkiverer begivenheder, som er ældre end: %04d-%02d-%02d"
-
-#: ../src/ical-archive.c:377
-#, c-format
-msgid "Archiving uid: %s"
-msgstr "Arkiverer uid: %s"
-
-#. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
-msgid "\tVTODO not complete; not archived"
-msgstr "\tVTODO er ikke komplet; er ikke arkiveret"
-
-#. it is recurrent event
-#: ../src/ical-archive.c:388
-#, c-format
-msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr "\tGentagne. Slutår: %04d, måned: %02d, dag: %02d"
-
-#: ../src/ical-archive.c:405
-msgid "Archiving done\n"
-msgstr "Arkivering udført\n"
-
-#. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
-msgid "Starting archive removal."
-msgstr "Starter arkivfjernelse."
-
-#: ../src/ical-archive.c:422
-msgid "\tPHASE 1: reset recurring appointments"
-msgstr "\tFASE 1: nulstil gentagne aftaler"
-
-#. PHASE 2: go through archive file and add everything back to base orage.
-#. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
-msgid "\tPHASE 2: return archived appointments"
-msgstr "\tFASE 2: Gendan arkiverede aftaler"
-
-#: ../src/ical-archive.c:470
-msgid "Archive removal done\n"
-msgstr "Arkiveringsfjernelse gennemført\n"
-
-#: ../src/ical-code.c:932
-msgid "Orage default alarm"
-msgstr "Orage standardalarm"
-
-#: ../src/ical-code.c:3115
-#, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "Opret alarmliste: Tilføjet %d alarmer. Behandlet %d begivenheder."
-
-#: ../src/ical-code.c:3117
-#, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tFandt %d alarmer af hvilke %d er aktive. (Gennemsøgte %d "
-"gentagelsesalarmer.)"
-
-#: ../src/ical-expimp.c:123
-msgid "Starting import file preprocessing"
-msgstr "Starter importfil-klargørelse"
-
-#: ../src/ical-expimp.c:158
-msgid "... Patched DCREATED to be CREATED."
-msgstr "... Rettede DCREATED skal OPRETTES."
-
-#: ../src/ical-expimp.c:197
-msgid "... Patched timezone to Orage format."
-msgstr "... Rettede tidszoner til Orage-format."
-
-#: ../src/ical-expimp.c:206
-msgid "Import file preprocessing done"
-msgstr "Importfil-klargørelse gennemført"
-
-#: ../src/interface.c:284
-msgid "Calendar files"
-msgstr "Kalenderfiler"
-
-#: ../src/interface.c:631
-msgid "Current foreign files"
-msgstr "Nuværende eksterne filer"
-
-#: ../src/interface.c:643
-msgid "READ ONLY"
-msgstr "KUN LÆSNING"
-
-#: ../src/interface.c:645
-msgid "READ WRITE"
-msgstr "LÆS SKRIV"
-
-#: ../src/interface.c:663
-msgid "***** No foreign files *****"
-msgstr "***** Ingen eksterne filer *****"
-
-#: ../src/interface.c:974
-msgid "Import/export"
-msgstr "Importér/eksportér"
-
-#: ../src/interface.c:981
-msgid "Import"
-msgstr "Importér"
-
-#: ../src/interface.c:986
-msgid "Read from file:"
-msgstr "Læs fra fil:"
-
-#: ../src/interface.c:1003
-msgid ""
-"Separate filenames with comma(,).\n"
-" NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Seperate filnavne med komma(,).\n"
-" BEMÆRK: komma er ikke et gyldigt tegn i filnavne i Orage."
-
-#: ../src/interface.c:1008
-msgid "Export"
-msgstr "Eksportér"
-
-#: ../src/interface.c:1013
-msgid "Write to file:"
-msgstr "Skriv til fil:"
-
-#: ../src/interface.c:1034 ../src/interface.c:1046
-msgid "Select"
-msgstr "Vælg"
-
-#: ../src/interface.c:1037
-msgid "All appointments"
-msgstr "Alle aftaler"
-
-#: ../src/interface.c:1050
-msgid "Named appointments: "
-msgstr "Navngivne aftaler: "
-
-#: ../src/interface.c:1062
-msgid ""
-"Note that only main file appointments are read.\n"
-"Archived and Foreign events are not exported."
-msgstr ""
-"Husk at det kun er hovedfils-aftalerne som bliver læst.\n"
-"Arkiverede og eksterne begivenheder bliver ikke eksporteret."
-
-#: ../src/interface.c:1065
-msgid ""
-"Note that only main file appointments are read.\n"
-"Foreign events are not exported."
-msgstr ""
-"Husk at det kun er hovedfils-aftalerne som bliver læst.\n"
-"Eksterne begivenheder bliver ikke eksporteret."
-
-#: ../src/interface.c:1068
-msgid "You can easily drag these from event-list window."
-msgstr "Du kan nemt trække disse fra begivenhedslistevinduet."
-
-#: ../src/interface.c:1070
-msgid "Orage appointment UIDs separated by commas."
-msgstr "Orage aftale-UIDer adskilt med kommaer."
-
-#: ../src/interface.c:1076
-msgid "Archive"
-msgstr "Arkivér"
-
-#: ../src/interface.c:1084
-#, c-format
-msgid "Archive now (threshold: %d months)"
-msgstr "Arkivér nu (grænse: %d måneder)"
-
-#: ../src/interface.c:1094
-msgid "You can change archive threshold in parameters"
-msgstr "Du kan ændre arkivgrænser under indstillinger"
-
-#: ../src/interface.c:1101
-msgid "Revert archive now"
-msgstr "Gendan arkiv nu"
-
-#: ../src/interface.c:1107
-msgid ""
-"Return all archived events into main orage file and remove arch file.\n"
-"This is useful for example when doing export and moving orage\n"
-"appointments to another system."
-msgstr ""
-"Tilbagefør alle arkiverede begivenheder til Orages hovedfil og fjern "
-"arkivfil.\n"
-"Dette er brugbart for eksempel ved en eksport  og flytning af Orage\n"
-"aftaler til et andet system."
-
-#: ../src/interface.c:1118
-msgid "Orage files"
-msgstr "Orage-filer"
-
-#: ../src/interface.c:1125
-msgid "Orage main calendar file"
-msgstr "Orage-hovedkalenderfil"
-
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Nuværende fil"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Ny fil"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Handlingstilvalg"
-
-#: ../src/interface.c:1156 ../src/interface.c:1222
-msgid "Rename"
-msgstr "Omdøb"
-
-#: ../src/interface.c:1160
-msgid ""
-"Orage internal file rename only.\n"
-"Does not touch external filesystem at all.\n"
-"New file must exist."
-msgstr ""
-"Kun Orage intern filomdøbning.\n"
-"Rør ikke eksternt filsystem overhovedet.\n"
-"Ny fil skal eksistere."
-
-#: ../src/interface.c:1164 ../src/interface.c:1227
-msgid "Copy"
-msgstr "Kopiér"
-
-#: ../src/interface.c:1168
-msgid "Current file is copied and stays unmodified in the old place."
-msgstr "Nuværende fil bliver kopieret og bliver uændret på det gamle sted."
-
-#: ../src/interface.c:1172 ../src/interface.c:1232
-msgid "Move"
-msgstr "Flyt"
-
-#: ../src/interface.c:1176
-msgid "Current file is moved and vanishes from the old place."
-msgstr "Nuværende fil bliver flyttet og forsvinder fra det gamle sted."
-
-#: ../src/interface.c:1190
-msgid "Archive file"
-msgstr "Arkivfil"
-
-#: ../src/interface.c:1254
-msgid "Foreign files"
-msgstr "Eksterne filer"
-
-#: ../src/interface.c:1261
-msgid "Add new foreign file"
-msgstr "Tilføj ny ekstern fil"
-
-#: ../src/interface.c:1266
-msgid "Foreign file:"
-msgstr "Ekstern fil:"
-
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Tilvalg"
-
-#: ../src/interface.c:1286
-msgid "Read only"
-msgstr "Læs kun"
-
-#: ../src/interface.c:1294
-msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Indstil denne hvis du vil være sikker på, at denne fil aldrig bliver ændret "
-"af Orage.\n"
-"Husk at ændring af eksterne filer kan gøre dem ikke kompatible med "
-"originalværktøjet, hvor de kom fra!"
-
-#: ../src/interface.c:1308
-msgid "Exchange data - Orage"
-msgstr "Udveksle data - Orage"
-
-#: ../src/main.c:268
-#, c-format
-msgid ""
-"\tThis is %s version %s\n"
-"\n"
-msgstr ""
-"\tDette er %s version %s\n"
-"\n"
-
-#: ../src/main.c:270
-#, c-format
-msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr "\tUdgivet under betingelserne af GNU General Public License.\n"
-
-#: ../src/main.c:271
-#, c-format
-msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr "\tKompileret med GTK+-%d.%d.%d, "
-
-#: ../src/main.c:273
-#, c-format
-msgid "using GTK+-%d.%d.%d.\n"
-msgstr "bruger GTK+-%d.%d.%d.\n"
-
-#: ../src/main.c:276
-#, c-format
-msgid "\tUsing DBUS for import.\n"
-msgstr "\tBruger DBUS til import.\n"
-
-#: ../src/main.c:278
-#, c-format
-msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr "\tBruger ikke DBUS. Import virker kun delvis.\n"
-
-#: ../src/main.c:281
-#, c-format
-msgid "\tUsing libnotify.\n"
-msgstr "\tBruger libnotify.\n"
-
-#: ../src/main.c:283
-#, c-format
-msgid "\tNot using libnotify.\n"
-msgstr "\tBruger ikke libnotify.\n"
-
-#: ../src/main.c:286
-#, c-format
-msgid "\tUsing automatic archiving.\n"
-msgstr "\tBruger automatisk arkivering.\n"
-
-#: ../src/main.c:288
-#, c-format
-msgid "\tNot using archiving.\n"
-msgstr "\tBruger ikke arkivering.\n"
-
-#: ../src/main.c:291
-#, c-format
-msgid "\tUsing operating system package libical.\n"
-msgstr "\tBrug operativsystempakken libical.\n"
-
-#: ../src/main.c:293
-#, c-format
-msgid "\tUsing Orage local version of libical.\n"
-msgstr "\tBrug lokal version til Orage af libical.\n"
-
-#: ../src/main.c:306
-#, c-format
-msgid ""
-"Usage: orage [options] [files]\n"
-"\n"
-msgstr ""
-"Brug: orage [tilvalg] [filer]\n"
-"\n"
-
-#: ../src/main.c:307
-#, c-format
-msgid "Options:\n"
-msgstr "Tilvalg:\n"
-
-#: ../src/main.c:308
-#, c-format
-msgid "--version (-v) \t\tshow version of orage\n"
-msgstr "--version (-v) \t\tvis version af orage\n"
-
-#: ../src/main.c:309
-#, c-format
-msgid "--help (-h) \t\tprint this text\n"
-msgstr "--help (-h) \t\tudskriv denne tekst\n"
-
-#: ../src/main.c:310
-#, c-format
-msgid "--preferences (-p) \tshow preferences form\n"
-msgstr "--preferences (-p) \tvis indstillingsformular\n"
-
-#: ../src/main.c:311
-#, c-format
-msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr "--toggle (-t) \t\tgør orage synlig/usynlig\n"
-
-#: ../src/main.c:312
-#, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) fil [RW] \ttilføj en ekstern fil\n"
-
-#: ../src/main.c:313
-#, c-format
-msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr "--remove-foreign (-r) fil \tfjern en ekstern fil\n"
-
-#: ../src/main.c:314
-#, c-format
-msgid ""
-"--export (-e) file [appointment...] \texport appointments from Orage to "
-"file\n"
-msgstr "--export (-e) fil [aftaler...] \teksportér aftaler fra Orage til fil\n"
-
-#: ../src/main.c:316
-#, c-format
-msgid "files=ical files to load into orage\n"
-msgstr "filer=ical-filer for indlæsning til orage\n"
-
-#: ../src/main.c:318
-#, c-format
-msgid "\tdbus not included in orage. \n"
-msgstr "\tdbus er ikke inkluderet i orage. \n"
-
-#: ../src/main.c:319
-#, c-format
-msgid ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
-msgstr ""
-"\tuden dbus [filer] og eksterne filtilvalg(-a & -r) kan kun bruges ved "
-"opstart af orage \n"
-
-#: ../src/main.c:511
-#, c-format
-msgid ""
-"\n"
-"Unknown option %s\n"
-"\n"
-msgstr ""
-"\n"
-"Ukendt tilvalg %s\n"
-"\n"
-
-#: ../src/mainbox.c:287
-msgid "_Exchange data"
-msgstr "_Udveksle data"
-
-#. Edit menu
-#: ../src/mainbox.c:298
-msgid "_Edit"
-msgstr "_Redigér"
-
-#: ../src/mainbox.c:308
-msgid "View selected _date"
-msgstr "Vis valgte _dato"
-
-#: ../src/mainbox.c:311
-msgid "View selected _week"
-msgstr "Vis valgte _uge"
-
-#: ../src/mainbox.c:317
-msgid "Select _Today"
-msgstr "Vælg _i dag"
-
-#: ../src/mainbox.c:323
-msgid "Show _Globaltime"
-msgstr "Vis _global tid"
-
-#. Help menu
-#: ../src/mainbox.c:327
-msgid "_Help"
-msgstr "_Hjælp"
-
-#: ../src/mainbox.c:448
-msgid "Never"
-msgstr "Aldrig"
-
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Titel: %s\n"
-" Start:\t%s\n"
-" Slut:\t%s\n"
-" Notat:\n"
-"%s"
-
-#: ../src/mainbox.c:460
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Titel: %s\n"
-" Start:\t%s\n"
-" Slut:\t%s\n"
-" Notat:\n"
-"%s"
-
-#: ../src/mainbox.c:546
-msgid "<b>To do:</b>"
-msgstr "<b>Gøremål:</b>"
-
-#: ../src/mainbox.c:582
-#, c-format
-msgid "<b>Events for %s:</b>"
-msgstr "<b>Begivenheder for %s:</b>"
-
-#: ../src/mainbox.c:593
-#, c-format
-msgid "<b>Events for %s - %s:</b>"
-msgstr "<b>Begivenheder for %s - %s::</b>"
-
-#: ../src/parameters.c:522
-msgid "Main settings"
-msgstr "Hovedindstillinger"
-
-#: ../src/parameters.c:528
-msgid "Timezone"
-msgstr "Tidszone"
-
-#: ../src/parameters.c:543
-msgid "You should always define your local timezone."
-msgstr "Du bør altid definere din lokale tidszone."
-
-#: ../src/parameters.c:552
-msgid "Archive threshold (months)"
-msgstr "Arkivgrænse (måneder)"
-
-#: ../src/parameters.c:562
-msgid "(0 = no archiving)"
-msgstr "(0 = ingen arkivering)"
-
-#: ../src/parameters.c:565
-msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Arkivering bruges til at spare tid og plads ved håndtering af begivenheder."
-
-#: ../src/parameters.c:574
-msgid "Sound command"
-msgstr "Lydkommando"
-
-#: ../src/parameters.c:589
-msgid "This command is given to shell to make sound in alarms."
-msgstr "Denne kommando gives til skallen for at give lyd i alarmer."
-
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "Vis indstillinger"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Kalenderens hovedvindue"
-
-#: ../src/parameters.c:618
-msgid "Show borders"
-msgstr "Vis rammer"
-
-#: ../src/parameters.c:625
-msgid "Show menu"
-msgstr "Vis menu"
-
-# It refers to the pager panel plugin that allows switching between
-# virtual desktops. The string in question is the label for the option
-# that controls whether the calendar window is shown in the desktop
-# thumbnails.
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Vis år og måned"
-
-#: ../src/parameters.c:639
-msgid "Show day names"
-msgstr "Vis navne på dage"
-
-#: ../src/parameters.c:646
-msgid "Show week numbers"
-msgstr "Vis ugenumre"
-
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr "Vis gøremålsliste"
-
-#: ../src/parameters.c:660
-msgid "Number of days to show in event window"
-msgstr "Antal dage som skal vises i begivenhedsvinduet"
-
-#: ../src/parameters.c:666
-msgid "0 = do not show event list at all"
-msgstr "0 = undlad at vise beginhedslisten"
-
-#: ../src/parameters.c:676
-msgid "Show on all desktops"
-msgstr "Vis alle skriveborde"
-
-#: ../src/parameters.c:683
-msgid "Keep on top"
-msgstr "Placér i toppen"
-
-#: ../src/parameters.c:690
-msgid "Show in taskbar"
-msgstr "Vis i opgavebjælke"
-
-# It refers to the pager panel plugin that allows switching between
-# virtual desktops. The string in question is the label for the option
-# that controls whether the calendar window is shown in the desktop
-# thumbnails.
-#: ../src/parameters.c:697
-msgid "Show in pager"
-msgstr "Vis i skærmskifter"
-
-#: ../src/parameters.c:704
-msgid "Show in systray"
-msgstr "Vis i statusfelt"
-
-#: ../src/parameters.c:739
-msgid "Calendar start"
-msgstr "Kalenderstart"
-
-#: ../src/parameters.c:744
-msgid "Show"
-msgstr "Vis"
-
-#: ../src/parameters.c:756
-msgid "Hide"
-msgstr "Skjul"
-
-#: ../src/parameters.c:768
-msgid "Minimized"
-msgstr "Minimeret"
-
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr "Ekstra indstillinger"
-
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr "Åbn når kalender fremkommer"
-
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "Vælg dags dato"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr "Vælg tidligere valgt dato"
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "Brug dynamisk ikon til statusfelt"
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "Brug dynamisk ikon"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "Dynamisk ikon viser nuværende måned og månedsdag. "
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Hovedkalender viser ved dobbeltklik"
-
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr "Vis dagene"
-
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr "Begivenhedsliste"
-
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr "Vindue til begivenhedsliste"
-
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr "Antal ekstra dage som vises i begivenhedslisten"
-
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-"Dette er kun standardværdien. Du kan ændre dette i det aktuelle "
-"begivenhedsvindue."
-
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr "Brug vækkeur"
-
-#: ../src/parameters.c:921
-msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-"Brug denne tidtager hvis Orage har problemer med at fungere efter hvile- "
-"eller dvaletilstand. (Eksempelvis hvis statusikonet ikke genopfriskes eller "
-"en alarm ikke aktiveres.)"
-
-#: ../src/parameters.c:938
-msgid "Orage Preferences"
-msgstr "Orage-indstillinger"
-
-#: ../src/parameters.c:1050
-msgid "First Orage start. Searching default timezone."
-msgstr "Første Orage-opstart. Søger standardtidszone."
-
-#: ../src/parameters.c:1069
-#, c-format
-msgid "Default timezone set to %s."
-msgstr "Standardtidszone indstillet til %s."
-
-#: ../src/parameters.c:1072
-msgid "Default timezone not found, please, set it manually."
-msgstr "Standardtidszone ikke fundet. Indstil venligst denne manuelt."
-
-#: ../src/reminder.c:562
-msgid "Reminder "
-msgstr "Påminder "
-
-#: ../src/reminder.c:591
-msgid "Open"
-msgstr "Åben"
-
-#: ../src/reminder.c:722
-msgid "Reminder - Orage"
-msgstr "Påminder - Orage"
-
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr "Påmind mig igen efter angivet tid"
-
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr "Tryk <Execute> for at påminde mig igen efter angivet tid:"
-
-#: ../src/reminder.c:1099
-msgid "Next active alarms:"
-msgstr "Næste aktive alarmer:"
-
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
-#, c-format
-msgid ""
-"\n"
-"%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d d %02d t %02d minutter til : %s"
-
-#: ../src/reminder.c:1166
-#, c-format
-msgid ""
-"\n"
-"No active alarms found"
-msgstr ""
-"\n"
-"Ingen aktive alarmer fundet"
-
-#: ../src/timezone_names.c:36
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../src/timezone_names.c:37
-msgid "Africa/Abidjan"
-msgstr "Afrika/Abidjan"
-
-#: ../src/timezone_names.c:38
-msgid "Africa/Accra"
-msgstr "Afrika/Accra"
-
-#: ../src/timezone_names.c:39
-msgid "Africa/Addis_Ababa"
-msgstr "Afrika/Addis Ababa"
-
-#: ../src/timezone_names.c:40
-msgid "Africa/Algiers"
-msgstr "Afrika/Algier"
-
-#: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr "Afrika/Asmara"
-
-#: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr "Afrika/Bamako"
-
-#: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr "Afrika/Bangui"
-
-#: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr "Afrika/Banjul"
-
-#: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr "Afrika/Bissau"
-
-#: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr "Afrika/Blantyre"
-
-#: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr "Afrika/Brazzaville"
-
-#: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr "Afrika/Bujumbura"
-
-#: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr "Afrika/Kairo"
-
-#: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr "Afrika/Casablanca"
-
-#: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr "Afrika/Ceuta"
-
-#: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr "Afrika/Konakry"
-
-#: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr "Afrika/Dakar"
-
-#: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr "Afrika/Dar es-Salaam"
-
-#: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr "Afrika/Djibouti"
-
-#: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr "Afrika/Douala"
-
-#: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr "Afrika/El-Aaiun"
-
-#: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr "Afrika/Freetown"
-
-#: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr "Afrika/Gaborone"
-
-#: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr "Afrika/Harare"
-
-#: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr "Afrika/Johannesburg"
-
-#: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr "Afrika/Kampala"
-
-#: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr "Afrika/Khartoum"
-
-#: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr "Afrika/Kigali"
-
-#: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr "Afrika/Kinshasa"
-
-#: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr "Afrika/Lagos"
-
-#: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr "Afrika/Libreville"
-
-#: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr "Afrika/Lomé"
-
-#: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr "Afrika/Luanda"
-
-#: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr "Afrika/Lubumbashi"
-
-#: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr "Afrika/Lusaka"
-
-#: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr "Afrika/Malabo"
-
-#: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr "Afrika/Maputo"
-
-#: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr "Afrika/Masero"
-
-#: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr "Afrika/Mbabane"
-
-#: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr "Afrika/Mogadishu"
-
-#: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr "Afrika/Monrovia"
-
-#: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr "Afrika/Nairobi"
-
-#: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr "Afrika/Ndjamena"
-
-#: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr "Afrika/Niamey"
-
-#: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr "Afrika/Nouakchott"
-
-#: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr "Afrika/Ouagadougou"
-
-#: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr "Afrika/Porto-Novo"
-
-#: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr "Afrika/Sao Tome"
-
-#: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr "Afrika/Timbuktu"
-
-#: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr "Afrika/Tripoli"
-
-#: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr "Afrika/Tunis"
-
-#: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr "Afrika/Windhoek"
-
-#: ../src/timezone_names.c:89
-msgid "America"
-msgstr "Amerika"
-
-#: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr "Amerika/Adak"
-
-#: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr "Amerika/Anchorage"
-
-#: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr "Amerika/Anguilla"
-
-#: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr "Amerika/Antigua"
-
-#: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr "Amerika/Araguaina"
-
-#: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr "Amerika/Argentina/Buenos Aires"
-
-#: ../src/timezone_names.c:96
-msgid "America/Argentina/Catamarca"
-msgstr "Amerika/Argentina/Catamarca"
-
-#: ../src/timezone_names.c:97
-msgid "America/Argentina/Cordoba"
-msgstr "Amerika/Argentina/Córdoba"
-
-#: ../src/timezone_names.c:98
-msgid "America/Argentina/Jujuy"
-msgstr "Amerika/Argentina/Jujuy"
-
-#: ../src/timezone_names.c:99
-msgid "America/Argentina/Mendoza"
-msgstr "Amerika/Argentina/Mendoza"
-
-#: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr "Amerika/Aruba"
-
-#: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr "Amerika/Asunción"
-
-#: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr "Amerika/Barbados"
-
-#: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr "Amerika/Belem"
-
-#: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr "Amerika/Belice"
-
-#: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr "Amerika/Boa Vista"
-
-#: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr "Amerika/Bogotá"
-
-#: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr "Amerika/Boise"
-
-#: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr "Amerika/Buenos Aires"
-
-#: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr "Amerika/Cambridge Bay"
-
-#: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr "Amerika/Cancún"
-
-#: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr "Amerika/Caracas"
-
-#: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr "Amerika/Catamarca"
-
-#: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr "Amerika/Cayenne"
-
-#: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr "Amerika/Cayman"
-
-#: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr "Amerika/Chicago"
-
-#: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr "Amerika/Chihuahua"
-
-#: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr "Amerika/Córdoba"
-
-#: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr "Amerika/Costa Rica"
-
-#: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr "Amerika/Cuiabá"
-
-#: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr "Amerika/Curacao"
-
-#: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr "Amerika/Dawson"
-
-#: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr "Amerika/Dawson Creek"
-
-#: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr "Amerika/Denver"
-
-#: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr "Amerika/Detroit"
-
-#: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr "Amerika/Dominica"
-
-#: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr "Amerika/Edmonton"
-
-#: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr "Amerika/Eirunepe"
-
-#: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr "Amerika/El Salvador"
-
-#: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr "Amerika/Fortaleza"
-
-#: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr "Amerika/Glace Bay"
-
-#: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr "Amerika/Godthåb"
-
-#: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr "Amerika/Goose_Bay"
-
-#: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr "Amerika/Grand_Turk"
-
-#: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr "Amerika/Grenada"
-
-#: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr "Amerika/Guadeloupe"
-
-#: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr "Amerika/Guatemala"
-
-#: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr "Amerika/Guayaquil"
-
-#: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr "Amerika/Guyana"
-
-#: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr "Amerika/Halifax"
-
-#: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr "Amerika/Havana"
-
-#: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr "Amerika/Hermosillo"
-
-#: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr "Amerika/Indiana/Indianapolis"
-
-#: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr "Amerika/Indiana/Knox"
-
-#: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr "Amerika/Indiana/Marengo"
-
-#: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr "Amerika/Indiana/Vevay"
-
-#: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr "Amerika/Indianapolis"
-
-#: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr "Amerika/Inuvik"
-
-#: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr "Amerika/Iqaluit"
-
-#: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr "Amerika/Jamaica"
-
-#: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr "Amerika/Jujuy"
-
-#: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr "Amerika/Juneau"
-
-#: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr "Amerika/Kentucky/Louisville"
-
-#: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr "Amerika/Kentucky/Monticello"
-
-#: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr "Amerika/La_Paz"
-
-#: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr "Amerika/Lima"
-
-#: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr "Amerika/Los_Angeles"
-
-#: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr "Amerika/Louisville"
-
-#: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr "Amerika/Maceio"
-
-#: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr "Amerika/Managua"
-
-#: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr "Amerika/Manaus"
-
-#: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr "Amerika/Martinique"
-
-#: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr "Amerika/Mazatlan"
-
-#: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr "Amerika/Mendoza"
-
-#: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr "Amerika/Menominee"
-
-#: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr "Amerika/Mérida"
-
-#: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr "Amerika/Mexico City"
-
-#: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr "Amerika/Miquelon"
-
-#: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr "Amerika/Monterrey"
-
-#: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr "Amerika/Montevideo"
-
-#: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr "Amerika/Montreal"
-
-#: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr "Amerika/Montserrat"
-
-#: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr "Amerika/Nassau"
-
-#: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr "Amerika/New York"
-
-#: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr "Amerika/Nipigon"
-
-#: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr "Amerika/Nome"
-
-#: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr "Amerika/Noronha"
-
-#: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr "Amerika/Panama"
-
-#: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr "Amerika/Pangnirtung"
-
-#: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr "Amerika/Paramaribo"
-
-#: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr "Amerika/Phoenix"
-
-#: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr "Amerika/Port-au-Prince"
-
-#: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr "Amerika/Port-of-Spain"
-
-#: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr "Amerika/Porto Velho"
-
-#: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr "Amerika/Puerto Rico"
-
-#: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr "Amerika/Rainy River"
-
-#: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr "Amerika/Rankin Inlet"
-
-#: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr "Amerika/Recife"
-
-#: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr "Amerika/Regina"
-
-#: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr "Amerika/Rio Branco"
-
-#: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr "Amerika/Rosario"
-
-#: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr "Amerika/Santiago"
-
-#: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr "Amerika/Santo Domingo"
-
-#: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr "Amerika/Sao Paulo"
-
-#: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr "Amerika/Scoresbysund"
-
-#: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr "Amerika/Shiprock"
-
-#: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr "Amerika/Sankt Johns"
-
-#: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr "Amerika/Sankt Kitts"
-
-#: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr "Amerika/Sankt Lucia"
-
-#: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr "Amerika/Sankt Thomas"
-
-#: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr "Amerika/Sankt Vincent"
-
-#: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr "Amerika/Swift Current"
-
-#: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr "Amerika/Tegucigalpa"
-
-#: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr "Amerika/Thule"
-
-#: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr "Amerika/Thunder Bay"
-
-#: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr "Amerika/Tijuana"
-
-#: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr "Amerika/Tortola"
-
-#: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr "Amerika/Vancouver"
-
-#: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr "Amerika/Whitehorse"
-
-#: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr "Amerika/Winnipeg"
-
-#: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr "Amerika/Yakutat"
-
-#: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr "Amerika/Yellowknife"
-
-#: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr "Antarktis"
-
-#: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr "Antarktis/Casey"
-
-#: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr "Antarktis/Davis"
-
-#: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr "Antarktis/DumontDUrville"
-
-#: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr "Antarktis/Mawson"
-
-#: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr "Antarktis/McMurdo"
-
-#: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr "Antarktis/Palmer"
-
-#: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr "Antarktis/Sydpolen"
-
-#: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr "Antarktis/Syowa"
-
-#: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr "Antarktis/Vostok"
-
-#: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr "Arktis"
-
-#: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr "Arktis/Longyearbyen"
-
-#: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr "Asien"
-
-#: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr "Asien/Aden"
-
-#: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr "Asien/Almaty"
-
-#: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr "Asien/Amman"
-
-#: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr "Asien/Anadyr"
-
-#: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr "Asien/Aqtau"
-
-#: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr "Asien/Aqtobe"
-
-#: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr "Asien/Ashgabat"
-
-#: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr "Asien/Baghdad"
-
-#: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr "Asien/Bahrain"
-
-#: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr "Asien/Baku"
-
-#: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr "Asien/Bangkok"
-
-#: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr "Asien/Beirut"
-
-#: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr "Asien/Bishkek"
-
-#: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr "Asien/Brunei"
-
-#: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr "Asien/Kolkata"
-
-#: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr "Asien/Chungking"
-
-#: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr "Asien/Colombo"
-
-#: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr "Asien/Damaskus"
-
-#: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr "Asien/Dhaka"
-
-#: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr "Asien/Dili"
-
-#: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr "Asien/Dubai"
-
-#: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr "Asien/Dusjanbe"
-
-#: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr "Asien/Gaza"
-
-#: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr "Asien/Harbin"
-
-#: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr "Asien/Hong Kong"
-
-#: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr "Asien/Hovd"
-
-#: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr "Asien/Irkutsk"
-
-#: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr "Asien/Istanbul"
-
-#: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr "Asien/Jakarta"
-
-#: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr "Asien/Jayapura"
-
-#: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr "Asien/Jerusalem"
-
-#: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr "Asien/Kabul"
-
-#: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr "Asien/Kamtjatka"
-
-#: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr "Asien/Karachi"
-
-#: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr "Asien/Kashgar"
-
-#: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr "Asien/Katmandu"
-
-#: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr "Asien/Krasnoyarsk"
-
-#: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr "Asien/Kuala Lumpur"
-
-#: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr "Asien/Kuching"
-
-#: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr "Asien/Kuwait"
-
-#: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr "Asien/Macao"
-
-#: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr "Asien/Magadan"
-
-#: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr "Asien/Manila"
-
-#: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr "Asien/Muskat"
-
-#: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr "Asien/Nicosia"
-
-#: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr "Asien/Novosibirsk"
-
-#: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr "Asien/Omsk"
-
-#: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr "Asien/Phnom Penh"
-
-#: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr "Asien/Pontianak"
-
-#: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr "Asien/Pyongyang"
-
-#: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr "Asien/Qatar"
-
-#: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr "Asien/Rangoon"
-
-#: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr "Asien/Riyadh"
-
-#: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr "Asien/Ho Chi Minh-byen"
-
-#: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr "Asien/Samarkand"
-
-#: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr "Asien/Seoul"
-
-#: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr "Asien/Shanghai"
-
-#: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr "Asien/Singapore"
-
-#: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr "Asien/Taipei"
-
-#: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr "Asien/Tasjkent"
-
-#: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr "Asien/Tbilisi"
-
-#: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr "Asien/Teheran"
-
-#: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr "Asien/Thimphu"
-
-#: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr "Asien/Tokyo"
-
-#: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr "Asien/Ujung Pandang"
-
-#: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr "Asien/Ulan Bator"
-
-#: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr "Asien/Urumqi"
-
-#: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr "Asien/Vientiane"
-
-#: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr "Asien/Vladivostok"
-
-#: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr "Asien/Yakutsk"
-
-#: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr "Asien/Ekaterinburg"
-
-#: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr "Asien/Yerevan"
-
-#: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr "Atlantisk"
-
-#: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr "Atlantisk/Azorerne"
-
-#: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr "Atlantisk/Bermuda"
-
-#: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr "Atlantisk/Kanariske Øer"
-
-#: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr "Atlantisk/Kap Verde"
-
-#: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr "Atlantisk/Færøerne"
-
-#: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr "Atlantisk/Jan Mayen"
-
-#: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr "Atlantisk/Madeira"
-
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr "Atlantisk/Reykjavik"
-
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr "Atlantisk/South Georgia"
-
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr "Atlantisk/Sankt Helena"
-
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr "Atlantisk/Stanley"
-
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr "Australien"
-
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr "Australien/Adelaide"
-
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr "Australien/Brisbane"
-
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr "Australien/Broken Hill"
-
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr "Australien/Darwin"
-
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr "Australien/Hobart"
-
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr "Australien/Lindeman"
-
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr "Australien/Lord Howe"
-
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr "Australien/Melbourne"
-
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr "Australien/Perth"
-
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr "Australien/Sydney"
-
-#: ../src/timezone_names.c:320
-msgid "Europe"
-msgstr "Europa"
-
-#: ../src/timezone_names.c:321
-msgid "Europe/Amsterdam"
-msgstr "Europa/Amsterdam"
-
-#: ../src/timezone_names.c:322
-msgid "Europe/Andorra"
-msgstr "Europa/Andorra"
-
-#: ../src/timezone_names.c:323
-msgid "Europe/Athens"
-msgstr "Europa/Athen"
-
-#: ../src/timezone_names.c:324
-msgid "Europe/Belfast"
-msgstr "Europa/Belfast"
-
-#: ../src/timezone_names.c:325
-msgid "Europe/Belgrade"
-msgstr "Europa/Beograd"
-
-#: ../src/timezone_names.c:326
-msgid "Europe/Berlin"
-msgstr "Europa/Berlin"
-
-#: ../src/timezone_names.c:327
-msgid "Europe/Bratislava"
-msgstr "Europa/Bratislava"
-
-#: ../src/timezone_names.c:328
-msgid "Europe/Brussels"
-msgstr "Europa/Bruxelles"
-
-#: ../src/timezone_names.c:329
-msgid "Europe/Bucharest"
-msgstr "Europa/Bukarest"
-
-#: ../src/timezone_names.c:330
-msgid "Europe/Budapest"
-msgstr "Europa/Budapest"
-
-#: ../src/timezone_names.c:331
-msgid "Europe/Chisinau"
-msgstr "Europa/Chisinau"
-
-#: ../src/timezone_names.c:332
-msgid "Europe/Copenhagen"
-msgstr "Europa/København"
-
-#: ../src/timezone_names.c:333
-msgid "Europe/Dublin"
-msgstr "Europa/Dublin"
-
-#: ../src/timezone_names.c:334
-msgid "Europe/Gibraltar"
-msgstr "Europa/Gibraltar"
-
-#: ../src/timezone_names.c:335
-msgid "Europe/Helsinki"
-msgstr "Europa/Helsingfors"
-
-#: ../src/timezone_names.c:336
-msgid "Europe/Istanbul"
-msgstr "Europa/Istanbul"
-
-#: ../src/timezone_names.c:337
-msgid "Europe/Kaliningrad"
-msgstr "Europa/Kaliningrad"
-
-#: ../src/timezone_names.c:338
-msgid "Europe/Kiev"
-msgstr "Europa/Kiev"
-
-#: ../src/timezone_names.c:339
-msgid "Europe/Lisbon"
-msgstr "Europa/Lisabon"
-
-#: ../src/timezone_names.c:340
-msgid "Europe/Ljubljana"
-msgstr "Europa/Ljubljana"
-
-#: ../src/timezone_names.c:341
-msgid "Europe/London"
-msgstr "Europa/London"
-
-#: ../src/timezone_names.c:342
-msgid "Europe/Luxembourg"
-msgstr "Europa/Luxembourg"
-
-#: ../src/timezone_names.c:343
-msgid "Europe/Madrid"
-msgstr "Europa/Madrid"
-
-#: ../src/timezone_names.c:344
-msgid "Europe/Malta"
-msgstr "Europa/Malta"
-
-#: ../src/timezone_names.c:345
-msgid "Europe/Minsk"
-msgstr "Europa/Minsk"
-
-#: ../src/timezone_names.c:346
-msgid "Europe/Monaco"
-msgstr "Europa/Monaco"
-
-#: ../src/timezone_names.c:347
-msgid "Europe/Moscow"
-msgstr "Europa/Moskva"
-
-#: ../src/timezone_names.c:348
-msgid "Europe/Nicosia"
-msgstr "Europa/Nicosia"
-
-#: ../src/timezone_names.c:349
-msgid "Europe/Oslo"
-msgstr "Europa/Oslo"
-
-#: ../src/timezone_names.c:350
-msgid "Europe/Paris"
-msgstr "Europa/Paris"
-
-#: ../src/timezone_names.c:351
-msgid "Europe/Prague"
-msgstr "Europa/Prag"
-
-#: ../src/timezone_names.c:352
-msgid "Europe/Riga"
-msgstr "Europa/Riga"
-
-#: ../src/timezone_names.c:353
-msgid "Europe/Rome"
-msgstr "Europa/Rom"
-
-#: ../src/timezone_names.c:354
-msgid "Europe/Samara"
-msgstr "Europa/Samara"
-
-#: ../src/timezone_names.c:355
-msgid "Europe/San_Marino"
-msgstr "Europa/San Marino"
-
-#: ../src/timezone_names.c:356
-msgid "Europe/Sarajevo"
-msgstr "Europa/Sarajevo"
-
-#: ../src/timezone_names.c:357
-msgid "Europe/Simferopol"
-msgstr "Europa/Simferopol"
-
-#: ../src/timezone_names.c:358
-msgid "Europe/Skopje"
-msgstr "Europa/Skopje"
-
-#: ../src/timezone_names.c:359
-msgid "Europe/Sofia"
-msgstr "Europa/Sofia"
-
-#: ../src/timezone_names.c:360
-msgid "Europe/Stockholm"
-msgstr "Europa/Stokholm"
-
-#: ../src/timezone_names.c:361
-msgid "Europe/Tallinn"
-msgstr "Europa/Tallinn"
-
-#: ../src/timezone_names.c:362
-msgid "Europe/Tirane"
-msgstr "Europa/Tirana"
-
-#: ../src/timezone_names.c:363
-msgid "Europe/Uzhgorod"
-msgstr "Europa/Uzhgorod"
-
-#: ../src/timezone_names.c:364
-msgid "Europe/Vaduz"
-msgstr "Europa/Vaduz"
-
-#: ../src/timezone_names.c:365
-msgid "Europe/Vatican"
-msgstr "Europa/Vatikanstaten"
-
-#: ../src/timezone_names.c:366
-msgid "Europe/Vienna"
-msgstr "Europa/Wien"
-
-#: ../src/timezone_names.c:367
-msgid "Europe/Vilnius"
-msgstr "Europa/Vilnius"
-
-#: ../src/timezone_names.c:368
-msgid "Europe/Warsaw"
-msgstr "Europa/Warszawa"
-
-#: ../src/timezone_names.c:369
-msgid "Europe/Zagreb"
-msgstr "Europa/Zagreb"
-
-#: ../src/timezone_names.c:370
-msgid "Europe/Zaporozhye"
-msgstr "Europa/Zaporozhye"
-
-#: ../src/timezone_names.c:371
-msgid "Europe/Zurich"
-msgstr "Europa/Zürich"
-
-#: ../src/timezone_names.c:372
-msgid "Indian"
-msgstr "Indien"
-
-#: ../src/timezone_names.c:373
-msgid "Indian/Antananarivo"
-msgstr "Indien/Antananarivo"
-
-#: ../src/timezone_names.c:374
-msgid "Indian/Chagos"
-msgstr "Indien/Chagos"
-
-#: ../src/timezone_names.c:375
-msgid "Indian/Christmas"
-msgstr "Indien/Christmas Island"
-
-#: ../src/timezone_names.c:376
-msgid "Indian/Cocos"
-msgstr "Indien/Cocos"
-
-#: ../src/timezone_names.c:377
-msgid "Indian/Comoro"
-msgstr "Indien/Comorerne"
-
-#: ../src/timezone_names.c:378
-msgid "Indian/Kerguelen"
-msgstr "Indien/Kerguelen"
-
-#: ../src/timezone_names.c:379
-msgid "Indian/Mahe"
-msgstr "Indien/Mahé"
-
-#: ../src/timezone_names.c:380
-msgid "Indian/Maldives"
-msgstr "Indien/Maldiverne"
-
-#: ../src/timezone_names.c:381
-msgid "Indian/Mauritius"
-msgstr "Indien/Mauritius"
-
-#: ../src/timezone_names.c:382
-msgid "Indian/Mayotte"
-msgstr "Indien/Mayotte"
-
-#: ../src/timezone_names.c:383
-msgid "Indian/Reunion"
-msgstr "Indien/Reunion"
-
-#: ../src/timezone_names.c:384
-msgid "Pacific"
-msgstr "Oceanien"
-
-#: ../src/timezone_names.c:385
-msgid "Pacific/Apia"
-msgstr "Oceanien/Apia"
-
-#: ../src/timezone_names.c:386
-msgid "Pacific/Auckland"
-msgstr "Oceanien/Auckland"
-
-#: ../src/timezone_names.c:387
-msgid "Pacific/Chatham"
-msgstr "Oceanien/Chatham"
-
-#: ../src/timezone_names.c:388
-msgid "Pacific/Easter"
-msgstr "Oceanien/Påskeøen"
-
-#: ../src/timezone_names.c:389
-msgid "Pacific/Efate"
-msgstr "Oceanien/Efate"
-
-#: ../src/timezone_names.c:390
-msgid "Pacific/Enderbury"
-msgstr "Oceanien/Enderbury"
-
-#: ../src/timezone_names.c:391
-msgid "Pacific/Fakaofo"
-msgstr "Oceanien/Fakaofo"
-
-#: ../src/timezone_names.c:392
-msgid "Pacific/Fiji"
-msgstr "Oceanien/Fiji"
-
-#: ../src/timezone_names.c:393
-msgid "Pacific/Funafuti"
-msgstr "Oceanien/Funafuti"
-
-#: ../src/timezone_names.c:394
-msgid "Pacific/Galapagos"
-msgstr "Oceanien/Galapagos"
-
-#: ../src/timezone_names.c:395
-msgid "Pacific/Gambier"
-msgstr "Oceanien/Gambier"
-
-#: ../src/timezone_names.c:396
-msgid "Pacific/Guadalcanal"
-msgstr "Oceanien/Guadalcanal"
-
-#: ../src/timezone_names.c:397
-msgid "Pacific/Guam"
-msgstr "Oceanien/Guam"
-
-#: ../src/timezone_names.c:398
-msgid "Pacific/Honolulu"
-msgstr "Oceanien/Honolulu"
-
-#: ../src/timezone_names.c:399
-msgid "Pacific/Johnston"
-msgstr "Oceanien/Johnston"
-
-#: ../src/timezone_names.c:400
-msgid "Pacific/Kiritimati"
-msgstr "Oceanien/Juleøen"
-
-#: ../src/timezone_names.c:401
-msgid "Pacific/Kosrae"
-msgstr "Oceanien/Kosrae"
-
-#: ../src/timezone_names.c:402
-msgid "Pacific/Kwajalein"
-msgstr "Oceanien/Kwajalein"
-
-#: ../src/timezone_names.c:403
-msgid "Pacific/Majuro"
-msgstr "Oceanien/Majuro"
-
-#: ../src/timezone_names.c:404
-msgid "Pacific/Marquesas"
-msgstr "Oceanien/Marquesas"
-
-#: ../src/timezone_names.c:405
-msgid "Pacific/Midway"
-msgstr "Oceanien/Midwayøerne"
-
-#: ../src/timezone_names.c:406
-msgid "Pacific/Nauru"
-msgstr "Oceanien/Nauru"
-
-#: ../src/timezone_names.c:407
-msgid "Pacific/Niue"
-msgstr "Oceanien/Niue"
-
-#: ../src/timezone_names.c:408
-msgid "Pacific/Norfolk"
-msgstr "Oceanien/Norfolk"
-
-#: ../src/timezone_names.c:409
-msgid "Pacific/Noumea"
-msgstr "Oceanien/Noumea"
-
-#: ../src/timezone_names.c:410
-msgid "Pacific/Pago_Pago"
-msgstr "Oceanien/Pago Pago"
-
-#: ../src/timezone_names.c:411
-msgid "Pacific/Palau"
-msgstr "Oceanien/Palau"
-
-#: ../src/timezone_names.c:412
-msgid "Pacific/Pitcairn"
-msgstr "Oceanien/Pitcairn"
-
-#: ../src/timezone_names.c:413
-msgid "Pacific/Ponape"
-msgstr "Oceanien/Pohnpei"
-
-#: ../src/timezone_names.c:414
-msgid "Pacific/Port_Moresby"
-msgstr "Oceanien/Port Moresby"
-
-#: ../src/timezone_names.c:415
-msgid "Pacific/Rarotonga"
-msgstr "Oceanien/Cook-øerne"
-
-#: ../src/timezone_names.c:416
-msgid "Pacific/Saipan"
-msgstr "Oceanien/Saipan"
-
-#: ../src/timezone_names.c:417
-msgid "Pacific/Tahiti"
-msgstr "Oceanien/Tahiti"
-
-#: ../src/timezone_names.c:418
-msgid "Pacific/Tarawa"
-msgstr "Oceanien/Tarawa"
-
-#: ../src/timezone_names.c:419
-msgid "Pacific/Tongatapu"
-msgstr "Oceanien/Tongatapu"
-
-#: ../src/timezone_names.c:420
-msgid "Pacific/Truk"
-msgstr "Oceanien/Truk"
-
-#: ../src/timezone_names.c:421
-msgid "Pacific/Wake"
-msgstr "Oceanien/Wake"
-
-#: ../src/timezone_names.c:422
-msgid "Pacific/Wallis"
-msgstr "Oceanien/Wallis"
-
-#: ../src/timezone_names.c:423
-msgid "Pacific/Yap"
-msgstr "Oceanien/Yap"
-
-#: ../src/tray_icon.c:469
-msgid "New appointment"
-msgstr "Ny aftale"
-
-#: ../src/tray_icon.c:485
-msgid "About Orage"
-msgstr "Om Orage"
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-msgid "Orage Panel Clock"
-msgstr "Orage panelur"
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-msgid "Show time and date?"
-msgstr "Vis tid og dato?"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Kalender"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Orage-kalenderindstillinger"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-msgid "Orage preferences"
-msgstr "Orage-indstillinger"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Indstillinger til kalenderprogrammet (Orage) til Xfce4"
-
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Skrivebordskalender"
-
-#: ../xfcalendar.desktop.in.h:3
-msgid "Orage Calendar"
-msgstr "Orage - kalender"
-
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Titel: %s\n"
-#~ " Start:\t%s\n"
-#~ " Forfald:\t%s\n"
-#~ " Udført:\t%s\n"
-#~ "Notat:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Du skal selv angive alle undvigesekvenser osv.\n"
-#~ " Denne streng er direkte overført til skallen for kørsel"
-
-#~ msgid "Orage clock"
-#~ msgstr "Orage ur"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Original skaber, tidligere vedligeholdere"
-
-#~ msgid "Contributor"
-#~ msgstr "Bidragsyder"
-
-#~ msgid "Info"
-#~ msgstr "Info"
-
-#~ msgid "Warning"
-#~ msgstr "Advarsel"
-
-#~ msgid "Error"
-#~ msgstr "Fejl"
-
-#~ msgid "Set sticked"
-#~ msgstr "Indstil klæbende"
-
-#~ msgid "Select always today"
-#~ msgstr "Vælg altid i dag"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Ved visning af hovedkalender, stil markøren på enten tidligere valgte dag "
-#~ "eller altid til nuværende dag."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Afslutter tidsjusteringstilstand"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Start tidsjusteringstilstand"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "justér minutter"
-
-#~ msgid "Vary"
-#~ msgstr "Varierende"
-
-#~ msgid "Select timezone"
-#~ msgstr "Vælg tidszone"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Ændr ur "
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "angiv urets tidszone,\n"
-#~ "(=en gyldig TZ værdi)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Ændre indstillinger"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Angiv lokal tidszone. (dette er brugt til visning, hvis tiden er på "
-#~ "tidligere(-) eller næste dato(+) ved tilføjning af +/- efter tiden)"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr "Indstil en gyldig tidszone (=TZ) værdi eller vælg en fra listen."
-
-#~ msgid "show line _1:"
-#~ msgstr "vis linje _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "vis linje _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "vis linje _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Egenskaber"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Kunne ikke starte 'orage -p'"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> indsæt nuværende dato i lokalt datoformat.\n"
-#~ "<T> indsætter tid og\n"
-#~ "<DT> indsætter dato og tid."
-
-#~ msgid "Show event list"
-#~ msgstr "Vis begivenhedsliste"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = Brug statisk ikon)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Dynamiske ikoner viser nuværende dato og måned. De er kun synlige i "
-#~ "statusfelt. Hvis statusfelt er for småt for dynamisk ikonstørrelse, vil "
-#~ "Orage automatiskskifte tilbage til statisk ikon."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Kalenderindstillinger"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Xfce4-kalenderindstillinger"
diff -Nru orage-4.8.3/po/de.po orage-4.12.1/po/de.po
--- orage-4.8.3/po/de.po	2012-01-03 12:01:01.000000000 +0000
+++ orage-4.12.1/po/de.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,27 +1,49 @@
-# German translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Moritz Heiber <moe@xfce.org>, 2003.
-# Fabian Nowak <timystery@arcor.de>, 2005-2008, 2010.
-# Nico Schümann <nico@prog.nico22.de>, 2007.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Fabian Nowak <timystery@arcor.de>, 2005-2008, 2010
+# Georg Eckert <eckert.georg@gmx.de>, 2013-2015
+# Johannes Lips <johannes.lips@gmail.com>, 2014
+# Marcel Michael Kapfer <marcelmichaelkapfer@yahoo.co.nz>, 2013
+# Moritz Heiber <moe@xfce.org>, 2003
+# Nico Schümann <nico@prog.nico22.de>, 2007
 # Simon Schneider <simon@schneiderimtal.de>, 2009
-#
+# Tobias Bannert <tobannert@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Orage 4.5.9.6-svn\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2010-02-18 15:49+0100\n"
-"Last-Translator: Fabian Nowak <timystery@arcor.de>\n"
-"Language-Team: German <xfce-i18n@xfce.org>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2015-02-26 20:03+0000\n"
+"Last-Translator: Georg Eckert <eckert.georg@gmx.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/xfce-apps/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "keine Unterstreichung"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "einzeln"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "doppelt"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "niedrig"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr "Hebe Weltzeitfenster hervor..."
+msgstr "Weltzeitfenster hervorheben …"
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
@@ -33,9 +55,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"Klicken, um Uhr zu bearbeiten"
+msgstr "%s\nKlicken, um Uhr zu bearbeiten"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -45,9 +65,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"Knopf 1, um Einstellungen zu ändern \n"
-"Knopf 2, um Uhrzeiten einzustellen"
+msgstr "Knopf 1, um Einstellungen zu ändern \nKnopf 2, um Uhrzeiten einzustellen"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -56,8 +74,11 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"Minuten einstellen. Klicken Sie die Pfeile mit Taste 2 an, um nur 1 Minute "
+msgstr "Minuten einstellen. Klicken Sie die Pfeile mit Taste 2 an, um nur 1 Minute "
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Weltzeit"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -259,6 +280,10 @@
 msgid "Use normal decorations"
 msgstr "Normale Verzierungen"
 
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Keine"
+
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
 msgstr "Keine Fensterverzierung (Rahmen)"
@@ -334,7 +359,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Ort"
@@ -395,98 +420,108 @@
 msgid "floating"
 msgstr "gleitend"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Weltzeit"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Orage Weltzeit"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "Uhrzeiten verschiedener Länder zeigen"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Weltzeit"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Keine Drehung"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Links drehen"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Rechts drehen"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "Erscheinung"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
 msgstr "_Rahmen anzeigen"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
 msgstr "_Vorderfarbe setzen:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
 msgstr "Hinter_grundfarbe setzen:"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
 msgstr "_Höhe einstellen:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
 msgstr "Die Höhe horizontaler Leisten kann nicht verändert werden"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
 msgstr "_Breite einstellen:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
 msgstr "Die Breite vertikaler Leisten kann nicht verändert werden"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Zeilen _vertikal anzeigen"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "Uhreinstellungen"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
 msgstr "Zeitzone setzen auf:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "Zeile %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
 msgstr "Geben Sie gültige Parameter der Funktion »strftime« ein."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
 msgstr "Kurzhilfe:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
 msgstr "Zeit korrigieren nach Ruhemodus/Tiefschlaf"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Sie benötigen dies nur, wenn Sie für eine relativ kurze Zeitspanne (weniger "
-"als 5 Stunden) in den Ruhemodus oder Tiefschlaf gehen und Ihre sichtbare "
-"Zeit keine Sekunden enthält. Unter diesen Umständen ist es nämlich möglich, "
-"dass die Uhr von Orage die Zeit etwas verfälscht wiedergibt, wenn Sie dies "
-"nicht ausgewählt haben. (Wählt man dies aus, werden einige Fähigkeiten der "
-"CPU und das Vermeiden von Interrupts nicht mehr funktionieren.)"
+msgstr "Sie benötigen dies nur, wenn Sie für eine relativ kurze Zeitspanne (weniger als 5 Stunden) in den Ruhemodus oder Tiefschlaf gehen und Ihre sichtbare Zeit keine Sekunden enthält. Unter diesen Umständen ist es nämlich möglich, dass die Uhr von Orage die Zeit etwas verfälscht wiedergibt, wenn Sie dies nicht ausgewählt haben. (Wählt man dies aus, werden einige Fähigkeiten der CPU und das Vermeiden von Interrupts nicht mehr funktionieren.)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -496,22 +531,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Diese Programm verwendet die Funktion »strftime«, um die Zeit zu erhalten.\n"
-"Verwenden Sie beliebigen gültigen Code, um die Zeit in dem Format zu "
-"erhalten, das Sie bevorzugen.\n"
-"Einige häufig verwendete Codes sind:\n"
-"\t%A = Wochentag\t\t\t%B = Monat\n"
-"\t%c = Datum und Zeit\t\t%R = Stunde und Minuten\n"
-"\t%V = Kalenderwoche\t\t%Z = Verwendete Zeitzone\n"
-"\t%H = Stunden \t\t\t%M = Minuten\n"
-"\t%X = Ortszeit\t\t\t\t%x = Ortsdatum"
+msgstr "Diese Programm verwendet die Funktion »strftime«, um die Zeit zu erhalten.\nVerwenden Sie beliebigen gültigen Code, um die Zeit in dem Format zu erhalten, das Sie bevorzugen.\nEinige häufig verwendete Codes sind:\n\t%A = Wochentag\t\t\t%B = Monat\n\t%c = Datum und Zeit\t\t%R = Stunde und Minuten\n\t%V = Kalenderwoche\t\t%Z = Verwendete Zeitzone\n\t%H = Stunden \t\t\t%M = Minuten\n\t%X = Ortszeit\t\t\t\t%x = Ortsdatum"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
 msgstr "Uhrzeiteinstellungen für Orage"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -520,8 +545,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
 msgstr "%A, %d. %B %Y (KW %V)"
 
@@ -536,7 +560,7 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Ende"
 
@@ -544,242 +568,295 @@
 msgid "Due"
 msgstr "Fälligkeit"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
-msgstr "Datei auswählen..."
+msgstr "Datei auswählen …"
 
 #: ../src/appointment.c:680
 msgid "Sound Files"
 msgstr "Klangdateien"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Alle Dateien"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Der Termin wurde geändert."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "Möchten Sie fortfahren?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Nein, nicht verlassen"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Ja, Änderungen verwerfen und verlassen"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "Das Ende dieses Termins liegt vor dem Beginn."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "Nicht eingestellt"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Neuer Termin in diese Datei hinzufügen"
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Orage Standarddatei"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Hinzufügen des Termins fehlgeschlagen."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Beim Hinzufügen des Termins ist ein Fehler aufgetreten. Für mehr Informationen bitte die Logdatei öffnen."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Terminaktualisierung fehlgeschlagen"
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Mehr Informationen in der Logdate. (Eventuell wurde die Datei von einem anderen Programm aktualisiert?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
 msgstr "Dieser Termin wird endgültig gelöscht."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Nein, Entfernen abbrechen"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Ja, entfernen"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Wählen Sie das Datum aus"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Heute"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "Dieser Termin existiert nicht."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
-msgstr ""
-"Er wurde wahrscheinlich entfernt, bitte klicken Sie auf »Aktualisieren«."
+msgstr "Er wurde wahrscheinlich entfernt, bitte klicken Sie auf »Aktualisieren«."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Aktuelle Rubriken"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Neue Rubrik mit Farbe hinzufügen"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Rubrik:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Farben von Rubriken - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr " *** KOPIE ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "Neuer Termin - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Datei"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "Sp_eichern und schließen"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "D_uplizieren"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Speichern"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Speichern und schließen"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Wiederherstellen"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Duplizieren"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Entfernen"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Frei"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Allgemein"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Typ "
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Ereignis "
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Irgendwann stattfindendes Ereignis. Zum Beispiel:\n"
-"Treffen, Geburtstag oder Fernsehsendung."
+msgstr "Irgendwann stattfindendes Ereignis. Zum Beispiel:\nTreffen, Geburtstag oder Fernsehsendung."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "Aufgabe"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Etwas, das Sie irgendwann tun sollten. Zum Beispiel:\n"
-"Auto waschen, die neuste Orage-Version testen."
+msgstr "Etwas, das Sie irgendwann tun sollten. Zum Beispiel:\nAuto waschen, die neuste Orage-Version testen."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Protokoll"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Notieren, dass etwas passiert ist. Zum Beispiel:\n"
-"Bemerkung, dass Ihre Mutter angerufen hat oder der erste Schnee fiel."
+msgstr "Notieren, dass etwas passiert ist. Zum Beispiel:\nBemerkung, dass Ihre Mutter angerufen hat oder der erste Schnee fiel."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Titel"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "Ganztägige Veranstaltung"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Beginn"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Setzen   "
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Dauer"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "Tage"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "Stunden"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "Minuten"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Verfügbarkeit"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Ende"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "Fertig"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Rubriken"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Dies ist die besondere Kategorie, die dazu genutzt werden kann, diesen "
-"Termin in der Listenansicht farbig zu hinterlegen."
+msgstr "Dies ist die besondere Kategorie, die dazu genutzt werden kann, diesen Termin in der Listenansicht farbig zu hinterlegen."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "Farben für Rubriken aktualisieren"
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "Priorität"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Wenn Sie den 8 oder mehr einstellen wird der Termin NICHT in Listenfenstern angezeigt.\nDiese Funktion kann genutzt werden um Listenfenster übersichtlicher zu gestalten, macht das Auffinden dieses Termins jedoch schwieriger.\n(Benachrichtigungen werden normal ausgelöst.)\n(Es gibt einen nicht dokumentierten Parameter zum Ändern des Standardlimits von 8.)"
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Bemerkung"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -788,142 +865,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"Diese Kurzbefehle haben sofortige Auswirkung:\n"
-" <D> fügt das aktuelle Datum im Ortszeitformat ein\n"
-" <T> fügt die Zeit ein\n"
-" <DT fügt Datum und Zeit ein\n"
-"\n"
-"Diese werden nur dann später konvertiert, wenn auf sie gestoßen wird:\n"
-" <&Ynnnn> wird übersetzt in das aktuelle Jahr minus nnnn.\n"
-"(Dies kann z.B. bei Geburtstagserinnerungen eingesetzt werden, um das Alter "
-"der Person zu ermitteln.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Diese Kurzbefehle haben sofortige Auswirkung:\n <D> fügt das aktuelle Datum im Ortszeitformat ein\n <T> fügt die Zeit ein\n <DT fügt Datum und Zeit ein\n\nDiese werden nur dann später konvertiert, wenn auf sie gestoßen wird:\n <&Ynnnn> wird übersetzt in das aktuelle Jahr minus nnnn.\n(Dies kann z.B. bei Geburtstagserinnerungen eingesetzt werden, um das Alter der Person zu ermitteln.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "Vor dem Beginn"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "Vor dem Ende"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "Nach dem Beginn"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "Nach dem Ende"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Erinnerung"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Erinnerungszeitpunkt"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Häufig möchten Sie benachrichtigt werden:\n"
-" 1) bevor ein Ereignis beginnt\n"
-" 2) bevor eine Aufgabe endet\n"
-" 3) nach dem Start einer Aufgabe"
+msgstr "Häufig möchten Sie benachrichtigt werden:\n 1) bevor ein Ereignis beginnt\n 2) bevor eine Aufgabe endet\n 3) nach dem Start einer Aufgabe"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr "Beständige Erinnerung"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Wählen Sie diese Option, wenn Orage Sie erinnern soll, auch wenn es zum "
-"Zeitpunkt der Erinnerung nicht aktiv war."
+msgstr "Wählen Sie diese Option, wenn Orage Sie erinnern soll, auch wenn es zum Zeitpunkt der Erinnerung nicht aktiv war."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Klang"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "Benutzen"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
 msgstr "Dies markieren, um ein Tonsignal für die Erinnerung zu benutzen"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "Erinnerungsklang wiederholen"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "mal"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "Sek.-Intervall"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "Visuell"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Orage-Fenster benutzen"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
 msgstr "Wählen Sie dies aus, um die Erinnerung am Fenster von Orage zu zeigen."
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Benachrichtigung verwenden"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
 msgstr "Wählen Sie dies für eine Benachrichtigung bei der Erinnerung aus."
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "Ablaufzeit setzen"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
 msgstr "Wählen Sie dies für eine automatisch auslaufende Benachrichtigung aus."
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 = Systemvorgabezeit"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "Sekunden"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Anwendung"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
-msgstr ""
-"Wählen Sie dies aus, um eine Anwendung oder ein Skript bei der Erinnerung "
-"auszuführen."
+msgstr "Wählen Sie dies aus, um eine Anwendung oder ein Skript bei der Erinnerung auszuführen."
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -933,157 +992,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
+msgstr "Alle Escape-Sequenzen usw. müssen manuell eingegeben werden.\nDiese Zeichenkette wird einfach an die Shell zur Ausführung übergeben.\nFolgende spezielle Befehle werden zur Laufzeit ersetzt:\n\t<&T>  Terminname\n\t<&D>  Terminbeschreibung\n\t<&AT> Erinnerungszeitpunkt\n\t<&ST> Terminbeginn\n\t<&ET> Terminende"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
 msgstr "Diesen Alarm jetzt testen"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "<b>Standarderinnerung</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
-msgstr ""
-"Die aktuellen Einstellungen als Standard für zukünfige Erinnerungen speichern"
+msgstr "Die aktuellen Einstellungen als Standard für zukünfige Erinnerungen speichern"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
 msgstr "Die aktuellen Einstellungen der Standarderinnerung laden"
 
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Keine"
-
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Täglich"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Wöchentlich"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Monatlich"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Jährlich"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
 msgstr "Stündlich"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Mo"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Di"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Mi"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Do"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Fr"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "Sa"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "So"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Wiederholung"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Komplexität"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Einfach"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "Dies für ein sich regelmäßig wiederholendes Ereignis wählen"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Dies für komplexe Zeiten benutzen, wie:\n"
-" Jeden Samstag und Sonntag oder\n"
-" Der erste Dienstag jedes Monats"
+msgstr "Dies für komplexe Zeiten benutzen, wie:\n Jeden Samstag und Sonntag oder\n Der erste Dienstag jedes Monats"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Häufigkeit"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Alle"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "Mal"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Die Häufigkeit auf ein bestimmtes Intervall beschränken\n"
-" z. B. jeden dritten Tag\n"
-" Häufigkeit = täglich, Intervall = 3"
+msgstr "Die Häufigkeit auf ein bestimmtes Intervall beschränken\n z. B. jeden dritten Tag\n Häufigkeit = täglich, Intervall = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Beschränkung"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Immer wiederholen"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Wiederholen "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Wiederholen bis "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Wochentage"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "Welcher Tag"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1091,298 +1139,297 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Wochentag für monat- oder jährliche Ereignisse wählen\n"
-" Zum Beispiel:\n"
-" Zweiter Mittwoch jedes Monats:\n"
-"\tHäufigkeit = Monatlich,\n"
-"\tWochentage = nur Mittwoch wählen,\n"
-"\tWelcher Tag = 2 der Nummer unter Mittwoch markieren"
+msgstr "Wochentag für monat- oder jährliche Ereignisse wählen\n Zum Beispiel:\n Zweiter Mittwoch jedes Monats:\n\tHäufigkeit = Monatlich,\n\tWochentage = nur Mittwoch wählen,\n\tWelcher Tag = 2 der Nummer unter Mittwoch markieren"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr "Basis für Aufgaben"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"Aufgabe tritt regelmäßig auf. Beginnend mit der Startzeit und wiederholt "
-"nach jedem Intervall unabhängig davon, wann sie zuletzt beendet wurde"
+msgstr "Aufgabe tritt regelmäßig auf. Beginnend mit der Startzeit und wiederholt nach jedem Intervall unabhängig davon, wann sie zuletzt beendet wurde"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"Wiederauftreten der Aufgabe hängt von der Zeit der letzten Beendung ab und "
-"wiederholt sich ein Intervall nach der letzten Beendung.\n"
-"\n"
-"(Beachten Sie, dass Sie nichts über den vergangenen Verlauf der Aufgabe "
-"sagen können, da das Wiederauftreten sich nach jeder Beendigung ändert.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "Wiederauftreten der Aufgabe hängt von der Zeit der letzten Beendung ab und wiederholt sich ein Intervall nach der letzten Beendung.\n\n(Beachten Sie, dass Sie nichts über den vergangenen Verlauf der Aufgabe sagen können, da das Wiederauftreten sich nach jeder Beendigung ändert.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "Ausnahmen"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"Mehr Ausnahmetermine hinzufügen, indem die Kalendertage unten angeklickt "
-"werden.\n"
-"Eine Ausnahme ist entweder Ausschluss (-) oder Einschluss (+) abhängig von "
-"der auswahl.\n"
-"Entfernen über Anklicken der Daten."
+msgstr "Mehr Ausnahmetermine hinzufügen, indem die Kalendertage unten angeklickt werden.\nEine Ausnahme ist entweder Ausschluss (-) oder Einschluss (+) abhängig von der auswahl.\nEntfernen über Anklicken der Daten."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr "Ausnahmen hinzufügen"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-"Ausgeschlossene Tage sind ganze Tage, an denen der Termin nicht zutrifft"
+msgstr "Ausgeschlossene Tage sind ganze Tage, an denen der Termin nicht zutrifft"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
 msgstr "Eingeschlossene Zeit hinzufügen (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"Eingeschlossene Zeiten haben die gleiche Zeitzone wie die Startzeit, aber "
-"sie dürfen eine andere Uhrzeit haben"
+msgstr "Eingeschlossene Zeiten haben die gleiche Zeitzone wie die Startzeit, aber sie dürfen eine andere Uhrzeit haben"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
 msgstr "Termine mit Aktionen"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Ansicht"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "_Gehe zu"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Neu"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Zurück"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Heute"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Vor"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Eine Woche zurück"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Einen Tag zurück"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Einen Tag vor"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Eine Woche vor"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Auffrischen"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Schließen"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "Anzahl der anzuzeigenden Tage"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - Tagesansicht"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Ganzer Tag"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Zeit"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "Es wurden keine Zeilen ausgewählt."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Um eine Zeile zu markieren oder zu kopieren, klicken Sie sie an."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"Sie entfernen alle ausgewählten\n"
-"Termine endgültig."
+msgstr "Sie entfernen alle ausgewählten\nTermine endgültig."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Ja, entfernen"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Zurück"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Vor"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Finden"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "Tagesansicht"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Anzuzeigende Zusatztage"
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Zusätzliche Tage anzeigen:"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "nur erste Wiederholung"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Aktivieren um nur die erste Wiederholung eines Ereignisses zu sehen. Standardmäßig werden alle angezeigt.\nHinweis: Auch alle Dringenden Termine werden angezeigt.\nHinweis: Sich wiederholende Ereignisse können eher in der Liste erscheinen, da nur das erste Auftreten aufgelistet wird."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "auch alte"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Aktivieren, wenn auch alte Ereignisse angezeigt werden sollen. Kann nur aktiviert werden, wenn 'nur erste Wiederholung' aktiviert ist, um sehr lange Listen zu vermeiden.\nHinweis: Auswahl von 'zusätzliche Tage' bedeutet weiterhin ob neuere Termine aufgeührt werden."
+
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "Protokolleinträge seit:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Suchen"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "Text suchen "
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Kennzeichen"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Titel"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Klicken Sie doppelt auf die Zeile, um sie zu ändern.\n"
-"\n"
-"Kennzeichen (der Reihe nach):\n"
-"\t 1. Erinnerung: n=keine Erinnerung\n"
-"\t\t A=visuelle S=zusätzlich Klang\n"
-"\t 2. Wiederholung: n=keine Wiederholung\n"
-"\t\t D=Täglich W=Wöchentlich M=Monatlich Y=Jährlich\n"
-"\t 3. Typ: f=Frei B=Beschäftigt\n"
-"\t 4. In Datei:\n"
-"\t\tO=Orage A=Archiv F=Fremddatei\n"
-"\t 5. Art des Termins:\n"
-"\t\tE=Ereignis T=TODO J=Protokoll"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Wählen Sie das Datum aus"
+msgstr "Zur Bearbeitung doppelt klicken.\n\nMarken der Reihe nach:\n\t 1. Erinnerung: n=keine Erinnerung\n\t\t A=Erinnerung gesetzt P=Anhaltende Erinnerung gesetzt\n\t 2. Wiederholung: n=keine Wiederholung\n\t\t H=stündlich D=täglich W=wöchentlich M=monatlich Y=jährlich\n\t 3. Art: f=frei B=beschäftigt\n\t 4. Befindet sich in Datei:\n\t\tO=Orage A=Archiv F=Fremd\n\t 5. Art des Termins:\n\t\tE=Ereignis T=Aufgabe J=Tagebucheintrag"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tWiederkehr beendet, verschiebe ins Archiv."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Archivierung nicht aktiviert. Beende"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Schwellwert für Archivierung: %d Monat(e)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tEreignisse archivieren, die älter sind als: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Archiv-UID: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tVTODO nicht vollständig; nicht archiviert."
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tWiederkehrend. Endjahr: %04d, -Monat: %02d, -Tag: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Archivierung abgeschlossen\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Beginne Archiventfernung."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tSchritt 1: Setze wiederkehrende Termine zurück"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tSchritt 2: Hole archivierte Termine zurück"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Archiventfernung abgeschlossen\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Standarderinnerung"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Erinnerungsliste für Orage-Hauptdatei wurde erstellt:"
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-"Benachrichtigungsliste: %d Benachrichtigungen hinzugefügt. %d Ereignisse "
-"bearbeitet."
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Erinnerungsliste für Fremddatei wurde erstellt: %s (%s)"
+
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "%d Benachrichtigungen aktiviert. %d Ereignisse abgearbeitet."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\t%d Benachrichtigungen, von denen %d aktiv sind, gefunden (%d "
-"wiederkehrende Benachrichtigungen wurden durchsucht)."
+msgstr "\t%d Benachrichtigungen, von denen %d aktiv sind, gefunden (%d wiederkehrende Benachrichtigungen wurden durchsucht)."
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1394,13 +1441,22 @@
 
 #: ../src/ical-expimp.c:197
 msgid "... Patched timezone to Orage format."
-msgstr "... Zeitzone wurde auf das Orage-Format angepasst."
+msgstr "… Zeitzone wurde auf das Orage-Format angepasst."
 
 #: ../src/ical-expimp.c:206
 msgid "Import file preprocessing done"
 msgstr "Vorbereitungen für den Dateiimport abgeschlossen"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Externe Aktualisierung der Datei %s festgestellt."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Datei wurde extern verändert. Erinnerungen und Kalender werden aktualisiert."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Kalenderdateien"
 
@@ -1408,620 +1464,670 @@
 msgid "Current foreign files"
 msgstr "Aktuelle Fremddateien"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "Nur-Lesen"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "Lesen-Schreiben"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Keine Fremddateien *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Hinzufügen der Fremddatei fehlgeschlagen"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage kann maximal 10 fremde Dateien verwalten. Limit erreicht."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Dateiname ist leer."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Name ist leer."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Datei existiert nicht."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Dateiname existiert bereits in Orage."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Name existiert bereits in Orage."
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Import/Export"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Import"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Aus Datei:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Dateinamen durch Kommata trennen\n"
-" Anmerkung: Das Komma ist kein gültiges Zeichen für Orage-Dateinamen."
+msgstr "Dateinamen durch Kommata trennen\n Anmerkung: Das Komma ist kein gültiges Zeichen für Orage-Dateinamen."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Exportieren"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "In Datei:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Alle Termine"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Benannte Termine: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Beachten Sie, dass nur Hauptdateitermine gelesen werden.\n"
-"Archivierte und fremde Ereignisse werden nicht exportiert."
+msgstr "Beachten Sie, dass nur Hauptdateitermine gelesen werden.\nArchivierte und fremde Ereignisse werden nicht exportiert."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Beachten Sie, dass nur Hauptdateitermine gelesen werden.\n"
-"Fremde Ereignisse werden nicht exportiert."
+msgstr "Beachten Sie, dass nur Hauptdateitermine gelesen werden.\nFremde Ereignisse werden nicht exportiert."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "Sie können diese einfach aus dem Terminübersichtsfenster ziehen."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "Orage-Termin-UIDs durch Kommata getrennt."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Archiv"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Jetzt archivieren (Grenze: %d Monate)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Die Archivierungsgrenze kann durch Parameter geändert werden"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Archiv jetzt wiederherstellen"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Alle archivierten Termine in die Haupt-Oragedatei kopieren und das Archiv\n"
-"entfernen. Dies ist nützlich, wenn z. B. Orage-Termine auf ein anderes\n"
-"System kopiert werden sollen."
+msgstr "Alle archivierten Termine in die Haupt-Oragedatei kopieren und das Archiv\nentfernen. Dies ist nützlich, wenn z. B. Orage-Termine auf ein anderes\nSystem kopiert werden sollen."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Orage-Dateien"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Orage-Hauptdatei"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Aktuelle Datei"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Neue Datei"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Aktionsoptionen"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Aktuelle Datei:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Neue Datei:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Optionen für Aktionen:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Interne Orage-Datei nur umbenennen.\n"
-"Dies berührt das externe Dateisystem nicht.\n"
-"Die neue Datei muss existieren."
+msgstr "Interne Orage-Datei nur umbenennen.\nDies berührt das externe Dateisystem nicht.\nDie neue Datei muss existieren."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Kopieren"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr "Die aktuelle Datei wird kopiert und bleibt unverändert."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Verschieben"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "Die aktuelle Datei wird verschoben und vom alten Platz entfernt."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Archivdatei"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Fremddateien"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Neue Fremddatei hinzufügen"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Fremddatei:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Optionen"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Sichtbarer Name:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Nur-Lesen"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Aktivieren Sie dies, wenn Sie sichergehen wollen, dass diese Datei nie von "
-"Orage geändert wird.\n"
-"Beachten Sie, dass eine Fremddatei unter Umständen nicht mehr mit dem "
-"ursprünglich verwendeten Programm funktioniert, wenn Sie das Verändern von "
-"Fremddateien erlauben!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Aktivieren Sie dies, wenn Sie sichergehen wollen, dass diese Datei nie von Orage geändert wird.\nBeachten Sie, dass eine Fremddatei unter Umständen nicht mehr mit dem ursprünglich verwendeten Programm funktioniert, wenn Sie das Verändern von Fremddateien erlauben!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Dieser interne Name wird dem Nutzer statt des Dateinamen angezeigt."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Tauschdaten - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"Dies ist %s Version %s\n"
-"\n"
+msgstr "Dies ist %s Version %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
-"\tUnter den Bedingungen der GNU General Public License veröffentlicht.\n"
+msgstr "\tUnter den Bedingungen der GNU General Public License veröffentlicht.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tKompilliert mit GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "benutzt GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tBenutzt D-Bus zum Import.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tBenutzt D-Bus nicht. Der Import funktioniert nur teilweise.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tBenutzt libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tBenutzt libnotify nicht.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tBenutzt Archivierung.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tBenutzt Archivierung nicht.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tBenutzt Betriebssystemversion des Pakets libical.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tBenutzt lokale Orageversion des Pakets libical.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Verwendung: orage [Optionen] [Dateien]\n"
-"\n"
+msgstr "Verwendung: orage [Optionen] [Dateien]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Optionen:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\t\tOrage-Version anzeigen\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (h) \t\t\tDiesen Hilfetext anzeigen\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (p) \t\tEinstellungsformular anzeigen\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\t\tOrage sichtbar/unsichtbar machen\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) Datei [RW] \tFremddatei hinzufügen\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) datei [RW] [name] \tFremddatei hinzufügen\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) Datei \tFremddatei entfernen\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
-"--export (-e) Datei [Termin...] \tTermine aus Orage in Datei exportieren\n"
+msgstr "--export (-e) Datei [Termin …] \tTermine aus Orage in Datei exportieren\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "Dateien=Von Orage zu ladende Ical-Dateien\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tD-Bus wird nicht mit Orage mitgeliefert. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tkann ohne D-Bus [Dateien] und Fremddateioptionen (-a, -r) nur beim Start "
-"benutzt werden \n"
+msgstr "\tkann ohne D-Bus [Dateien] und Fremddateioptionen (-a, -r) nur beim Start benutzt werden \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Unbekannte Option »%s«\n"
-"\n"
+msgstr "\nUnbekannte Option »%s«\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Tauschdaten"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Ausgewähltes _Datum anzeigen"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Ausgewählte _Woche anzeigen"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Heutiger _Tag"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
 msgstr "_Weltzeit zeigen"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Kein Titel definiert"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr "Ort: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n Bemerkung:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Nie"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Titel: %s\n"
-" Beginn:\t%s\n"
-" Ende:\t%s\n"
-"Bemerkung:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "Bezeichnung: %s\n%s Beginn:\t%s\n Fällig:\t%s\nErledigt:\t%s%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Titel: %s\n"
-" Beginn:\t%s\n"
-" Ende:\t%s\n"
-"Bemerkung:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Bezeichnung: %s\n%s Beginn:\t%s\n Ende:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Zu erledigen:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Ereignisse am %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>Ereignisse von %s bis %s:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "Haupteinstellungen"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "Sie sollten immer Ihre Zeitzone angeben."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "Grenze für Archivierung (Monate)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = keine Archivierung)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Die Archivierung wird verwendet, um Zeit und Platz beim Bearbeiten von "
-"Terminen zu sparen."
+msgstr "Die Archivierung wird verwendet, um Zeit und Platz beim Bearbeiten von Terminen zu sparen."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Befehl zur Tonwiedergabe"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-"Dieser Befehl wird verwendet, um einen Klang bei Erinnerungen abzuspielen."
+msgstr "Dieser Befehl wird verwendet, um einen Klang bei Erinnerungen abzuspielen."
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "Anzeigeeinstellungen"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Kalenderfenster"
 
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Kalenderhauptfenster"
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Aussehen des Kalenders"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "Rahmen anzeigen"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "Menü anzeigen"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Monat und Jahr zeigen"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
 msgstr "Wochentagnamen anzeigen"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
 msgstr "Wochenzahlen zeigen"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Monat und Jahr zeigen"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Kalender-Infokästen"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "Liste zu erledigender Aufgaben anzeigen"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
 msgstr "Anzahl der Tage, die im Ereignisfenster angezeigt werden"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
 msgstr "0 = keine Tage anzeigen"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Kalendersichtbarkeit"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
 msgstr "Auf allen Arbeitsflächen zeigen"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
 msgstr "Immer oberhalb"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "In der Taskleiste zeigen"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "In Arbeitsflächenübersicht zeigen"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "In der Systemleiste zeigen"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "Kalender beim Start..."
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Anzeigen"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Verstecken"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Minimiert"
 
-#: ../src/parameters.c:793
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "Bei Öffnen des Kalenderfensters"
+
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Aktuelles Datum wählen"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Zuvor gewähltes Datum auswählen."
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Doppelklick auf Kalendertag zeigt"
+
+#: ../src/parameters.c:828
+msgid "Days view"
+msgstr "Tagesansicht"
+
+#: ../src/parameters.c:840
+msgid "Event list"
+msgstr "Ereignisliste"
+
+#: ../src/parameters.c:862
 msgid "Extra settings"
 msgstr "Spezialeinstellungen"
 
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr "Beim Öffnen des Kalenderfenster"
-
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "Heutiges Datum auswählen"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr "Zuletzt gewähltes Datum auswählen"
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Terminübersicht"
+
+#: ../src/parameters.c:874
+msgid "Number of extra days to show in event list"
+msgstr "Anzahl zusätzlicher Tage, die in der Ereignisliste angezeigt werden sollen"
+
+#: ../src/parameters.c:883
+msgid ""
+"This is just the default value, you can change it in the actual eventlist "
+"window."
+msgstr "Dies ist der Standardwert, Sie können ihn im jeweiligen Ereignisfenster ändern."
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Nur erste Wiederholung eines Ereignisses anzeigen "
 
-#: ../src/parameters.c:836
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Erster Tag in Wochenansicht"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Erster Tag der Woche"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Ausgewählter Tag"
+
+#: ../src/parameters.c:943
 msgid "Use dynamic tray icon"
 msgstr "Dynamisches Systemleistenlogo verwenden"
 
-#: ../src/parameters.c:841
+#: ../src/parameters.c:948
 msgid "Use dynamic icon"
 msgstr "Dynamisches Symbol verwenden"
 
-#: ../src/parameters.c:847
+#: ../src/parameters.c:954
 msgid "Dynamic icon shows current month and day of the month."
 msgstr "Das dynamische Systemleistenlogo zeigt den aktuellen Monat und Tag."
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Doppelklick auf den Hauptkalender zeigt"
+#: ../src/parameters.c:962 ../src/parameters.c:967
+msgid "Use wakeup timer"
+msgstr "Zeitschalter verwenden"
 
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr "Tagesansicht"
+#: ../src/parameters.c:973
+msgid ""
+"Use this timer if Orage has problems waking up properly after suspend or "
+"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "Verwenden Sie diesen Zeitschalter, wenn Orage Probleme hat, nach Ruhezustand oder Energiesparmodus ordnungsgemäß aufzuwachen. (z.B.: wenn das Taskleistensymbol nicht aktualisiert wird oder Benachrichtigungen nicht ausgelöst werden.)"
 
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr "Ereignisliste"
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Visuelle Standarderinnerung für Fremddateien"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr "Ereignisliste"
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Orage-Fenster"
 
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr ""
-"Anzahl zusätzlicher Tage, die in der Ereignisliste angezeigt werden sollen"
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Benachrichtigungsdienst"
 
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-"Dies ist der Standardwert, Sie können ihn im jeweiligen Ereignisfenster "
-"ändern."
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Beim Schließen immer Beenden"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Immer beenden"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:1029
 msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Standardmäßig bleibt Orage im Hintergrund geöffnet, wenn es geschlossen wird. Diese Option bewirkt, dass Orage beendet wird und beim Schließen nie im Hintergrund aktiv bleibt."
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Einstellungen für Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
 msgstr "Erstmaliges Starten von Orage. Suche Standardzeitzone."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Standardmäßige Zeitzone auf »%s« setzen"
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
 msgstr "Standardmäßige Zeitzone nicht gefunden; bitte setzen Sie sie manuell."
 
@@ -2033,41 +2139,35 @@
 msgid "Open"
 msgstr "Öffnen"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Erinnerungen - Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Später einnnern"
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "Nach gewisser Zeit wieder erinnern"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-"Drücken Sie <Ausführen>, um nach der angegebenen Zeit erinnert zu werden:"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Nächste aktiven Erinnerungen:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d Tag(e), %02d Stunde(n), %02d Minute(n) bis: %s"
+msgstr "\n%02d Tag(e), %02d Stunde(n), %02d Minute(n) bis: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Keine aktiven Erinnerungen gefunden"
+msgstr "\nKeine aktiven Erinnerungen gefunden"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2090,1537 +2190,2229 @@
 msgstr "Afrika/Algier"
 
 #: ../src/timezone_names.c:41
+msgid "Africa/Asmara"
+msgstr "Afrika/Asmara"
+
+#: ../src/timezone_names.c:42
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
-#: ../src/timezone_names.c:42
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "Afrika/Banjul"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blanryre"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "Afrika/Kairo"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "Afrika/Conakry"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_Salaam"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "Afrika/Djibouti"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "Afrika/Duala"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Aaium"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "Afrika/Freetown"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaborone"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "Afrika/Juba"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johannesburg"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "Afrika/Khartoum"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinshasa"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "Afrika/Libreville"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbashi"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "Afrika/Mogadishu"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovia"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndjamena"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamey"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nouakchott"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ouagadougou"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripoli"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunesien"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "Afrika/Windhuk"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "Amerika"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "Amerika/Anchorage"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "Amerika/Anguilla"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "Amerika/Antigua"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "Amerika/Araguaina"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "Amerika/Argentinien/Buenos_Aires"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "Amerika/Argentinien/Catamarca"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "Amerika/Argentinien/ComodRivadavia"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "Amerika/Argentinien/Cordoba"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "Amerika/Argentinien/Jujuy"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "Amerika/Argentinien/La_Rioja"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "Amerika/Argentinien/Mendoza"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "Amerika/Argentinien/Rio_Gallegos"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "Amerika/Argentinien/Salta"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "Amerika/Argentinien/San_Juan"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "Amerika/Argentinien/San_Luis"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "Amerika/Argentinien/Tucuman"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "Amerika/Argentinien/Ushuaia"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "Amerika/Asuncion"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "Amerika/Atikokan"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "Amerika/Atka"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "Amerika/Bahia"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "Amerika/Bahia_Banderas"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "Amerika/Blanc-Sablon"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "Amerika/Boise"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Cambridge_Bay"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "Amerika/Campo_Grande"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "Amerika/Cancun"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "Amerika/Carcas"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "Amerika/Catamarca"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "America/Cayenne"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "Amerika/Cayman"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "Amerika/Chicago"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "Amerika/Chihuahua"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "Amerika/Coral_Harbour"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "Amerika/Cordoba"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "Amerika/Costa_Rica"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "Amerika/Creston"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "Amerika/Cuiaba"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "Amerika/Curacao"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "Amerika/Danmarkshavn"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "Amerika/Dawson"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Dawson_Creek"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "Amerika/Dominica"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "Amerika/Ensenada"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "Amerika/Eirunepe"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "Amerika/Fort_Wayne"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glade_Bay"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "Amerika/Godthab"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "Amerika/Goose_Bay"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grand_Turk"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "Amerika/Guadeloupe"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "Amerika/Guatemala"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "Amerika/Guayaquil"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "Amerika&Guyana"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "Amerika/Halifax"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosillo"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indiana/Indianapolis"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indiana/Knox"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indiana/Marengo"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "Amerika/Indiana/Petersburg"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "Amerika/Indiana/Tell_City"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indiana/Vevay"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "Amerika/Indiana/Vincennes"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "Amerika/Indiana/Winamac"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "Amerika/Indianapolis"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "Amerika/Iqaluit"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "Amerika/Jamaika"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "Amerika/Jujuy"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "Amerika/Juneau"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentucky/Louisville"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentucky/Monticello"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "Amerika/Knox_IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "Amerika/Kralendijk"
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "Amerika/La_Paz"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Angeles"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "Amerika/Louisville"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "Amerika/Lower_Princes"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "Amerika/Maceio"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "Amerika/Managua"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "Amerika/Marigot"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "Amerika/Martinique"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "Amerika/Matamoros"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "Amerika/Mazatlan"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "Amerika/Menominee"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "Amerika/Metlakatla"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "Amerika/Mexico_City"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "Amerika/Miquelon"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "Amerika/Moncton"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "Amerika/Monterrey"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "Amerika/Montserrat"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "Amerika/Nome"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "Amerika/North_Dakota/Beulah"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "Amerika/North_Dakota/Center"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "Amerika/North_Dakota/New_Salem"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "Amerika/Noronha"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "Amerika/Ojinaga"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "Amerika/Phoenix"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Port-au-Prince"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_of_Spain"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "Amerika/Porto_Acre"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "Amerika/Porto_Velho"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Puerto_Rico"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "Amerika/Rainy_River"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Rankin_Inlet"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "Amerika/Recife"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "Amerika/Resolute"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branco"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "Amerika/Rosario"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "Amerika/Santa_Isabel"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "Amerika/Santarem"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "Amerika/Santiago"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo_Domingo"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao_Paulo"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "Amerika/Scoresbysund"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "Amerika/Shiprock"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "Amerika/Sitka"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "Amerika/St_Barthelemy"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "Amerika/St_Johns"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "Amerika/St_Kitts"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "Amerika/St_Lucia"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "Amerika/St_Thomas"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "Amerika/St_Vincent"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "Amerika/Swift_Current"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegucigalpa"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "Amerika/Thule"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Thunder_Bay"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "Amerika/Tijuana"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "Amerika/Toronto"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "Amerika/Vancouver"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "Amerika/Virgin"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "Amerika/Whitehorse"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "Amerika/Winnipeg"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "Amerika/Yakutat"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "Amerika/Yellowknife"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Antarktis"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Antarktis/Casey"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Antarktis/Davis"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktis/DumontDUrville"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Antarktis/Macquarie"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Antarktis/Mawson"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Antarktis/McMurdo"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Antarktis/Palmer"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Antarktis/Rothera"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Antarktis/Süd_pol"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "Antarktis/Syowa"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Antarktis/Vostok"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Arktis"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Arktis/Longyerbyen"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Asien"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Asien/Aden"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Asien/Almaty"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Asien/Amman"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Asien/Anadyr"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Asien/Aqtau"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Asien/Aqtobe"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "Asien/Ashgabat"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Asien/Ashkhabad"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "Asien/Baghdad"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Asien/Bahrain"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Asien/Baku"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Asien/Bangkok"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Asien/Beirut"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Asien/Bishkek"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Asien/Brunei"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Asien/Calcutta"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Asien/Choibalsan"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "Asien/Chongqing"
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "Asien/Chungking"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Asien/Colombo"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Asien/Dacca"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "Asien/Damascus"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Asien/Dhaka"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Asien/Dili"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Asien/Dubai"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Asien/Dushanbe"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Asien/Gaza"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Asien/Harbin"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Asien/Hebron"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Asien/Hong_Kong"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Asien/Ho_Chi_Minh"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Asien/Hovd"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Asien/Irkutsk"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Asien/Istanbul"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Asien/Jakarta"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Asien/Jayapura"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Asien/Jerusalem"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Asien/Kabul"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Asien/Kamchatka"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Asien/Karachi"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Asien/Kashgar"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Asien/Kathmandu"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Asien/Katmandu"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Asien/Khandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Asien/Kolkata"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Asien/Karasnoyarsk"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asien/Kuala_Lumpur"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Asien/Kuching"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Asien/Kuwait"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Asien/Mancao"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Asien/Macau"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Asien/Magadan"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Asien/Makassar"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Asien/Manila"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Asien/Muscat"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Asien/Nicosia"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Asien/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Asien/Novosibirsk"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Asien/Omsk"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Asien/Oral"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Asien/Phnom_Penh"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Asien/Pontianak"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Asien/Pyongyang"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Asien/Qatat"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Asien/Qyzylorda"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Asien/Rangoon"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Asien/Riyadh"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Asien/Riad87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Asien/Riad88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Asien/Riad89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Asien/Saigon"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Asien/Sakhalin"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Asien/Samarkand"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Asien/Seoul"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Asien/Shanghai"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Asien/Singapur"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Asien/Taipei"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Asien/Tashkent"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Asien/Tbilisi"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Asien/Tehran"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Asien/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Asien/Thimbu"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Asien/Thimphu"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Asien/Tokyo"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "Asien/Ujung_Pandang"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Asien/Ulaanbaarar"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Asien/Ulan_Bator"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Asien/Urumqi"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Asien/Ust-Nera"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Asien/Vientiane"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Asien/Vladivostok"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Asien/Yakutsk"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Asien/Yekaterinburg"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Asien/Yerevan"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Atlantik"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azoren"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermuda"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Atlantik/Kanaren"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Cape_Verde"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "Atlantik/Faeroe"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlantik/Färöer"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantik/Jan_Mayen"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "Atlantik/Madeira"
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantik/Reykjavik"
 
-#: ../src/timezone_names.c:306
+#: ../src/timezone_names.c:375
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantik/Süd_georgien"
 
-#: ../src/timezone_names.c:307
+#: ../src/timezone_names.c:376
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/St_Helena"
 
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr "Atlantik/Stanley"
+#: ../src/timezone_names.c:377
+msgid "Atlantic/Stanley"
+msgstr "Atlantik/Stanley"
+
+#: ../src/timezone_names.c:378
+msgid "Australia"
+msgstr "Australien"
+
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Australien/Canberra"
+
+#: ../src/timezone_names.c:380
+msgid "Australia/Adelaide"
+msgstr "Australien/Adelaide"
+
+#: ../src/timezone_names.c:381
+msgid "Australia/Brisbane"
+msgstr "Australien/Brisbane"
+
+#: ../src/timezone_names.c:382
+msgid "Australia/Broken_Hill"
+msgstr "Australien/Broken_Hill"
+
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Australien/Currie"
+
+#: ../src/timezone_names.c:384
+msgid "Australia/Darwin"
+msgstr "Australien/Darwin"
+
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Australien/Eucla"
+
+#: ../src/timezone_names.c:386
+msgid "Australia/Hobart"
+msgstr "Australien/Hobart"
+
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr "Australien/Lindeman"
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr "Australien/Lord_Howe"
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "Australien/Melbourne"
+
+#: ../src/timezone_names.c:390
+msgid "Australia/Perth"
+msgstr "Australien/Perth"
+
+#: ../src/timezone_names.c:391
+msgid "Australia/Sydney"
+msgstr "Australien/Sydney"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brasilien"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brasilien/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brasilien/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brasilien/Ost"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brasilien/West"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Kanada/Atlantische_Provinzen"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Kanada/Zentral"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Kanada/East-Saskatchewan"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Kanada/Östlich"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Kanada/Mountain"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Kanada/Neufundland"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Kanada/Pazifik"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Kanada/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Kanada/Yukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Chile"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Chile/Kontinental"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Chile/Osterinsel"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
 
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr "Australien"
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
 
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr "Australien/Adelaide"
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
 
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr "Australien/Brisbane"
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
 
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr "Australien/Broken_Hill"
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
 
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr "Australien/Darwin"
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
 
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr "Australien/Hobart"
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
 
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr "Australien/Lindeman"
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
 
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr "Australien/Lord_Howe"
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
 
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr "Australien/Melbourne"
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
 
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr "Australien/Perth"
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
 
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr "Australien/Sydney"
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Universalzeit"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Zulu-Zeit"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Europa"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Europa/Athen"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrad"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Europa/Berlin"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Europe/Pressburg"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Europa/Brüssel"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Europa/Bukarest"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Europa/Büsingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Europe/Kischinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Europa/Kopenhagen"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Europa/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Europa/Isle_of_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Europa/Instabul"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Europa/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Europe/Kaliningrad"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Europa/Kiew"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Europa/Lissabonn"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Europa/London"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxemburg"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Europa/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Europa/Monakko"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Europa/Moskau"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "Europe/Nicosia"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Europa/Paris"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Europa/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Europa/Prag"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Europa/Rom"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Europe/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajewo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "Europe/Simferopol"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "Europe/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Europa/Stockholm"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Europe/Tallinn"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Europe/Tirane"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Europa/Tiraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "Europe/Uschhorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Europe/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Europa/Vatikan"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Europa/Wien"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "Europe/Wilna"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Europa/Wolgograd"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "Europa/Warschau"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "Europe/Saporischschja"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "Europa/Zürich"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Indien"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "Indien/Antananarivo"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "Indien/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "Indien/Christmas"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "Indien/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "Indien/Comoro"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "Indien/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "Indien/Mahe"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "Indien/Maldives"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "Indien/Mauritius"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "Indien/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "Indien/Reunion"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Mexiko"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Mexiko/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Mexiko/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Mexiko/General"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "MittlererOsten"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Mittlerer_Osten/Riad87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Mittlerer_Osten/Riad88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Mittlerer_Osten/Riad89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Pazifik"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "Pazifik/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Pazifik/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Pazifik/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Pazifik/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "Pazifik/Osterinseln"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "Pazifik/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "Pazifik/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Pazifik/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "Pazifik/Fiji"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Pazifik/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Pazifik/Galapagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Pazifik/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "Pazifik/Guadalkanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Pazifik/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Pazifik/Honolulu"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Pazifik/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "Pazifik/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "Pazifik/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "Pazifik/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Pazifik/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Pazifik/Marquesas"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Pazifik/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Pazifik/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Pazifik/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Pazifik/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "Pazifik/Noumea"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Pazifik/Pago_Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Pazifik/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "Pazifik/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Pazifik/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "Pazifik/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Pazifik/Port_Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Pazifik/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Pazifik/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pazific/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Pazifik/Tahiti"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Pazifik/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Pazifik/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Pazifik/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Pazifik/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Pazifik/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "Pazifik/Yap"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "US"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "US/Alaska"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "USA/Aleutian"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "US/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "US/Zentral"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "USA/Östlich"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "USA/East-Indiana"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "US/Hawaii"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "USA/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "USA/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "USA/Mountain_States"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "USA/Pazifik"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "USA/Pacific-New"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "US/Samoa"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "Neuer Termin"
@@ -3638,271 +4430,26 @@
 msgstr "Wieviel Uhr und welches Datum ist jetzt?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Kalender"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Einstellungen für den Kalender Orage"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Einstellungen für Orage"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Einstellungen für die  Kalenderanwendung von Xfce 4 (Orage)"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Arbeitsplatz-Kalender"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Einstellungen für den Kalender Orage"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Kalender"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Orage-Kalender"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Titel: %s\n"
-#~ " Beginn:\t%s\n"
-#~ " Fällig:\t%s\n"
-#~ " Ende:\t%s\n"
-#~ "Bemerkung:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Sie müssen alle Escape-Zeichen selbst eingeben.\n"
-#~ " Diese Zeichenkette wird direkt der Shell zum Verarbeiten übergeben"
-
-#~ msgid "Orage clock"
-#~ msgstr "Orage-Uhr"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Erschaffer, vorheriger Koordinator"
-
-#~ msgid "Contributor"
-#~ msgstr "Mitwirkende"
-
-#~ msgid "Info"
-#~ msgstr "Info"
-
-#~ msgid "Warning"
-#~ msgstr "Warnung"
-
-#~ msgid "Error"
-#~ msgstr "Fehler"
-
-#~ msgid "Display"
-#~ msgstr "Anzeigen"
-
-#~ msgid "Set sticked"
-#~ msgstr "Klebrig"
-
-#~ msgid "Select always today"
-#~ msgstr "Immer den heutigen Tag wählen"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Wenn die Hauptseite des Kalenders gezeigt wird, wird entweder der zuletzt "
-#~ "markierte oder der aktuelle Tag markiert."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Beende Zeitanpassungsmodus"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Startet Zeitanpassungsmodus"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "Einstellen, um Minuten zu ändern"
-
-#~ msgid "Vary"
-#~ msgstr "verändern"
-
-#~ msgid "Select timezone"
-#~ msgstr "Wählen Sie eine Zeitzone"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Uhr bearbeiten "
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "Zeitzohne der Uhr eingeben\n"
-#~ "(=jede gültige Zeitzonenangabe)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Einstellungen bearbeiten"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Lokale Zeitzone eingeben. (Zeigt an, ob die Zeit am vorigen(-)oder "
-#~ "nächsten(+) Datum ist, indem +/- an die Zeit anhängt wird)"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr ""
-#~ "Geben Sie eine gültige Zeitone (TZ) ein oder wählen Sie eine aus der "
-#~ "Liste."
-
-#~ msgid "show line _1:"
-#~ msgstr "Zeige Zeile _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "Zeige Zeile _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "Zeige Zeile _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Eigenschaften"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Konnte den Befehl »orage -p« nicht ausführen"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> fügt das aktuelle, lokale Datum ein.\n"
-#~ "<T> fügt die Zeit und\n"
-#~ "<DT> fügt Datum und Zeit ein."
-
-#~ msgid "Show event list"
-#~ msgstr "Ereignisliste anzeigen"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = Statisches Symbole verwenden)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Das dynamische Symbol zeigt den Tag und den Monat. Es ist nur in der "
-#~ "Systemleiste sichtbar. Sollte diese für das dynamische Symbol zu klein "
-#~ "sein, zeigt Orage automatisch das statische Symbol an."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Kalendereinstellungen"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Kalendereinstellungen"
-
-#~ msgid ""
-#~ "Set this if you want to make sure that this file is never modified by "
-#~ "Orage."
-#~ msgstr "Dies setzen, damit die Datei nie von Orage verändert wird."
-
-#~ msgid "Not defined"
-#~ msgstr "Nicht definiert"
-
-#~ msgid "Monday"
-#~ msgstr "Montag"
-
-#~ msgid "Tuesday"
-#~ msgstr "Dienstag"
-
-#~ msgid "Wednesday"
-#~ msgstr "Mittwoch"
-
-#~ msgid "Thursday"
-#~ msgstr "Donnerstag"
-
-#~ msgid "Friday"
-#~ msgstr "Freitag"
-
-#~ msgid "Saturday"
-#~ msgstr "Samstag"
-
-#~ msgid "Sunday"
-#~ msgstr "Sonntag"
-
-#~ msgid "Ical week start day"
-#~ msgstr "Ical Wochenstarttag"
-
-#~ msgid "Days"
-#~ msgstr "Tage"
-
-#~ msgid "recur"
-#~ msgstr "wiederholend"
-
-#~ msgid "normal"
-#~ msgstr "Normal"
-
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%d.%m.%Y"
-
-#~ msgid "Calendar Files"
-#~ msgstr "Kalenderdateien"
-
-#~ msgid "Calendar borders"
-#~ msgstr "Kalender-Umrandung"
-
-#~ msgid "Hidden"
-#~ msgstr "Ausgeblendet"
-
-#~ msgid "3 months"
-#~ msgstr "3 Monate"
-
-#~ msgid "6 months"
-#~ msgstr "6 Monate"
-
-#~ msgid "1 year"
-#~ msgstr "1 Jahr"
-
-#~ msgid "Application"
-#~ msgstr "Anwendung"
-
-#~ msgid "Button Label|Orage"
-#~ msgstr "Orage"
-
-#~ msgid "Core developer"
-#~ msgstr "Hauptentwickler"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Alle Informationen zu diesem\n"
-#~ "Datum gehen verloren."
-
-#~ msgid "Clear"
-#~ msgstr "Löschen"
-
-#~ msgid "uid"
-#~ msgstr "Nutzerkennung"
-
-#~ msgid "This should not happen"
-#~ msgstr "Das sollte nicht passieren"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Konnte MCS-Kanal nicht erzeugen"
-
-#~ msgid "Open archive file..."
-#~ msgstr "Archivdatei öffnen"
-
-#~ msgid "Close archive file"
-#~ msgstr "Archivdatei schließen"
-
-#~ msgid "A time value is wrong."
-#~ msgstr "Ein Zeitwert ist falsch."
-
-#~ msgid ""
-#~ "Time values must be written 'hh:mm', for instance '09:36' or '15:23'."
-#~ msgstr ""
-#~ "Zeitwerte müssen als 'hh:mm' eingegeben werden, z.B. '09:36' oder '15:23'."
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Arbeitsplatz-Kalender"
diff -Nru orage-4.8.3/po/dz.po orage-4.12.1/po/dz.po
--- orage-4.8.3/po/dz.po	2012-01-03 12:01:01.000000000 +0000
+++ orage-4.12.1/po/dz.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,3768 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: orage 4.4.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2006-10-24 15:42+0530\n"
-"Last-Translator: wangmo sherpa <rinwanshe@yahoo.com>\n"
-"Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: dz\n"
-"Plural-Forms: nplurals=2;=plural(n!=1)\n"
-"X-Poedit-Language: Dzongkha\n"
-"X-Poedit-Country: Bhutan\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: ../globaltime/globaltime.c:100
-msgid "Raising GlobalTime window..."
-msgstr ""
-
-#: ../globaltime/globaltime.c:102
-msgid "GlobalTime window raise failed"
-msgstr ""
-
-#. ********** timezone tooltip **********
-#: ../globaltime/globaltime.c:277
-#, c-format
-msgid ""
-"%s\n"
-"click to modify clock"
-msgstr ""
-
-#: ../globaltime/globaltime.c:386
-#, fuzzy
-msgid "Localtime"
-msgstr "གནས་ཁོངས།"
-
-#: ../globaltime/globaltime.c:464
-msgid ""
-"button 1 to change preferences \n"
-"button 2 to adjust time of clocks"
-msgstr ""
-
-#: ../globaltime/globaltime.c:480
-msgid "adjust to change hour"
-msgstr ""
-
-#: ../globaltime/globaltime.c:496
-msgid ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
-msgid "NEW"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:289
-msgid "NEW COPY"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:310
-msgid "Not possible to delete the last clock."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:516
-msgid "update this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
-msgid "add new empty clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:526
-msgid "add new clock using this clock as model"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:531
-msgid "delete this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:539
-msgid "move this clock first"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:544
-msgid "move this clock left"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:549
-msgid "move this clock right"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:554
-msgid "move this clock last"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:562
-msgid "set the timezone of this clock to be local timezone"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
-msgid "close window and exit"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:590
-#, fuzzy
-msgid "Globaltime preferences "
-msgstr "ཨོ་རེཇི་ དགའ་གདམ་ཚུ། "
-
-#. -----------------------HEADING-------------------------------------------
-#: ../globaltime/gt_prefs.c:603
-msgid "Clock Parameters"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:607
-msgid "Name of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:613
-#, fuzzy
-msgid "enter name of clock"
-msgstr "ཨོ་རེཇི་ ཆེ་འཁོར། "
-
-#: ../globaltime/gt_prefs.c:616
-msgid "Timezone of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:643
-msgid "Text Formatting"
-msgstr ""
-
-#. ------------------------background-------------------------
-#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
-#, fuzzy
-msgid "Background color:"
-msgstr "གདོང་གཞི་ཚོས་གཞི་ གཞི་སྒྲིག་འབད།:(_b)"
-
-#: ../globaltime/gt_prefs.c:656
-msgid "Click to change background colour for clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
-#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
-#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
-#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
-#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
-#, fuzzy
-msgid "Use default"
-msgstr "ཨོ་རེཇི་སྔོན་སྒྲིག་དྲིལ་བརྡ།"
-
-#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
-#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
-#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
-msgid "Cross this to use default instead of selected value"
-msgstr ""
-
-#. ------------------------foreground-------------------------
-#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
-#, fuzzy
-msgid "Foreground (=text) color:"
-msgstr "གདོང་གཞི་ཚོས་གཞི་གཞི་སྒྲིག་འབད།:(_c)"
-
-#: ../globaltime/gt_prefs.c:688
-msgid "Click to change foreground colour for clock"
-msgstr ""
-
-#. ------------------------name font-------------------------
-#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
-msgid "Font for name of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:720
-msgid "Click to change font for clock name"
-msgstr ""
-
-#. ------------------------time font-------------------------
-#: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
-msgid "Font for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:753
-msgid "Click to change font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:780
-msgid "Underline name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:810
-msgid "Underline time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:850
-msgid "Text Default Formatting"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:863
-msgid "Click to change default background colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
-msgid "Cross this to use system default instead of selected color"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:896
-msgid "Click to change default text colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:929
-msgid "Click to change default font for clock name"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
-msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:963
-msgid "Click to change default font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:990
-msgid "Underline for name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:1004
-msgid "Underline for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1027
-#, fuzzy
-msgid "update preferences"
-msgstr "ཨོ་རེཇི་ དགའ་གདམ་ཚུ། "
-
-#: ../globaltime/gt_prefs.c:1062
-#, fuzzy
-msgid "Globaltime Preferences"
-msgstr "ཨོ་རེཇི་ དགའ་གདམ་ཚུ། "
-
-#. -----------------------HEADING--------------------------------------
-#: ../globaltime/gt_prefs.c:1073
-#, fuzzy
-msgid "General Preferences"
-msgstr "ཨོ་རེཇི་ དགའ་གདམ་ཚུ། "
-
-#: ../globaltime/gt_prefs.c:1077
-#, fuzzy
-msgid "Decorations:"
-msgstr "དུས་ཡུན།"
-
-#: ../globaltime/gt_prefs.c:1078
-#, fuzzy
-msgid "Standard"
-msgstr "ཟླ་ཐོ།"
-
-#: ../globaltime/gt_prefs.c:1083
-msgid "Use normal decorations"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1094
-msgid "Do not show window decorations (borders)"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1100
-#, fuzzy
-msgid "Clock size:"
-msgstr "ཁ་བསྡམས།"
-
-#: ../globaltime/gt_prefs.c:1101
-msgid "Equal"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1106
-msgid "All clocks have same size"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1111
-#, fuzzy
-msgid "Varying"
-msgstr "ཉེན་བརྡ།"
-
-#: ../globaltime/gt_prefs.c:1116
-msgid "Clock sizes vary"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1122
-#, fuzzy
-msgid "Local timezone:"
-msgstr "ཉེ་གནས་ཆུ་ཚོད་གླིང་སྡེ་འཐུ།"
-
-#: ../globaltime/timezone_selection.c:101
-#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
-msgid " Other"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:156
-#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
-#, c-format
-msgid "%d hour %d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:159
-#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, fuzzy, c-format
-msgid "%d hour"
-msgstr "ཆུ་ཚོད་ཚུ།"
-
-#: ../globaltime/timezone_selection.c:161
-#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, fuzzy, c-format
-msgid "%d mins"
-msgstr "སྐར་མ་ཚུ།"
-
-#: ../globaltime/timezone_selection.c:167
-#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
-msgid "backward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:170
-#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-#, fuzzy
-msgid "forward"
-msgstr "གདོང་བསྐྱོད།"
-
-#: ../globaltime/timezone_selection.c:194
-#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
-msgid "not changed"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:195
-#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
-msgid "not changing"
-msgstr ""
-
-#. location
-#: ../globaltime/timezone_selection.c:247
-#: ../globaltime/timezone_selection.c:252
-#: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
-#: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
-msgid "Location"
-msgstr "གནས་ཁོངས།"
-
-#: ../globaltime/timezone_selection.c:258
-#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
-msgid "GMT Offset"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:264
-#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
-msgid "Previous/Next Change"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:269
-#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
-msgid "Country"
-msgstr ""
-
-#. We are actually setting the g_par parameter. In other words
-#. we are setting the global default timezone for Orage. This is
-#. done very seldom and we do not want to allow "floating" here.
-#. This test is ugly, but it is not worth an extra parameter.
-#. this is normal appointment
-#: ../globaltime/timezone_selection.c:299
-#: ../globaltime/timezone_selection.c:309
-#: ../panel-plugin/timezone_selection.c:300
-#: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
-#: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
-msgid "Pick timezone"
-msgstr "ཆུ་ཚོད་གླིང་སྡེ་འཐུ།"
-
-#: ../globaltime/timezone_selection.c:302
-#: ../globaltime/timezone_selection.c:312
-#: ../panel-plugin/timezone_selection.c:303
-#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
-#: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
-msgid "Change mode"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:303
-#: ../globaltime/timezone_selection.c:313
-#: ../globaltime/timezone_selection.c:352
-#: ../panel-plugin/timezone_selection.c:304
-#: ../panel-plugin/timezone_selection.c:314
-#: ../panel-plugin/timezone_selection.c:353 ../src/timezone_selection.c:320
-#: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
-#: ../src/timezone_selection.c:379
-msgid "UTC"
-msgstr "ཡུ་ཊི་སི།"
-
-#. NOTE: this exists only if ical timezones are being used
-#: ../globaltime/timezone_selection.c:304
-#: ../globaltime/timezone_selection.c:357
-#: ../panel-plugin/timezone_selection.c:305
-#: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
-#: ../src/timezone_selection.c:384
-msgid "floating"
-msgstr "འཕུར་ལྡིང་།"
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "གནས་ཁོངས།"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
-msgid "Orage Globaltime"
-msgstr "ཟླ་ཐོ།"
-
-#: ../globaltime/globaltime.desktop.in.h:3
-msgid "Show clocks from different countries"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:224
-msgid "Appearance"
-msgstr "འབྱུང་སྣང་། "
-
-#. show frame
-#: ../panel-plugin/oc_config.c:229
-msgid "Show _frame"
-msgstr "གཞི་ཁྲམ་སྟོན། (_f)"
-
-#. foreground color
-#: ../panel-plugin/oc_config.c:239
-msgid "set foreground _color:"
-msgstr "གདོང་གཞི་ཚོས་གཞི་གཞི་སྒྲིག་འབད།:(_c)"
-
-#. background color
-#: ../panel-plugin/oc_config.c:253
-msgid "set _background color:"
-msgstr "གདོང་གཞི་ཚོས་གཞི་ གཞི་སྒྲིག་འབད།:(_b)"
-
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
-msgid "set _height:"
-msgstr "མཐོ་ཚད་གཞི་སྒྲིག་འབད།:(_h)"
-
-#: ../panel-plugin/oc_config.c:277
-msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:282
-msgid "set _width:"
-msgstr "རྒྱ་ཚད་གཞི་སྒྲིག་འབད།:(_w)"
-
-#: ../panel-plugin/oc_config.c:293
-msgid "Note that you can not change the width of vertical panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:316
-msgid "Clock Options"
-msgstr "ཆེ་འཁོར་ གདམ་ཁ་ཚུ། "
-
-#. timezone
-#: ../panel-plugin/oc_config.c:326
-msgid "set timezone to:"
-msgstr "ལུ་ ཆུ་ཚོད་གླིང་སྡེ་ གཞི་སྒྲིག་འབད། "
-
-#: ../panel-plugin/oc_config.c:347
-#, c-format
-msgid "Line %d:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:357
-msgid "Enter any valid strftime function parameter."
-msgstr "ཨེསི་ཊི་ཨར་ཨེཕ་ དུས་ཚོད་ལས་འགན་ཚད་བཟུང་ནུས་ལྡན་གང་རུང་བཙུགས། "
-
-#. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
-msgid "Tooltip:"
-msgstr "ལག་ཆས་ཕན་བསླབ།:"
-
-#. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
-msgid "fix time after suspend/hibernate"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:415
-msgid ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:432
-msgid ""
-"This program uses strftime function to get time.\n"
-"Use any valid code to get time in the format you prefer.\n"
-"Some common codes are:\n"
-"\t%A = weekday\t\t\t%B = month\n"
-"\t%c = date & time\t\t%R = hour & minute\n"
-"\t%V = week number\t\t%Z = timezone in use\n"
-"\t%H = hours \t\t\t\t%M = minute\n"
-"\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"འ་ནི་ལས་རིམ་གྱིས་ དུས་ཚོད་འཐོབ་ནིའི་དོན་ལུ་ ཨེསི་ཊི་ཨར་ཨེཕ་ཆུ་ཚོད་ལས་འགན་ལག་ལེན་འཐབ་ཨིན། \n"
-"ཁྱོད་ཀྱིས་ དགའ་བའི་གཞི་ཁྲམ་ནང་ དུས་ཚོད་འཐོབ་ནིའི་དོན་ལུ་ གསང་ཡིག་ནུས་ལྡན་གང་རུང་ལག་ལེན་འཐབ། \n"
-"མཐུན་མོང་གསང་ལ་ལོ་ཅིག་ནི་: \n"
-"\t%A = བདུན་ཕྲག་ཉིནམ་\t\t\t%B = ཟླཝ། \n"
-"\t%c = ཚེས་གྲངས་དང་ དུས་ཚོད་\t\t%R = ཆུ་ཚོད་དང་ སྐར་མ། \n"
-" (&t)(&m)\t%V = བདུན་ཕྲག་གི་གྱངས་ཁ་\t\t%Z = ལག་ལེན་འཐབ་བཞིན་ཡོད་པའི་ ཆུ་ཚོད་གླིང་སྡེ། \n"
-"\t%H = ཆུ་ཚོད་ཚུ་ \t\t\t\t%M = སྐར་མ། \n"
-"\t%X = ཉེ་གནས་དུས་ཚོད་\t\t\t%x = ཉེ་གནས་ཚེས་གྲངས།"
-
-#: ../panel-plugin/oc_config.c:457
-#, fuzzy
-msgid "Orage clock Preferences"
-msgstr "ཨོ་རེཇི་ དགའ་གདམ་ཚུ། "
-
-#. no lines yet
-#. TRANSLATORS: Use format characters from strftime(3)
-#. * to get the proper string for your locale.
-#. * I used these:
-#. * %A  : full weekday name
-#. * %d  : day of the month
-#. * %B  : full month name
-#. * %Y  : four digit year
-#. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
-msgid "%A %d %B %Y/%V"
-msgstr "%A %d %B %Y/%V"
-
-#: ../src/about-xfcalendar.c:40
-msgid "Maintainer"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:47
-#, fuzzy
-msgid "Manage your time with Orage"
-msgstr "ཁྱོད་ཀྱི་དུས་ཚོད་འདི་ ཨེགསི་ཨེཕ་སི་ཨི་ ༤ དང་གཅིག་ཁར་འཛིན་སྐྱོང་འབད། "
-
-#. if (gtk_toggle_button_get_active(
-#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
-#. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
-msgid "End"
-msgstr "མཇུག་བསྡུ།"
-
-#: ../src/appointment.c:333
-#, fuzzy
-msgid "Due"
-msgstr "ལྷག"
-
-#: ../src/appointment.c:493 ../src/mainbox.c:783
-msgid "Orage"
-msgstr "ཨོ་རེཇི།"
-
-#. to avoid timing problems when updating entry
-#. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
-msgid "Select a file..."
-msgstr "ཡིག་སྣོད་གཅིག་སེལ་འཐུ་འབད།..."
-
-#: ../src/appointment.c:680
-msgid "Sound Files"
-msgstr "སྒྲ་སྐད་ཡིག་སྣོད་ཚུ།"
-
-#: ../src/appointment.c:687 ../src/interface.c:290
-msgid "All Files"
-msgstr "ཡིག་སྣོད་ཚུ་ཆ་མཉམ།"
-
-#: ../src/appointment.c:739
-msgid "The appointment information has been modified."
-msgstr "དུས་སྟབས་བརྡ་དོན་འདི་ ལེགས་བཅོས་འབད་དེ་ཡོད།"
-
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
-msgid "Do you want to continue?"
-msgstr "ཁྱོད་ཀྱིས་ འཕྲོ་མཐུད་ནི་ཨིན་ན?"
-
-#: ../src/appointment.c:767
-msgid "The end of this appointment is earlier than the beginning."
-msgstr "འ་ནི་དུས་སྟབས་ཀྱི་མཇུག་འདི་ འགོ་ཐོག་ལས་ཧེ་མ་ཨིན། "
-
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-#, fuzzy
-msgid "Not set"
-msgstr "དྲན་འཛིན།"
-
-#: ../src/appointment.c:1193
-msgid "This appointment will be permanently removed."
-msgstr "འ་ནི་དུས་སྟབས་འདི་ རྟག་བརྟན་སྦེ་རྩ་བསྐྲད་གཏང་ནི་ཨིན། "
-
-#: ../src/appointment.c:1692
-#, fuzzy
-msgid "This appointment does not exist."
-msgstr "འ་ནི་དུས་སྟབས་འདི་ རྟག་བརྟན་སྦེ་རྩ་བསྐྲད་གཏང་ནི་ཨིན། "
-
-#: ../src/appointment.c:1693
-msgid "It was probably removed, please refresh your screen."
-msgstr ""
-
-#: ../src/appointment.c:1995
-#, fuzzy
-msgid "Current categories"
-msgstr "ཟླ་ཐོའི་ཡིག་སྣོད་ཚུ། "
-
-#: ../src/appointment.c:2010
-msgid "Add new category with color"
-msgstr ""
-
-#: ../src/appointment.c:2014
-msgid "Category:"
-msgstr ""
-
-#: ../src/appointment.c:2045
-msgid "Colors of categories - Orage"
-msgstr ""
-
-#: ../src/appointment.c:2092
-msgid " *** COPY ***"
-msgstr ""
-
-#: ../src/appointment.c:2353
-msgid "New appointment - Orage"
-msgstr "དུས་སྟབས་གསརཔ-ཨོ་རེཇི།"
-
-#. File menu stuff
-#. ********* File menu *********
-#. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
-msgid "_File"
-msgstr "ཡིག་སྣོད། (_F)"
-
-#: ../src/appointment.c:2388
-msgid "Sav_e and close"
-msgstr "སྲུངས་ཏེ་ཁ་བསྡམས། (_e)"
-
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
-msgid "D_uplicate"
-msgstr "ངོ་བཤུས། (_u)"
-
-#: ../src/appointment.c:2589
-msgid "Save"
-msgstr "སྲུངས།"
-
-#: ../src/appointment.c:2591
-msgid "Save and close"
-msgstr "སྲུངས་ཏེ་བསྡམས། "
-
-#: ../src/appointment.c:2596
-msgid "Revert"
-msgstr "རྒྱབ་ལོག"
-
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
-msgid "Duplicate"
-msgstr "ངོ་བཤུས།"
-
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
-msgid "Delete"
-msgstr "བཏོན་གཏང་།"
-
-#: ../src/appointment.c:2621
-msgid "Free"
-msgstr "དལཝ།"
-
-#: ../src/appointment.c:2621
-msgid "Busy"
-msgstr "ཁོམ་མེད།"
-
-#: ../src/appointment.c:2625
-msgid "General"
-msgstr "ཡོངས་ཁྱབ།"
-
-#. type
-#: ../src/appointment.c:2631
-msgid "Type "
-msgstr ""
-
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
-msgid "Event"
-msgstr ""
-
-#: ../src/appointment.c:2636
-msgid ""
-"Event that will happen sometime. For example:\n"
-"Meeting or birthday or TV show."
-msgstr ""
-
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-#, fuzzy
-msgid "Todo"
-msgstr "ད་རིས། "
-
-#: ../src/appointment.c:2642
-msgid ""
-"Something that you should do sometime. For example:\n"
-"Wash your car or test new version of Orage."
-msgstr ""
-
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
-msgid "Journal"
-msgstr ""
-
-#: ../src/appointment.c:2649
-msgid ""
-"Make a note that something happened. For example:\n"
-"Remark that your mother called or first snow came."
-msgstr ""
-
-#. title
-#: ../src/appointment.c:2656
-msgid "Title "
-msgstr "གོ་མིང་།"
-
-#: ../src/appointment.c:2671
-msgid "All day event"
-msgstr "ཉིནམ་གང་གི་བྱུང་ལས།"
-
-#. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
-msgid "Start"
-msgstr "འགོ་བཙུགས།"
-
-#: ../src/appointment.c:2697
-msgid "Set      "
-msgstr ""
-
-#: ../src/appointment.c:2718
-msgid "Duration"
-msgstr "དུས་ཡུན།"
-
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
-msgid "days"
-msgstr "ཉིནམ་ཚུ།"
-
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
-msgid "hours"
-msgstr "ཆུ་ཚོད་ཚུ།"
-
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
-msgid "mins"
-msgstr "སྐར་མ་ཚུ།"
-
-#. Availability (only for EVENT)
-#: ../src/appointment.c:2738
-msgid "Availability"
-msgstr "ཐོབ་ཚུགསཔ།"
-
-#. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
-#, fuzzy
-msgid "Completed"
-msgstr "མགོ་རྙོགས་དྲགས། "
-
-#: ../src/appointment.c:2749
-#, fuzzy
-msgid "Done"
-msgstr "ཅི་མེད།"
-
-#. categories
-#: ../src/appointment.c:2770
-msgid "Categories"
-msgstr ""
-
-#: ../src/appointment.c:2782
-msgid ""
-"This is special category, which can be used to color this appointment in "
-"list views."
-msgstr ""
-
-#: ../src/appointment.c:2787
-msgid "update colors for categories."
-msgstr ""
-
-#. priority
-#: ../src/appointment.c:2793
-msgid "Priority"
-msgstr ""
-
-#. note
-#: ../src/appointment.c:2803
-msgid "Note"
-msgstr "དྲན་འཛིན།"
-
-#: ../src/appointment.c:2824
-msgid ""
-"These shorthand commands take effect immediately:\n"
-"    <D> inserts current date in local date format\n"
-"    <T> inserts time and\n"
-"    <DT> inserts date and time.\n"
-"\n"
-"These are converted only later when they are seen:\n"
-"    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before Start"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before End"
-msgstr ""
-
-#: ../src/appointment.c:2896
-#, fuzzy
-msgid "After Start"
-msgstr "འགོ་བཙུགས།"
-
-#: ../src/appointment.c:2896
-msgid "After End"
-msgstr ""
-
-#: ../src/appointment.c:2903
-msgid "Alarm"
-msgstr "དྲིལ་བརྡ།"
-
-#. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-#, fuzzy
-msgid "Alarm time"
-msgstr "དྲིལ་བརྡ།"
-
-#: ../src/appointment.c:2933
-msgid ""
-"Often you want to get alarm:\n"
-" 1) before Event start\n"
-" 2) before Todo end\n"
-" 3) after Todo start"
-msgstr ""
-
-#: ../src/appointment.c:2938
-msgid "Persistent alarm"
-msgstr ""
-
-#: ../src/appointment.c:2940
-msgid ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
-msgstr ""
-
-#. **** Audio Alarm ****
-#: ../src/appointment.c:2949
-msgid "Sound"
-msgstr "སྒྲ་སྐད།"
-
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
-msgid "Use"
-msgstr ""
-
-#: ../src/appointment.c:2955
-msgid "Select this if you want audible alarm"
-msgstr ""
-
-#: ../src/appointment.c:2972
-msgid "Repeat alarm sound"
-msgstr "དྲིལ་བརྡ་སྒྲ་སྐད་ཡང་བསྐྱར་འབད།"
-
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
-msgid "times"
-msgstr "དུསས་ཚོད་ཚུ།"
-
-#: ../src/appointment.c:3004
-#, fuzzy
-msgid "sec interval"
-msgstr "བར་མཚམས། "
-
-#. **** Display Alarm ****
-#: ../src/appointment.c:3014
-msgid "Visual"
-msgstr ""
-
-#: ../src/appointment.c:3018
-msgid "Use Orage window"
-msgstr ""
-
-#: ../src/appointment.c:3020
-msgid "Select this if you want Orage window alarm"
-msgstr ""
-
-#: ../src/appointment.c:3032
-msgid "Use notification"
-msgstr ""
-
-#: ../src/appointment.c:3034
-msgid "Select this if you want notification alarm"
-msgstr ""
-
-#: ../src/appointment.c:3040
-#, fuzzy
-msgid "Set timeout"
-msgstr "ཆུ་ཚོད་གླིང་སྡེ་སེལ་འཐུ་འབད། "
-
-#: ../src/appointment.c:3043
-msgid "Select this if you want notification to expire automatically"
-msgstr ""
-
-#: ../src/appointment.c:3054
-msgid "0 = system default expiration time"
-msgstr ""
-
-#: ../src/appointment.c:3059
-msgid "seconds"
-msgstr ""
-
-#. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
-#, fuzzy
-msgid "Procedure"
-msgstr "རྒྱུ་དངོས་ཚུ། "
-
-#: ../src/appointment.c:3076
-#, fuzzy
-msgid "Select this if you want procedure or script alarm"
-msgstr "ཁྱོད་ལུ་ དུས་རྒྱུན་ཡང་བསྐྱར་འབད་བའི་བྱུང་ལས་དགོ་པ་ཅིན་ འ་ནི་ལག་ལེན་འཐབ།"
-
-#: ../src/appointment.c:3082
-msgid ""
-"You must enter all escape etc characters yourself.\n"
-"This string is just given to shell to process.\n"
-"The following special commands are replaced at run time:\n"
-"\t<&T>  appointment title\n"
-"\t<&D>  appointment description\n"
-"\t<&AT> alarm time\n"
-"\t<&ST> appointment start time\n"
-"\t<&ET> appointment end time"
-msgstr ""
-
-#: ../src/appointment.c:3094
-msgid "Test this alarm by raising it now"
-msgstr ""
-
-#: ../src/appointment.c:3101
-#, fuzzy
-msgid "<b>Default alarm</b>"
-msgstr "ཨོ་རེཇི་སྔོན་སྒྲིག་དྲིལ་བརྡ།"
-
-#: ../src/appointment.c:3109
-msgid "Store current settings as default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3114
-msgid "Set current settings from default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "ཅི་མེད།"
-
-#: ../src/appointment.c:3176
-msgid "Daily"
-msgstr "ཉིན་བསྟར།"
-
-#: ../src/appointment.c:3176
-msgid "Weekly"
-msgstr "བདུན་རིམ།"
-
-#: ../src/appointment.c:3176
-msgid "Monthly"
-msgstr "ཟླ་རིམ།"
-
-#: ../src/appointment.c:3176
-msgid "Yearly"
-msgstr "ལོ་བསྟར།"
-
-#: ../src/appointment.c:3176
-msgid "Hourly"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Mon"
-msgstr "མིག"
-
-#: ../src/appointment.c:3178
-msgid "Tue"
-msgstr "ལྷག"
-
-#: ../src/appointment.c:3178
-msgid "Wed"
-msgstr "ཕུར།"
-
-#: ../src/appointment.c:3178
-msgid "Thu"
-msgstr "པ།"
-
-#: ../src/appointment.c:3178
-msgid "Fri"
-msgstr "སྤེན།"
-
-#: ../src/appointment.c:3178
-msgid "Sat"
-msgstr "ཉིམ།"
-
-#: ../src/appointment.c:3178
-msgid "Sun"
-msgstr "ཟླཝ།"
-
-#: ../src/appointment.c:3183
-msgid "Recurrence"
-msgstr "སླར་འབྱུང་།"
-
-#. complexity
-#: ../src/appointment.c:3189
-msgid "Complexity"
-msgstr "མགོ་རྙོགས་དྲགས། "
-
-#: ../src/appointment.c:3192
-msgid "Basic"
-msgstr "གཞི་རིམ། "
-
-#: ../src/appointment.c:3198
-msgid "Advanced"
-msgstr "ཡར་བསྐྱོད་འབད་འབདཝ།"
-
-#: ../src/appointment.c:3202
-msgid "Use this if you want regular repeating event"
-msgstr "ཁྱོད་ལུ་ དུས་རྒྱུན་ཡང་བསྐྱར་འབད་བའི་བྱུང་ལས་དགོ་པ་ཅིན་ འ་ནི་ལག་ལེན་འཐབ།"
-
-#: ../src/appointment.c:3204
-#, fuzzy
-msgid ""
-"Use this if you need complex times like:\n"
-" Every Saturday and Sunday or \n"
-" First Tuesday every month"
-msgstr ""
-"ཁྱོད་ཀྱི་ བདུན་ཕྲག་གཉིས་པམ་ཆ་མཉམ་ ཡང་ན་:\n"
-"གཟའ་ཉིམ་དང་ཟླཝ་ཆ་མཉམ་རང་ ཡང་ན་\n"
-"ཟླ་རིམ་གྱི་ དང་པའི་གཟའ་ལྷགཔ་བཟུམ་མའི་གོ་དཀའ་བའི་ དུས་ཚོད་དགོ་པ་ཅིན།"
-
-#. frequency
-#: ../src/appointment.c:3211
-msgid "Frequency"
-msgstr "འབྱུང་ཐེངས།་"
-
-#: ../src/appointment.c:3217
-msgid "Each"
-msgstr "རེ་རེ། "
-
-#: ../src/appointment.c:3224
-msgid "occurrence"
-msgstr "བྱུང་བ། "
-
-#: ../src/appointment.c:3228
-#, fuzzy
-msgid ""
-"Limit frequency to certain interval.\n"
-" For example: Every third day:\n"
-" Frequency = Daily and Interval = 3"
-msgstr ""
-"འབྱུང་ཐེངས་འདི་ བར་མཚམས་འཚམས་ཅིག་ལས་ཚད་བཟུང་། དཔེ་འབད་བ་ཅིན་:\n"
-"ཉིནམ་གསུམ་པམ་ཆ་མཉམ་ནང་: འབྱུང་ཐེངས་ = ཉིན་བསྟར་དང་བར་མཚམས་ =༣།"
-
-#: ../src/appointment.c:3274
-msgid "Limit"
-msgstr "ཚད། "
-
-#: ../src/appointment.c:3276
-msgid "Repeat forever"
-msgstr "རྟག་པར་ཡང་བསྐྱར་འབད།"
-
-#: ../src/appointment.c:3282
-msgid "Repeat "
-msgstr "ཡང་བསྐྱར་འབད།"
-
-#: ../src/appointment.c:3298
-msgid "Repeat until "
-msgstr "ཚུན་ཚོད་ ཡང་བསྐྱར་འབད།"
-
-#. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-msgid "Weekdays"
-msgstr "བདུན་ཕྲག་ཉིནམ་ཚུ།"
-
-#: ../src/appointment.c:3323
-msgid "Which day"
-msgstr "ཉིནམ་ག་འདི།"
-
-#: ../src/appointment.c:3331
-msgid ""
-"Specify which weekday for monthly and yearly events.\n"
-" For example:\n"
-" Second Wednesday each month:\n"
-"\tFrequency = Monthly,\n"
-"\tWeekdays = check only Wednesday,\n"
-"\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"ཟླ་རིམ་དང་ ལོ་བསྟར་བྱུང་ལས་ཚུའི་དོན་ལུ་ བདུན་ཕྲག་ཉིནམ་ག་ཨིན་མི་འདི་ སེལ་འཐུ་འབད།\n"
-"དཔེ་འབད་བ་ཅིན་:\n"
-"ཟླཝ་རེ་རེ་ལུ་ གཟའ་ཕུར་བུ་གཉིས་པམ་འདི་:\n"
-"\t འབྱུང་ཐེངས་ = ཟླ་རིམ་\n"
-"\t བདུན་ཕྲག་ཉིནམ་ཚུ་ = གཟའ་ཕུར་བུ་རྐྱངམ་ཅིག་ཞིབ་དཔྱད་འབད་\n"
-"\t ཉིནམ་ག་འདི་སྨོ་ = གཟའ་ཕུར་བུ་གི་འོག་གི་ཨང་གྲངས་ལས་ ༢ སེལ་འཐུ་འབད།"
-
-#. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
-msgid "TODO base"
-msgstr ""
-
-#: ../src/appointment.c:3352
-msgid ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
-msgstr ""
-
-#: ../src/appointment.c:3354
-msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-
-#. exceptions
-#: ../src/appointment.c:3361
-#, fuzzy
-msgid "Exceptions"
-msgstr "ཆེ་འཁོར་ གདམ་ཁ་ཚུ། "
-
-#: ../src/appointment.c:3374
-msgid ""
-"Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
-"Remove by clicking the data."
-msgstr ""
-
-#: ../src/appointment.c:3379
-msgid "Add excluded date (-)"
-msgstr ""
-
-#: ../src/appointment.c:3381
-msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-
-#: ../src/appointment.c:3387
-msgid "Add included time (+)"
-msgstr ""
-
-#: ../src/appointment.c:3389
-msgid ""
-"Included times have same timezone than start time, but they may have "
-"different time"
-msgstr ""
-
-#. calendars showing the action days
-#: ../src/appointment.c:3406
-msgid "Action dates"
-msgstr ""
-
-#. ********* View menu *********
-#. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
-msgid "_View"
-msgstr "མཐོང་སྣང་།(_V)"
-
-#. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
-msgid "_Go"
-msgstr "འགྱོ། (_G)"
-
-#: ../src/day-view.c:319 ../src/event-list.c:1110
-msgid "New"
-msgstr "གསརཔ།"
-
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "ལོག"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "ད་རིས། "
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "གདོང་བསྐྱོད།"
-
-#: ../src/day-view.c:333 ../src/event-list.c:1128
-msgid "Refresh"
-msgstr "ཡང་སེལ་འབད།"
-
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
-msgid "Close"
-msgstr "ཁ་བསྡམས།"
-
-#: ../src/day-view.c:454
-msgid "Unknown"
-msgstr ""
-
-#: ../src/day-view.c:704
-msgid "       Number of days to show"
-msgstr ""
-
-#: ../src/day-view.c:935
-#, fuzzy
-msgid "Orage - day view"
-msgstr "ཟླ་ཐོ།"
-
-#. date only appointment
-#: ../src/event-list.c:190
-msgid "All day"
-msgstr "ཉིནམ་གང།"
-
-#: ../src/event-list.c:580 ../src/event-list.c:1281
-msgid "Time"
-msgstr "དུས་ཚོད།"
-
-#: ../src/event-list.c:748
-msgid "No rows have been selected."
-msgstr ""
-
-#: ../src/event-list.c:749
-msgid "Click a row to select it and after that you can copy it."
-msgstr ""
-
-#: ../src/event-list.c:918
-msgid ""
-"You will permanently remove all\n"
-"selected appointments."
-msgstr ""
-
-#: ../src/event-list.c:1130
-msgid "Find"
-msgstr ""
-
-#: ../src/event-list.c:1137
-msgid "Dayview"
-msgstr ""
-
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr ""
-
-#: ../src/event-list.c:1201
-msgid "Journal entries starting from:"
-msgstr ""
-
-#: ../src/event-list.c:1221
-#, fuzzy
-msgid "Search"
-msgstr "རེ་རེ། "
-
-#: ../src/event-list.c:1224
-msgid "Search text "
-msgstr ""
-
-#: ../src/event-list.c:1289
-msgid "Flags"
-msgstr "ཟུར་རྟགས་ཚུ། "
-
-#: ../src/event-list.c:1297
-msgid "Title"
-msgstr "མགོ་མིང་།"
-
-#: ../src/event-list.c:1323
-#, fuzzy
-msgid ""
-"Double click line to edit it.\n"
-"\n"
-"Flags in order:\n"
-"\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
-"\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
-"\t 3. Type: f=free B=Busy\n"
-"\t 4. Located in file:\n"
-"\t\tO=Orage A=Archive F=Foreign\n"
-"\t 5. Appointment type:\n"
-"\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"འདི་ ཞུན་དག་འབད་ནིའི་དོན་ལུ་ གྲལ་ཐིག་འདི་ ལོག་བལྟབ་ཨེབ་གཏང་། \n"
-"\n"
-"ཟུར་རྟགས་ཚུ་ གོ་རིམ་ནང་།:\n"
-"\t ༡. དྲིལ་བརྡ།: ཨེན་ = དྲིལ་བརྡ་མེད།\n"
-"\t\tA= མཐོང་བའི་དྲིལ་བརྡ་ ཨེསི་= ཡང་ སྒྲ་སྐད་དྲིལ་བརྡ།\n"
-"\t ༢. སླར་འབྱུང་: ཨེན་= སླར་འབྱུང་མེདཔ་\n"
-"\t\t ཌི་= ཉིན་བསྟར་ ཌབ་ལུ་= བདུན་རིམ་ ཨེམ་= ཟླ་རིམ་ ཝའི་= ལོ་བསྟར་\n"
-"\t ༣. ཡིག་དཔར་འདི་: ཨེཕ་= དེལཝ་ བི་= ཁོམ་མེད་སྦེ་བརྐྱབ།"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "ཚེས་གྲངས་འདི་འཐུ།"
-
-#. remove since it has ended
-#: ../src/ical-archive.c:267
-msgid "\tRecur ended, moving to archive file."
-msgstr ""
-
-#: ../src/ical-archive.c:329
-msgid "Archiving not enabled. Exiting"
-msgstr ""
-
-#: ../src/ical-archive.c:347
-#, fuzzy, c-format
-msgid "Archiving threshold: %d month(s)"
-msgstr "ཐེརེཤ་ཧཱོལ་ ཡིག་མཛོད། "
-
-#. yy mon day
-#: ../src/ical-archive.c:350
-#, c-format
-msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr ""
-
-#: ../src/ical-archive.c:377
-#, fuzzy, c-format
-msgid "Archiving uid: %s"
-msgstr "ཡིག་མཛོད་ཚུ།"
-
-#. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
-msgid "\tVTODO not complete; not archived"
-msgstr ""
-
-#. it is recurrent event
-#: ../src/ical-archive.c:388
-#, c-format
-msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr ""
-
-#: ../src/ical-archive.c:405
-#, fuzzy
-msgid "Archiving done\n"
-msgstr "ཡིག་མཛོད་ཚུ།"
-
-#. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
-#, fuzzy
-msgid "Starting archive removal."
-msgstr "ཐེརེཤ་ཧཱོལ་ ཡིག་མཛོད། "
-
-#: ../src/ical-archive.c:422
-msgid "\tPHASE 1: reset recurring appointments"
-msgstr ""
-
-#. PHASE 2: go through archive file and add everything back to base orage.
-#. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
-msgid "\tPHASE 2: return archived appointments"
-msgstr ""
-
-#: ../src/ical-archive.c:470
-#, fuzzy
-msgid "Archive removal done\n"
-msgstr "ཐེརེཤ་ཧཱོལ་ ཡིག་མཛོད། "
-
-#: ../src/ical-code.c:932
-msgid "Orage default alarm"
-msgstr "ཨོ་རེཇི་སྔོན་སྒྲིག་དྲིལ་བརྡ།"
-
-#: ../src/ical-code.c:3115
-#, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-
-#: ../src/ical-code.c:3117
-#, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-
-#: ../src/ical-expimp.c:123
-msgid "Starting import file preprocessing"
-msgstr ""
-
-#: ../src/ical-expimp.c:158
-msgid "... Patched DCREATED to be CREATED."
-msgstr ""
-
-#: ../src/ical-expimp.c:197
-msgid "... Patched timezone to Orage format."
-msgstr ""
-
-#: ../src/ical-expimp.c:206
-msgid "Import file preprocessing done"
-msgstr ""
-
-#: ../src/interface.c:284
-msgid "Calendar files"
-msgstr "ཟླ་ཐོའི་ཡིག་སྣོད་ཚུ། "
-
-#: ../src/interface.c:631
-msgid "Current foreign files"
-msgstr ""
-
-#: ../src/interface.c:643
-msgid "READ ONLY"
-msgstr ""
-
-#: ../src/interface.c:645
-msgid "READ WRITE"
-msgstr ""
-
-#: ../src/interface.c:663
-msgid "***** No foreign files *****"
-msgstr ""
-
-#: ../src/interface.c:974
-msgid "Import/export"
-msgstr ""
-
-#: ../src/interface.c:981
-msgid "Import"
-msgstr ""
-
-#: ../src/interface.c:986
-msgid "Read from file:"
-msgstr ""
-
-#: ../src/interface.c:1003
-msgid ""
-"Separate filenames with comma(,).\n"
-" NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-
-#: ../src/interface.c:1008
-msgid "Export"
-msgstr ""
-
-#: ../src/interface.c:1013
-#, fuzzy
-msgid "Write to file:"
-msgstr "ཡིག་མཛོད་ཡིག་སྣོད།"
-
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
-msgid "Select"
-msgstr "བཏོན་གཏང་།"
-
-#: ../src/interface.c:1037
-#, fuzzy
-msgid "All appointments"
-msgstr "དུས་སྟབས་གསརཔ།"
-
-#: ../src/interface.c:1050
-#, fuzzy
-msgid "Named appointments: "
-msgstr "དུས་སྟབས་གསརཔ།"
-
-#: ../src/interface.c:1062
-msgid ""
-"Note that only main file appointments are read.\n"
-"Archived and Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1065
-msgid ""
-"Note that only main file appointments are read.\n"
-"Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1068
-msgid "You can easily drag these from event-list window."
-msgstr ""
-
-#: ../src/interface.c:1070
-msgid "Orage appointment UIDs separated by commas."
-msgstr ""
-
-#: ../src/interface.c:1076
-#, fuzzy
-msgid "Archive"
-msgstr "ཡིག་མཛོད་ཚུ།"
-
-#: ../src/interface.c:1084
-#, fuzzy, c-format
-msgid "Archive now (threshold: %d months)"
-msgstr "ཐེརེཤ་ཧཱོལ་ ཡིག་མཛོད། "
-
-#: ../src/interface.c:1094
-msgid "You can change archive threshold in parameters"
-msgstr ""
-
-#: ../src/interface.c:1101
-msgid "Revert archive now"
-msgstr ""
-
-#: ../src/interface.c:1107
-msgid ""
-"Return all archived events into main orage file and remove arch file.\n"
-"This is useful for example when doing export and moving orage\n"
-"appointments to another system."
-msgstr ""
-
-#: ../src/interface.c:1118
-#, fuzzy
-msgid "Orage files"
-msgstr "ཨོ་རེཇི་ དགའ་གདམ་ཚུ། "
-
-#: ../src/interface.c:1125
-#, fuzzy
-msgid "Orage main calendar file"
-msgstr "ཟླ་ཐོའི་ཡིག་སྣོད་ཚུ། "
-
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "ཟླ་ཐོའི་ཡིག་སྣོད་ཚུ། "
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-#, fuzzy
-msgid "New file"
-msgstr "ཡིག་མཛོད་ཡིག་སྣོད།"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr ""
-
-#: ../src/interface.c:1156 ../src/interface.c:1222
-msgid "Rename"
-msgstr ""
-
-#: ../src/interface.c:1160
-msgid ""
-"Orage internal file rename only.\n"
-"Does not touch external filesystem at all.\n"
-"New file must exist."
-msgstr ""
-
-#: ../src/interface.c:1164 ../src/interface.c:1227
-msgid "Copy"
-msgstr ""
-
-#: ../src/interface.c:1168
-msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-
-#: ../src/interface.c:1172 ../src/interface.c:1232
-msgid "Move"
-msgstr ""
-
-#: ../src/interface.c:1176
-msgid "Current file is moved and vanishes from the old place."
-msgstr ""
-
-#: ../src/interface.c:1190
-msgid "Archive file"
-msgstr "ཡིག་མཛོད་ཡིག་སྣོད།"
-
-#: ../src/interface.c:1254
-msgid "Foreign files"
-msgstr ""
-
-#: ../src/interface.c:1261
-msgid "Add new foreign file"
-msgstr ""
-
-#: ../src/interface.c:1266
-msgid "Foreign file:"
-msgstr ""
-
-#: ../src/interface.c:1284
-#, fuzzy
-msgid "Options"
-msgstr "ཆེ་འཁོར་ གདམ་ཁ་ཚུ། "
-
-#: ../src/interface.c:1286
-msgid "Read only"
-msgstr ""
-
-#: ../src/interface.c:1294
-msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-
-#: ../src/interface.c:1308
-msgid "Exchange data - Orage"
-msgstr ""
-
-#: ../src/main.c:268
-#, c-format
-msgid ""
-"\tThis is %s version %s\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:270
-#, c-format
-msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
-
-#: ../src/main.c:271
-#, c-format
-msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
-
-#: ../src/main.c:273
-#, c-format
-msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
-
-#: ../src/main.c:276
-#, c-format
-msgid "\tUsing DBUS for import.\n"
-msgstr ""
-
-#: ../src/main.c:278
-#, c-format
-msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
-
-#: ../src/main.c:281
-#, c-format
-msgid "\tUsing libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:283
-#, c-format
-msgid "\tNot using libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:286
-#, c-format
-msgid "\tUsing automatic archiving.\n"
-msgstr ""
-
-#: ../src/main.c:288
-#, c-format
-msgid "\tNot using archiving.\n"
-msgstr ""
-
-#: ../src/main.c:291
-#, c-format
-msgid "\tUsing operating system package libical.\n"
-msgstr ""
-
-#: ../src/main.c:293
-#, c-format
-msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
-
-#: ../src/main.c:306
-#, c-format
-msgid ""
-"Usage: orage [options] [files]\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:307
-#, fuzzy, c-format
-msgid "Options:\n"
-msgstr "ཆེ་འཁོར་ གདམ་ཁ་ཚུ། "
-
-#: ../src/main.c:308
-#, c-format
-msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
-
-#: ../src/main.c:309
-#, c-format
-msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
-
-#: ../src/main.c:310
-#, c-format
-msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
-
-#: ../src/main.c:311
-#, c-format
-msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
-
-#: ../src/main.c:312
-#, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:313
-#, c-format
-msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:314
-#, c-format
-msgid ""
-"--export (-e) file [appointment...] \texport appointments from Orage to "
-"file\n"
-msgstr ""
-
-#: ../src/main.c:316
-#, c-format
-msgid "files=ical files to load into orage\n"
-msgstr ""
-
-#: ../src/main.c:318
-#, c-format
-msgid "\tdbus not included in orage. \n"
-msgstr ""
-
-#: ../src/main.c:319
-#, c-format
-msgid ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
-msgstr ""
-
-#: ../src/main.c:511
-#, c-format
-msgid ""
-"\n"
-"Unknown option %s\n"
-"\n"
-msgstr ""
-
-#: ../src/mainbox.c:287
-msgid "_Exchange data"
-msgstr ""
-
-#. Edit menu
-#: ../src/mainbox.c:298
-msgid "_Edit"
-msgstr "ཞུན་དག་འབད། (_E)"
-
-#: ../src/mainbox.c:308
-msgid "View selected _date"
-msgstr "སེལ་འཐུ་གྲུབ་ཡོད་པའི་ཚེས་གྲངས་ བལྟ། (_d)"
-
-#: ../src/mainbox.c:311
-#, fuzzy
-msgid "View selected _week"
-msgstr "སེལ་འཐུ་གྲུབ་ཡོད་པའི་ཚེས་གྲངས་ བལྟ། (_d)"
-
-#: ../src/mainbox.c:317
-msgid "Select _Today"
-msgstr "ད་རིས་སེལ་འཐུ་འབད། (_T)"
-
-#: ../src/mainbox.c:323
-#, fuzzy
-msgid "Show _Globaltime"
-msgstr "གནས་ཁོངས།"
-
-#. Help menu
-#: ../src/mainbox.c:327
-msgid "_Help"
-msgstr "གྲོགས་རམ། (_H)"
-
-#: ../src/mainbox.c:448
-#, fuzzy
-msgid "Never"
-msgstr "ནམ་ཡང་།"
-
-#: ../src/mainbox.c:453
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:460
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:546
-msgid "<b>To do:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:582
-#, c-format
-msgid "<b>Events for %s:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:593
-#, c-format
-msgid "<b>Events for %s - %s:</b>"
-msgstr ""
-
-#: ../src/parameters.c:522
-#, fuzzy
-msgid "Main settings"
-msgstr "ཟླ་ཐོ་སྒྲིག་སྟངས་ཚུ།"
-
-#: ../src/parameters.c:528
-msgid "Timezone"
-msgstr "ཆུ་ཚོད་གླིང་སྡེ།"
-
-#: ../src/parameters.c:543
-msgid "You should always define your local timezone."
-msgstr ""
-
-#: ../src/parameters.c:552
-#, fuzzy
-msgid "Archive threshold (months)"
-msgstr "ཐེརེཤ་ཧཱོལ་ ཡིག་མཛོད། "
-
-#: ../src/parameters.c:562
-msgid "(0 = no archiving)"
-msgstr ""
-
-#: ../src/parameters.c:565
-msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-
-#: ../src/parameters.c:574
-msgid "Sound command"
-msgstr ""
-
-#: ../src/parameters.c:589
-msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "བཀྲམ་སྟོན་འབད་ཡོདཔ།"
-
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
-msgstr "ཟླ་ཐོ་ སྒོ་སྒྲིག"
-
-#: ../src/parameters.c:618
-#, fuzzy
-msgid "Show borders"
-msgstr "གཞི་ཁྲམ་སྟོན། (_f)"
-
-#: ../src/parameters.c:625
-#, fuzzy
-msgid "Show menu"
-msgstr "གཞི་ཁྲམ་སྟོན། (_f)"
-
-#: ../src/parameters.c:632
-#, fuzzy
-msgid "Show month and year"
-msgstr "པེ་ཇར་ནང་སྟོན།"
-
-#: ../src/parameters.c:639
-#, fuzzy
-msgid "Show day names"
-msgstr "གཞི་ཁྲམ་སྟོན། (_f)"
-
-#: ../src/parameters.c:646
-#, fuzzy
-msgid "Show week numbers"
-msgstr "གཞི་ཁྲམ་སྟོན། (_f)"
-
-#: ../src/parameters.c:653
-#, fuzzy
-msgid "Show todo list"
-msgstr "གཞི་ཁྲམ་སྟོན། (_f)"
-
-#: ../src/parameters.c:660
-msgid "Number of days to show in event window"
-msgstr ""
-
-#: ../src/parameters.c:666
-msgid "0 = do not show event list at all"
-msgstr ""
-
-#: ../src/parameters.c:676
-msgid "Show on all desktops"
-msgstr ""
-
-#: ../src/parameters.c:683
-#, fuzzy
-msgid "Keep on top"
-msgstr "ལུ་ ཆུ་ཚོད་གླིང་སྡེ་ གཞི་སྒྲིག་འབད། "
-
-#: ../src/parameters.c:690
-msgid "Show in taskbar"
-msgstr "ལས་ཀ་ཕྲ་རིང་ནང་སྟོན།"
-
-#: ../src/parameters.c:697
-msgid "Show in pager"
-msgstr "པེ་ཇར་ནང་སྟོན།"
-
-#: ../src/parameters.c:704
-msgid "Show in systray"
-msgstr "སིསི་ཊེརེ་ནང་སྟོན། "
-
-#: ../src/parameters.c:739
-msgid "Calendar start"
-msgstr "ཟླ་ཐོ་འགོ་བཙུགས།"
-
-#: ../src/parameters.c:744
-msgid "Show"
-msgstr "སྟོན།"
-
-#: ../src/parameters.c:756
-msgid "Hide"
-msgstr "སྦ།"
-
-#: ../src/parameters.c:768
-msgid "Minimized"
-msgstr "ཆུང་ཀུ་བཟོ་བཟོཝ།"
-
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr ""
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "ཟླ་ཐོ་ སྒོ་སྒྲིག"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "ད་རིས་སེལ་འཐུ་འབད། (_T)"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr ""
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
-
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr ""
-
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr ""
-
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr ""
-
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr ""
-
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
-
-#: ../src/parameters.c:921
-msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-
-#: ../src/parameters.c:938
-msgid "Orage Preferences"
-msgstr "ཨོ་རེཇི་ དགའ་གདམ་ཚུ། "
-
-#: ../src/parameters.c:1050
-msgid "First Orage start. Searching default timezone."
-msgstr ""
-
-#: ../src/parameters.c:1069
-#, fuzzy, c-format
-msgid "Default timezone set to %s."
-msgstr "ལུ་ ཆུ་ཚོད་གླིང་སྡེ་ གཞི་སྒྲིག་འབད། "
-
-#: ../src/parameters.c:1072
-msgid "Default timezone not found, please, set it manually."
-msgstr ""
-
-#: ../src/reminder.c:562
-msgid "Reminder "
-msgstr "དྲན་བསྐུལ།"
-
-#: ../src/reminder.c:591
-msgid "Open"
-msgstr ""
-
-#: ../src/reminder.c:722
-#, fuzzy
-msgid "Reminder - Orage"
-msgstr "དྲན་བསྐུལ།"
-
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
-
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-
-#: ../src/reminder.c:1099
-msgid "Next active alarms:"
-msgstr "དྲིལ་བརྡ་ཤུགས་ལྡན་གཞན་མི་ཚུ།"
-
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
-#, c-format
-msgid ""
-"\n"
-"%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"ལུ་ %02d ཉིནམ་ %02d ཆུ་ཚོད་ %02d སྐར་མ་:%s"
-
-#: ../src/reminder.c:1166
-#, c-format
-msgid ""
-"\n"
-"No active alarms found"
-msgstr ""
-"\n"
-"དྲིལ་བརྡ་ཤུགས་ལྡན་གཅིག་་ཡང་ཐོབ་མ་ཚུགས། "
-
-#: ../src/timezone_names.c:36
-msgid "Africa"
-msgstr "ཨཕ་རི་ཀ།"
-
-#: ../src/timezone_names.c:37
-msgid "Africa/Abidjan"
-msgstr "ཨཕ་རི་ཀ་/ཨ་བིད་ཇཱན།"
-
-#: ../src/timezone_names.c:38
-msgid "Africa/Accra"
-msgstr "ཨཕ་རི་ཀ་/ཨེཀ་ར།"
-
-#: ../src/timezone_names.c:39
-msgid "Africa/Addis_Ababa"
-msgstr "ཨཕ་རི་ཀ་/ཨ་ཌིསི་ ཨ་བ་བ། (_A)"
-
-#: ../src/timezone_names.c:40
-msgid "Africa/Algiers"
-msgstr "ཨཕ་རི་ཀ་/ཨཱལ་ཇི་ཡརསི།"
-
-#: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr "ཨཕ་རི་ཀ་/ཨཱསི་མི་ར།"
-
-#: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr "ཨཕ་རི་ཀ་/བ་མ་ཀོ།"
-
-#: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr "ཨཕ་རི་ཀ་/བང་གུའི།"
-
-#: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr "ཨཕ་རི་ཀ་/བཱན་ཇཱུལ།"
-
-#: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr "ཨཕ་རི་ཀ་/བིསི་སའོ།"
-
-#: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr "ཨཕ་རི་ཀ་/བེ་ལེན་ཊ་ཡེར།"
-
-#: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr "ཨཕ་རི་ཀ་/བ་ར་ཛ་བི་ལི།"
-
-#: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr "ཨཕ་རི་ཀ་/བུ་ཇུམ་བུ་ར།"
-
-#: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr "ཨཕ་རི་ཀ་/ཀའི་རོ།"
-
-#: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr "ཨཕ་རི་ཀ་/ཀ་ས་བེ་ལེན་ཀ།"
-
-#: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr "ཨཕ་རི་ཀ་/སིའུ་ཊ།"
-
-#: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr "ཨཕ་རི་ཀ་/ཀོ་ནཀ་རི།"
-
-#: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr "ཨཕ་རི་ཀ་/ཌ་ཀར།"
-
-#: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr "ཨཕ་རི་ཀ་/དར་ ཨེསི་ ས་ལམ། (_e)(_S)"
-
-#: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr "ཨཕ་རི་ཀ་/ཇི་བའོ་ཊི། "
-
-#: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr "ཨཕ་རི་ཀ་/དུ་ཝ་ལ།"
-
-#: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr "ཨཕ་རི་ཀ་/ཨེལ་ ཨའིན། (_A)"
-
-#: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr "ཨཕ་རི་ཀ་/ཕིརི་ཊའུན།"
-
-#: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr "ཨཕ་རི་ཀ་/ག་བོ་རོ་ནི།"
-
-#: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr "ཨཕ་རི་ཀ་/ཧ་ར་རི།"
-
-#: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr "ཨཕ་རི་ཀ་/ཇོ་ཧ་ནེསི་བཱརག"
-
-#: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr "ཨཕ་རི་ཀ་/ཀམ་པ་ལ།"
-
-#: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr "ཨཕ་རི་ཀ་/ཁར་ཊོམ།"
-
-#: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr "ཨཕ་རི་ཀ་/ཀི་ག་ལི།"
-
-#: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr "ཨཕ་རི་ཀ་/ཀིན་ཤ་ཡ།"
-
-#: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr "ཨཕ་རི་ཀ་/ལ་གོསི།"
-
-#: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr "ཨཕ་རི་ཀ་/ལི་བར་བི་ལི།"
-
-#: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr "ཨཕ་རི་ཀ་/ལཱོམ།"
-
-#: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr "ཨཕ་རི་ཀ་/ལའུན་ཌ།"
-
-#: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr "ཨཕ་རི་ཀ་/ལུ་བུམ་བ་ཤི།"
-
-#: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr "ཨཕ་རི་ཀ་/ལུ་ས་ཀ།"
-
-#: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr "ཨཕ་རི་ཀ་/མ་ལ་བོ།"
-
-#: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr "ཨཕ་རི་ཀ་/མ་པུ་ཊོ།"
-
-#: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr "ཨཕ་རི་ཀ་/མ་སི་རུ།"
-
-#: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr "ཨཕ་རི་ཀ་/བ་བ་ནི།"
-
-#: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr "ཨཕ་རི་ཀ་/མོ་ག་དི་ཤུ།"
-
-#: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr "ཨཕ་རི་ཀ་/མཱོན་རོ་བི་ཡ།"
-
-#: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr "ཨཕ་རི་ཀ་/ནའི་རོ་བི།"
-
-#: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr "ཨཕ་རི་ཀ་/ཇ་མི་ན།"
-
-#: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr "ཨཕ་རི་ཀ་/ནི་ཡ་མེ།"
-
-#: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr "ཨཕ་རི་ཀ་/ནའུཀ་ཅོཊི།"
-
-#: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr "ཨཕ་རི་ཀ་/ཨོ་འ་ག་དོའུ་གོའུ།"
-
-#: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr "ཨཕ་རི་ཀ་/པོར་ཊོ་ ནོ་བོ། (_N)"
-
-#: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr "ཨཕ་རི་ཀ་/སའོ་ ཊོམ། (_T)"
-
-#: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr "ཨཕ་རི་ཀ་/ཊིམ་བུཀ་ཊུ།"
-
-#: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr "ཨཕ་རི་ཀ་/ཊི་པོ་ལི།"
-
-#: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr "ཨཕ་རི་ཀ་/ཊུ་ནིསི།"
-
-#: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr "ཨཕ་རི་ཀ་/ཝིནཌི་ཧོཡིཀ།"
-
-#: ../src/timezone_names.c:89
-msgid "America"
-msgstr "ཨ་མི་རི་ཀ།"
-
-#: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr "ཨ་མི་རི་ཀ་/ཨ་ཌཀ།"
-
-#: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr "ཨ་མི་རི་ཀ་/ཨེན་ཀོ་རེཇི།"
-
-#: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr "ཨ་མི་རི་ཀ་/ཨེང་གུའི་ལ།"
-
-#: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr "ཨ་མི་རི་ཀ་/ཨེན་ཊི་གུ་འ།"
-
-#: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr "ཨ་མི་རི་ཀ་/ཨ་ར་གུའི་ན།"
-
-#: ../src/timezone_names.c:95
-#, fuzzy
-msgid "America/Argentina/Buenos_Aires"
-msgstr "ཨ་མི་རི་ཀ་/བུས་ནོསི་ ཨེ་རེསི། (_A)"
-
-#: ../src/timezone_names.c:96
-#, fuzzy
-msgid "America/Argentina/Catamarca"
-msgstr "ཨ་མི་རི་ཀ་/ཀེ་ཊ་མར་ཀ།"
-
-#: ../src/timezone_names.c:97
-#, fuzzy
-msgid "America/Argentina/Cordoba"
-msgstr "ཨ་མི་རི་ཀ་/ཀོར་ཌོ་བ།"
-
-#: ../src/timezone_names.c:98
-#, fuzzy
-msgid "America/Argentina/Jujuy"
-msgstr "ཨ་མི་རི་ཀ་/ཇུ་ཇུ་ཡེ།"
-
-#: ../src/timezone_names.c:99
-#, fuzzy
-msgid "America/Argentina/Mendoza"
-msgstr "ཨ་མི་རི་ཀ་/མེན་ཌོ་ཛ།"
-
-#: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr "ཨ་མི་རི་ཀ་/ཨ་རུ་བ།"
-
-#: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr "ཨ་མི་རི་ཀ་/ཨ་སཱུན་སི་འན།"
-
-#: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr "ཨ་མི་རི་ཀ་/བར་བ་ཌོསི།"
-
-#: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr "ཨ་མི་རི་ཀ་/བེ་ལེམ།"
-
-#: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr "ཨ་མི་རི་ཀ་/བེ་ལིཛི།"
-
-#: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr "ཨ་མི་རི་ཀ་/བོ་འ་ བིསི་ཊ། (_V)"
-
-#: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr "ཨ་མི་རི་ཀ་/བོ་གོ་ཊ།"
-
-#: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr "ཨ་མི་རི་ཀ་/བོ་ཡེསི།"
-
-#: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr "ཨ་མི་རི་ཀ་/བུས་ནོསི་ ཨེ་རེསི། (_A)"
-
-#: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr "ཨ་མི་རི་ཀ་/ཀེམ་བིརིཇི་ བེ། (_B)"
-
-#: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr "ཨ་མི་རི་ཀ་/ཀེན་ཀཱུན།"
-
-#: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr "ཨ་མི་རི་ཀ་/ཀ་ར་ཀཱསི།"
-
-#: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr "ཨ་མི་རི་ཀ་/ཀེ་ཊ་མར་ཀ།"
-
-#: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr "ཨ་མི་རི་ཀ་/ཀེ་ཡེན་ནི།"
-
-#: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr "ཨ་མི་རི་ཀ་/ཀེ་མན།"
-
-#: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr "ཨ་མི་རི་ཀ་/ཤི་ཀ་གོ།"
-
-#: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr "ཨ་མི་རི་ཀ་/ཅི་ཧུ་འ་ཧུ་འ།"
-
-#: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr "ཨ་མི་རི་ཀ་/ཀོར་ཌོ་བ།"
-
-#: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr "ཨ་མི་རི་ཀ་/ཀཱོསི་ཊ་རི་ཀ། (_R)"
-
-#: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr "ཨ་མི་རི་ཀ་/ཀུའི་བ། "
-
-#: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr "ཨ་མི་རི་ཀ་/ཀུ་ར་ཀའོ།"
-
-#: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr "ཨ་མི་རི་ཀ་/དའུ་སཱན།"
-
-#: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr "ཨ་མི་རི་ཀ་/དའུ་སཱན་ ཀིརིཀ། (_C)"
-
-#: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr "ཨ་མི་རི་ཀ་/ཌེན་བར།"
-
-#: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr "ཨ་མི་རི་ཀ་/ཌེ་ཊོའིཊི།"
-
-#: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr "ཨ་མི་རི་ཀ་/ཌོ་མི་ནི་ཀ།"
-
-#: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr "ཨ་མི་རི་ཀ་/ཨིཌི་མཱོན་ཊོན།"
-
-#: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr "ཨ་མི་རི་ཀ་/ཨི་རུ་ནེ་པི།"
-
-#: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr "ཨ་མི་རི་ཀ་/ཨེལ་ སེལ་བེ་ཌོར། (_S)"
-
-#: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr "ཨ་མི་རི་ཀ་/ཕོར་ཊ་ལི་ཛ།"
-
-#: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr "ཨ་མི་རི་ཀ་/གེལེསི་ བེ། (_B)"
-
-#: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr "ཨ་མི་རི་ཀ་/གོཌི་ཐབ།"
-
-#: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr "ཨ་མི་རི་ཀ་/གུསི་ བེ། (_B)"
-
-#: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr "ཨ་མི་རི་ཀ་/གེརེནཌི་ ཊརཀ། (_T)"
-
-#: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr "ཨ་མི་རི་ཀ་/གིརི་ན་ཌ།"
-
-#: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr "ཨ་མི་རི་ཀ་/གུ་འ་དི་ལོཔ།"
-
-#: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr "ཨ་མི་རི་ཀ་/གའུ་ཏི་མ་ལ།"
-
-#: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr "ཨ་མི་རི་ཀ་/གུ་འ་ཡ་ཀུཡིལ། "
-
-#: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr "ཨ་མི་རི་ཀ་/གུ་ཡ་ན།"
-
-#: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr "ཨ་མི་རི་ཀ་/ཧེ་ལི་ཕེགསི།"
-
-#: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr "ཨ་མི་རི་ཀ་/ཧ་བ་ན།"
-
-#: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr "ཨ་མི་རི་ཀ་/ཧར་མོ་སི་ལོ།"
-
-#: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr "ཨ་མི་རི་ཀ་/ཨིན་དི་ཡ་ན་/ཨིན་དི་ཡ་ན་པོ་ལིསི། "
-
-#: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr "ཨ་མི་རི་ཀ་/ཨིན་དི་ཡ་ན་/ནོགསི།"
-
-#: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr "ཨ་མི་རི་ཀ་/ཨིན་དི་ཡ་ན་/མེ་རིན་གོ།"
-
-#: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr "ཨ་མི་རི་ཀ་/ཨིན་དི་ཡ་ན་/བི་བེ།"
-
-#: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr "ཨ་མི་རི་ཀ་/ཨིན་དི་ཡ་ན་པོ་ལིསི།"
-
-#: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr "ཨ་མི་རི་ཀ་/ཨི་ནུ་བིཀ།"
-
-#: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr "ཨ་མི་རི་ཀ་/ཨི་ཀ་ལུའིཊི།"
-
-#: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr "ཨ་མི་རི་ཀ་/ཇ་མའི་ཀ།"
-
-#: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr "ཨ་མི་རི་ཀ་/ཇུ་ཇུ་ཡེ།"
-
-#: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr "ཨ་མི་རི་ཀ་/ཇུ་ནིའུ།"
-
-#: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr "ཨ་མི་རི་ཀ་/ཀེན་ཊ་ཀི་/ལོའིསི་བི་ལི།"
-
-#: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr "ཨ་མི་རི་ཀ་/ཀེན་ཊ་ཀི་/མཱོན་ཊི་སེ་ལོ།"
-
-#: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr "ཨ་མི་རི་ཀ་/ལ་ པཛི། (_P)"
-
-#: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr "ཨ་མི་རི་ཀ་/ལི་མ།"
-
-#: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr "ཨ་མི་རི་ཀ་/ལའོསི་ ཨེན་ཇི་ལེསི། (_A)"
-
-#: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr "ཨ་མི་རི་ཀ་/ལོའིསི་བི་ལི།"
-
-#: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr "ཨ་མི་རི་ཀ་/མེ་སིའོ།"
-
-#: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr "ཨ་མི་རི་ཀ་/མ་ན་གུ་འ།"
-
-#: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr "ཨ་མི་རི་ཀ་/མ་ནའོསི།"
-
-#: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr "ཨ་མི་རི་ཀ་/མར་ཊི་ནིཀ།"
-
-#: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr "ཨ་མི་རི་ཀ་/མ་ཛཊི་ལན།"
-
-#: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr "ཨ་མི་རི་ཀ་/མེན་ཌོ་ཛ།"
-
-#: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr "ཨ་མི་རི་ཀ་/མེ་ནོ་མི་ནི། "
-
-#: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr "ཨ་མི་རི་ཀ་/མེ་རི་ཌ།"
-
-#: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr "ཨ་མི་རི་ཀ་/མེག་སི་ཀོ་ གྲོང་སྡེ། (_C)"
-
-#: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr "ཨ་མི་རི་ཀ་/མི་ཀུས་ལཱོན།"
-
-#: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr "ཨ་མི་རི་ཀ་/མཱོན་ཊི་རེ།"
-
-#: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr "ཨ་མི་རི་ཀ་/མཱོན་ཊི་ཝི་ཌོ།"
-
-#: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr "ཨ་མི་རི་ཀ་/མཱོན་ཊེརལ།"
-
-#: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr "ཨ་མི་རི་ཀ་/མཱོནཊི་སི་རཊི། "
-
-#: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr "ཨ་མི་རི་ཀ་/ན་སའོ།"
-
-#: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr "ཨ་མི་རི་ཀ་/ནིའུ་ ཡོརོཀ། (_Y)"
-
-#: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr "ཨ་མི་རི་ཀ་/ནི་པི་གཱོན།"
-
-#: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr "ཨ་མི་རི་ཀ་/ནོམ།"
-
-#: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr "ཨ་མི་རི་ཀ་/ནོ་རོན་ཧ།"
-
-#: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr "ཨ་མི་རི་ཀ་/པ་ན་མ།"
-
-#: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr "ཨ་མི་རི་ཀ་/པང་ནིར་ཊུང་།"
-
-#: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr "ཨ་མི་རི་ཀ་/པེ་ར་མེ་རི་བོ།"
-
-#: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr "ཨ་མི་རི་ཀ་/ཕོའི་ནིགསི། "
-
-#: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr "ཨ་མི་རི་ཀ་/པོརོཊི་-ཨའུ་-པིརིནསི། "
-
-#: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr "ཨ་མི་རི་ཀ་/པོརོཊི་ ཨོཕ་ ཨིཔེན། (_o)(_S)"
-
-#: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr "ཨ་མི་རི་ཀ་/པོར་ཊོ་ བེལ་ལྷོ། (_V)"
-
-#: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr "ཨ་མི་རི་ཀ་/པུར་ཊོ་ རི་ཀོ། (_R)"
-
-#: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr "ཨ་མི་རི་ཀ་/རེ་ནི་ རི་བར། (_R)"
-
-#: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr "ཨ་མི་རི་ཀ་/རཱན་ཀིན་ ཨིན་ལེཊི། (_I)"
-
-#: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr "ཨ་མི་རི་ཀ་/རི་སའིཕ། "
-
-#: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr "ཨ་མི་རི་ཀ་/རེ་ཇི་ན།"
-
-#: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr "ཨ་མི་རི་ཀ་/རིའོ་ བེརེན་ཀོ། (_B)"
-
-#: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr "ཨ་མི་རི་ཀ་/རོ་ས་རིའོ།"
-
-#: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr "ཨ་མི་རི་ཀ་/སཱན་ཏི་ཡ་གོ།"
-
-#: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr "ཨ་མི་རི་ཀ་/སཱན་ཏོ་ ཌོ་མིང་གོ། (_D)"
-
-#: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr "ཨ་མི་རི་ཀ་/སའོ་ པའོ་ལོ། (_P)"
-
-#: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr "ཨ་མི་རི་ཀ་/ཨིསི་ཀོརསི་བཱའི་སཱནཌི།"
-
-#: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr "ཨ་མི་རི་ཀ་/ཨིཔ་རོཀ།"
-
-#: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr "ཨ་མི་རི་ཀ་/སེནཊི་ ཇཱོནསི། (_J)"
-
-#: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr "ཨ་མི་རི་ཀ་/སེནཊི་ ཀིཊིསི། (_K)"
-
-#: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr "ཨ་མི་རི་ཀ་/སེནཊི་ ལུ་སི་ཡ། (_L)"
-
-#: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr "ཨ་མི་རི་ཀ་/སེནཊི་ ཐོ་མཱསི། (_T)"
-
-#: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr "ཨ་མི་རི་ཀ་/སེནཊི་ བིན་སེནཊི། (_V)"
-
-#: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr "ཨ་མི་རི་ཀ་/སུཡིཕཊི་ ཀ་རེནཊི། (_C)"
-
-#: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr "ཨ་མི་རི་ཀ་/ཏེ་གུ་ཅི་གཱལ་པ།"
-
-#: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr "ཨ་མི་རི་ཀ་/ཐུ་ལི།"
-
-#: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr "ཨ་མི་རི་ཀ་/ཐཱན་ཌར་ བེ། (_B)"
-
-#: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr "ཨ་མི་རི་ཀ་/ཏི་ཇུ་འ་ན།"
-
-#: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr "ཨ་མི་རི་ཀ་/ཏོར་ཏོ་ལ།"
-
-#: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr "ཨ་མི་རི་ཀ་/བེན་ཀོ་བར།"
-
-#: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr "ཨ་མི་རི་ཀ་/ཝའིཊི་ཧོརསི།"
-
-#: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr "ཨ་མི་རི་ཀ་/ཝིན་ནི་པེག"
-
-#: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr "ཨ་མི་རི་ཀ་/ཡ་ཀུ་ཊེཊི།"
-
-#: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr "ཨ་མི་རི་ཀ་/ཡེ་ལོ་ནའིཕ།"
-
-#: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr "ཨེན་ཊར་ཊི་ཀ།"
-
-#: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr "ཨེན་ཊར་ཊི་ཀ་/ཀེ་སེ།"
-
-#: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr "ཨེན་ཊར་ཊི་ཀ་/ཌེ་བིསི།"
-
-#: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr "ཨེན་ཊར་ཊི་ཀ་/ཌུ་མཱོནཊི་ཌུར་བི་ལི།"
-
-#: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr "ཨེན་ཊར་ཊི་ཀ་/མའོ་སཱན།"
-
-#: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr "ཨེན་ཊར་ཊི་ཀ་/མེཀ་མུར་དོ།"
-
-#: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr "ཨེན་ཊར་ཊི་ཀ་/པཱལ་མར།"
-
-#: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr "ཨེན་ཊར་ཊི་ཀ་/ལྷོ་རྩེ།(_P)"
-
-#: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr "ཨེན་ཊར་ཊི་ཀ་/སི་ཡོ་ཝ།"
-
-#: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr "ཨེན་ཊར་ཊི་ཀ་/བཱོསི་ཊོཀ།"
-
-#: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr "ཨར་ཊིཀ།"
-
-#: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr "ཨར་ཏིཀ་/ལོང་ཨི་ཡར་བིན།"
-
-#: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr "ཨེ་ཤི་ཡ།"
-
-#: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr "ཨེ་ཤི་ཡ་/ཨེ་ཌེན།"
-
-#: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr "ཨེ་ཤི་ཡ་/ཨཱལ་མ་ཊི།"
-
-#: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr "ཨེ་ཤི་ཡ་/ཨམ་མཱན།"
-
-#: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr "ཨེ་ཤི་ཡ་/ཨ་ན་ཌིར།"
-
-#: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr "ཨེ་ཤི་ཡ་/ཨཀ་ཊའུ།"
-
-#: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr "ཨེ་ཤི་ཡ་/ཨཀ་ཊོ་བི།"
-
-#: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr "ཨེ་ཤི་ཡ་/ཨེཤི་ག་བཊི།"
-
-#: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr "ཨེ་ཤི་ཡ་/བཱག་དཱད།"
-
-#: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr "ཨེ་ཤི་ཡ་/བཱ་རེན།"
-
-#: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr "ཨེ་ཤི་/བ་ཀུ།"
-
-#: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr "ཨེ་ཤི་ཡ་/བེང་ཀོཀ།"
-
-#: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr "ཨེ་ཤི་ཡ་/བི་རུཊི།"
-
-#: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr "ཨེ་ཤི་ཡ་/བིཤ་ཀེཀ།"
-
-#: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr "ཨེ་ཤི་ཡ་/བུརུ་ན་ཡེ།"
-
-#: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr "ཨེ་ཤི་ཡ་/ཀཱལ་ཀ་ཊ།"
-
-#: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr "ཨེ་ཤི་ཡ་/ཅུང་ཀིང་། "
-
-#: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr "ཨེ་ཤི་ཡ་/ཀོ་ལོམ་བོ། "
-
-#: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr "ཨེ་ཤི་ཡ་/ད་མཱསི་ཀཱསི།"
-
-#: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr "ཨེ་ཤི་ཡ་/ཌ་ཀ།"
-
-#: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr "ཨེ་ཤི་ཡ་/དི་ལི།"
-
-#: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr "ཨེ་ཤི་ཡ་/དུ་བ་ཡེ།"
-
-#: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr "ཨེ་ཤི་ཡ་/དུ་ཤཱན་བི།"
-
-#: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr "ཨེ་ཤི་ཡ་/ག་ཛ།"
-
-#: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr "ཨེ་ཤི་ཡ་/ཧར་བིན། "
-
-#: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr "ཨེ་ཤི་ཡ་/ཧོང་ཀོང་།"
-
-#: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr "ཨེ་ཤི་ཡ་/ཧོབ་ཌི།"
-
-#: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr "ཨེ་ཤི་ཡ་/ཨིར་ཀུཊིསི།"
-
-#: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr "ཨེ་ཤི་ཡ་/ཨིསི་ཏཱན་བཱུལ།"
-
-#: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr "ཨེ་ཤི་ཡ་/ཇ་ཀར་ཏ།"
-
-#: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr "ཨེ་ཤི་ཡ་/ཇ་ཡ་པུ་ར།"
-
-#: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr "ཨེ་ཤི་ཡ་/ཇོ་རུ་ས་ལིམ། "
-
-#: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr "ཨེ་ཤི་ཡ་/ཀ་བཱུལ།"
-
-#: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr "ཨེ་ཤི་ཡ་/ཀམ་ཅཊ་ཀ།"
-
-#: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr "ཨེ་ཤི་ཡ་/ཀ་ར་ཅི།"
-
-#: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr "ཨེ་ཤི་ཡ་/ཀཱཤ་གར།"
-
-#: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr "ཨེ་ཤི་ཡ་/ཀཊ་མཱན་ཌུ།"
-
-#: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr "ཨེ་ཤི་ཡ་/ཀེརེསི་ནོ་ཡརསིཀ།"
-
-#: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr "ཨེ་ཤི་ཡ་/ཀུ་འ་ལ་ ལམ་པུར། (_L)"
-
-#: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr "ཨེ་ཤི་ཡ་/ཀུ་ཅིང་།"
-
-#: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr "ཨེ་ཤི་ཡ་/ཀུ་ཝེཊི།"
-
-#: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr "ཨེ་ཤི་ཡ་/མ་ཀའོ།"
-
-#: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr "ཨེ་ཤི་ཡ་/མ་ག་དཱན།"
-
-#: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr "ཨེ་ཤི་ཡ་/མ་ནི་ལ།"
-
-#: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr "ཨེ་ཤི་ཡ་/མཱུསི་ཀཊི།"
-
-#: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr "ཨེ་ཤི་ཡ་/ནི་ཀོ་སི་ཡ།"
-
-#: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr "ཨེ་ཤི་ཡ་/ནོ་བོ་སི་བིརསིཀ།"
-
-#: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr "ཨེ་ཤི་ཡ་/ཨོམསིཀ།"
-
-#: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr "ཨེ་ཤི་ཡ་/ནོམ་ པེན། (_P)"
-
-#: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr "ཨེ་ཤི་ཡ་/པཱོན་ཊི་ཡ་ནཀ།"
-
-#: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr "ཨེ་ཤི་ཡ་/པི་འོང་ཡང་།"
-
-#: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr "ཨེ་ཤི་ཡ་/ཀ་ཊར།"
-
-#: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr "ཨེ་ཤི་ཡ་/རང་གཱུན།"
-
-#: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr "ཨེ་ཤི་ཡ་/རི་ཡཱད།"
-
-#: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr "ཨེ་ཤི་ཡ་/སའི་གཱོན། "
-
-#: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr "ཨེ་ཤི་ཡ་/ས་མར་ཀཱནཌི།"
-
-#: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr "ཨེ་ཤི་ཡ་/སི་འོལ།"
-
-#: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr "ཨེ་ཤི་ཡ་/ཤང་ཧ་ཡེ།"
-
-#: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr "ཨེ་ཤི་ཡ་/སིང་ག་པོར།"
-
-#: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr "ཨེ་ཤི་ཡ་/ཏའི་པི།"
-
-#: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr "ཨེ་ཤི་ཡ་/ཏཤི་ཀེནཊི།"
-
-#: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr "ཨེ་ཤི་ཡ་/ཊི་བི་ལི་སི།"
-
-#: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr "ཨེ་ཤི་ཡ་/ཏེ་རཱན།"
-
-#: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr "ཨེ་ཤི་ཡ་/ཐིམ་ཕུག"
-
-#: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr "ཨེ་ཤི་ཡ་/ཊོ་ཀི་ཡོ།"
-
-#: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr "ཨེ་ཤི་ཡ་/ཨུ་ཇུང་ པཱན་དང་། (_P)"
-
-#: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr "ཨེ་ཤི་ཡ་/ཨུ་ལཱན་བ་ཊར།"
-
-#: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr "ཨེ་ཤི་ཡ་/ཨུ་རུམ་ཀི།"
-
-#: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr "ཨེ་ཤི་ཡ་/བེན་ཤེའེན།"
-
-#: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr "ཨེ་ཤི་ཡ་/བ་ལ་དི་བཱོསི་ཊོཀ།"
-
-#: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr "ཨེ་ཤི་ཡ་/ཡ་ཀུཊིསི།"
-
-#: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr "ཨེ་ཤི་ཡ་/ཡེ་ཀ་ཊེ་རིན་བཱརག"
-
-#: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr "ཨེ་ཤི་ཡ་/ཡེ་རི་བཱན།"
-
-#: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr "ཨེཊི་ལེན་ཊིཀ།"
-
-#: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr "ཨེཊི་ལེན་ཊིཀ་/ཨ་ཛོ་རེསི།"
-
-#: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr "ཨེཊི་ལེན་ཊིཀ་/བར་མུ་ད།"
-
-#: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr "ཨེཊི་ལེན་ཊིཀ་/ཀེ་ར་ནི།"
-
-#: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr "ཨེཏི་ལེན་ཊིཀ་/ཀེཔ་ བར་དི། (_V)"
-
-#: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr "ཨེཊི་ལེན་ཊིཀ་/ཕེ་རོའི།"
-
-#: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr "ཨེཊི་ལེན་ཊིཀ་/ཇཱན་ མ་ཡེན། (_M)"
-
-#: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr "ཨེཊི་ལེན་ཊིཀ་/མེ་ཌི་ར།"
-
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr "ཨེཊི་ལེན་ཊིཀ་/རེཀ་ཇ་བིཀ།"
-
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr "ཨེཊི་ལེན་ཊིཀ་/ལྷོ་ཇིའོར་ཇི་ཡ། (_G)"
-
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr "ཨེཊེ་ལེན་ཊིཀ་/ཨེནཊི་ ཧེ་ལི་ན། (_H)"
-
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr "ཨེཊི་ལེན་ཊིཀ་/སིཊེན་ལེ།"
-
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr "ཨཱསི་ཊ་ལི་ཡ།"
-
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr "ཨཱསི་ཊ་ལི་ཡ་/ཨ་ཌི་ལེ་ཌི།"
-
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr "ཨཱསི་ཊ་ལི་ཡ་/བིརིསི་བེན།"
-
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr "ཨཱསི་ཊ་ལི་ཡ་/བོརོ་ཀཱན་ཧིལ། (_H)"
-
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr "ཨཱསི་ཊ་ལི་ཡ་/དར་ཝིན། "
-
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr "ཨཱསི་ཊ་ལི་ཡ་/ཧོ་བཱཊི།"
-
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr "ཨཱསི་ཊ་ལི་ཡ་/ལིན་ཌི་མཱན། "
-
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr "ཨཱསི་ཊ་ལི་ཡ་/ལོརོཌི་ ཧོ་ཝི། (_H)"
-
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr "ཨཱསི་ཊ་ལི་ཡ་/མེལ་བོརོན།"
-
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr "ཨཱསི་ཊ་ལི་ཡ་/པརཐ།"
-
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr "ཨཱསི་ཊ་ལི་ཡ་/སིཌི་ནི།"
-
-#: ../src/timezone_names.c:320
-msgid "Europe"
-msgstr "ཡུ་རོཔ།"
-
-#: ../src/timezone_names.c:321
-msgid "Europe/Amsterdam"
-msgstr "ཡུ་རོཔ་/ཨེམསི་ཊར་ཌམ།"
-
-#: ../src/timezone_names.c:322
-msgid "Europe/Andorra"
-msgstr "ཡུ་རོཔ་/ཨེན་ཌོ་ར།"
-
-#: ../src/timezone_names.c:323
-msgid "Europe/Athens"
-msgstr "ཡུ་རོཔ་/ཨེ་ཐེནསི།"
-
-#: ../src/timezone_names.c:324
-msgid "Europe/Belfast"
-msgstr "ཡུ་རོཔ་/བེལ་ཕཱསིཊི།"
-
-#: ../src/timezone_names.c:325
-msgid "Europe/Belgrade"
-msgstr "ཡུ་རོཔ་/བེལ་གེརེཌི།"
-
-#: ../src/timezone_names.c:326
-msgid "Europe/Berlin"
-msgstr "ཡུ་རོཔ་/བར་ལིན།"
-
-#: ../src/timezone_names.c:327
-msgid "Europe/Bratislava"
-msgstr "ཡུ་རོཔ་/བ་ར་ཏིསི་ལ་བ།"
-
-#: ../src/timezone_names.c:328
-msgid "Europe/Brussels"
-msgstr "ཡུ་རོཔ་/བུརུ་སེལསི།"
-
-#: ../src/timezone_names.c:329
-msgid "Europe/Bucharest"
-msgstr "ཡུ་རོཔ་/བུ་ཅ་རེསིཊི།"
-
-#: ../src/timezone_names.c:330
-msgid "Europe/Budapest"
-msgstr "ཡུ་རོཔ་/བུ་ད་པེསིཊི།"
-
-#: ../src/timezone_names.c:331
-msgid "Europe/Chisinau"
-msgstr "ཡུ་རོཔ་/ཅི་སི་ནའུ།"
-
-#: ../src/timezone_names.c:332
-msgid "Europe/Copenhagen"
-msgstr "ཡུ་རོཔ་/ཀོ་པེན་ཧེ་གཱན།"
-
-#: ../src/timezone_names.c:333
-msgid "Europe/Dublin"
-msgstr "ཡུ་རོཔ་/དུབ་ལིན།"
-
-#: ../src/timezone_names.c:334
-msgid "Europe/Gibraltar"
-msgstr "ཡུ་རོཔ་/ཇིབ་རཱལ་ཊར།"
-
-#: ../src/timezone_names.c:335
-msgid "Europe/Helsinki"
-msgstr "ཡུ་རོཔ་/ཧེལ་སིན་ཀི།"
-
-#: ../src/timezone_names.c:336
-msgid "Europe/Istanbul"
-msgstr "ཡུ་རོན་/ཨིསི་ཏཱན་བཱུལ།"
-
-#: ../src/timezone_names.c:337
-msgid "Europe/Kaliningrad"
-msgstr "ཡུ་རོཔ་/ཀ་ལི་ནིན་གེརེཌི།"
-
-#: ../src/timezone_names.c:338
-msgid "Europe/Kiev"
-msgstr "ཡུ་རོཔ་/ཀིབ།"
-
-#: ../src/timezone_names.c:339
-msgid "Europe/Lisbon"
-msgstr "ཡུ་རོཔ/ལིསི་བཱོན།"
-
-#: ../src/timezone_names.c:340
-msgid "Europe/Ljubljana"
-msgstr "ཡུ་རོཔ་/ཨེལ་ཇུབལ་ཇ་ན།"
-
-#: ../src/timezone_names.c:341
-msgid "Europe/London"
-msgstr "ཡུ་རོཔ་/ལཱོན་ཌཱན།"
-
-#: ../src/timezone_names.c:342
-msgid "Europe/Luxembourg"
-msgstr "ཡུ་རོཔ་/ལག་ཟེམ་བཱརག"
-
-#: ../src/timezone_names.c:343
-msgid "Europe/Madrid"
-msgstr "ཡུ་རོཔ་/མེཌི་རིཌི།"
-
-#: ../src/timezone_names.c:344
-msgid "Europe/Malta"
-msgstr "ཡུ་རོཔ་/མཱལ་ཊ།"
-
-#: ../src/timezone_names.c:345
-msgid "Europe/Minsk"
-msgstr "ཡུ་རོཔ་/མིནསིཀ།"
-
-#: ../src/timezone_names.c:346
-msgid "Europe/Monaco"
-msgstr "ཡུ་རོཔ་/མོ་ན་ཀོ།"
-
-#: ../src/timezone_names.c:347
-msgid "Europe/Moscow"
-msgstr "ཡུ་རོཔ་/མོསི་ཀོ།"
-
-#: ../src/timezone_names.c:348
-msgid "Europe/Nicosia"
-msgstr "ཡུ་རོཔ་/ནི་ཀོ་སི་ཡ།"
-
-#: ../src/timezone_names.c:349
-msgid "Europe/Oslo"
-msgstr "ཡུ་རོཔ་/ཨོས་ལོ།"
-
-#: ../src/timezone_names.c:350
-msgid "Europe/Paris"
-msgstr "ཡུ་རོཔ་/པེ་རིསི།"
-
-#: ../src/timezone_names.c:351
-msgid "Europe/Prague"
-msgstr "ཡུ་རོཔ་/པེརེག"
-
-#: ../src/timezone_names.c:352
-msgid "Europe/Riga"
-msgstr "ཡུ་རོཔ་/རི་ག"
-
-#: ../src/timezone_names.c:353
-msgid "Europe/Rome"
-msgstr "ཡུ་རོཔ་/རོམ།"
-
-#: ../src/timezone_names.c:354
-msgid "Europe/Samara"
-msgstr "ཡུ་རོཔ་/ས་མ་ར།"
-
-#: ../src/timezone_names.c:355
-msgid "Europe/San_Marino"
-msgstr "ཡུ་རོཔ་/སེན་ མེ་རི་ནོ། (_M)"
-
-#: ../src/timezone_names.c:356
-msgid "Europe/Sarajevo"
-msgstr "ཡུ་རོཔ་/ས་ར་ཇི་བོ།"
-
-#: ../src/timezone_names.c:357
-msgid "Europe/Simferopol"
-msgstr "ཡུ་རོཔ་/སིམ་ཕི་རོ་པཱོལ།"
-
-#: ../src/timezone_names.c:358
-msgid "Europe/Skopje"
-msgstr "ཡུ་རོཔ་/སིཀོཔ་ཇི།"
-
-#: ../src/timezone_names.c:359
-msgid "Europe/Sofia"
-msgstr "ཡུ་རོཔ་/སོ་ཕི་ཡ།"
-
-#: ../src/timezone_names.c:360
-msgid "Europe/Stockholm"
-msgstr "ཡུ་རོཔ་/སིཊོཀ་ཧོ་ལོམ།་"
-
-#: ../src/timezone_names.c:361
-msgid "Europe/Tallinn"
-msgstr "ཡུ་རོཔ་/ཊཱལ་ལིན། "
-
-#: ../src/timezone_names.c:362
-msgid "Europe/Tirane"
-msgstr "ཡུ་རོཔ་/ཊི་ར་ནི།"
-
-#: ../src/timezone_names.c:363
-msgid "Europe/Uzhgorod"
-msgstr "ཡུ་རོཔ་/ཨུཛ་གོ་རཱོཌི།"
-
-#: ../src/timezone_names.c:364
-msgid "Europe/Vaduz"
-msgstr "ཡུ་རོཔ་/བ་དུཛི།"
-
-#: ../src/timezone_names.c:365
-msgid "Europe/Vatican"
-msgstr "ཡུ་རོཔ་/བ་ཊི་ཀཱན།"
-
-#: ../src/timezone_names.c:366
-msgid "Europe/Vienna"
-msgstr "ཡུ་རོཔ་/བི་ཡ་ན།"
-
-#: ../src/timezone_names.c:367
-msgid "Europe/Vilnius"
-msgstr "ཡུ་རོཔ་/བིལ་ནི་ཡཱསི།"
-
-#: ../src/timezone_names.c:368
-msgid "Europe/Warsaw"
-msgstr "ཡུ་རོཔ་/ཝར་ས།"
-
-#: ../src/timezone_names.c:369
-msgid "Europe/Zagreb"
-msgstr "ཡུ་རོཔ་/ཛག་རེབ།"
-
-#: ../src/timezone_names.c:370
-msgid "Europe/Zaporozhye"
-msgstr "ཡུ་རོཔ་/ཛ་པོ་རོ་ཛའི།"
-
-#: ../src/timezone_names.c:371
-msgid "Europe/Zurich"
-msgstr "ཡུ་རོཔ་/ཛུ་རིཆི། "
-
-#: ../src/timezone_names.c:372
-msgid "Indian"
-msgstr "ཨིན་ཌི་ཡཱན།"
-
-#: ../src/timezone_names.c:373
-msgid "Indian/Antananarivo"
-msgstr "ཨིན་ཌི་ཡཱན་/ཨེན་ཊ་ན་ན་རི་བོ།"
-
-#: ../src/timezone_names.c:374
-msgid "Indian/Chagos"
-msgstr "ཨིན་ཌི་ཡཱན་/ཅ་གོསི།"
-
-#: ../src/timezone_names.c:375
-msgid "Indian/Christmas"
-msgstr "ཨིན་ཌི་ཡཱན་/ཀིརིསིཊི་མཱསི། "
-
-#: ../src/timezone_names.c:376
-msgid "Indian/Cocos"
-msgstr "ཨིན་ཌི་ཡཱན་/ཀོ་ཀོསི། "
-
-#: ../src/timezone_names.c:377
-msgid "Indian/Comoro"
-msgstr "ཨིན་ཌ་ཡཱན་/ཀོ་མོ་རོ།"
-
-#: ../src/timezone_names.c:378
-msgid "Indian/Kerguelen"
-msgstr "ཨིན་ཌི་ཡཱན་/ཀར་གུས་ལེན། "
-
-#: ../src/timezone_names.c:379
-msgid "Indian/Mahe"
-msgstr "ཨིན་ཌི་ཡཱན་/མ་ཧེ།"
-
-#: ../src/timezone_names.c:380
-msgid "Indian/Maldives"
-msgstr "ཨིན་ཌི་ཡཱན་/མེལ་དིབསི། "
-
-#: ../src/timezone_names.c:381
-msgid "Indian/Mauritius"
-msgstr "ཨིན་ཌི་ཡཱན་/མའུ་རི་ཤི་ཡཱསི། "
-
-#: ../src/timezone_names.c:382
-msgid "Indian/Mayotte"
-msgstr "ཨིན་ཌི་ཡཱན་/མ་ཡོ་ཊི།"
-
-#: ../src/timezone_names.c:383
-msgid "Indian/Reunion"
-msgstr "ཨིན་ཌི་ཡཱན་/རི་ཡུ་ནིཡཱན། "
-
-#: ../src/timezone_names.c:384
-msgid "Pacific"
-msgstr "པེ་སི་ཕིག"
-
-#: ../src/timezone_names.c:385
-msgid "Pacific/Apia"
-msgstr "པེ་སི་ཕིག་/ཨ་པི་ཡ།"
-
-#: ../src/timezone_names.c:386
-msgid "Pacific/Auckland"
-msgstr "པེ་སི་ཕིག་/ཨཀ་ལེནཌི། "
-
-#: ../src/timezone_names.c:387
-msgid "Pacific/Chatham"
-msgstr "པེ་སི་ཕིག་/ཅ་ཐམ། "
-
-#: ../src/timezone_names.c:388
-msgid "Pacific/Easter"
-msgstr "པེ་སི་ཕིག་/ཨིསི་ཊར། "
-
-#: ../src/timezone_names.c:389
-msgid "Pacific/Efate"
-msgstr "པེ་སི་ཕིག་/ཨི་ཕེཊི།"
-
-#: ../src/timezone_names.c:390
-msgid "Pacific/Enderbury"
-msgstr "པེ་སི་ཕིག་/ཨིན་ཌར་བུ་རི།"
-
-#: ../src/timezone_names.c:391
-msgid "Pacific/Fakaofo"
-msgstr "པེ་སི་ཕིག་/ཕ་ཀའོ་ཕོ།"
-
-#: ../src/timezone_names.c:392
-msgid "Pacific/Fiji"
-msgstr "པེ་སི་ཕིག་/ཕི་ཇི།"
-
-#: ../src/timezone_names.c:393
-msgid "Pacific/Funafuti"
-msgstr "པེ་སི་ཕིག་/ཕུ་ན་ཕུ་ཊི།"
-
-#: ../src/timezone_names.c:394
-msgid "Pacific/Galapagos"
-msgstr "པེ་སི་ཕིག་/ག་ལ་པ་གོསི།"
-
-#: ../src/timezone_names.c:395
-msgid "Pacific/Gambier"
-msgstr "པེ་སི་ཕིག་/གེམ་བི་ཡར།"
-
-#: ../src/timezone_names.c:396
-msgid "Pacific/Guadalcanal"
-msgstr "པེ་སི་ཕིག་/གའུ་དཱལ་ཀེ་ནཱལ།"
-
-#: ../src/timezone_names.c:397
-msgid "Pacific/Guam"
-msgstr "པེ་སི་ཕིག་/གུའམ།"
-
-#: ../src/timezone_names.c:398
-msgid "Pacific/Honolulu"
-msgstr "པེ་སི་ཕིག་/ཧོ་ནོ་ལུ་ལུ།"
-
-#: ../src/timezone_names.c:399
-msgid "Pacific/Johnston"
-msgstr "པེ་སི་ཕིག་/ཇཱོནསི་ཊཱོན།"
-
-#: ../src/timezone_names.c:400
-msgid "Pacific/Kiritimati"
-msgstr "པེ་སི་ཕིག་/ཀི་རི་ཏི་མ་ཏི། "
-
-#: ../src/timezone_names.c:401
-msgid "Pacific/Kosrae"
-msgstr "པེ་སི་ཕིག་/ཀོསི་རེ།"
-
-#: ../src/timezone_names.c:402
-msgid "Pacific/Kwajalein"
-msgstr "པེ་སི་ཕིག་/ཀ་བ་ཇ་ལིན། "
-
-#: ../src/timezone_names.c:403
-msgid "Pacific/Majuro"
-msgstr "པེ་སི་ཕིག་/མ་ཇུ་རོ།"
-
-#: ../src/timezone_names.c:404
-msgid "Pacific/Marquesas"
-msgstr "པེ་སི་ཕིག་/མར་ཀིའུ་སཱསི།"
-
-#: ../src/timezone_names.c:405
-msgid "Pacific/Midway"
-msgstr "པེ་སི་ཕིག་/མིཌི་ཝེ།"
-
-#: ../src/timezone_names.c:406
-msgid "Pacific/Nauru"
-msgstr "པེ་སི་ཕིག་/ནའུ་རུ།"
-
-#: ../src/timezone_names.c:407
-msgid "Pacific/Niue"
-msgstr "པེ་སི་ཕིག་/ནིའུ།"
-
-#: ../src/timezone_names.c:408
-msgid "Pacific/Norfolk"
-msgstr "པེ་སི་ཕིག་/ནོར་ཕཱོལཀ།"
-
-#: ../src/timezone_names.c:409
-msgid "Pacific/Noumea"
-msgstr "པེ་སི་ཕིག་/ནོའུ་མི།"
-
-#: ../src/timezone_names.c:410
-msgid "Pacific/Pago_Pago"
-msgstr "པེ་སི་ཕིག་/པ་གོ་པ་གོ།(_P)"
-
-#: ../src/timezone_names.c:411
-msgid "Pacific/Palau"
-msgstr "པེ་སི་ཕིག་/པ་ལའུ།"
-
-#: ../src/timezone_names.c:412
-msgid "Pacific/Pitcairn"
-msgstr "པེ་སི་ཕིག་/པིཊི་ཀའི་རིན།"
-
-#: ../src/timezone_names.c:413
-msgid "Pacific/Ponape"
-msgstr "པེ་སི་ཕིག་/པོ་ནེཔ།"
-
-#: ../src/timezone_names.c:414
-msgid "Pacific/Port_Moresby"
-msgstr "པེ་སི་པིག་/པོརོཊི་-མོ་རེསི་བི།"
-
-#: ../src/timezone_names.c:415
-msgid "Pacific/Rarotonga"
-msgstr "པེ་སི་ཕིག་/ར་རོ་ཊོང་ག"
-
-#: ../src/timezone_names.c:416
-msgid "Pacific/Saipan"
-msgstr "པེ་སི་ཕིག་/སའི་པན།"
-
-#: ../src/timezone_names.c:417
-msgid "Pacific/Tahiti"
-msgstr "པེ་སི་ཕིག་/ཏ་ཧི་ཏི། "
-
-#: ../src/timezone_names.c:418
-msgid "Pacific/Tarawa"
-msgstr "པེ་སི་ཕིག་/ཏ་ར་ཝ།"
-
-#: ../src/timezone_names.c:419
-msgid "Pacific/Tongatapu"
-msgstr "པེ་སི་ཕིག་/ཊོང་ག་ཏ་པུ། "
-
-#: ../src/timezone_names.c:420
-msgid "Pacific/Truk"
-msgstr "པེ་སི་ཕིག་/ཊཀ། "
-
-#: ../src/timezone_names.c:421
-msgid "Pacific/Wake"
-msgstr "པེ་སི་ཕིག་/ཝེཀ།"
-
-#: ../src/timezone_names.c:422
-msgid "Pacific/Wallis"
-msgstr "པེ་སི་ཕིག་/ཝ་ལིསི།"
-
-#: ../src/timezone_names.c:423
-msgid "Pacific/Yap"
-msgstr "པེ་སི་ཕིག/ཡཔ།"
-
-#: ../src/tray_icon.c:469
-msgid "New appointment"
-msgstr "དུས་སྟབས་གསརཔ།"
-
-#: ../src/tray_icon.c:485
-msgid "About Orage"
-msgstr "ཨོ་རེཇི་སྐོར་ལས།"
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
-msgid "Orage Panel Clock"
-msgstr "ཨོ་རེཇི་ཆེ་འཁོར།"
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
-msgid "Show time and date?"
-msgstr "དུས་ཚོད་དང་ཚེས་གྲངས་ག་ཅི་སྨོ?"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "ཟླ་ཐོ།"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "ཨོ་རེཇི་ དགའ་གདམ་ཚུ། "
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "ཨོ་རེཇི་ དགའ་གདམ་ཚུ། "
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "ཨེགསི་ཨེཕ་སི་ཨི་ ༤ ཟླ་ཐོ་གློག་རིམ་དོན་ལུ་ སྒྲིག་སྟངས་ཚུ།"
-
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "ཌེཀསི་ཊོཔ་ ཟླ་ཐོ།"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "ཟླ་ཐོ།"
-
-#~ msgid "Orage clock"
-#~ msgstr "ཨོ་རེཇི་ ཆེ་འཁོར། "
-
-#~ msgid "Contributor"
-#~ msgstr "ཞལ་འདེབས་པ། "
-
-#~ msgid "Warning"
-#~ msgstr "ཉེན་བརྡ།"
-
-#~ msgid "Display"
-#~ msgstr "བཀྲམ་སྟོན་འབད།"
-
-#, fuzzy
-#~ msgid "Select always today"
-#~ msgstr "ད་རིས་སེལ་འཐུ་འབད། (_T)"
-
-#, fuzzy
-#~ msgid "Vary"
-#~ msgstr "ལོ་བསྟར།"
-
-#~ msgid "Select timezone"
-#~ msgstr "ཆུ་ཚོད་གླིང་སྡེ་སེལ་འཐུ་འབད། "
-
-#, fuzzy
-#~ msgid "Modify Preferences"
-#~ msgstr "ཨོ་རེཇི་ དགའ་གདམ་ཚུ། "
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr ""
-#~ "ནུས་ལྡན་ ཆུ་ཚོད་གླིང་སྡེ་ (=TZ) གནས་གོང་ གང་རུང་གཞི་སྒྲིག་དང་ ཡང་ན་ ཐོ་ཡིག་ལས་གཅིག་འཐུ་ད།"
-
-#~ msgid "show line _1:"
-#~ msgstr "གྲལ་ཐིག་ ༡ སྟོན་ད།:(_1)"
-
-#~ msgid "show line _2:"
-#~ msgstr "གྲལ་ཐིག་ ༢ སྟོན།:(_2)"
-
-#~ msgid "show line _3:"
-#~ msgstr "གྲལ་ཐིག་ ༣ སྟོན།:(_3)"
-
-#~ msgid "Properties"
-#~ msgstr "རྒྱུ་དངོས་ཚུ། "
-
-#, fuzzy
-#~ msgid "Show event list"
-#~ msgstr "སིསི་ཊེརེ་ནང་སྟོན། "
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "ཨེགསི་ཨེཕ་སི་ཨི་ ༤ ཟླ་ཐོ་སྒྲིག་སྟངས།"
-
-#, fuzzy
-#~ msgid "Monday"
-#~ msgstr "ད་རིས། "
-
-#, fuzzy
-#~ msgid "Tuesday"
-#~ msgstr "ད་རིས། "
-
-#, fuzzy
-#~ msgid "Wednesday"
-#~ msgstr "བདུན་ཕྲག་ཉིནམ་ཚུ།"
-
-#, fuzzy
-#~ msgid "Thursday"
-#~ msgstr "ད་རིས། "
-
-#, fuzzy
-#~ msgid "Friday"
-#~ msgstr "སྤེན།"
-
-#, fuzzy
-#~ msgid "Sunday"
-#~ msgstr "སྒྲ་སྐད།"
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "ཉིནམ་ཚུ།"
-
-#, fuzzy
-#~ msgid "normal"
-#~ msgstr "ཡོངས་ཁྱབ།"
-
-#~ msgid "Calendar borders"
-#~ msgstr "ཟླ་ཐོ་མཐའ་མཚམས་ཚུ།"
-
-#~ msgid "Hidden"
-#~ msgstr "གསང་བ།"
-
-#~ msgid "3 months"
-#~ msgstr "ཟླཝ་༣།"
-
-#~ msgid "6 months"
-#~ msgstr "ཟླཝ་༦།"
-
-#~ msgid "1 year"
-#~ msgstr "ལོ་གཅིག"
-
-#~ msgid "Application"
-#~ msgstr "གློག་རིམ།"
-
-#~ msgid "Button Label|Orage"
-#~ msgstr "ཨེབ་རྟ་ཁ་ཡིག་བཏགས་ནི།|ཨོ་རེཇི།"
-
-#~ msgid "Core developer"
-#~ msgstr "ནང་སྙིང་བཟོ་མི། "
-
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%m/%d/%Y"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "ཁྱོད་ཀྱིས་ འ་ནི་ཚེས་གྲངས་དང་འབྲེལ་བའི་བརྡ་དོན་ཚུ་ཆ་མཉམ་རང་\n"
-#~ "རྩ་བསྐྲད་གཏང་ནི་ཨིན།"
-
-#~ msgid "Clear"
-#~ msgstr "བསལ།"
-
-#~ msgid "uid"
-#~ msgstr "ཡུ་ཨའི་ཌི།"
-
-#~ msgid "This should not happen"
-#~ msgstr "འ་ནི་འདི་ འབྱུང་མ་དགོ་མི་ཅིག་ཨིན།"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "ཨེམ་སི་ཨེསི་ ཞབས་ཏོག་སྤྱོད་མི་རྒྱུ་ལམ་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ།"
-
-#~ msgid "Open archive file..."
-#~ msgstr "ཡིག་མཛོད་ ཡིག་སྣོད་ཁ་ཕྱེ།..."
-
-#~ msgid "Close archive file"
-#~ msgstr "ཡིག་མཛོད་ཡིག་སྣོད་ཁ་བསྡམས། "
diff -Nru orage-4.8.3/po/el.po orage-4.12.1/po/el.po
--- orage-4.8.3/po/el.po	2012-01-03 12:01:02.000000000 +0000
+++ orage-4.12.1/po/el.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,21 +1,40 @@
-# Greek translations of orage
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Stavros Giannouris <StavrosG2002@freemail.gr>, 2005-2006.
-# Stathis Kamperis <ekamperi@auth.gr>, 2006.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2015
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012
+# Stathis Kamperis <ekamperi@auth.gr>, 2006
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2009-11-29 11:47+0200\n"
-"Last-Translator: Marios Andonoudiou <supermodmusic@gmail.com>\n"
-"Language-Team: Greek <nls@tux.hellug.gr>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2015-03-14 13:12+0000\n"
+"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/xfce-apps/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr ""
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr ""
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr ""
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr ""
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -31,9 +50,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"κάντε κλικ για επεξεργασία του ρολογιού"
+msgstr "%s\nκάντε κλικ για επεξεργασία του ρολογιού"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -43,20 +60,21 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"πλήκτρο 1 για αλλαγή προτιμήσεων \n"
-"πλήκτρο 2 για ρύθμιση της ώρας των ρολογιών"
+msgstr "πλήκτρο 1 για αλλαγή προτιμήσεων \nπλήκτρο 2 για ρύθμιση της ώρας των ρολογιών"
 
 #: ../globaltime/globaltime.c:480
-#, fuzzy
 msgid "adjust to change hour"
-msgstr "ρύθμιση για αλλαγή ώρας"
+msgstr "ρυθμίστε για να αλλάξετε την ώρα"
 
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
 msgstr ""
 
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Παγκόσμια ώρα"
+
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
 msgstr "ΝΕΟ"
@@ -154,9 +172,8 @@
 #: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
 #: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
-#, fuzzy
 msgid "Cross this to use default instead of selected value"
-msgstr "Επιλέξτε εδώ για χρήση της προκαθορισμένης τιμής αντί της επιλεγμένης"
+msgstr ""
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
@@ -201,51 +218,37 @@
 
 #: ../globaltime/gt_prefs.c:863
 msgid "Click to change default background colour for clocks"
-msgstr ""
-"Κάντε κλικ για να αλλάξετε το προκαθορισμένο χρώμα παρασκνίου στα ρολόγια"
+msgstr "Κάντε κλικ για να αλλάξετε το προκαθορισμένο χρώμα παρασκνίου στα ρολόγια"
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
-"Επιλέξτε αυτό για να γίνει χρήση του προεπιλεγμένου από το σύστημα, αντί του "
-"επιλεγμένου χρώματος"
+msgstr "Επιλέξτε αυτό για να γίνει χρήση του προεπιλεγμένου από το σύστημα, αντί του επιλεγμένου χρώματος"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
-msgstr ""
-"Κάντε κλικ για να αλλάξετε το προκαθορισμένο χρώμα κειμένου για τα ρολόγια"
+msgstr "Κάντε κλικ για να αλλάξετε το προκαθορισμένο χρώμα κειμένου για τα ρολόγια"
 
 #: ../globaltime/gt_prefs.c:929
-#, fuzzy
 msgid "Click to change default font for clock name"
 msgstr ""
-"Κάντε κλικ για να αλλάξετε προεπιλεγμένη γραμματοσειρά για το όνομα ρολογιού"
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
-#, fuzzy
 msgid "Cross this to use system default font instead of selected font"
 msgstr ""
-"Επιλέξτε εδώ για χρήση της προκαθορισμένης γραμματοσειράς του συστήματος "
-"αντί της επιλεγμένης γραμματοσειράς"
 
 #: ../globaltime/gt_prefs.c:963
-#, fuzzy
 msgid "Click to change default font for clock time"
 msgstr ""
-"Κάντε κλικ για να αλλάξετε προεπιλεγμένη γραμματοσειρά για την ώρα του "
-"ρολογιού"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:990
-#, fuzzy
 msgid "Underline for name of clock:"
-msgstr "Υπογράμμιση ονόματος ρολογιού:"
+msgstr ""
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:1004
-#, fuzzy
 msgid "Underline for time of clock:"
-msgstr "Υπογράμμιση ώρας ρολογιού:"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1027
 msgid "update preferences"
@@ -261,9 +264,8 @@
 msgstr "Γενικές προτιμήσεις"
 
 #: ../globaltime/gt_prefs.c:1077
-#, fuzzy
 msgid "Decorations:"
-msgstr "Πλαίσια παραθύρων:"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1078
 msgid "Standard"
@@ -273,6 +275,10 @@
 msgid "Use normal decorations"
 msgstr "Χρήση κανονικών διακοσμήσεων παραθύρου"
 
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Κανένα"
+
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
 msgstr "Να μην εμφανίζονται οι διακοσμήσεις του παραθύρου (περίγραμμα)"
@@ -348,16 +354,15 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Τοποθεσία"
 
 #: ../globaltime/timezone_selection.c:258
 #: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
-#, fuzzy
 msgid "GMT Offset"
-msgstr "Διαφορά από GMT"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:264
 #: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
@@ -388,7 +393,7 @@
 #: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
 #: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
 msgid "Change mode"
-msgstr ""
+msgstr "Αλλαγή κατάστασης"
 
 #: ../globaltime/timezone_selection.c:303
 #: ../globaltime/timezone_selection.c:313
@@ -410,88 +415,99 @@
 msgid "floating"
 msgstr "μετακινούμενη"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Παγκόσμια ώρα"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Παγκόσμια ώρα του Orage"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "Εμφάνιση ρολογιών από διαφορετικές χώρες"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Παγκόσμια ώρα"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Καμια περιστροφή"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Περιστροφή αριστερά"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Περιστροφή δεξιά"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "Εμφάνιση"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
 msgstr "Με _πλαίσιο"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
 msgstr "Χρώμα _κειμένου:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
 msgstr "Χρώμα _παρασκηνίου:"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
-#, fuzzy
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
-msgstr "ορισμός _ύψουςt:"
+msgstr ""
 
-#: ../panel-plugin/oc_config.c:277
-#, fuzzy
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
-msgstr "Σημειώστε ότι δεν μπορείτε να αλλάξετε το ύψος των οριζόντιων πλαισίων"
+msgstr ""
 
-#: ../panel-plugin/oc_config.c:282
-#, fuzzy
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
-msgstr "ορισμός _πλάτους"
+msgstr ""
 
-#: ../panel-plugin/oc_config.c:293
-#, fuzzy
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
-msgstr "Σημειώστε ότι δεν μπορείτε να αλλάξετε το πλάτος των κάθετων πλαισίων"
+msgstr ""
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr ""
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "Επιλογές ρολογιού"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
 msgstr "ορισμός ζώνης ώρας:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "Γραμμή %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
 msgstr "Εισάγετε μια έγκυρη παράμετρο της συνάρτησης strftime."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
 msgstr "Υπόδειξη:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
-#, fuzzy
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
-msgstr "διόρθωση ώρας μετά την αναστολή/αδρανοποίηση"
+msgstr ""
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
@@ -500,7 +516,7 @@
 "features from working.)"
 msgstr ""
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -510,22 +526,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Αυτό το πρόγραμμα χρησιμοποιεί τη συνάρτηση strftime για να εμφανίσει την "
-"ώρα.\n"
-"Εισάγετε κάποιον έγκυρο κωδικό για να εμφανίσετε την ώρα στη μορφή που "
-"προτιμάτε.\n"
-"Μερικοί κοινοί κωδικοί είναι οι:\t%A = ημέρα εβδομάδας\t\t%B = μήνας\n"
-"\t%c = ημερομηνία & ώρα\t\t%R = ώρα και λεπτά\n"
-"\t%V = αριθμός εβδομάδας\t\t%Z = ζώνη ώρας\n"
-"\t%H = ώρες \t\t\t\t%M = λεπτό\n"
-"\t%X = τοπική ώρα\t\t\t%x = τοπική ημερομηνία"
+msgstr "Αυτό το πρόγραμμα χρησιμοποιεί τη συνάρτηση strftime για να εμφανίσει την ώρα.\nΕισάγετε κάποιον έγκυρο κωδικό για να εμφανίσετε την ώρα στη μορφή που προτιμάτε.\nΜερικοί κοινοί κωδικοί είναι οι:\t%A = ημέρα εβδομάδας\t\t%B = μήνας\n\t%c = ημερομηνία & ώρα\t\t%R = ώρα και λεπτά\n\t%V = αριθμός εβδομάδας\t\t%Z = ζώνη ώρας\n\t%H = ώρες \t\t\t\t%M = λεπτό\n\t%X = τοπική ώρα\t\t\t%x = τοπική ημερομηνία"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
 msgstr "Προτιμήσεις ρολογιού Orage"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -534,13 +540,11 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y"
 
 #: ../src/about-xfcalendar.c:40
-#, fuzzy
 msgid "Maintainer"
 msgstr "Συντηρητής"
 
@@ -551,7 +555,7 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Τέλος"
 
@@ -559,13 +563,13 @@
 msgid "Due"
 msgstr ""
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Επιλογή αρχείου..."
 
@@ -573,231 +577,281 @@
 msgid "Sound Files"
 msgstr "Αρχεία ήχου"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Οι πληροφορίες του ραντεβού έχουν τροποποιηθεί."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "Επιθυμείτε να συνεχίσετε;"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr ""
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr ""
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "Το τέλος αυτού του ραντεβού είναι νωρίτερα από την αρχή του."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-#, fuzzy
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
-msgstr "Δεν έχει οριστεί"
+msgstr ""
+
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
 msgstr "Αυτό το ραντεβού θα απομακρυνθεί οριστικά."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr ""
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr ""
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Επιλογή ημερομηνίας"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Σήμερα"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "Αυτό το ραντεβού δεν υπάρχει."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
 msgstr "Πιθανώς έχει αφαιρεθεί, παρακαλώ ανανεώστε την οθόνη σας."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Τρέχουσες κατηγορίες"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Προσθήκη νέας κατηγορίας με χρώμα"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Κατηγορία:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Χρώματα κατηγοριών - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr "*** ΑΝΤΙΓΡΑΦΟ ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "Νέο ραντεβού - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Αρχείο"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "Αποθήκ_ευση και κλείσιμο"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "Δημιουργία αντι_γράφου"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Αποθήκευση και κλείσιμο"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Επαναφορά"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Αντίγραφο"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Διαθέσιμος/η"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Απασχολημένος/η"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Γενικές"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Τύπος"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Συμβάν"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Συμβάν που θα συμβεί κάποια στιγμή. Για παράδειγμα:\n"
-"Συνάντηση ή γενέθλια ή εκπομπή της τηλεόρασης."
+msgstr "Συμβάν που θα συμβεί κάποια στιγμή. Για παράδειγμα:\nΣυνάντηση ή γενέθλια ή εκπομπή της τηλεόρασης."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-#, fuzzy
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
-msgstr "Να κάνω"
+msgstr ""
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Κάτι που θα πρέπει να κάνετε κάποια στιγμή. Για παράδειγμα:\n"
-"Πλύντε το αυτοκίνητό σας ή δοκιμάστε τη νέα έκδοση του Orage."
+msgstr "Κάτι που θα πρέπει να κάνετε κάποια στιγμή. Για παράδειγμα:\nΠλύντε το αυτοκίνητό σας ή δοκιμάστε τη νέα έκδοση του Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Ημερολόγιο"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Κάντε μια σημείωση οτι κάτι συνέβη. Για παράδειγμα:\n"
-"Σημειώστε οτι σας κάλεσε η μητέρα σας ή οτι μόλις χιόνισε."
+msgstr "Κάντε μια σημείωση οτι κάτι συνέβη. Για παράδειγμα:\nΣημειώστε οτι σας κάλεσε η μητέρα σας ή οτι μόλις χιόνισε."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Τίτλος"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "Νέο γεγονός ολόκληρης της μέρας"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Έναρξη"
 
-# FIXME: In order to be translated correctly, we have to check the way this
-# string is used.
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Set      "
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Διάρκεια"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "ημέρες"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "ώρες"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "λεπτά"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Διαθεσιμότητα"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Ολοκληρώθηκαν"
 
-#: ../src/appointment.c:2749
-#, fuzzy
+#: ../src/appointment.c:2862
 msgid "Done"
-msgstr "Έγινε"
+msgstr "Ολοκληρώθηκε"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Κατηγορίες"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
 msgstr ""
 
-#: ../src/appointment.c:2787
-#, fuzzy
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
-msgstr "ανανέωση χρωμάτων για τις κατηγορίες."
+msgstr ""
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "Προτεραιότητα"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr ""
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Σημείωση"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -806,135 +860,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "Πριν την εκκίνηση"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "Πριν το τέλος"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "Μετά την εκκίνηση"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "Μετά το τέλος"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Ειδοποίηση"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-#, fuzzy
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Ώρα αφύπνισης"
 
-#: ../src/appointment.c:2933
-#, fuzzy
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
 msgstr ""
-"Συχνά θέλετε να έχετε αφύπνιση:\n"
-" 1) πριν την έναρξη γεγονότος\n"
-" 2) πριν από το τέλος από κάτι που έχετε να κάνετε\n"
-" 3) μετά την έναρξη από κάτι που έχετε να κάνετε"
 
-#: ../src/appointment.c:2938
-#, fuzzy
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
-msgstr "Επίμονη αφύπνισης"
+msgstr ""
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
 msgstr ""
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Ήχοι"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "Χρήση"
 
-#: ../src/appointment.c:2955
-#, fuzzy
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
-msgstr "Επιλέξτε αυτό αν θέλετε ηχητικό συναγερμό"
+msgstr ""
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "Επανάληψη ήχου ειδοποίησης"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "φορές"
 
-#: ../src/appointment.c:3004
-#, fuzzy
+#: ../src/appointment.c:3119
 msgid "sec interval"
-msgstr "sec διάστημα"
+msgstr ""
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
-msgstr ""
+msgstr "Ορατό"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr ""
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
 msgstr ""
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Χρήση ειδοποίησης"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
 msgstr ""
 
-#: ../src/appointment.c:3040
-#, fuzzy
+#: ../src/appointment.c:3155
 msgid "Set timeout"
-msgstr "Επιλογή ζώνης ώρας"
+msgstr ""
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
 msgstr ""
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr ""
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "δευτερόλεπτα"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Διαδικασία"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
 msgstr ""
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -946,101 +989,92 @@
 "\t<&ET> appointment end time"
 msgstr ""
 
-#: ../src/appointment.c:3094
-#, fuzzy
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
-msgstr "Δοκιμή αυτής της αφύπνισης με την αύξηση του τώρα"
+msgstr ""
 
-#: ../src/appointment.c:3101
-#, fuzzy
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
-msgstr "Προκαθορισμένη ειδοποίηση"
+msgstr ""
 
-#: ../src/appointment.c:3109
-#, fuzzy
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
-msgstr "Αποθηκεύστε τις τρέχουσες ρυθμίσεις ως προεπιλογή συναγερμού"
+msgstr ""
 
-#: ../src/appointment.c:3114
-#, fuzzy
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
-msgstr "Ορίστε τις τρέχουσες ρυθμίσεις από το προεπιλεγμένο ξυπνητήρι"
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Κανένα"
+msgstr ""
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Ημερήσια"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Εβδομαδιαία"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Μηνιαία"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Ετήσια"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
-msgstr ""
+msgstr "Ωραιαία"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Δευ"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Τρι"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Τετ"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Πεμ"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Παρ"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "Σάβ"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "Κυρ"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Επανάληψη"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Περιπλοκότητα"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Βασικά"
 
-#: ../src/appointment.c:3198
-#, fuzzy
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Προχωρημένα"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "Χρησιμοποιήστε αυτό εαν επιθυμείτε κανονικά επαναλαμβανόμενο συμβάν"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
@@ -1048,53 +1082,51 @@
 msgstr ""
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Συχνότητα"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Κάθε"
 
-#: ../src/appointment.c:3224
-#, fuzzy
+#: ../src/appointment.c:3337
 msgid "occurrence"
-msgstr "περιστατικό"
+msgstr ""
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
 msgstr ""
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Όριο"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Συνεχές"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Επανάληψη"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Επανάληψη μέχρι"
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-#, fuzzy
+#: ../src/appointment.c:3423
 msgid "Weekdays"
-msgstr "Εργάσιμες ημέρες"
+msgstr ""
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "Ποιά ημέρα"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1105,274 +1137,294 @@
 msgstr ""
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr ""
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
 msgstr ""
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "Εξαιρέσεις"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
 msgstr ""
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr ""
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr ""
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
 msgstr ""
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
 msgstr ""
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
 msgstr ""
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Προβολή"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "_Μετάβαση"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Νέο"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Πίσω"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Σήμερα"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Μπροστά"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Πίσω μια εβδομάδα"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Πίσω μια ημέρα"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Μπροστά μια ημέρα"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Μπροστά μια εβδομάδα"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Ανανέωση"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr ""
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - Προβολή ημέρας"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Ολόκληρη τη μέρα"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Ώρα"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "Δεν έχουν επιλεγεί γραμμές"
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
 msgstr ""
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
+msgstr "Θα διαγραφούν όλα τα\nεπιλεγμένα ραντεβού."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
 msgstr ""
-"Θα διαγραφούν όλα τα\n"
-"επιλεγμένα ραντεβού."
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Πίσω"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Μπροστά"
+
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Εύρεση"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "Προβολή ημέρας"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Επιπλέον ημέρες προς εμφάνιση"
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr ""
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr ""
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr ""
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr ""
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr ""
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "Καταχωρήσεις ημερολογίου που ξεκινάνε απο:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "Αναζήτηση κειμένου"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Διακόπτες"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Τίτλος"
 
-#: ../src/event-list.c:1323
-#, fuzzy
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
-"Επεξεργασία με διπλό κλικ.\n"
-"\n"
-"Σημαίες κατά σειρά:\n"
-"\t 1. Ειδοποίηση: n=χωρίς ειδοποίηση\n"
-"\t\t A=Οπτική ειδοποίηση S=και ηχητική ειδοποίηση\n"
-"\t 2.Επανάληψη: n=χωρίς επανάληψη\n"
-"\t\t D=Ημερήσιο W=Εβδομαδιαίο M=Μηνιαίο Y=Ετήσιο\n"
-"\t 3. Τύπος: f=Διαθέσιμος B=Απασχολημένος"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Επιλογή ημερομηνίας"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr ""
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr ""
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Όριο αρχειοθέτησης: %d μήνας(ες)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr ""
 
-#: ../src/ical-archive.c:377
-#, fuzzy, c-format
+#: ../src/ical-archive.c:379
+#, c-format
 msgid "Archiving uid: %s"
-msgstr "Αρχειοθέτηση"
+msgstr ""
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr ""
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr ""
 
-#: ../src/ical-archive.c:405
-#, fuzzy
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
-msgstr "Αρχειοθέτηση"
+msgstr ""
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
-#, fuzzy
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
-msgstr "Κατώφλι αρχειοθέτησης"
+msgstr ""
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr ""
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr ""
 
-#: ../src/ical-archive.c:470
-#, fuzzy
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
-msgstr "Κατώφλι αρχειοθέτησης"
+msgstr ""
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Προκαθορισμένη ειδοποίηση"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr ""
+
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
+msgid "\tAdded %d alarms. Processed %d events."
 msgstr ""
-"Δημιουργία λίστας ειδοποιήσεων: Πρόθήκη %d ειδοποιήσεων. Επεξεργασία %d "
-"συμβάντων."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tΒρέθηκαν %d ειδοποιήσεις απο τις οποίες %d είναι ενεργές. (Αναζήτηση %d "
-"επαναλαμβανόμενων ειδοποιήσεων)"
+msgstr "\tΒρέθηκαν %d ειδοποιήσεις απο τις οποίες %d είναι ενεργές. (Αναζήτηση %d επαναλαμβανόμενων ειδοποιήσεων)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1390,7 +1442,16 @@
 msgid "Import file preprocessing done"
 msgstr ""
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Αρχεία ημερολογίου"
 
@@ -1398,596 +1459,672 @@
 msgid "Current foreign files"
 msgstr ""
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
-msgstr ""
+msgstr "ΜΟΝΟ ΓΙΑ ΑΝΑΓΝΩΣΗ"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
-msgstr ""
+msgstr "ΑΝΑΓΝΩΣΗ ΕΓΓΡΑΦΗ"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr ""
 
-#: ../src/interface.c:974
-msgid "Import/export"
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Το όνομα αρχείου είναι κενό."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Το όνομα είναι κενό."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Το αρχείο δεν υπάρχει."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Υπάρχει ήδη το ίδιο όνομα αρχείου στο Orange."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
 msgstr ""
 
-#: ../src/interface.c:981
+#: ../src/interface.c:965
+msgid "Import/export"
+msgstr "Εισαγωγή/εξαγωγή"
+
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Εισαγωγή"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Ανάγνωση από αρχείο:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
 msgstr ""
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Εξαγωγή"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Εγγραφή στο αρχείο:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Επιλογή"
 
-#: ../src/interface.c:1037
-#, fuzzy
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Όλα τα ραντεβού"
 
-#: ../src/interface.c:1050
-#, fuzzy
+#: ../src/interface.c:1041
 msgid "Named appointments: "
-msgstr "Νέο ραντεβού"
+msgstr ""
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr ""
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr ""
 
-#: ../src/interface.c:1076
-#, fuzzy
+#: ../src/interface.c:1067
 msgid "Archive"
-msgstr "Αρχειοθέτηση"
+msgstr ""
 
-#: ../src/interface.c:1084
-#, fuzzy, c-format
+#: ../src/interface.c:1075
+#, c-format
 msgid "Archive now (threshold: %d months)"
-msgstr "Κατώφλι αρχειοθέτησης"
+msgstr ""
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr ""
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr ""
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
 msgstr ""
 
-#: ../src/interface.c:1118
-#, fuzzy
+#: ../src/interface.c:1109
 msgid "Orage files"
-msgstr "Προτιμήσεις Orage"
+msgstr "Αρχεία Orage"
 
-#: ../src/interface.c:1125
-#, fuzzy
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
-msgstr "Ημερολόγιο"
+msgstr ""
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "Όνομα αρχείου"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Τρέχον αρχείο:"
 
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Νέο αρχείο"
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Νέο αρχείο:"
 
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
 msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Μετονομασία"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
 msgstr ""
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr ""
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Μετακίνηση"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr ""
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Όνομα αρχείου"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr ""
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr ""
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr ""
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Επιλογές"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Μόνο για ανάγνωση"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr ""
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
 msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr ""
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
 msgstr ""
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr ""
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr ""
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr ""
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr ""
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr ""
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr ""
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr ""
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr ""
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr ""
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr ""
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr ""
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
+msgstr "Χρήση: orage [options] [files]\n\n"
 
-#: ../src/main.c:307
-#, fuzzy, c-format
+#: ../src/main.c:314
+#, c-format
 msgid "Options:\n"
-msgstr "Επιλογές ρολογιού"
+msgstr "Επιλογές:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
+msgstr "--version (-v) \t\tεμφάνιση έκδοσης του orange\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
+msgstr "--help (-h) \t\tεμφάνιση αυτού του κειμένου\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
+msgstr "--preferences (-p) \tεμφάνιση φόρμας προτιμήσεων\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
+msgstr "--toggle (-t) \t\tεναλλαγή orange εμφανούς/κρυφού\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
 msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
+msgstr "--remove-foreign (-r) file \tαφαίρεση ξένου αρχείου\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--export (-e) file [appointment...] \tεξαγωγή ραντεβού του Orange σε αρχείο\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr ""
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr ""
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
 msgstr ""
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
+msgstr "\nΆγνωστη επιλογή %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr ""
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Προβολή της επιλεγμένης _ημερομηνίας"
 
-#: ../src/mainbox.c:311
-#, fuzzy
+#: ../src/mainbox.c:329
 msgid "View selected _week"
-msgstr "Προβολή της επιλεγμένης _ημερομηνίας"
+msgstr ""
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Επίλεξε το _σήμερα"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Τοποθεσία"
+msgstr ""
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr ""
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr "Τοποθεσία: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr ""
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Ποτέ"
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:495
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Τίτλος: %s\n%s Έναρξη:\t%s\n Λήξη:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr ""
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr ""
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr ""
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "Κύριες ρυθμίσεις"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Ζώνη ώρας"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr ""
 
-#: ../src/parameters.c:552
-#, fuzzy
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
-msgstr "Κατώφλι αρχειοθέτησης"
+msgstr ""
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr ""
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
 msgstr ""
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Εντολή ήχου"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
 msgstr ""
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Ρυθμίσεις οθόνης"
-
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
+#: ../src/parameters.c:596
+msgid "Calendar window"
 msgstr "Παράθυρο ημερολογίου"
 
-#: ../src/parameters.c:618
-#, fuzzy
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr ""
+
+#: ../src/parameters.c:609
 msgid "Show borders"
-msgstr "Εμφάνιση περιγράμματος"
+msgstr ""
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "Εμφάνιση μενού"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Εμφάνιση μήνα και έτους"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
 msgstr "Εμφάνιση ονομάτων ημερών"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
 msgstr "Εμφάνιση αρίθμησης εβδομάδων"
 
-#: ../src/parameters.c:653
-#, fuzzy
-msgid "Show todo list"
-msgstr "Εμφάνιση λίστας προς υλοποίηση"
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Εμφάνιση μήνα και έτους"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr ""
 
 #: ../src/parameters.c:660
+msgid "Show todo list"
+msgstr ""
+
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
 msgstr ""
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
 msgstr ""
 
-#: ../src/parameters.c:676
-msgid "Show on all desktops"
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
 msgstr ""
 
-#: ../src/parameters.c:683
-#, fuzzy
+#: ../src/parameters.c:691
+msgid "Show on all desktops"
+msgstr "Εμφάνιση σε όλες τις επιφάνειες εργασίας"
+
+#: ../src/parameters.c:696
 msgid "Keep on top"
-msgstr "ορισμός ζώνης ώρας:"
+msgstr ""
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "Προβολή στη μπάρα εργασιών"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "Προβολή στον ειδοποιητή"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "Προβολή στον πίνακα συστήματος"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "Εκκίνηση"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Προβολή"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Απόκρυψη"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Ελαχιστοποιημένο"
 
-#: ../src/parameters.c:793
-#, fuzzy
-msgid "Extra settings"
-msgstr "Μορφοποίηση Κειμένου"
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Παράθυρο ημερολογίου"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "Επίλεξε το _σήμερα"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
 msgstr ""
 
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
+#: ../src/parameters.c:792
+msgid "Select today's date"
 msgstr ""
 
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
 msgstr ""
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
 msgstr ""
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
 msgstr ""
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
 msgstr "Λίστα εκδηλώσεων"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Περισσότερες ρυθμίσεις"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
 msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
 msgstr ""
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
 msgstr ""
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr ""
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr ""
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Πρώτη ημέρα της εβδομάδας"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Επιλεγμένη ημέρα"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr ""
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Χρήση δυναμικού εικονιδίου"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr ""
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr ""
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr ""
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr ""
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr ""
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr ""
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr ""
+
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Προτιμήσεις Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
 msgstr ""
 
-#: ../src/parameters.c:1069
-#, fuzzy, c-format
+#: ../src/parameters.c:1176
+#, c-format
 msgid "Default timezone set to %s."
-msgstr "ορισμός ζώνης ώρας:"
+msgstr ""
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
-msgstr ""
+msgstr "Δεν βρέθηκε προεπιλεγμένη ζώνη ώρας, παρακαλώ επιλέξτε την χειροκίνητα."
 
 #: ../src/reminder.c:562
 msgid "Reminder "
@@ -1997,37 +2134,35 @@
 msgid "Open"
 msgstr "Άνοιγμα"
 
-#: ../src/reminder.c:722
-#, fuzzy
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
-msgstr "Υπενθύμιση"
+msgstr "Υπενθύμιση - Orange"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
+#: ../src/reminder.c:803
+msgid "Postpone"
 msgstr ""
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
 msgstr ""
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr ""
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
 msgstr ""
 
-#: ../src/reminder.c:1166
-#, fuzzy, c-format
+#: ../src/reminder.c:1154
+#, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr "Επανάληψη ήχου ειδοποίησης"
+msgstr ""
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2050,1728 +2185,2266 @@
 msgstr "Αφρική/Αλγέρι"
 
 #: ../src/timezone_names.c:41
+msgid "Africa/Asmara"
+msgstr ""
+
+#: ../src/timezone_names.c:42
 msgid "Africa/Asmera"
 msgstr "Αφρική/Ασμέρα"
 
-#: ../src/timezone_names.c:42
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "Αφρική/Μπαμακό"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "Αφρική/Μπάνγκουι"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "Αφρική/Μπαντζούλ"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "Αφρική/Μπισσάου"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "Αφρική/Μπλάντυρ"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "Αφρική/Μπραζαβίλ"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "Αφρική/Μπουζουμπούρα"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "Αφρική/Κάιρο"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "Αφρική/Καζαμπλάνκα"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "Αφρική/Κέουτα"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "Αφρική/Κόνακρυ"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "Αφρική/Ντακάρ"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "Αφρική/Νταρ-Ες-Σαλάμ"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "Αφρική/Τζιμπουτί"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "Αφρική/Ντουάλα"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "Αφρική/Ελ Αγιούν"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "Αφρική/Φρητάουν"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "Αφρική/Γκαμπορόν"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "Αφρική/Χαράρε"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr ""
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "Αφρική/Γιοχάνεσμπουργκ"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "Αφρική/Καμπάλα"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "Αφρική/Χαρτούμ"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "Αφρική/Κιγκάλι"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "Αφρική/Κινσάσα"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "Αφρική/Λάγγος"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "Αφρική/Λιμπρεβίλ"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "Αφρική/Λόμε"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "Αφρική/Λουάντα"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "Αφρική/Λουμπουμπάσι"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "Αφρική/Λουζάκα"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "Αφρική/Μαλάμπο"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "Αφρική/Μαπούτο"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "Αφρική/Μασερού"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "Αφρική/Μπαμπάνε"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "Αφρική/Μογκαντίσου"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "Αφρική/Μονροβία"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "Αφρική/Ναϊρόμπι"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "Αφρική/Ντζιαμένα"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "Αφρική/Νιαμέυ"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "Αφρική/Νουακχώτ"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "Αφρική/Ουαγκαντούγκου"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "Αφρική/Πόρτο-Νόβο"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "Αφρική/Σάο Τόμε"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "Αφρική/Τιμπουκτού"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "Αφρική/Τρίπολη"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "Αφρική/Τύνιδα"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "Αφρική/Ουίντχουκ"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "Αμερική"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "Αμερική/Αντάκ"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "Αμερική/Άνκορατζ"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "Αμερική/Αγκίλα"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "Αμερική/Αντίγκουα"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "Αμερική/Αραγκουάινα"
 
-#: ../src/timezone_names.c:95
-#, fuzzy
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
-msgstr "Αμερική/Μπουένος Άιρες"
+msgstr "Αμερική/Αργεντινή/_Μπουένος Άιρες"
 
-#: ../src/timezone_names.c:96
-#, fuzzy
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
-msgstr "Αμερική/Καταμάρκα"
+msgstr "Αμερική/Αργεντινή/Καταμάρκα"
 
-#: ../src/timezone_names.c:97
-#, fuzzy
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr ""
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
-msgstr "Αμερική/Κόρντομπα"
+msgstr "Αμερική/Αργεντινή/Κόρντομπα"
 
-#: ../src/timezone_names.c:98
-#, fuzzy
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
-msgstr "Αμερική/Γιούγιουι"
+msgstr "Αμερική/Αργεντινή/Γιούγιουι"
 
-#: ../src/timezone_names.c:99
-#, fuzzy
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr ""
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
-msgstr "Αμερική/Μεντόζα"
+msgstr "Αμερική/Αργεντινή/Μεντόζα"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr ""
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr ""
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr ""
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr ""
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr ""
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr ""
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "Αμερική/Αρούμπα"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "Αμερική/Ασουνθιόν"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr ""
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr ""
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr ""
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr ""
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "Αμερική/Μπαρμπάντος"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "Αμερική/Μπέλεμ"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "Αμερική/Μπελίζ"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr ""
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "Αμερική/Μπόα Βίστα"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "Αμερική/Μπογκοτά"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "Αμερική/Μπόιζ"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "Αμερική/Μπουένος Άιρες"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "Αμερική/Κέμπριτζ Μπέυ"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr ""
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "Αμερική/Κανκούν"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "Αμερική/Καράκας"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "Αμερική/Καταμάρκα"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "Αμερική/Καϋέν"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "Αμερική/Κάυμαν"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "Αμερική/Σικάγο"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "Αμερική/Τσιουάουα"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr ""
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "Αμερική/Κόρντομπα"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "Αμερική/Κόστα Ρίκα"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr ""
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "Αμερική/Κουϊάμπα"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "Αμερική/Κουρασάο"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "Αμερική/Ντώσον"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "Αμερική/Ντώσον Κρηκ"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "Αμερική/Ντένβερ"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "Αμερική/Ντητρόιτ"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "Αμερική/Ντομίνικα"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "Αμερική/Έντμοντον"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr ""
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "Αμερική/Εϊρουνέπε"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "Αμερική/Ελ Σαλβαδόρ"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "Αμερική/Φορταλέζα"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr ""
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "Αμερική/Γκλέις Μπέυ"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "Αμερική/Γκόντχαμπ"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "Αμερική/Γκουζ Μπέυ"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "Αμερική/Γκραντ Τουρκ"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "Αμερική/Γρενάδα"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "Αμερική/Γουαδελούπη"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "Αμερική/Γουατεμάλα"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "Αμερική/Γκουαγιακίλ"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "Αμερική/Γουϊάνα"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "Αμερική/Χάλιφαξ"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "Αμερική/Αβάνα"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "Αμερική/Ερμοσίλλο"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "Αμερική/Ινδιάνα/Ινδιανάπολη"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "Αμερική/Ινδιάνα/Νοξ"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "Αμερική/Ινδιάνα/Μαρένγκο"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr ""
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr ""
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "Αμερική/Ινδιάνα/Βέβεϋ"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr ""
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr ""
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "Αμερική/Ινδιανάπολη"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "Αμερική/Ινουβίκ"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "Αμερική/Ικαλούιτ"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "Αμερική/Τζαμάικα"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "Αμερική/Γιούγιουι"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "Αμερική/Γιούνω"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "Αμερική/Κεντάκυ/Λούισβιλ"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "Αμερική/Κεντάκυ/Μοντισέλλο"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr ""
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr ""
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "Αμερική/Λα Παζ"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "Αμερική/Λίμα"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "Αμερική/Λος Άντζελες"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "Αμερική/Λούισβιλ"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr ""
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "Αμερική/Μασέιο"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "Αμερική/Μανάγκουα"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "Αμερική/Μανάους"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr ""
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "Αμερική/Μαρτινίκα"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr ""
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "Αμερική/Μαζατλάν"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "Αμερική/Μεντόζα"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "Αμερική/Μενομινέ"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "Αμερική/Μερίντα"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr ""
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "Αμερική/Πόλη του Μεξικού"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "Αμερική/Μικελόν"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr ""
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "Αμερική/Μοντερέυ"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "Αμερική/Μοντεβιντέο"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "Αμερική/Μόντρεαλ"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "Αμερική/Μονσεράτ"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "Αμερική/Νασσάου"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "Αμερική/Νέα Υόρκη"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "Αμερική/Νιπιγκόν"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "Αμερική/Νόμε"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr ""
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr ""
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "Αμερική/Νορόνα"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr ""
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "Αμερική/Παναμάς"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "Αμερική/Πάγγνιρτουγκ"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "Αμερική/Παραμαρίμπο"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "Αμερική/Φοίνιξ"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "Αμερική/Πορτ-Ο-Πρενς"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "Αμερική/Πορτ-Οβ-Σπέιν"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr ""
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "Αμερική/Πόρτο Βέλο"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "Αμερική/Πουέρτο Ρίκο"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "Αμερική/Ρέινυ Ρίβερ"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "Αμερική/Ράνκιν_Ίνλετ"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "Αμερική/Ρεσίφε"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "Αμερική/Ρεγκίνα"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr ""
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "Αμερική/Ρίο Μπράνκο"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "Αμερική/Ροσάριο"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr ""
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr ""
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "Αμερική/Σαντιάγκο"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "Αμερική/Σάντο Ντομίνγκο"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "Αμερική/Σάο Πάολο"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "Αμερική/Σκορέσμπυσουντ"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "Αμερική/Σίπροκ"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr ""
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr ""
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "Αμερική/Σαιντ Τζωνς"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "Αμερική/Σαιντ Κιτς"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "Αμερική/Σαντα Λουτσία"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "Αμερική/Σαιντ Τόμας"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "Αμερική/Σαιντ Βίνσεντ"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "Αμερική/Σουίφτ Κάρρεντ"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "Αμερική/Τεγκουσιγκάλπα"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "Αμερική/Θούλη"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "Αμερική/Θάντερ Μπέυ"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "Αμερική/Τιχουάνα"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr ""
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "Αμερική/Τόρτολα"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "Αμερική/Βανκούβερ"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr ""
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "Αμερική/Γουάιτχορς"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "Αμερική/Γουίννιπεγκ"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "Αμερική/Γιάκουτατ"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "Αμερική/Γιέλοουνάιφ"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Ανταρκτική"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Ανταρκτική/Κέισυ"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Ανταρκτική/Ντέιβις"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Ανταρκτική/Ντυμόντ Ντ' Ουρβίλ"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr ""
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Ανταρκτική/Μώσον"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Ανταρκτική/ΜακΜέρντο"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Ανταρκτική/Πάλμερ"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr ""
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Ανταρκτική/Νότιος Πόλος"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "Ανταρκτική/Σίοβα"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Ανταρκτική/Βοστόκ"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Αρκτικός κύκλος"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Αρκτικός κύκλος/Λονγκιρμπίεν"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Ασία"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Ασία/Άντεν"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Ασία/Αλμάτυ"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Ασία/Αμμάν"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Ασία/Αναντύρ"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Ασία/Ακτάου"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Ασία/Ακτόμπε"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "Ασία/Ασγκαμπάτ"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr ""
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "Ασία/Βαγδάτη"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Ασία/Μπαχρέιν"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Ασία/Μπακού"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Ασία/Μπανγκόγκ"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Ασία/Βηρυτός"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Ασία/Μπίσκεκ"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Ασία/Μπρουνέι"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Ασία/Καλκούτα"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr ""
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr ""
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "Ασία/Άντεν"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Ασία/Κολόμπο"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr ""
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "Ασία/Δαμασκός"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Ασία/Ντάκα"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Ασία/Ντίλι"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Ασία/Ντουμπάι"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Ασία/Ντουσάμπε"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Ασία/Γάζα"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Ασία/Χαρμπίν"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr ""
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Ασία/Χονγκ Κονγκ"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr ""
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Ασία/Χοβντ"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Ασία/Ιρκούτσκ"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Ασία/Κωνσταντινούπολη"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Ασία/Τζακάρτα"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Ασία/Τζαγιαπούρα"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Ασία/Ιερουσαλήμ"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Ασία/Καμπούλ"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Ασία/Καμτσάτκα"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Ασία/Καράτσι"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Ασία/Κασγκάρ"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr ""
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Ασία/Κατμαντού"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr ""
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr ""
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Ασία/Κρασνόγιαρσκ"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Ασία/Κουάλα Λουμπούρ"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Ασία/Κούτσινγκ"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Ασία/Κουβέιτ"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Ασία/Μακάο"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr ""
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Ασία/Μαγκαντάν"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr ""
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Ασία/Μανίλα"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Ασία/Μουσκάτ"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Ασία/Λευκωσία"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr ""
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Ασία/Νοβοσιμπίρσκ"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Ασία/Ομσκ"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr ""
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Ασία/Πνομ Πενχ"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Ασία/Ποντιάνακ"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Ασία/Πιονγκ Γιανγκ"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Ασία/Κατάρ"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Ασία/Ρανγκούν"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Ασία/Ριάντ"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr ""
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr ""
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr ""
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Ασία/Σαϊγκόν"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Ασία/Σαμαρκάνδη"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Ασία/Σεούλ"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Ασία/Σαγγάη"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Ασία/Σιγκαπούρη"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Ασία/Ταϊπέι"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Ασία/Τασκένδη"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Ασία/Τυφλίδα"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Ασία/Τεχεράνη"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr ""
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr ""
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Ασία/Τιμφού"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Ασία/Τόκιο"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "Ασία/Ουγιούνγκ Παντάνγκ"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Ασία/Ουλάν Μπατόρ"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr ""
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Ασία/Ουρούμκι"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr ""
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Ασία/Βιεντιάνε"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Ασία/Βλαδιβοστόκ"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Ασία/Γιακούτσκ"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Ασία/Αικατερίνμπουργκ"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Ασία/Ερεβάν"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Ατλαντικός"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Ατλαντικός/Αζόρες"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Ατλαντικός/Βερμούδες"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Ατλαντικός/Κανάριοι Νήσοι"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "Ατλαντικός/Πράσινο Ακρωτήριο"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "Ατλαντικός/Φερόες"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr ""
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "Ατλαντικός/Γιαν Μάυεν"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "Ατλαντικός/Μαδέρα"
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
 msgstr "Ατλαντικός/Ρέυκιαβικ"
 
-#: ../src/timezone_names.c:306
+#: ../src/timezone_names.c:375
 msgid "Atlantic/South_Georgia"
 msgstr "Ατλαντικός/Σάουθ Τζώρτζια"
 
-#: ../src/timezone_names.c:307
+#: ../src/timezone_names.c:376
 msgid "Atlantic/St_Helena"
 msgstr "Ατλαντικός/Σάντα Ελένα"
 
-#: ../src/timezone_names.c:308
+#: ../src/timezone_names.c:377
 msgid "Atlantic/Stanley"
 msgstr "Ατλαντικός/Στάνλεϋ"
 
-#: ../src/timezone_names.c:309
+#: ../src/timezone_names.c:378
 msgid "Australia"
 msgstr "Αυστραλία"
 
-#: ../src/timezone_names.c:310
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr ""
+
+#: ../src/timezone_names.c:380
 msgid "Australia/Adelaide"
 msgstr "Αυστραλία/Αδελαΐδα"
 
-#: ../src/timezone_names.c:311
+#: ../src/timezone_names.c:381
 msgid "Australia/Brisbane"
 msgstr "Αυστραλία/Μπρισμπέιν"
 
-#: ../src/timezone_names.c:312
+#: ../src/timezone_names.c:382
 msgid "Australia/Broken_Hill"
 msgstr "Αυστραλία/Μπρόκεν Χιλ"
 
-#: ../src/timezone_names.c:313
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr ""
+
+#: ../src/timezone_names.c:384
 msgid "Australia/Darwin"
 msgstr "Αυστραλία/Ντάργουιν"
 
-#: ../src/timezone_names.c:314
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr ""
+
+#: ../src/timezone_names.c:386
 msgid "Australia/Hobart"
 msgstr "Αυστραλία/Χόμπαρτ"
 
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr "Αυστραλία/Λίντεμαν"
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr "Αυστραλία/Λίντεμαν"
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr "Αυστραλία/Λορντ Χάου"
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "Αυστραλία/Μελβούρνη"
+
+#: ../src/timezone_names.c:390
+msgid "Australia/Perth"
+msgstr "Αυστραλία/Περθ"
+
+#: ../src/timezone_names.c:391
+msgid "Australia/Sydney"
+msgstr "Αυστραλία/Σύδνεϋ"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr ""
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr ""
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr ""
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr ""
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr ""
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Καναδάς"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Καναδάς/Ατλαντικός"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr ""
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr ""
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr ""
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr ""
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr ""
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr ""
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr ""
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr ""
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Χιλή"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr ""
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr ""
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr ""
 
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr "Αυστραλία/Λορντ Χάου"
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
 
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr "Αυστραλία/Μελβούρνη"
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
 
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr "Αυστραλία/Περθ"
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr ""
 
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr "Αυστραλία/Σύδνεϋ"
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr ""
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Ευρώπη"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "Ευρώπη/Άμστερνταμ"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Ευρώπη/Ανδόρρα"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Ευρώπη/Αθήνα"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Ευρώπη/Μπέλφαστ"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Ευρώπη/Βελιγράδι"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Ευρώπη/Βερολίνο"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Ευρώπη/Μπρατισλάβα"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Ευρώπη/Βρυξέλες"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Ευρώπη/Βουκουρέστι"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Ευρώπη/Βουδαπέστη"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr ""
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Ευρώπη/Σισινάου"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Ευρώπη/Κοπεγχάγη"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "Ευρώπη/Δουβλίνο"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Ευρώπη/Γιβραλτάρ"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr ""
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Ευρώπη/Ελσίνκι"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr ""
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Ευρώπη/Κωνσταντινούπολη"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Ευρώπη/Τζέρσεϊ"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Ευρώπη/Καλίνιγκραντ"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Ευρώπη/Κίεβο"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Ευρώπη/Λισαβώνα"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "Ευρώπη/Λιουμπλιάνα"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Ευρώπη/Λονδίνο"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Ευρώπη/Λουξεμβούργο"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Ευρώπη/Μαδρίτη"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Ευρώπη/Μάλτα"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr ""
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Ευρώπη/Μινσκ"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Ευρώπη/Μονακό"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Ευρώπη/Μόσχα"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "Ευρώπη/Λευκωσία"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Ευρώπη/Όσλο"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Ευρώπη/Παρίσι"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr ""
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Ευρώπη/Πράγα"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Ευρώπη/Ρίγα"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Ευρώπη/Ρώμη"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Ευρώπη/Σαμάρα"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Ευρώπη/Άγιος Μαρίνος"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Ευρώπη/Σεράγιεβο"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "Ευρώπη/Σιμφερόπολ"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "Ευρώπη/Σκόπια"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Ευρώπη/Σόφια"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Ευρώπη/Στοκχόλμη"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Ευρώπη/Ταλίν"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Ευρώπη/Τίρανα"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr ""
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "Ευρώπη/Ούζγκοροντ"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Ευρώπη/Βαντούζ"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Ευρώπη/Βατικανό"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Ευρώπη/Βιέννη"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "Ευρώπη/Βίλνιους"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr ""
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "Ευρώπη/Βαρσοβία"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Ευρώπη/Ζάγκρεμπ"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "Ευρώπη/Ζαπορόζιε"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "Ευρώπη/Ζυρίχη"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Ινδικός"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "Ινδικός/Ανταναναρίβο"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "Ινδικός/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "Ινδικός/Christmas"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "Ινδικός/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "Ινδικός/Κομόρες"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "Ινδικός/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "Ινδικός/Μάχε"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "Ινδικός/Μαλδίβες"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "Ινδικός/Μαυρίκιος"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "Ινδικός/Μαγιότ"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "Ινδικός/Ρεουνιόν"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Μεξικό"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr ""
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr ""
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr ""
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr ""
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr ""
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr ""
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr ""
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Ειρηνικός"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "Ειρηνικός/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Ειρηνικός/Ώκλαντ"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Ειρηνικός/Τσάτχαμ"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr ""
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "Ειρηνικός/Πάσχα"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "Ειρηνικός/Εφάτε"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "Ειρηνικός/Εντέρμπουρυ"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Ειρηνικός/Φακαόφο"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "Ειρηνικός/Φίτζι"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Ειρηνικός/Φουναφούτι"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Ειρηνικός/Γκαλαπάγος"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Ειρηνικός/Γκαμπιέ"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "Ειρηνικός/Γκουανταλκανάλ"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Ειρηνικός/Γουάμ"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Ειρηνικός/Χονολουλού"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Ειρηνικός/Τζόνστον"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "Ειρηνικός/Κριτιμάτι"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "Ειρηνικός/Κοσράε"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "Ειρηνικός/Κουατζαλίν"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Ειρηνικός/Μαγιούρο"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Ειρηνικός/Μαρκέσας"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Ειρηνικός/Μίντγουέϊ"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Ειρηνικός/Ναούρου"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Ειρηνικός/Νιούε"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Ειρηνικός/Νόρφολκ"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "Ειρηνικός/Νουμία"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Ειρηνικός/Πάγκο Πάγκο"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Ειρηνικός/Παλάου"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "Ειρηνικός/Νήσοι Πίτκαιρν"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr ""
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "Ειρηνικός/Πονάπε"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Ειρηνικός/Πορτ Μόρσμπι"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Ειρηνικός/Ραροτόνγκα"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Ειρηνικός/Σαϊπάν"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr ""
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Ειρηνικός/Ταϊτή"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Ειρηνικός/Ταράβα"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Ειρηνικός/Τονγκαπάτου"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Ειρηνικός/Τρούκ"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Ειρηνικός/Ουέηκ"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Ειρηνικός/Γουάλις"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "Ειρηνικός/Γιάπ"
 
-#: ../src/tray_icon.c:469
-msgid "New appointment"
-msgstr "Νέο ραντεβού"
-
-#: ../src/tray_icon.c:485
-msgid "About Orage"
-msgstr "Περί Orage"
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
-msgid "Orage Panel Clock"
-msgstr "Ρολόι Orage"
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-msgid "Show time and date?"
-msgstr "Εμφάνιση ημερομηνίας και ώρας;"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Ημερολόγιο"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Προτιμήσεις Orage"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-msgid "Orage preferences"
-msgstr "Προτιμήσεις Orage"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Ρυθμίσεις ημερολογίου του Xfce 4"
-
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Ημερολόγιο γραφείου"
-
-#: ../xfcalendar.desktop.in.h:3
-msgid "Orage Calendar"
-msgstr "Ημερολόγιο Orage"
-
-#~ msgid "Orage clock"
-#~ msgstr "Ρολόι orage"
-
-#~ msgid "Contributor"
-#~ msgstr "Συντελεστής"
-
-#~ msgid "Info"
-#~ msgstr "Πληροφορίες"
-
-#~ msgid "Warning"
-#~ msgstr "Προειδοποίηση"
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
 
-#~ msgid "Error"
-#~ msgstr "Σφάλμα"
-
-#~ msgid "Display"
-#~ msgstr "Εμφάνιση"
-
-#~ msgid "Select always today"
-#~ msgstr "Επίλεξε το _σήμερα"
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Εκκίνηση κατάστασης ρύθμισης ώρας"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Εκκίνηση κατάστασης ρύθμισης ώρας"
-
-#~ msgid "Vary"
-#~ msgstr "Ετήσια"
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr ""
 
-#~ msgid "Select timezone"
-#~ msgstr "Επιλογή ζώνης ώρας"
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr ""
 
-#~ msgid "Modify Clock "
-#~ msgstr "Επεξεργασία Ρολογιού"
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr ""
 
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "εισάγετε ζώνη ώρας του ρολογιού,\n"
-#~ "(=οποιαδήποτε έγκυρη TZ τιμή)"
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr ""
 
-#~ msgid "Modify Preferences"
-#~ msgstr "Προτιμήσεις Orage"
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr ""
 
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr "Εισάγετε κάποια έγκυρη ζώνη ώρας (=TZ) ή επιλέξτε μια από τη λίστα."
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr ""
 
-#~ msgid "show line _1:"
-#~ msgstr "Εμφάνιση γραμμής _1:"
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr ""
 
-#~ msgid "show line _2:"
-#~ msgstr "Εμφάνιση γραμμής _2:"
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr ""
 
-#~ msgid "show line _3:"
-#~ msgstr "Εμφάνιση γραμμής _3:"
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr ""
 
-#~ msgid "Properties"
-#~ msgstr "Ιδιότητες"
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr ""
 
-#~ msgid "Show event list"
-#~ msgstr "Προβολή στον πίνακα συστήματος"
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr ""
 
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Ρυθμίσεις ημερολογίου του Xfce 4"
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr ""
 
-#~ msgid "Monday"
-#~ msgstr "Σήμερα"
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr ""
 
-#~ msgid "Tuesday"
-#~ msgstr "Σήμερα"
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "ΗΠΑ"
 
-#~ msgid "Wednesday"
-#~ msgstr "Εβδομαδιαία"
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "ΗΠΑ/Αλάσκα"
 
-#~ msgid "Thursday"
-#~ msgstr "Σήμερα"
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr ""
 
-#~ msgid "Friday"
-#~ msgstr "ημέρες"
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "ΗΠΑ/Αριζόνα"
 
-#~ msgid "Sunday"
-#~ msgstr "Ήχοι"
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr ""
 
-#~ msgid "Days"
-#~ msgstr "ημέρες"
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr ""
 
-#~ msgid "normal"
-#~ msgstr "Γενικές"
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr ""
 
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%d/%m/%Y"
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "ΗΠΑ/Χαβάη"
 
-#~ msgid "Calendar Files"
-#~ msgstr "Αρχεία ημερολογίου"
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr ""
 
-#~ msgid "Calendar borders"
-#~ msgstr "Περιγράμματα παραθύρου"
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "ΗΠΑ/Μίτσιγκαν"
 
-#~ msgid "Hidden"
-#~ msgstr "Απόκρυψη"
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr ""
 
-#~ msgid "3 months"
-#~ msgstr "3 μήνες"
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr ""
 
-#~ msgid "6 months"
-#~ msgstr "6 μήνες"
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr ""
 
-#~ msgid "1 year"
-#~ msgstr "1 χρόνο"
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr ""
 
-#~ msgid "Application"
-#~ msgstr "Εφαρμογή"
+#: ../src/tray_icon.c:469
+msgid "New appointment"
+msgstr "Νέο ραντεβού"
 
-#~ msgid "Button Label|Orage"
-#~ msgstr "Orage"
+#: ../src/tray_icon.c:485
+msgid "About Orage"
+msgstr "Περί Orage"
 
-#~ msgid "Core developer"
-#~ msgstr "Βασικός προγραμματιστής"
+#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
+msgid "Orage Panel Clock"
+msgstr ""
 
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Θα αφαιρέσετε όλες τις πληροφορίες \n"
-#~ "που σχετίζονται με αυτή την ημερομηνία."
+#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
+msgid "Show time and date?"
+msgstr "Εμφάνιση ημερομηνίας και ώρας;"
 
-#~ msgid "Clear"
-#~ msgstr "Καθάρισμα"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
+msgid "Orage preferences"
+msgstr "Προτιμήσεις Orage"
 
-#~ msgid "uid"
-#~ msgstr "uid"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr "Ρυθμίσεις εφαρμογής ημερολογίου του Xfce 4 (Orange)"
 
-#~ msgid "This should not happen"
-#~ msgstr "Αυτό δε θα έπρεπε να συμβεί"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Προτιμήσεις ημερολογίου Orange"
 
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Αδύνατη η δημιουργία καναλιού πελάτη MCS"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Ημερολόγιο"
 
-#~ msgid "Open archive file..."
-#~ msgstr "Επιλογή αρχείου..."
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr "Ημερολόγιο Orage"
 
-#~ msgid "Close archive file"
-#~ msgstr "Κλείσιμο αρχείου"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Ημερολόγιο γραφείου"
diff -Nru orage-4.8.3/po/en_AU.po orage-4.12.1/po/en_AU.po
--- orage-4.8.3/po/en_AU.po	2012-01-03 12:01:02.000000000 +0000
+++ orage-4.12.1/po/en_AU.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,29 +1,46 @@
-# British English translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Zuza Software Foundation (Translate.org.za), 2004.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Michael Findlay <keltoiboy@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2006-10-08 17:20+0900\n"
-"Last-Translator: Juha Kautto <juha@xfce.org>\n"
-"Language-Team: Austrilian English <en_gb@li.org>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2014-10-02 06:15+0000\n"
+"Last-Translator: Michael Findlay <keltoiboy@gmail.com>\n"
+"Language-Team: English (Australia) (http://www.transifex.com/projects/p/xfce-apps/language/en_AU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Language: en_AU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "no underline"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "single"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "double"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "low"
+
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr ""
+msgstr "Raising GlobalTime window..."
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
-msgstr ""
+msgstr "GlobalTime window raise failed"
 
 #. ********** timezone tooltip **********
 #: ../globaltime/globaltime.c:277
@@ -31,112 +48,116 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
+msgstr "%s\nclick to modify clock"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
-msgstr ""
+msgstr "Localtime"
 
 #: ../globaltime/globaltime.c:464
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
+msgstr "button 1 to change preferences \nbutton 2 to adjust time of clocks"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
-msgstr ""
+msgstr "adjust to change hour"
 
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
+msgstr "adjust to change minute. Click arrows with button 2 to change only 1 minute."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Global Time"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
-msgstr ""
+msgstr "NEW"
 
 #: ../globaltime/gt_prefs.c:289
 msgid "NEW COPY"
-msgstr ""
+msgstr "NEW COPY"
 
 #: ../globaltime/gt_prefs.c:310
 msgid "Not possible to delete the last clock."
-msgstr ""
+msgstr "Not possible to delete the last clock."
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
-msgstr ""
+msgstr "update this clock"
 
 #: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
 msgid "add new empty clock"
-msgstr ""
+msgstr "add new empty clock"
 
 #: ../globaltime/gt_prefs.c:526
 msgid "add new clock using this clock as model"
-msgstr ""
+msgstr "add new clock using this clock as model"
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
-msgstr ""
+msgstr "delete this clock"
 
 #: ../globaltime/gt_prefs.c:539
 msgid "move this clock first"
-msgstr ""
+msgstr "move this clock first"
 
 #: ../globaltime/gt_prefs.c:544
 msgid "move this clock left"
-msgstr ""
+msgstr "move this clock left"
 
 #: ../globaltime/gt_prefs.c:549
 msgid "move this clock right"
-msgstr ""
+msgstr "move this clock right"
 
 #: ../globaltime/gt_prefs.c:554
 msgid "move this clock last"
-msgstr ""
+msgstr "move this clock last"
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
-msgstr ""
+msgstr "set the timezone of this clock to be local timezone"
 
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
-msgstr ""
+msgstr "close window and exit"
 
 #: ../globaltime/gt_prefs.c:590
 msgid "Globaltime preferences "
-msgstr ""
+msgstr "Globaltime preferences "
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
 msgid "Clock Parameters"
-msgstr ""
+msgstr "Clock Parameters"
 
 #: ../globaltime/gt_prefs.c:607
 msgid "Name of the clock:"
-msgstr ""
+msgstr "Name of the clock:"
 
 #: ../globaltime/gt_prefs.c:613
 msgid "enter name of clock"
-msgstr ""
+msgstr "enter name of clock"
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
-msgstr ""
+msgstr "Timezone of the clock:"
 
 #: ../globaltime/gt_prefs.c:643
 msgid "Text Formatting"
-msgstr ""
+msgstr "Text Formatting"
 
 #. ------------------------background-------------------------
 #: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
 msgid "Background color:"
-msgstr ""
+msgstr "Background colour:"
 
 #: ../globaltime/gt_prefs.c:656
 msgid "Click to change background colour for clock"
-msgstr ""
+msgstr "Click to change background colour for clock"
 
 #: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
 #: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
@@ -144,208 +165,212 @@
 #: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
 #: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
 msgid "Use default"
-msgstr ""
+msgstr "Use default"
 
 #: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
 #: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
 msgid "Cross this to use default instead of selected value"
-msgstr ""
+msgstr "Cross this to use default instead of selected value"
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
 msgid "Foreground (=text) color:"
-msgstr ""
+msgstr "Foreground (=text) colour:"
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
-msgstr ""
+msgstr "Click to change foreground colour for clock"
 
 #. ------------------------name font-------------------------
 #: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
 msgid "Font for name of clock:"
-msgstr ""
+msgstr "Font for name of clock:"
 
 #: ../globaltime/gt_prefs.c:720
 msgid "Click to change font for clock name"
-msgstr ""
+msgstr "Click to change font for clock name"
 
 #. ------------------------time font-------------------------
 #: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
 msgid "Font for time of clock:"
-msgstr ""
+msgstr "Font for time of clock:"
 
 #: ../globaltime/gt_prefs.c:753
 msgid "Click to change font for clock time"
-msgstr ""
+msgstr "Click to change font for clock time"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:780
 msgid "Underline name of clock:"
-msgstr ""
+msgstr "Underline name of clock:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:810
 msgid "Underline time of clock:"
-msgstr ""
+msgstr "Underline time of clock:"
 
 #: ../globaltime/gt_prefs.c:850
 msgid "Text Default Formatting"
-msgstr ""
+msgstr "Text Default Formatting"
 
 #: ../globaltime/gt_prefs.c:863
 msgid "Click to change default background colour for clocks"
-msgstr ""
+msgstr "Click to change default background colour for clocks"
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
+msgstr "Cross this to use system default instead of selected colour"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
-msgstr ""
+msgstr "Click to change default text colour for clocks"
 
 #: ../globaltime/gt_prefs.c:929
 msgid "Click to change default font for clock name"
-msgstr ""
+msgstr "Click to change default font for clock name"
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
+msgstr "Cross this to use system default font instead of selected font"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
-msgstr ""
+msgstr "Click to change default font for clock time"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:990
 msgid "Underline for name of clock:"
-msgstr ""
+msgstr "Underline for name of clock:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:1004
 msgid "Underline for time of clock:"
-msgstr ""
+msgstr "Underline for time of clock:"
 
 #: ../globaltime/gt_prefs.c:1027
 msgid "update preferences"
-msgstr ""
+msgstr "update preferences"
 
 #: ../globaltime/gt_prefs.c:1062
 msgid "Globaltime Preferences"
-msgstr ""
+msgstr "Globaltime Preferences"
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
 msgid "General Preferences"
-msgstr ""
+msgstr "General Preferences"
 
 #: ../globaltime/gt_prefs.c:1077
 msgid "Decorations:"
-msgstr ""
+msgstr "Decorations:"
 
 #: ../globaltime/gt_prefs.c:1078
 msgid "Standard"
-msgstr ""
+msgstr "Standard"
 
 #: ../globaltime/gt_prefs.c:1083
 msgid "Use normal decorations"
-msgstr ""
+msgstr "Use normal decorations"
+
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "None"
 
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
-msgstr ""
+msgstr "Do not show window decorations (borders)"
 
 #: ../globaltime/gt_prefs.c:1100
 msgid "Clock size:"
-msgstr ""
+msgstr "Clock size:"
 
 #: ../globaltime/gt_prefs.c:1101
 msgid "Equal"
-msgstr ""
+msgstr "Equal"
 
 #: ../globaltime/gt_prefs.c:1106
 msgid "All clocks have same size"
-msgstr ""
+msgstr "All clocks have same size"
 
 #: ../globaltime/gt_prefs.c:1111
 msgid "Varying"
-msgstr ""
+msgstr "Varying"
 
 #: ../globaltime/gt_prefs.c:1116
 msgid "Clock sizes vary"
-msgstr ""
+msgstr "Clock sizes vary"
 
 #: ../globaltime/gt_prefs.c:1122
 msgid "Local timezone:"
-msgstr ""
+msgstr "Local timezone:"
 
 #: ../globaltime/timezone_selection.c:101
 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
 msgid " Other"
-msgstr ""
+msgstr " Other"
 
 #: ../globaltime/timezone_selection.c:156
 #: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
 #, c-format
 msgid "%d hour %d mins"
-msgstr ""
+msgstr "%d hour %d mins"
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
 #, c-format
 msgid "%d hour"
-msgstr ""
+msgstr "%d hour"
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
 #, c-format
 msgid "%d mins"
-msgstr ""
+msgstr "%d mins"
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
 msgid "backward"
-msgstr ""
+msgstr "backward"
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
 msgid "forward"
-msgstr ""
+msgstr "forward"
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
 msgid "not changed"
-msgstr ""
+msgstr "not changed"
 
 #: ../globaltime/timezone_selection.c:195
 #: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
 msgid "not changing"
-msgstr ""
+msgstr "not changing"
 
 #. location
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
-msgstr ""
+msgstr "Location"
 
 #: ../globaltime/timezone_selection.c:258
 #: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
 msgid "GMT Offset"
-msgstr ""
+msgstr "GMT Offset"
 
 #: ../globaltime/timezone_selection.c:264
 #: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
 msgid "Previous/Next Change"
-msgstr ""
+msgstr "Previous/Next Change"
 
 #: ../globaltime/timezone_selection.c:269
 #: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
 msgid "Country"
-msgstr ""
+msgstr "Country"
 
 #. We are actually setting the g_par parameter. In other words
 #. we are setting the global default timezone for Orage. This is
@@ -358,7 +383,7 @@
 #: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
 #: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
 msgid "Pick timezone"
-msgstr ""
+msgstr "Pick timezone"
 
 #: ../globaltime/timezone_selection.c:302
 #: ../globaltime/timezone_selection.c:312
@@ -366,7 +391,7 @@
 #: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
 #: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
 msgid "Change mode"
-msgstr ""
+msgstr "Change mode"
 
 #: ../globaltime/timezone_selection.c:303
 #: ../globaltime/timezone_selection.c:313
@@ -377,7 +402,7 @@
 #: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
 #: ../src/timezone_selection.c:379
 msgid "UTC"
-msgstr ""
+msgstr "UTC"
 
 #. NOTE: this exists only if ical timezones are being used
 #: ../globaltime/timezone_selection.c:304
@@ -386,94 +411,110 @@
 #: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
 #: ../src/timezone_selection.c:384
 msgid "floating"
-msgstr ""
+msgstr "floating"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr ""
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr ""
+msgstr "Orage Globaltime"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
-msgstr ""
+msgstr "Show clocks from different countries"
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Globaltime"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "No rotation"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Rotate left"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Rotate right"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
-msgstr ""
+msgstr "Appearance"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
-msgstr ""
+msgstr "Show _frame"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
-msgstr ""
+msgstr "set foreground _colour:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
-msgstr ""
+msgstr "set _background colour:"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
-msgstr ""
+msgstr "set _height:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
+msgstr "Note that you can not change the height of horizontal panels"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
-msgstr ""
+msgstr "set _width:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
-msgstr ""
+msgstr "Note that you can not change the width of vertical panels"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Show lines _vertically"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
-msgstr ""
+msgstr "Clock Options"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
-msgstr ""
+msgstr "set timezone to:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
-msgstr ""
+msgstr "Line %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
-msgstr ""
+msgstr "Enter any valid strftime function parameter."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
-msgstr ""
+msgstr "Tooltip:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
-msgstr ""
+msgstr "fix time after suspend/hibernate"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
+msgstr "You only need this if you do short term (less than 5 hours) suspend or hibernate and your visible time does not include seconds. Under these circumstances it is possible that Orageclock shows time inaccurately unless you have this selected. (Selecting this prevents cpu and interrupt saving features from working.)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -483,13 +524,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
+msgstr "This program uses strftime function to get time.\nUse any valid code to get time in the format you prefer.\nSome common codes are:\n\t%A = weekday\t\t\t%B = month\n\t%c = date & time\t\t%R = hour & minute\n\t%V = week number\t\t%Z = timezone in use\n\t%H = hours \t\t\t\t%M = minute\n\t%X = local time\t\t\t%x = local date"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
-msgstr ""
+msgstr "Orage clock Preferences"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -498,258 +538,318 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
-msgstr ""
+msgstr "%A %d %B %Y/%V"
 
 #: ../src/about-xfcalendar.c:40
 msgid "Maintainer"
-msgstr ""
+msgstr "Maintainer"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "Manage your time with Xfce4"
+msgstr "Manage your time with Orage"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
-msgstr ""
+msgstr "End"
 
 #: ../src/appointment.c:333
 msgid "Due"
-msgstr ""
+msgstr "Due"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
-msgstr ""
+msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
-msgstr ""
+msgstr "Select a file..."
 
 #: ../src/appointment.c:680
 msgid "Sound Files"
-msgstr ""
+msgstr "Sound Files"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
-msgstr ""
+msgstr "All Files"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
-msgstr ""
+msgstr "The appointment information has been modified."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
-msgstr ""
+msgstr "Do you want to continue?"
+
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "No, do not leave"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Yes, ignore modifications and leave"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
-msgstr ""
+msgstr "The end of this appointment is earlier than the beginning."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
-msgstr ""
+msgstr "Not set"
+
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Add new appointment to this file."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Orage default file"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Appointment addition failed."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Error happened when adding appointment. Look more details from the log file."
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Appointment update failed."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Look more details from the log file. (Perhaps file was updated external from Orage?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
-msgstr ""
+msgstr "This appointment will be permanently removed."
+
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "No, cancel the removal"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Yes, remove it"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Pick the date"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Today"
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
-msgstr ""
+msgstr "This appointment does not exist."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
-msgstr ""
+msgstr "It was probably removed, please refresh your screen."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
-msgstr ""
+msgstr "Current categories"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
-msgstr ""
+msgstr "Add new category with colour"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
-msgstr ""
+msgstr "Category:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
-msgstr ""
+msgstr "Colours of categories - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
-msgstr ""
+msgstr " *** COPY ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
-msgstr ""
+msgstr "New appointment - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
-msgstr ""
+msgstr "_File"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
-msgstr ""
+msgstr "Sav_e and close"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
-msgstr ""
+msgstr "D_uplicate"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
-msgstr ""
+msgstr "Save"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
-msgstr ""
+msgstr "Save and close"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
-msgstr ""
+msgstr "Revert"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
-msgstr ""
+msgstr "Duplicate"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
-msgstr ""
+msgstr "Delete"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
-msgstr ""
+msgstr "Free"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
-msgstr ""
+msgstr "Busy"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
-msgstr ""
+msgstr "General"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
-msgstr ""
+msgstr "Type "
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
-msgstr ""
+msgstr "Event"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
+msgstr "Event that will happen sometime. For example:\nMeeting or birthday or TV show."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
-msgstr ""
+msgstr "Todo"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
+msgstr "Something that you should do sometime. For example:\nWash your car or test new version of Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
-msgstr ""
+msgstr "Journal"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
+msgstr "Make a note that something happened. For example:\nRemark that your mother called or first snow came."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
-msgstr ""
+msgstr "Title "
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
-msgstr ""
+msgstr "All day event"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
-msgstr ""
+msgstr "Start"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
-msgstr ""
+msgstr "Set      "
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
-msgstr ""
+msgstr "Duration"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
-msgstr ""
+msgstr "days"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
-msgstr ""
+msgstr "hours"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
-msgstr ""
+msgstr "mins"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
-msgstr ""
+msgstr "Availability"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
-msgstr ""
+msgstr "Completed"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
-msgstr ""
+msgstr "Done"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
-msgstr ""
+msgstr "Categories"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
+msgstr "This is special category, which can be used to colour this appointment in list views."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
-msgstr ""
+msgstr "update colours for categories."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
-msgstr ""
+msgstr "Priority"
+
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "If you set this 8 or bigger, the appointment is NOT shown on list windows.\nYou can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n(Alarms will still fire normally.)\n(There is undocumented parameter so that you can change the default limit of 8.)"
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
-msgstr ""
+msgstr "Note"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -758,125 +858,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "These shorthand commands take effect immediately:\n    <D> inserts current date in local date format\n    <T> inserts time and\n    <DT> inserts date and time.\n\nThese are converted only later when they are seen:\n    <&Ynnnn> is translated to current year minus nnnn.\n(This can be used for example in birthday reminders to tell how old the person will be.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
-msgstr ""
+msgstr "Before Start"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
-msgstr ""
+msgstr "Before End"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
-msgstr ""
+msgstr "After Start"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
-msgstr ""
+msgstr "After End"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
-msgstr ""
+msgstr "Alarm"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
-msgstr ""
+msgstr "Alarm time"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
+msgstr "Often you want to get alarm:\n 1) before Event start\n 2) before Todo end\n 3) after Todo start"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
-msgstr ""
+msgstr "Persistent alarm"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
+msgstr "Select this if you want Orage to remind you even if it has not been active when the alarm happened."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
-msgstr ""
+msgstr "Sound"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
-msgstr ""
+msgstr "Use"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
-msgstr ""
+msgstr "Select this if you want audible alarm"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
-msgstr ""
+msgstr "Repeat alarm sound"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
-msgstr ""
+msgstr "times"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
-msgstr ""
+msgstr "sec interval"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
-msgstr ""
+msgstr "Visual"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
-msgstr ""
+msgstr "Use Orage window"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
-msgstr ""
+msgstr "Select this if you want Orage window alarm"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
-msgstr ""
+msgstr "Use notification"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
-msgstr ""
+msgstr "Select this if you want notification alarm"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
-msgstr ""
+msgstr "Set timeout"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
-msgstr ""
+msgstr "Select this if you want notification to expire automatically"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
-msgstr ""
+msgstr "0 = system default expiration time"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
-msgstr ""
+msgstr "seconds"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
-msgstr ""
+msgstr "Procedure"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
-msgstr ""
+msgstr "Select this if you want procedure or script alarm"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -886,150 +985,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
+msgstr "You must enter all escape etc characters yourself.\nThis string is just given to shell to process.\nThe following special commands are replaced at run time:\n\t<&T>  appointment title\n\t<&D>  appointment description\n\t<&AT> alarm time\n\t<&ST> appointment start time\n\t<&ET> appointment end time"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
-msgstr ""
+msgstr "Test this alarm by raising it now"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
-msgstr ""
+msgstr "<b>Default alarm</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
-msgstr ""
+msgstr "Store current settings as default alarm"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr ""
+msgstr "Set current settings from default alarm"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
-msgstr ""
+msgstr "Daily"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
-msgstr ""
+msgstr "Weekly"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
-msgstr ""
+msgstr "Monthly"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
-msgstr ""
+msgstr "Yearly"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
-msgstr ""
+msgstr "Hourly"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
-msgstr ""
+msgstr "Mon"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
-msgstr ""
+msgstr "Tue"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
-msgstr ""
+msgstr "Wed"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
-msgstr ""
+msgstr "Thu"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
-msgstr ""
+msgstr "Fri"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
-msgstr ""
+msgstr "Sat"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
-msgstr ""
+msgstr "Sun"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
-msgstr ""
+msgstr "Recurrence"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
-msgstr ""
+msgstr "Complexity"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
-msgstr ""
+msgstr "Basic"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
-msgstr ""
+msgstr "Advanced"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
-msgstr ""
+msgstr "Use this if you want regular repeating event"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
+msgstr "Use this if you need complex times like:\n Every Saturday and Sunday or \n First Tuesday every month"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
-msgstr ""
+msgstr "Frequency"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
-msgstr ""
+msgstr "Each"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
-msgstr ""
+msgstr "occurrence"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
+msgstr "Limit frequency to certain interval.\n For example: Every third day:\n Frequency = Daily and Interval = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
-msgstr ""
+msgstr "Limit"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
-msgstr ""
+msgstr "Repeat forever"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
-msgstr ""
+msgstr "Repeat "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
-msgstr ""
+msgstr "Repeat until "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
-msgstr ""
+msgstr "Weekdays"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
-msgstr ""
+msgstr "Which day"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1037,2516 +1132,3317 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
+msgstr "Specify which weekday for monthly and yearly events.\n For example:\n Second Wednesday each month:\n\tFrequency = Monthly,\n\tWeekdays = check only Wednesday,\n\tWhich day = select 2 from the number below Wednesday"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
-msgstr ""
+msgstr "TODO base"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
+msgstr "TODO reoccurs regularly starting on start time and repeating after each interval no matter when it was last completed"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
-msgstr ""
+msgstr "Exceptions"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
+msgstr "Add more exception dates by clicking the calendar days below.\nException is either exclusion(-) or inclusion(+) depending on the selection.\nRemove by clicking the data."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
-msgstr ""
+msgstr "Add excluded date (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
+msgstr "Excluded days are full days where this appointment is not happening"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
-msgstr ""
+msgstr "Add included time (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
+msgstr "Included times have same timezone than start time, but they may have different time"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
-msgstr ""
+msgstr "Action dates"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
-msgstr ""
+msgstr "_View"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
-msgstr ""
+msgstr "_Go"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
-msgstr ""
+msgstr "New"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr ""
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Back one week"
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr ""
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Back one day"
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr ""
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Forward one day"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Forward one week"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
-msgstr ""
+msgstr "Refresh"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
-msgstr ""
+msgstr "Close"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
-msgstr ""
+msgstr "Unknown"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
-msgstr ""
+msgstr "       Number of days to show"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
-msgstr ""
+msgstr "Orage - day view"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
-msgstr ""
+msgstr "All day"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
-msgstr ""
+msgstr "Time"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
-msgstr ""
+msgstr "No rows have been selected."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
-msgstr ""
+msgstr "Click a row to select it and after that you can copy it."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
+msgstr "You will permanently remove all\nselected appointments."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Yes, remove them"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Back"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Forward"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1189
 msgid "Find"
-msgstr ""
+msgstr "Find"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
-msgstr ""
+msgstr "Dayview"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr ""
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Extra days to show:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "only first repeating"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Check this if you only want to see the first repeating event. By default all are shown.\nNote that this also shows all urgencies.\nNote that repeating events may appear earlier in the list as the first occurrence only is listed."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "also old"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\nNote that extra days selection still defines if newer appointments are listed'."
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
-msgstr ""
+msgstr "Journal entries starting from:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
-msgstr ""
+msgstr "Search"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
-msgstr ""
+msgstr "Search text "
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
-msgstr ""
+msgstr "Flags"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
-msgstr ""
+msgstr "Title"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr ""
+msgstr "Double click line to edit it.\n\nFlags in order:\n\t 1. Alarm: n=no alarm\n\t\t A=Alarm is set P=Persistent alarm is set\n\t 2. Recurrence: n=no recurrence\n\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n\t 3. Type: f=free B=Busy\n\t 4. Located in file:\n\t\tO=Orage A=Archive F=Foreign\n\t 5. Appointment type:\n\t\tE=Event T=Todo J=Journal"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
-msgstr ""
+msgstr "\tRecur ended, moving to archive file."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
-msgstr ""
+msgstr "Archiving not enabled. Exiting"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
-msgstr ""
+msgstr "Archiving threshold: %d month(s)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr ""
+msgstr "\tArchiving events, which are older than: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
-msgstr ""
+msgstr "Archiving uid: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
-msgstr ""
+msgstr "\tVTODO not complete; not archived"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr ""
+msgstr "\tRecurring. End year: %04d, month: %02d, day: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
-msgstr ""
+msgstr "Archiving done\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
-msgstr ""
+msgstr "Starting archive removal."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
-msgstr ""
+msgstr "\tPHASE 1: reset recurring appointments"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
-msgstr ""
+msgstr "\tPHASE 2: return archived appointments"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
-msgstr ""
+msgstr "Archive removal done\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
-msgstr ""
+msgstr "Orage default alarm"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Created alarm list for main Orage file:"
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Created alarm list for foreign file: %s (%s)"
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\tAdded %d alarms. Processed %d events."
+
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
+msgstr "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
-msgstr ""
+msgstr "Starting import file preprocessing"
 
 #: ../src/ical-expimp.c:158
 msgid "... Patched DCREATED to be CREATED."
-msgstr ""
+msgstr "... Patched DCREATED to be CREATED."
 
 #: ../src/ical-expimp.c:197
 msgid "... Patched timezone to Orage format."
-msgstr ""
+msgstr "... Patched timezone to Orage format."
 
 #: ../src/ical-expimp.c:206
 msgid "Import file preprocessing done"
-msgstr ""
+msgstr "Import file preprocessing done"
+
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Found external update on file %s."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Refreshing alarms and calendar due to external file update."
 
-#: ../src/interface.c:284
+#: ../src/interface.c:271
 msgid "Calendar files"
-msgstr ""
+msgstr "Calendar files"
 
 #: ../src/interface.c:631
 msgid "Current foreign files"
-msgstr ""
+msgstr "Current foreign files"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
-msgstr ""
+msgstr "READ ONLY"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
-msgstr ""
+msgstr "READ WRITE"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
-msgstr ""
+msgstr "***** No foreign files *****"
+
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Foreign file add failed"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage can only handle 10 foreign files. Limit reached."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Filename is empty."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Name is empty."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "File does not exist."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Same filename already exists in Orage."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Same name already exists in Orage."
+
+#: ../src/interface.c:965
 msgid "Import/export"
-msgstr ""
+msgstr "Import/export"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
-msgstr ""
+msgstr "Import"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
-msgstr ""
+msgstr "Read from file:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
+msgstr "Separate filenames with comma(,).\n NOTE: comma is not valid character in filenames for Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
-msgstr ""
+msgstr "Export"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
-msgstr ""
+msgstr "Write to file:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
-msgstr "Select _Today"
+msgstr "Select"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
-msgstr ""
+msgstr "All appointments"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
-msgstr ""
+msgstr "Named appointments: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
+msgstr "Note that only main file appointments are read.\nArchived and Foreign events are not exported."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
+msgstr "Note that only main file appointments are read.\nForeign events are not exported."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
-msgstr ""
+msgstr "You can easily drag these from event-list window."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
-msgstr ""
+msgstr "Orage appointment UIDs separated by commas."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
-msgstr ""
+msgstr "Archive"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
-msgstr ""
+msgstr "Archive now (threshold: %d months)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
-msgstr ""
+msgstr "You can change archive threshold in parameters"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
-msgstr ""
+msgstr "Revert archive now"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
+msgstr "Return all archived events into main orage file and remove arch file.\nThis is useful for example when doing export and moving orage\nappointments to another system."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
-msgstr ""
+msgstr "Orage files"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
-msgstr ""
+msgstr "Orage main calendar file"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr ""
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Current file:"
 
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr ""
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "New file:"
 
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr ""
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Action options:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
-msgstr ""
+msgstr "Rename"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
+msgstr "Orage internal file rename only.\nDoes not touch external filesystem at all.\nNew file must exist."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
-msgstr ""
+msgstr "Copy"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
+msgstr "Current file is copied and stays unmodified in the old place."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
-msgstr ""
+msgstr "Move"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
-msgstr ""
+msgstr "Current file is moved and vanishes from the old place."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
-msgstr ""
+msgstr "Archive file"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
-msgstr ""
+msgstr "Foreign files"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
-msgstr ""
+msgstr "Add new foreign file"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
-msgstr ""
+msgstr "Foreign file:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr ""
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Visible name:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
-msgstr ""
+msgstr "Read only"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Set this if you want to make sure that this file is never modified by Orage.\nNote that modifying foreign files may make them incompatible with the original tool, where they came from!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "This internal name is displayed to user instead of file name."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
-msgstr ""
+msgstr "Exchange data - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
+msgstr "\tThis is %s version %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
+msgstr "\tReleased under the terms of the GNU General Public Licence.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
+msgstr "\tCompiled against GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
+msgstr "using GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
-msgstr ""
+msgstr "\tUsing DBUS for import.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
+msgstr "\tNot using DBUS. Import works only partially.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
-msgstr ""
+msgstr "\tUsing libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
-msgstr ""
+msgstr "\tNot using libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
-msgstr ""
+msgstr "\tUsing automatic archiving.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
-msgstr ""
+msgstr "\tNot using archiving.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
-msgstr ""
+msgstr "\tUsing operating system package libical.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
+msgstr "\tUsing Orage local version of libical.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
+msgstr "Usage: orage [options] [files]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
-msgstr ""
+msgstr "Options:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
+msgstr "--version (-v) \t\tshow version of orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
+msgstr "--help (-h) \t\tprint this text\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
+msgstr "--preferences (-p) \tshow preferences form\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
+msgstr "--toggle (-t) \t\tmake orage visible/unvisible\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
+msgstr "--remove-foreign (-r) file \tremove a foreign file\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--export (-e) file [appointment...] \texport appointments from Orage to file\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
-msgstr ""
+msgstr "files=ical files to load into orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
-msgstr ""
+msgstr "\tdbus not included in orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
+msgstr "\twithout dbus [files] and foreign file options(-a & -r) can only be used when starting orage \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
+msgstr "\nUnknown option %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
-msgstr ""
+msgstr "_Exchange data"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
-msgstr ""
+msgstr "_Edit"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
-msgstr ""
+msgstr "View selected _date"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
-msgstr ""
+msgstr "View selected _week"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Select _Today"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr ""
+msgstr "Show _Globaltime"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Help"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "No title defined"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr " Location: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n Note:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
-msgstr ""
+msgstr "Never"
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:495
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
+" Done:\t%s%s"
+msgstr "Title: %s\n%s Start:\t%s\n Due:\t%s\n Done:\t%s%s"
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Title: %s\n%s Start:\t%s\n End:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
-msgstr ""
+msgstr "<b>To do:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
-msgstr ""
+msgstr "<b>Events for %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
-msgstr ""
+msgstr "<b>Events for %s - %s:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
-msgstr ""
+msgstr "Main settings"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
-msgstr ""
+msgstr "Timezone"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
-msgstr ""
+msgstr "You should always define your local timezone."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
-msgstr ""
+msgstr "Archive threshold (months)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
-msgstr ""
+msgstr "(0 = no archiving)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
+msgstr "Archiving is used to save time and space when handling events."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
-msgstr ""
+msgstr "Sound command"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
+msgstr "This command is given to shell to make sound in alarms."
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr ""
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Calendar window"
 
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr ""
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Calendar visual details"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
-msgstr ""
+msgstr "Show borders"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
-msgstr ""
-
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr ""
+msgstr "Show menu"
 
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
-msgstr ""
+msgstr "Show day names"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
-msgstr ""
+msgstr "Show week numbers"
 
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr ""
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Show month and year"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Calendar info boxes"
 
 #: ../src/parameters.c:660
+msgid "Show todo list"
+msgstr "Show todo list"
+
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
-msgstr ""
+msgstr "Number of days to show in event window"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
-msgstr ""
+msgstr "0 = do not show event list at all"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Calendar visibility"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
-msgstr ""
+msgstr "Show on all desktops"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
-msgstr ""
+msgstr "Keep on top"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
-msgstr ""
+msgstr "Show in taskbar"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
-msgstr ""
+msgstr "Show in pager"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
-msgstr ""
+msgstr "Show in systray"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
-msgstr ""
+msgstr "Calendar start"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
-msgstr ""
+msgstr "Show"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
-msgstr ""
+msgstr "Hide"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
-msgstr ""
+msgstr "Minimised"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr ""
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "On calendar window open"
 
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr ""
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Select today's date"
 
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "Select _Today"
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Select previously selected date"
 
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Calendar day double click shows"
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
+#: ../src/parameters.c:828
+msgid "Days view"
+msgstr "Days view"
 
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr ""
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
-
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr ""
-
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
-msgstr ""
+msgstr "Event list"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr ""
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Extra settings"
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Event list window"
+
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
-msgstr ""
+msgstr "Number of extra days to show in event list"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
-msgstr ""
+msgstr "This is just the default value, you can change it in the actual eventlist window."
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Show only first repeating event"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Day view window default first day"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "First day of week"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Selected day"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Use dynamic tray icon"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Use dynamic icon"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Dynamic icon shows current month and day of the month."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
-msgstr ""
+msgstr "Use wakeup timer"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
+msgstr "Use this timer if Orage has problems waking up properly after suspend or hibernate. (For example tray icon not refreshed or alarms not firing.)"
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Foreign file default visual alarm"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Orage window"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Notify notification"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Always quit when asked to close"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Always quit"
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "By default Orage stays open in the background when asked to close. This option changes Orage to quit and never stay in background when it is asked to close."
+
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
-msgstr ""
+msgstr "Orage Preferences"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
-msgstr ""
+msgstr "First Orage start. Searching default timezone."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
-msgstr ""
+msgstr "Default timezone set to %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
-msgstr ""
+msgstr "Default timezone not found, please, set it manually."
 
 #: ../src/reminder.c:562
 msgid "Reminder "
-msgstr ""
+msgstr "Reminder "
 
 #: ../src/reminder.c:591
 msgid "Open"
-msgstr ""
+msgstr "Open"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
-msgstr ""
+msgstr "Reminder - Orage"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Postpone"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
+msgstr "Remind me again after the specified time"
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
-msgstr ""
+msgstr "Next active alarms:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
+msgstr "\n%02d d %02d h %02d min to: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
+msgstr "\nNo active alarms found"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
-msgstr ""
+msgstr "Africa"
 
 #: ../src/timezone_names.c:37
 msgid "Africa/Abidjan"
-msgstr ""
+msgstr "Africa/Abidjan"
 
 #: ../src/timezone_names.c:38
 msgid "Africa/Accra"
-msgstr ""
+msgstr "Africa/Accra"
 
 #: ../src/timezone_names.c:39
 msgid "Africa/Addis_Ababa"
-msgstr ""
+msgstr "Africa/Addis_Ababa"
 
 #: ../src/timezone_names.c:40
 msgid "Africa/Algiers"
-msgstr ""
+msgstr "Africa/Algiers"
 
 #: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr ""
+msgid "Africa/Asmara"
+msgstr "Africa/Asmara"
 
 #: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr ""
+msgid "Africa/Asmera"
+msgstr "Africa/Asmera"
 
 #: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr ""
+msgid "Africa/Bamako"
+msgstr "Africa/Bamako"
 
 #: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr ""
+msgid "Africa/Bangui"
+msgstr "Africa/Bangui"
 
 #: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr ""
+msgid "Africa/Banjul"
+msgstr "Africa/Banjul"
 
 #: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr ""
+msgid "Africa/Bissau"
+msgstr "Africa/Bissau"
 
 #: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr ""
+msgid "Africa/Blantyre"
+msgstr "Africa/Blantyre"
 
 #: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr ""
+msgid "Africa/Brazzaville"
+msgstr "Africa/Brazzaville"
 
 #: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr ""
+msgid "Africa/Bujumbura"
+msgstr "Africa/Bujumbura"
 
 #: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr ""
+msgid "Africa/Cairo"
+msgstr "Africa/Cairo"
 
 #: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr ""
+msgid "Africa/Casablanca"
+msgstr "Africa/Casablanca"
 
 #: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr ""
+msgid "Africa/Ceuta"
+msgstr "Africa/Ceuta"
 
 #: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr ""
+msgid "Africa/Conakry"
+msgstr "Africa/Conakry"
 
 #: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr ""
+msgid "Africa/Dakar"
+msgstr "Africa/Dakar"
 
 #: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr ""
+msgid "Africa/Dar_es_Salaam"
+msgstr "Africa/Dar_es_Salaam"
 
 #: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr ""
+msgid "Africa/Djibouti"
+msgstr "Africa/Djibouti"
 
 #: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr ""
+msgid "Africa/Douala"
+msgstr "Africa/Douala"
 
 #: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr ""
+msgid "Africa/El_Aaiun"
+msgstr "Africa/El_Aaiun"
 
 #: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr ""
+msgid "Africa/Freetown"
+msgstr "Africa/Freetown"
 
 #: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr ""
+msgid "Africa/Gaborone"
+msgstr "Africa/Gaborone"
 
 #: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr ""
+msgid "Africa/Harare"
+msgstr "Africa/Harare"
 
 #: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr ""
+msgid "Africa/Juba"
+msgstr "Africa/Juba"
 
 #: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr ""
+msgid "Africa/Johannesburg"
+msgstr "Africa/Johannesburg"
 
 #: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr ""
+msgid "Africa/Kampala"
+msgstr "Africa/Kampala"
 
 #: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr ""
+msgid "Africa/Khartoum"
+msgstr "Africa/Khartoum"
 
 #: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr ""
+msgid "Africa/Kigali"
+msgstr "Africa/Kigali"
 
 #: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr ""
+msgid "Africa/Kinshasa"
+msgstr "Africa/Kinshasa"
 
 #: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr ""
+msgid "Africa/Lagos"
+msgstr "Africa/Lagos"
 
 #: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr ""
+msgid "Africa/Libreville"
+msgstr "Africa/Libreville"
 
 #: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr ""
+msgid "Africa/Lome"
+msgstr "Africa/Lome"
 
 #: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr ""
+msgid "Africa/Luanda"
+msgstr "Africa/Luanda"
 
 #: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr ""
+msgid "Africa/Lubumbashi"
+msgstr "Africa/Lubumbashi"
 
 #: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr ""
+msgid "Africa/Lusaka"
+msgstr "Africa/Lusaka"
 
 #: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr ""
+msgid "Africa/Malabo"
+msgstr "Africa/Malabo"
 
 #: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr ""
+msgid "Africa/Maputo"
+msgstr "Africa/Maputo"
 
 #: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr ""
+msgid "Africa/Maseru"
+msgstr "Africa/Maseru"
 
 #: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr ""
+msgid "Africa/Mbabane"
+msgstr "Africa/Mbabane"
 
 #: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr ""
+msgid "Africa/Mogadishu"
+msgstr "Africa/Mogadishu"
 
 #: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr ""
+msgid "Africa/Monrovia"
+msgstr "Africa/Monrovia"
 
 #: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr ""
+msgid "Africa/Nairobi"
+msgstr "Africa/Nairobi"
 
 #: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr ""
+msgid "Africa/Ndjamena"
+msgstr "Africa/Ndjamena"
 
 #: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr ""
+msgid "Africa/Niamey"
+msgstr "Africa/Niamey"
 
 #: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr ""
+msgid "Africa/Nouakchott"
+msgstr "Africa/Nouakchott"
 
 #: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr ""
+msgid "Africa/Ouagadougou"
+msgstr "Africa/Ouagadougou"
 
 #: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr ""
+msgid "Africa/Porto-Novo"
+msgstr "Africa/Porto-Novo"
 
 #: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr ""
+msgid "Africa/Sao_Tome"
+msgstr "Africa/Sao_Tome"
 
 #: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr ""
+msgid "Africa/Timbuktu"
+msgstr "Africa/Timbuktu"
 
 #: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr ""
+msgid "Africa/Tripoli"
+msgstr "Africa/Tripoli"
 
 #: ../src/timezone_names.c:89
-msgid "America"
-msgstr ""
+msgid "Africa/Tunis"
+msgstr "Africa/Tunis"
 
 #: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr ""
+msgid "Africa/Windhoek"
+msgstr "Africa/Windhoek"
 
 #: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr ""
+msgid "America"
+msgstr "America"
 
 #: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr ""
+msgid "America/Adak"
+msgstr "America/Adak"
 
 #: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr ""
+msgid "America/Anchorage"
+msgstr "America/Anchorage"
 
 #: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr ""
+msgid "America/Anguilla"
+msgstr "America/Anguilla"
 
 #: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr ""
+msgid "America/Antigua"
+msgstr "America/Antigua"
 
 #: ../src/timezone_names.c:96
-msgid "America/Argentina/Catamarca"
-msgstr ""
+msgid "America/Araguaina"
+msgstr "America/Araguaina"
 
 #: ../src/timezone_names.c:97
-msgid "America/Argentina/Cordoba"
-msgstr ""
+msgid "America/Argentina/Buenos_Aires"
+msgstr "America/Argentina/Buenos_Aires"
 
 #: ../src/timezone_names.c:98
-msgid "America/Argentina/Jujuy"
-msgstr ""
+msgid "America/Argentina/Catamarca"
+msgstr "America/Argentina/Catamarca"
 
 #: ../src/timezone_names.c:99
-msgid "America/Argentina/Mendoza"
-msgstr ""
+msgid "America/Argentina/ComodRivadavia"
+msgstr "America/Argentina/ComodRivadavia"
 
 #: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr ""
+msgid "America/Argentina/Cordoba"
+msgstr "America/Argentina/Cordoba"
 
 #: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr ""
+msgid "America/Argentina/Jujuy"
+msgstr "America/Argentina/Jujuy"
 
 #: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr ""
+msgid "America/Argentina/La_Rioja"
+msgstr "America/Argentina/La_Rioja"
 
 #: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr ""
+msgid "America/Argentina/Mendoza"
+msgstr "America/Argentina/Mendoza"
 
 #: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr ""
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "America/Argentina/Rio_Gallegos"
 
 #: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr ""
+msgid "America/Argentina/Salta"
+msgstr "America/Argentina/Salta"
 
 #: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr ""
+msgid "America/Argentina/San_Juan"
+msgstr "America/Argentina/San_Juan"
 
 #: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr ""
+msgid "America/Argentina/San_Luis"
+msgstr "America/Argentina/San_Luis"
 
 #: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr ""
+msgid "America/Argentina/Tucuman"
+msgstr "America/Argentina/Tucuman"
 
 #: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr ""
+msgid "America/Argentina/Ushuaia"
+msgstr "America/Argentina/Ushuaia"
 
 #: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr ""
+msgid "America/Aruba"
+msgstr "America/Aruba"
 
 #: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr ""
+msgid "America/Asuncion"
+msgstr "America/Asuncion"
 
 #: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr ""
+msgid "America/Atikokan"
+msgstr "America/Atikokan"
 
 #: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr ""
+msgid "America/Atka"
+msgstr "America/Atka"
 
 #: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr ""
+msgid "America/Bahia"
+msgstr "America/Bahia"
 
 #: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr ""
+msgid "America/Bahia_Banderas"
+msgstr "America/Bahia_Banderas"
 
 #: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr ""
+msgid "America/Barbados"
+msgstr "America/Barbados"
 
 #: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr ""
+msgid "America/Belem"
+msgstr "America/Belem"
 
 #: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr ""
+msgid "America/Belize"
+msgstr "America/Belize"
 
 #: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr ""
+msgid "America/Blanc-Sablon"
+msgstr "America/Blanc-Sablon"
 
 #: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr ""
+msgid "America/Boa_Vista"
+msgstr "America/Boa_Vista"
 
 #: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr ""
+msgid "America/Bogota"
+msgstr "America/Bogota"
 
 #: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr ""
+msgid "America/Boise"
+msgstr "America/Boise"
 
 #: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr ""
+msgid "America/Buenos_Aires"
+msgstr "America/Buenos_Aires"
 
 #: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr ""
+msgid "America/Cambridge_Bay"
+msgstr "America/Cambridge_Bay"
 
 #: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr ""
+msgid "America/Campo_Grande"
+msgstr "America/Campo_Grande"
 
 #: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr ""
+msgid "America/Cancun"
+msgstr "America/Cancun"
 
 #: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr ""
+msgid "America/Caracas"
+msgstr "America/Caracas"
 
 #: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr ""
+msgid "America/Catamarca"
+msgstr "America/Catamarca"
 
 #: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr ""
+msgid "America/Cayenne"
+msgstr "America/Cayenne"
 
 #: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr ""
+msgid "America/Cayman"
+msgstr "America/Cayman"
 
 #: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr ""
+msgid "America/Chicago"
+msgstr "America/Chicago"
 
 #: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr ""
+msgid "America/Chihuahua"
+msgstr "America/Chihuahua"
 
 #: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr ""
+msgid "America/Coral_Harbour"
+msgstr "America/Coral_Harbour"
 
 #: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr ""
+msgid "America/Cordoba"
+msgstr "America/Cordoba"
 
 #: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr ""
+msgid "America/Costa_Rica"
+msgstr "America/Costa_Rica"
 
 #: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr ""
+msgid "America/Creston"
+msgstr "America/Creston"
 
 #: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr ""
+msgid "America/Cuiaba"
+msgstr "America/Cuiaba"
 
 #: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr ""
+msgid "America/Curacao"
+msgstr "America/Curacao"
 
 #: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr ""
+msgid "America/Danmarkshavn"
+msgstr "America/Danmarkshavn"
 
 #: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr ""
+msgid "America/Dawson"
+msgstr "America/Dawson"
 
 #: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr ""
+msgid "America/Dawson_Creek"
+msgstr "America/Dawson_Creek"
 
 #: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr ""
+msgid "America/Denver"
+msgstr "America/Denver"
 
 #: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr ""
+msgid "America/Detroit"
+msgstr "America/Detroit"
 
 #: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr ""
+msgid "America/Dominica"
+msgstr "America/Dominica"
 
 #: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr ""
+msgid "America/Edmonton"
+msgstr "America/Edmonton"
 
 #: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr ""
+msgid "America/Ensenada"
+msgstr "America/Ensenada"
 
 #: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr ""
+msgid "America/Eirunepe"
+msgstr "America/Eirunepe"
 
 #: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr ""
+msgid "America/El_Salvador"
+msgstr "America/El_Salvador"
 
 #: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr ""
+msgid "America/Fortaleza"
+msgstr "America/Fortaleza"
 
 #: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr ""
+msgid "America/Fort_Wayne"
+msgstr "America/Fort_Wayne"
 
 #: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr ""
+msgid "America/Glace_Bay"
+msgstr "America/Glace_Bay"
 
 #: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr ""
+msgid "America/Godthab"
+msgstr "America/Godthab"
 
 #: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr ""
+msgid "America/Goose_Bay"
+msgstr "America/Goose_Bay"
 
 #: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr ""
+msgid "America/Grand_Turk"
+msgstr "America/Grand_Turk"
 
 #: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr ""
+msgid "America/Grenada"
+msgstr "America/Grenada"
 
 #: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr ""
+msgid "America/Guadeloupe"
+msgstr "America/Guadeloupe"
 
 #: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr ""
+msgid "America/Guatemala"
+msgstr "America/Guatemala"
 
 #: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr ""
+msgid "America/Guayaquil"
+msgstr "America/Guayaquil"
 
 #: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr ""
+msgid "America/Guyana"
+msgstr "America/Guyana"
 
 #: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr ""
+msgid "America/Halifax"
+msgstr "America/Halifax"
 
 #: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr ""
+msgid "America/Havana"
+msgstr "America/Havana"
 
 #: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr ""
+msgid "America/Hermosillo"
+msgstr "America/Hermosillo"
 
 #: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr ""
+msgid "America/Indiana/Indianapolis"
+msgstr "America/Indiana/Indianapolis"
 
 #: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr ""
+msgid "America/Indiana/Knox"
+msgstr "America/Indiana/Knox"
 
 #: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr ""
+msgid "America/Indiana/Marengo"
+msgstr "America/Indiana/Marengo"
 
 #: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr ""
+msgid "America/Indiana/Petersburg"
+msgstr "America/Indiana/Petersburg"
 
 #: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr ""
+msgid "America/Indiana/Tell_City"
+msgstr "America/Indiana/Tell_City"
 
 #: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr ""
+msgid "America/Indiana/Vevay"
+msgstr "America/Indiana/Vevay"
 
 #: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr ""
+msgid "America/Indiana/Vincennes"
+msgstr "America/Indiana/Vincennes"
 
 #: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr ""
+msgid "America/Indiana/Winamac"
+msgstr "America/Indiana/Winamac"
 
 #: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr ""
+msgid "America/Indianapolis"
+msgstr "America/Indianapolis"
 
 #: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr ""
+msgid "America/Inuvik"
+msgstr "America/Inuvik"
 
 #: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr ""
+msgid "America/Iqaluit"
+msgstr "America/Iqaluit"
 
 #: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr ""
+msgid "America/Jamaica"
+msgstr "America/Jamaica"
 
 #: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr ""
+msgid "America/Jujuy"
+msgstr "America/Jujuy"
 
 #: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr ""
+msgid "America/Juneau"
+msgstr "America/Juneau"
 
 #: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr ""
+msgid "America/Kentucky/Louisville"
+msgstr "America/Kentucky/Louisville"
 
 #: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr ""
+msgid "America/Kentucky/Monticello"
+msgstr "America/Kentucky/Monticello"
 
 #: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr ""
+msgid "America/Knox_IN"
+msgstr "America/Knox_IN"
 
 #: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr ""
+msgid "America/Kralendijk"
+msgstr "America/Kralendijk"
 
 #: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr ""
+msgid "America/La_Paz"
+msgstr "America/La_Paz"
 
 #: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr ""
+msgid "America/Lima"
+msgstr "America/Lima"
 
 #: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr ""
+msgid "America/Los_Angeles"
+msgstr "America/Los_Angeles"
 
 #: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr ""
+msgid "America/Louisville"
+msgstr "America/Louisville"
 
 #: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr ""
+msgid "America/Lower_Princes"
+msgstr "America/Lower_Princes"
 
 #: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr ""
+msgid "America/Maceio"
+msgstr "America/Maceio"
 
 #: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr ""
+msgid "America/Managua"
+msgstr "America/Managua"
 
 #: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr ""
+msgid "America/Manaus"
+msgstr "America/Manaus"
 
 #: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr ""
+msgid "America/Marigot"
+msgstr "America/Marigot"
 
 #: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr ""
+msgid "America/Martinique"
+msgstr "America/Martinique"
 
 #: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr ""
+msgid "America/Matamoros"
+msgstr "America/Matamoros"
 
 #: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr ""
+msgid "America/Mazatlan"
+msgstr "America/Mazatlan"
 
 #: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr ""
+msgid "America/Mendoza"
+msgstr "America/Mendoza"
 
 #: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr ""
+msgid "America/Menominee"
+msgstr "America/Menominee"
 
 #: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr ""
+msgid "America/Merida"
+msgstr "America/Merida"
 
 #: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr ""
+msgid "America/Metlakatla"
+msgstr "America/Metlakatla"
 
 #: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr ""
+msgid "America/Mexico_City"
+msgstr "America/Mexico_City"
 
 #: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr ""
+msgid "America/Miquelon"
+msgstr "America/Miquelon"
 
 #: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr ""
+msgid "America/Moncton"
+msgstr "America/Moncton"
 
 #: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr ""
+msgid "America/Monterrey"
+msgstr "America/Monterrey"
 
 #: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr ""
+msgid "America/Montevideo"
+msgstr "America/Montevideo"
 
 #: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr ""
+msgid "America/Montreal"
+msgstr "America/Montreal"
 
 #: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr ""
+msgid "America/Montserrat"
+msgstr "America/Montserrat"
 
 #: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr ""
+msgid "America/Nassau"
+msgstr "America/Nassau"
 
 #: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr ""
+msgid "America/New_York"
+msgstr "America/New_York"
 
 #: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr ""
+msgid "America/Nipigon"
+msgstr "America/Nipigon"
 
 #: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr ""
+msgid "America/Nome"
+msgstr "America/Nome"
 
 #: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr ""
+msgid "America/North_Dakota/Beulah"
+msgstr "America/North_Dakota/Beulah"
 
 #: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr ""
+msgid "America/North_Dakota/Center"
+msgstr "America/North_Dakota/Center"
 
 #: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr ""
+msgid "America/North_Dakota/New_Salem"
+msgstr "America/North_Dakota/New_Salem"
 
 #: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr ""
+msgid "America/Noronha"
+msgstr "America/Noronha"
 
 #: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr ""
+msgid "America/Ojinaga"
+msgstr "America/Ojinaga"
 
 #: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr ""
+msgid "America/Panama"
+msgstr "America/Panama"
 
 #: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr ""
+msgid "America/Pangnirtung"
+msgstr "America/Pangnirtung"
 
 #: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr ""
+msgid "America/Paramaribo"
+msgstr "America/Paramaribo"
 
 #: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr ""
+msgid "America/Phoenix"
+msgstr "America/Phoenix"
 
 #: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr ""
+msgid "America/Port-au-Prince"
+msgstr "America/Port-au-Prince"
 
 #: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr ""
+msgid "America/Port_of_Spain"
+msgstr "America/Port_of_Spain"
 
 #: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr ""
+msgid "America/Porto_Acre"
+msgstr "America/Porto_Acre"
 
 #: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr ""
+msgid "America/Porto_Velho"
+msgstr "America/Porto_Velho"
 
 #: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr ""
+msgid "America/Puerto_Rico"
+msgstr "America/Puerto_Rico"
 
 #: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr ""
+msgid "America/Rainy_River"
+msgstr "America/Rainy_River"
 
 #: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr ""
+msgid "America/Rankin_Inlet"
+msgstr "America/Rankin_Inlet"
 
 #: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr ""
+msgid "America/Recife"
+msgstr "America/Recife"
 
 #: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr ""
+msgid "America/Regina"
+msgstr "America/Regina"
 
 #: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr ""
+msgid "America/Resolute"
+msgstr "America/Resolute"
 
 #: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr ""
+msgid "America/Rio_Branco"
+msgstr "America/Rio_Branco"
 
 #: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr ""
+msgid "America/Rosario"
+msgstr "America/Rosario"
 
 #: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr ""
+msgid "America/Santa_Isabel"
+msgstr "America/Santa_Isabel"
 
 #: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr ""
+msgid "America/Santarem"
+msgstr "America/Santarem"
 
 #: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr ""
+msgid "America/Santiago"
+msgstr "America/Santiago"
 
 #: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr ""
+msgid "America/Santo_Domingo"
+msgstr "America/Santo_Domingo"
 
 #: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr ""
+msgid "America/Sao_Paulo"
+msgstr "America/Sao_Paulo"
 
 #: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr ""
+msgid "America/Scoresbysund"
+msgstr "America/Scoresbysund"
 
 #: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr ""
+msgid "America/Shiprock"
+msgstr "America/Shiprock"
 
 #: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr ""
+msgid "America/Sitka"
+msgstr "America/Sitka"
 
 #: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr ""
+msgid "America/St_Barthelemy"
+msgstr "America/St_Barthelemy"
 
 #: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr ""
+msgid "America/St_Johns"
+msgstr "America/St_Johns"
 
 #: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr ""
+msgid "America/St_Kitts"
+msgstr "America/St_Kitts"
 
 #: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr ""
+msgid "America/St_Lucia"
+msgstr "America/St_Lucia"
 
 #: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr ""
+msgid "America/St_Thomas"
+msgstr "America/St_Thomas"
 
 #: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr ""
+msgid "America/St_Vincent"
+msgstr "America/St_Vincent"
 
 #: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr ""
+msgid "America/Swift_Current"
+msgstr "America/Swift_Current"
 
 #: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr ""
+msgid "America/Tegucigalpa"
+msgstr "America/Tegucigalpa"
 
 #: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr ""
+msgid "America/Thule"
+msgstr "America/Thule"
 
 #: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr ""
+msgid "America/Thunder_Bay"
+msgstr "America/Thunder_Bay"
 
 #: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr ""
+msgid "America/Tijuana"
+msgstr "America/Tijuana"
 
 #: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr ""
+msgid "America/Toronto"
+msgstr "America/Toronto"
 
 #: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr ""
+msgid "America/Tortola"
+msgstr "America/Tortola"
 
 #: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr ""
+msgid "America/Vancouver"
+msgstr "America/Vancouver"
 
 #: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr ""
+msgid "America/Virgin"
+msgstr "America/Virgin"
 
 #: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr ""
+msgid "America/Whitehorse"
+msgstr "America/Whitehorse"
 
 #: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr ""
+msgid "America/Winnipeg"
+msgstr "America/Winnipeg"
 
 #: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr ""
+msgid "America/Yakutat"
+msgstr "America/Yakutat"
 
 #: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr ""
+msgid "America/Yellowknife"
+msgstr "America/Yellowknife"
 
 #: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr ""
+msgid "Antarctica"
+msgstr "Antarctica"
 
 #: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr ""
+msgid "Antarctica/Casey"
+msgstr "Antarctica/Casey"
 
 #: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr ""
+msgid "Antarctica/Davis"
+msgstr "Antarctica/Davis"
 
 #: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr ""
+msgid "Antarctica/DumontDUrville"
+msgstr "Antarctica/DumontDUrville"
 
 #: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr ""
+msgid "Antarctica/Macquarie"
+msgstr "Antarctica/Macquarie"
 
 #: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr ""
+msgid "Antarctica/Mawson"
+msgstr "Antarctica/Mawson"
 
 #: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr ""
+msgid "Antarctica/McMurdo"
+msgstr "Antarctica/McMurdo"
 
 #: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr ""
+msgid "Antarctica/Palmer"
+msgstr "Antarctica/Palmer"
 
 #: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr ""
+msgid "Antarctica/Rothera"
+msgstr "Antarctica/Rothera"
 
 #: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr ""
+msgid "Antarctica/South_Pole"
+msgstr "Antarctica/South_Pole"
 
 #: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr ""
+msgid "Antarctica/Syowa"
+msgstr "Antarctica/Syowa"
 
 #: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr ""
+msgid "Antarctica/Vostok"
+msgstr "Antarctica/Vostok"
 
 #: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr ""
+msgid "Arctic"
+msgstr "Arctic"
 
 #: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr ""
+msgid "Arctic/Longyearbyen"
+msgstr "Arctic/Longyearbyen"
 
 #: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr ""
+msgid "Asia"
+msgstr "Asia"
 
 #: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr ""
+msgid "Asia/Aden"
+msgstr "Asia/Aden"
 
 #: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr ""
+msgid "Asia/Almaty"
+msgstr "Asia/Almaty"
 
 #: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr ""
+msgid "Asia/Amman"
+msgstr "Asia/Amman"
 
 #: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr ""
+msgid "Asia/Anadyr"
+msgstr "Asia/Anadyr"
 
 #: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr ""
+msgid "Asia/Aqtau"
+msgstr "Asia/Aqtau"
 
 #: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr ""
+msgid "Asia/Aqtobe"
+msgstr "Asia/Aqtobe"
 
 #: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr ""
+msgid "Asia/Ashgabat"
+msgstr "Asia/Ashgabat"
 
 #: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr ""
+msgid "Asia/Ashkhabad"
+msgstr "Asia/Ashkhabad"
 
 #: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr ""
+msgid "Asia/Baghdad"
+msgstr "Asia/Baghdad"
 
 #: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr ""
+msgid "Asia/Bahrain"
+msgstr "Asia/Bahrain"
 
 #: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr ""
+msgid "Asia/Baku"
+msgstr "Asia/Baku"
 
 #: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr ""
+msgid "Asia/Bangkok"
+msgstr "Asia/Bangkok"
 
 #: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr ""
+msgid "Asia/Beirut"
+msgstr "Asia/Beirut"
 
 #: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr ""
+msgid "Asia/Bishkek"
+msgstr "Asia/Bishkek"
 
 #: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr ""
+msgid "Asia/Brunei"
+msgstr "Asia/Brunei"
 
 #: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr ""
+msgid "Asia/Calcutta"
+msgstr "Asia/Calcutta"
 
 #: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr ""
+msgid "Asia/Choibalsan"
+msgstr "Asia/Choibalsan"
 
 #: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr ""
+msgid "Asia/Chongqing"
+msgstr "Asia/Chongqing"
 
 #: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr ""
+msgid "Asia/Chungking"
+msgstr "Asia/Chungking"
 
 #: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr ""
+msgid "Asia/Colombo"
+msgstr "Asia/Colombo"
 
 #: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr ""
+msgid "Asia/Dacca"
+msgstr "Asia/Dacca"
 
 #: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr ""
+msgid "Asia/Damascus"
+msgstr "Asia/Damascus"
 
 #: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr ""
+msgid "Asia/Dhaka"
+msgstr "Asia/Dhaka"
 
 #: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr ""
+msgid "Asia/Dili"
+msgstr "Asia/Dili"
 
 #: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr ""
+msgid "Asia/Dubai"
+msgstr "Asia/Dubai"
 
 #: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr ""
+msgid "Asia/Dushanbe"
+msgstr "Asia/Dushanbe"
 
 #: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr ""
+msgid "Asia/Gaza"
+msgstr "Asia/Gaza"
 
 #: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr ""
+msgid "Asia/Harbin"
+msgstr "Asia/Harbin"
 
 #: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr ""
+msgid "Asia/Hebron"
+msgstr "Asia/Hebron"
 
 #: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr ""
+msgid "Asia/Hong_Kong"
+msgstr "Asia/Hong_Kong"
 
 #: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr ""
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Asia/Ho_Chi_Minh"
 
 #: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr ""
+msgid "Asia/Hovd"
+msgstr "Asia/Hovd"
 
 #: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr ""
+msgid "Asia/Irkutsk"
+msgstr "Asia/Irkutsk"
 
 #: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr ""
+msgid "Asia/Istanbul"
+msgstr "Asia/Istanbul"
 
 #: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr ""
+msgid "Asia/Jakarta"
+msgstr "Asia/Jakarta"
 
 #: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr ""
+msgid "Asia/Jayapura"
+msgstr "Asia/Jayapura"
 
 #: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr ""
+msgid "Asia/Jerusalem"
+msgstr "Asia/Jerusalem"
 
 #: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr ""
+msgid "Asia/Kabul"
+msgstr "Asia/Kabul"
 
 #: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr ""
+msgid "Asia/Kamchatka"
+msgstr "Asia/Kamchatka"
 
 #: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr ""
+msgid "Asia/Karachi"
+msgstr "Asia/Karachi"
 
 #: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr ""
+msgid "Asia/Kashgar"
+msgstr "Asia/Kashgar"
 
 #: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr ""
+msgid "Asia/Kathmandu"
+msgstr "Asia/Kathmandu"
 
 #: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr ""
+msgid "Asia/Katmandu"
+msgstr "Asia/Katmandu"
 
 #: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr ""
+msgid "Asia/Khandyga"
+msgstr "Asia/Khandyga"
 
 #: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr ""
+msgid "Asia/Kolkata"
+msgstr "Asia/Kolkata"
 
 #: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr ""
+msgid "Asia/Krasnoyarsk"
+msgstr "Asia/Krasnoyarsk"
 
 #: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr ""
+msgid "Asia/Kuala_Lumpur"
+msgstr "Asia/Kuala_Lumpur"
 
 #: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr ""
+msgid "Asia/Kuching"
+msgstr "Asia/Kuching"
 
 #: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr ""
+msgid "Asia/Kuwait"
+msgstr "Asia/Kuwait"
 
 #: ../src/timezone_names.c:320
-msgid "Europe"
-msgstr ""
+msgid "Asia/Macao"
+msgstr "Asia/Macao"
 
 #: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Asia/Macau"
+
+#: ../src/timezone_names.c:322
+msgid "Asia/Magadan"
+msgstr "Asia/Magadan"
+
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Asia/Makassar"
+
+#: ../src/timezone_names.c:324
+msgid "Asia/Manila"
+msgstr "Asia/Manila"
+
+#: ../src/timezone_names.c:325
+msgid "Asia/Muscat"
+msgstr "Asia/Muscat"
+
+#: ../src/timezone_names.c:326
+msgid "Asia/Nicosia"
+msgstr "Asia/Nicosia"
+
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Asia/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
+msgid "Asia/Novosibirsk"
+msgstr "Asia/Novosibirsk"
+
+#: ../src/timezone_names.c:329
+msgid "Asia/Omsk"
+msgstr "Asia/Omsk"
+
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Asia/Oral"
+
+#: ../src/timezone_names.c:331
+msgid "Asia/Phnom_Penh"
+msgstr "Asia/Phnom_Penh"
+
+#: ../src/timezone_names.c:332
+msgid "Asia/Pontianak"
+msgstr "Asia/Pontianak"
+
+#: ../src/timezone_names.c:333
+msgid "Asia/Pyongyang"
+msgstr "Asia/Pyongyang"
+
+#: ../src/timezone_names.c:334
+msgid "Asia/Qatar"
+msgstr "Asia/Qatar"
+
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Asia/Qyzylorda"
+
+#: ../src/timezone_names.c:336
+msgid "Asia/Rangoon"
+msgstr "Asia/Rangoon"
+
+#: ../src/timezone_names.c:337
+msgid "Asia/Riyadh"
+msgstr "Asia/Riyadh"
+
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Asia/Riyadh87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Asia/Riyadh88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Asia/Riyadh89"
+
+#: ../src/timezone_names.c:341
+msgid "Asia/Saigon"
+msgstr "Asia/Saigon"
+
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Asia/Sakhalin"
+
+#: ../src/timezone_names.c:343
+msgid "Asia/Samarkand"
+msgstr "Asia/Samarkand"
+
+#: ../src/timezone_names.c:344
+msgid "Asia/Seoul"
+msgstr "Asia/Seoul"
+
+#: ../src/timezone_names.c:345
+msgid "Asia/Shanghai"
+msgstr "Asia/Shanghai"
+
+#: ../src/timezone_names.c:346
+msgid "Asia/Singapore"
+msgstr "Asia/Singapore"
+
+#: ../src/timezone_names.c:347
+msgid "Asia/Taipei"
+msgstr "Asia/Taipei"
+
+#: ../src/timezone_names.c:348
+msgid "Asia/Tashkent"
+msgstr "Asia/Tashkent"
+
+#: ../src/timezone_names.c:349
+msgid "Asia/Tbilisi"
+msgstr "Asia/Tbilisi"
+
+#: ../src/timezone_names.c:350
+msgid "Asia/Tehran"
+msgstr "Asia/Tehran"
+
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Asia/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Asia/Thimbu"
+
+#: ../src/timezone_names.c:353
+msgid "Asia/Thimphu"
+msgstr "Asia/Thimphu"
+
+#: ../src/timezone_names.c:354
+msgid "Asia/Tokyo"
+msgstr "Asia/Tokyo"
+
+#: ../src/timezone_names.c:355
+msgid "Asia/Ujung_Pandang"
+msgstr "Asia/Ujung_Pandang"
+
+#: ../src/timezone_names.c:356
+msgid "Asia/Ulaanbaatar"
+msgstr "Asia/Ulaanbaatar"
+
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Asia/Ulan_Bator"
+
+#: ../src/timezone_names.c:358
+msgid "Asia/Urumqi"
+msgstr "Asia/Urumqi"
+
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Asia/Ust-Nera"
+
+#: ../src/timezone_names.c:360
+msgid "Asia/Vientiane"
+msgstr "Asia/Vientiane"
+
+#: ../src/timezone_names.c:361
+msgid "Asia/Vladivostok"
+msgstr "Asia/Vladivostok"
+
+#: ../src/timezone_names.c:362
+msgid "Asia/Yakutsk"
+msgstr "Asia/Yakutsk"
+
+#: ../src/timezone_names.c:363
+msgid "Asia/Yekaterinburg"
+msgstr "Asia/Yekaterinburg"
+
+#: ../src/timezone_names.c:364
+msgid "Asia/Yerevan"
+msgstr "Asia/Yerevan"
+
+#: ../src/timezone_names.c:365
+msgid "Atlantic"
+msgstr "Atlantic"
+
+#: ../src/timezone_names.c:366
+msgid "Atlantic/Azores"
+msgstr "Atlantic/Azores"
+
+#: ../src/timezone_names.c:367
+msgid "Atlantic/Bermuda"
+msgstr "Atlantic/Bermuda"
+
+#: ../src/timezone_names.c:368
+msgid "Atlantic/Canary"
+msgstr "Atlantic/Canary"
+
+#: ../src/timezone_names.c:369
+msgid "Atlantic/Cape_Verde"
+msgstr "Atlantic/Cape_Verde"
+
+#: ../src/timezone_names.c:370
+msgid "Atlantic/Faeroe"
+msgstr "Atlantic/Faeroe"
+
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlantic/Faroe"
+
+#: ../src/timezone_names.c:372
+msgid "Atlantic/Jan_Mayen"
+msgstr "Atlantic/Jan_Mayen"
+
+#: ../src/timezone_names.c:373
+msgid "Atlantic/Madeira"
+msgstr "Atlantic/Madeira"
+
+#: ../src/timezone_names.c:374
+msgid "Atlantic/Reykjavik"
+msgstr "Atlantic/Reykjavik"
+
+#: ../src/timezone_names.c:375
+msgid "Atlantic/South_Georgia"
+msgstr "Atlantic/South_Georgia"
+
+#: ../src/timezone_names.c:376
+msgid "Atlantic/St_Helena"
+msgstr "Atlantic/St_Helena"
+
+#: ../src/timezone_names.c:377
+msgid "Atlantic/Stanley"
+msgstr "Atlantic/Stanley"
+
+#: ../src/timezone_names.c:378
+msgid "Australia"
+msgstr "Australia"
+
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Australia/ACT"
+
+#: ../src/timezone_names.c:380
+msgid "Australia/Adelaide"
+msgstr "Australia/Adelaide"
+
+#: ../src/timezone_names.c:381
+msgid "Australia/Brisbane"
+msgstr "Australia/Brisbane"
+
+#: ../src/timezone_names.c:382
+msgid "Australia/Broken_Hill"
+msgstr "Australia/Broken_Hill"
+
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Australia/Currie"
+
+#: ../src/timezone_names.c:384
+msgid "Australia/Darwin"
+msgstr "Australia/Darwin"
+
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Australia/Eucla"
+
+#: ../src/timezone_names.c:386
+msgid "Australia/Hobart"
+msgstr "Australia/Hobart"
+
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr "Australia/Lindeman"
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr "Australia/Lord_Howe"
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "Australia/Melbourne"
+
+#: ../src/timezone_names.c:390
+msgid "Australia/Perth"
+msgstr "Australia/Perth"
+
+#: ../src/timezone_names.c:391
+msgid "Australia/Sydney"
+msgstr "Australia/Sydney"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brazil"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brazil/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brazil/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brazil/East"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brazil/West"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Canada"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Canada/Atlantic"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Canada/Central"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Canada/East-Saskatchewan"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Canada/Eastern"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Canada/Mountain"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Canada/Newfoundland"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Canada/Pacific"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Canada/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Canada/Yukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Chile"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Chile/Continental"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Chile/EasterIsland"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Universal"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Zulu"
+
+#: ../src/timezone_names.c:446
+msgid "Europe"
+msgstr "Europe"
+
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
-msgstr ""
+msgstr "Europe/Amsterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
-msgstr ""
+msgstr "Europe/Andorra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
-msgstr ""
+msgstr "Europe/Athens"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
-msgstr ""
+msgstr "Europe/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
-msgstr ""
+msgstr "Europe/Belgrade"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
-msgstr ""
+msgstr "Europe/Berlin"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
-msgstr ""
+msgstr "Europe/Bratislava"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
-msgstr ""
+msgstr "Europe/Brussels"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
-msgstr ""
+msgstr "Europe/Bucharest"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
-msgstr ""
+msgstr "Europe/Budapest"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Europe/Busingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
-msgstr ""
+msgstr "Europe/Chisinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
-msgstr ""
+msgstr "Europe/Copenhagen"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
-msgstr ""
+msgstr "Europe/Dublin"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
-msgstr ""
+msgstr "Europe/Gibraltar"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Europe/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
-msgstr ""
+msgstr "Europe/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Europe/Isle_of_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
-msgstr ""
+msgstr "Europe/Istanbul"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Europe/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
-msgstr ""
+msgstr "Europe/Kaliningrad"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
-msgstr ""
+msgstr "Europe/Kiev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
-msgstr ""
+msgstr "Europe/Lisbon"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
-msgstr ""
+msgstr "Europe/Ljubljana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
-msgstr ""
+msgstr "Europe/London"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
-msgstr ""
+msgstr "Europe/Luxembourg"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
-msgstr ""
+msgstr "Europe/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
-msgstr ""
+msgstr "Europe/Malta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Europe/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
-msgstr ""
+msgstr "Europe/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
-msgstr ""
+msgstr "Europe/Monaco"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
-msgstr ""
+msgstr "Europe/Moscow"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
-msgstr ""
+msgstr "Europe/Nicosia"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
-msgstr ""
+msgstr "Europe/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
-msgstr ""
+msgstr "Europe/Paris"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Europe/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
-msgstr ""
+msgstr "Europe/Prague"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
-msgstr ""
+msgstr "Europe/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
-msgstr ""
+msgstr "Europe/Rome"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
-msgstr ""
+msgstr "Europe/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
-msgstr ""
+msgstr "Europe/San_Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
-msgstr ""
+msgstr "Europe/Sarajevo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
-msgstr ""
+msgstr "Europe/Simferopol"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
-msgstr ""
+msgstr "Europe/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
-msgstr ""
+msgstr "Europe/Sofia"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
-msgstr ""
+msgstr "Europe/Stockholm"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
-msgstr ""
+msgstr "Europe/Tallinn"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
-msgstr ""
+msgstr "Europe/Tirane"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Europe/Tiraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
-msgstr ""
+msgstr "Europe/Uzhgorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
-msgstr ""
+msgstr "Europe/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
-msgstr ""
+msgstr "Europe/Vatican"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
-msgstr ""
+msgstr "Europe/Vienna"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
-msgstr ""
+msgstr "Europe/Vilnius"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Europe/Volgograd"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
-msgstr ""
+msgstr "Europe/Warsaw"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
-msgstr ""
+msgstr "Europe/Zagreb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
-msgstr ""
+msgstr "Europe/Zaporozhye"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
-msgstr ""
+msgstr "Europe/Zurich"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
-msgstr ""
+msgstr "Indian"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
-msgstr ""
+msgstr "Indian/Antananarivo"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
-msgstr ""
+msgstr "Indian/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
-msgstr ""
+msgstr "Indian/Christmas"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
-msgstr ""
+msgstr "Indian/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
-msgstr ""
+msgstr "Indian/Comoro"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
-msgstr ""
+msgstr "Indian/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
-msgstr ""
+msgstr "Indian/Mahe"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
-msgstr ""
+msgstr "Indian/Maldives"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
-msgstr ""
+msgstr "Indian/Mauritius"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
-msgstr ""
+msgstr "Indian/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
-msgstr ""
+msgstr "Indian/Reunion"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Mexico"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Mexico/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Mexico/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Mexico/General"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Mideast"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Mideast/Riyadh87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Mideast/Riyadh88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Mideast/Riyadh89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
-msgstr ""
+msgstr "Pacific"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
-msgstr ""
+msgstr "Pacific/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
-msgstr ""
+msgstr "Pacific/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
-msgstr ""
+msgstr "Pacific/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Pacific/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
-msgstr ""
+msgstr "Pacific/Easter"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
-msgstr ""
+msgstr "Pacific/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
-msgstr ""
+msgstr "Pacific/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
-msgstr ""
+msgstr "Pacific/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
-msgstr ""
+msgstr "Pacific/Fiji"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
-msgstr ""
+msgstr "Pacific/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
-msgstr ""
+msgstr "Pacific/Galapagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
-msgstr ""
+msgstr "Pacific/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
-msgstr ""
+msgstr "Pacific/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
-msgstr ""
+msgstr "Pacific/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
-msgstr ""
+msgstr "Pacific/Honolulu"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
-msgstr ""
+msgstr "Pacific/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
-msgstr ""
+msgstr "Pacific/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
-msgstr ""
+msgstr "Pacific/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
-msgstr ""
+msgstr "Pacific/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
-msgstr ""
+msgstr "Pacific/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
-msgstr ""
+msgstr "Pacific/Marquesas"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
-msgstr ""
+msgstr "Pacific/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
-msgstr ""
+msgstr "Pacific/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
-msgstr ""
+msgstr "Pacific/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
-msgstr ""
+msgstr "Pacific/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
-msgstr ""
+msgstr "Pacific/Noumea"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
-msgstr ""
+msgstr "Pacific/Pago_Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
-msgstr ""
+msgstr "Pacific/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
-msgstr ""
+msgstr "Pacific/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Pacific/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
-msgstr ""
+msgstr "Pacific/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
-msgstr ""
+msgstr "Pacific/Port_Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
-msgstr ""
+msgstr "Pacific/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
-msgstr ""
+msgstr "Pacific/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pacific/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
-msgstr ""
+msgstr "Pacific/Tahiti"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
-msgstr ""
+msgstr "Pacific/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
-msgstr ""
+msgstr "Pacific/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
-msgstr ""
+msgstr "Pacific/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
-msgstr ""
+msgstr "Pacific/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
-msgstr ""
+msgstr "Pacific/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
-msgstr ""
+msgstr "Pacific/Yap"
+
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "US"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "US/Alaska"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "US/Aleutian"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "US/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "US/Central"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "US/Eastern"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "US/East-Indiana"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "US/Hawaii"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "US/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "US/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "US/Mountain"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "US/Pacific"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "US/Pacific-New"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "US/Samoa"
 
 #: ../src/tray_icon.c:469
 msgid "New appointment"
-msgstr ""
+msgstr "New appointment"
 
 #: ../src/tray_icon.c:485
 msgid "About Orage"
-msgstr ""
+msgstr "About Orage"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
 msgid "Orage Panel Clock"
-msgstr ""
+msgstr "Orage Panel Clock"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
 msgid "Show time and date?"
-msgstr ""
+msgstr "Show time and date?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr ""
+msgid "Orage preferences"
+msgstr "Orage preferences"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr ""
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr "Settings for the Xfce 4 Calendar Application (Orage)"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-msgid "Orage preferences"
-msgstr ""
+msgid "Orage Calendar Preferences"
+msgstr "Orage Calendar Preferences"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr ""
-
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr ""
-
 #: ../xfcalendar.desktop.in.h:3
-msgid "Orage Calendar"
-msgstr ""
-
-#~ msgid "Contributor"
-#~ msgstr "Contributor"
-
-#, fuzzy
-#~ msgid "Select always today"
-#~ msgstr "Select _Today"
-
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%d/%m/%y"
-
-#~ msgid "Core developer"
-#~ msgstr "Core developer"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-
-#~ msgid "Clear"
-#~ msgstr "Clear"
+msgid "Calendar"
+msgstr "Calendar"
 
-#~ msgid "This should not happen"
-#~ msgstr "This should not happen"
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr "Orage Calendar"
 
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Cannot create MCS client channel"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Desktop calendar"
diff -Nru orage-4.8.3/po/en_GB.po orage-4.12.1/po/en_GB.po
--- orage-4.8.3/po/en_GB.po	2012-01-03 12:01:02.000000000 +0000
+++ orage-4.12.1/po/en_GB.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,20 +1,20 @@
-# British English translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Zuza Software Foundation (Translate.org.za), 2004.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2008-05-10 12:24+1000\n"
-"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
-"Language-Team: British English <en_gb@li.org>\n"
+"POT-Creation-Date: 2013-11-18 18:30+0100\n"
+"PO-Revision-Date: 2013-11-19 15:56+0000\n"
+"Last-Translator: Xfce <transifex@xfce.org>\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/xfce/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../globaltime/globaltime.c:100
@@ -31,9 +31,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"click to modify clock"
+msgstr "%s\nclick to modify clock"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -43,9 +41,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"button 1 to change preferences \n"
-"button 2 to adjust time of clocks"
+msgstr "button 1 to change preferences \nbutton 2 to adjust time of clocks"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -54,8 +50,7 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
+msgstr "adjust to change minute. Click arrows with button 2 to change only 1 minute."
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -103,7 +98,7 @@
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
-msgstr "set the timezone of this clock to the local timezone"
+msgstr "set the timezone of this clock to be local timezone"
 
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
@@ -311,12 +306,12 @@
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
 msgid "backward"
-msgstr "backwards"
+msgstr "backward"
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
 msgid "forward"
-msgstr "forwards"
+msgstr "forward"
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
@@ -332,7 +327,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2771
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Location"
@@ -382,7 +377,7 @@
 #: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
 #: ../src/timezone_selection.c:379
 msgid "UTC"
-msgstr "GMT"
+msgstr "UTC"
 
 #. NOTE: this exists only if ical timezones are being used
 #: ../globaltime/timezone_selection.c:304
@@ -393,18 +388,18 @@
 msgid "floating"
 msgstr "floating"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Globaltime"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Orage Globaltime"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "Show clocks from different countries"
 
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Globaltime"
+
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
 msgstr "Appearance"
@@ -476,12 +471,7 @@
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
+msgstr "You only need this if you do short term (less than 5 hours) suspend or hibernate and your visible time does not include seconds. Under these circumstances it is possible that Orageclock shows time inaccurately unless you have this selected. (Selecting this prevents cpu and interrupt saving features from working.)"
 
 #: ../panel-plugin/oc_config.c:432
 msgid ""
@@ -493,15 +483,7 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"This program uses strftime function to get time.\n"
-"Use any valid code to get time in the format you prefer.\n"
-"Some common codes are:\n"
-"\t%A = weekday\t\t\t%B = month\n"
-"\t%c = date & time\t\t%R = hour & minute\n"
-"\t%V = week number\t\t%Z = timezone in use\n"
-"\t%H = hours \t\t\t\t%M = minute\n"
-"\t%X = local time\t\t\t%x = local date"
+msgstr "This program uses strftime function to get time.\nUse any valid code to get time in the format you prefer.\nSome common codes are:\n\t%A = weekday\t\t\t%B = month\n\t%c = date & time\t\t%R = hour & minute\n\t%V = week number\t\t%Z = timezone in use\n\t%H = hours \t\t\t\t%M = minute\n\t%X = local time\t\t\t%x = local date"
 
 #: ../panel-plugin/oc_config.c:457
 msgid "Orage clock Preferences"
@@ -516,7 +498,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
@@ -532,7 +514,7 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2800
 msgid "End"
 msgstr "End"
 
@@ -540,13 +522,13 @@
 msgid "Due"
 msgstr "Due"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Select a file..."
 
@@ -554,227 +536,273 @@
 msgid "Sound Files"
 msgstr "Sound Files"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "All Files"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "The appointment information has been modified."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1282 ../src/event-list.c:921
 msgid "Do you want to continue?"
 msgstr "Do you want to continue?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "No, do not leave"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Yes, ignore modifications and leave"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "The end of this appointment is earlier than the beginning."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1918
 msgid "Not set"
 msgstr "Not set"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1220
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1221
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1231
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1232
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1281
 msgid "This appointment will be permanently removed."
 msgstr "This appointment will be permanently removed."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1283 ../src/event-list.c:922
+msgid "No, cancel the removal"
+msgstr "No, cancel the removal"
+
+#: ../src/appointment.c:1284
+msgid "Yes, remove it"
+msgstr "Yes, remove it"
+
+#: ../src/appointment.c:1373 ../src/appointment.c:1388 ../src/day-view.c:457
+#: ../src/event-list.c:980
+msgid "Pick the date"
+msgstr "Pick the date"
+
+#: ../src/appointment.c:1375 ../src/appointment.c:1390 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:982 ../src/event-list.c:1132
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Today"
+
+#: ../src/appointment.c:1798
 msgid "This appointment does not exist."
 msgstr "This appointment does not exist."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1799
 msgid "It was probably removed, please refresh your screen."
 msgstr "It was probably removed, please refresh your screen."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2100
 msgid "Current categories"
 msgstr "Current categories"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2115
 msgid "Add new category with color"
 msgstr "Add new category with colour"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2119
 msgid "Category:"
 msgstr "Category:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2150
 msgid "Colors of categories - Orage"
 msgstr "Colours of categories - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2196
 msgid " *** COPY ***"
 msgstr " *** COPY ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2461
 msgid "New appointment - Orage"
 msgstr "New appointment - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2491 ../src/day-view.c:279 ../src/event-list.c:1033
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_File"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2497
 msgid "Sav_e and close"
 msgstr "Sav_e and close"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2510 ../src/event-list.c:1039
 msgid "D_uplicate"
 msgstr "D_uplicate"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2697
 msgid "Save"
 msgstr "Save"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2699
 msgid "Save and close"
 msgstr "Save and close"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2704
 msgid "Revert"
 msgstr "Revert"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2706 ../src/event-list.c:1123
 msgid "Duplicate"
 msgstr "Duplicate"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2711 ../src/event-list.c:1125
 msgid "Delete"
 msgstr "Delete"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Free"
 msgstr "Free"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Busy"
 msgstr "Busy"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2733
 msgid "General"
 msgstr "General"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2739
 msgid "Type "
 msgstr "Type "
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2741 ../src/event-list.c:1176
 msgid "Event"
 msgstr "Event"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2744
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Event that will happen sometime. For example:\n"
-"Meeting or birthday or TV show."
+msgstr "Event that will happen sometime. For example:\nMeeting or birthday or TV show."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2747 ../src/event-list.c:1196
 msgid "Todo"
 msgstr "Todo"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2750
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Something that you should do sometime. For example:\n"
-"Wash your car or test new version of Orage."
+msgstr "Something that you should do sometime. For example:\nWash your car or test new version of Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2753 ../src/event-list.c:1209
 msgid "Journal"
 msgstr "Journal"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2757
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Make a note that something happened. For example:\n"
-"Remark that your mother called or first snow came."
+msgstr "Make a note that something happened. For example:\nRemark that your mother called or first snow came."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2764
 msgid "Title "
 msgstr "Title "
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2779
 msgid "All day event"
 msgstr "All day event"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2785 ../src/appointment.c:3446 ../src/day-view.c:801
 msgid "Start"
 msgstr "Start"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2805
 msgid "Set      "
 msgstr "Set      "
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2826
 msgid "Duration"
 msgstr "Duration"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2830 ../src/appointment.c:3020 ../src/reminder.c:758
 msgid "days"
 msgstr "days"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2832 ../src/appointment.c:3022 ../src/reminder.c:760
 msgid "hours"
 msgstr "hours"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2834 ../src/appointment.c:3024 ../src/reminder.c:762
 msgid "mins"
 msgstr "mins"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2846
 msgid "Availability"
 msgstr "Availability"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2854 ../src/appointment.c:3452
 msgid "Completed"
 msgstr "Completed"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2857
 msgid "Done"
 msgstr "Done"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2878
 msgid "Categories"
 msgstr "Categories"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2890
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"This is special category, which can be used to colour this appointment in "
-"list views."
+msgstr "This is special category, which can be used to colour this appointment in list views."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2895
 msgid "update colors for categories."
 msgstr "update colours for categories."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2901
 msgid "Priority"
 msgstr "Priority"
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2911
 msgid "Note"
 msgstr "Note"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2932
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -783,140 +811,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"These shorthand commands take effect immediately:\n"
-"    <D> inserts current date in local date format\n"
-"    <T> inserts time and\n"
-"    <DT> inserts date and time.\n"
-"\n"
-"These are converted only later when they are seen:\n"
-"    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "These shorthand commands take effect immediately:\n    <D> inserts current date in local date format\n    <T> inserts time and\n    <DT> inserts date and time.\n\nThese are converted only later when they are seen:\n    <&Ynnnn> is translated to current year minus nnnn.\n(This can be used for example in birthday reminders to tell how old the person will be.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before Start"
 msgstr "Before Start"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before End"
 msgstr "Before End"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After Start"
 msgstr "After Start"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After End"
 msgstr "After End"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3011
 msgid "Alarm"
 msgstr "Alarm"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3017
 msgid "Alarm time"
 msgstr "Alarm time"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3041
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Often you want an alarm:\n"
-" 1) before Event start\n"
-" 2) before Todo end\n"
-" 3) after Todo start"
+msgstr "Often you want to get alarm:\n 1) before Event start\n 2) before Todo end\n 3) after Todo start"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3046
 msgid "Persistent alarm"
 msgstr "Persistent alarm"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3048
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
+msgstr "Select this if you want Orage to remind you even if it has not been active when the alarm happened."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3057
 msgid "Sound"
 msgstr "Sound"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3061 ../src/appointment.c:3181
 msgid "Use"
 msgstr "Use"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3063
 msgid "Select this if you want audible alarm"
 msgstr "Select this if you want audible alarm"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3080
 msgid "Repeat alarm sound"
 msgstr "Repeat alarm sound"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3096 ../src/appointment.c:3395
 msgid "times"
 msgstr "times"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3112
 msgid "sec interval"
 msgstr "sec interval"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3122
 msgid "Visual"
 msgstr "Visual"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3126
 msgid "Use Orage window"
 msgstr "Use Orage window"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3128
 msgid "Select this if you want Orage window alarm"
 msgstr "Select this if you want Orage window alarm"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3140
 msgid "Use notification"
 msgstr "Use notification"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3142
 msgid "Select this if you want notification alarm"
 msgstr "Select this if you want notification alarm"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3148
 msgid "Set timeout"
 msgstr "Set timeout"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3150
 msgid "Select this if you want notification to expire automatically"
 msgstr "Select this if you want notification to expire automatically"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3161
 msgid "0 = system default expiration time"
 msgstr "0 = system default expiration time"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3166
 msgid "seconds"
 msgstr "seconds"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3177
 msgid "Procedure"
 msgstr "Procedure"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3183
 msgid "Select this if you want procedure or script alarm"
 msgstr "Select this if you want procedure or script alarm"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3189
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -926,156 +938,150 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
+msgstr "You must enter all escape etc characters yourself.\nThis string is just given to shell to process.\nThe following special commands are replaced at run time:\n\t<&T>  appointment title\n\t<&D>  appointment description\n\t<&AT> alarm time\n\t<&ST> appointment start time\n\t<&ET> appointment end time"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3201
 msgid "Test this alarm by raising it now"
 msgstr "Test this alarm by raising it now"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3208
 msgid "<b>Default alarm</b>"
 msgstr "<b>Default alarm</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3216
 msgid "Store current settings as default alarm"
 msgstr "Store current settings as default alarm"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3221
 msgid "Set current settings from default alarm"
 msgstr "Set current settings from default alarm"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "None"
 msgstr "None"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Daily"
 msgstr "Daily"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Weekly"
 msgstr "Weekly"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Monthly"
 msgstr "Monthly"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Yearly"
 msgstr "Yearly"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Hourly"
-msgstr ""
+msgstr "Hourly"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Mon"
 msgstr "Mon"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Tue"
 msgstr "Tue"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Wed"
 msgstr "Wed"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Thu"
 msgstr "Thu"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Fri"
 msgstr "Fri"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sat"
 msgstr "Sat"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sun"
 msgstr "Sun"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3290
 msgid "Recurrence"
 msgstr "Recurrence"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3296
 msgid "Complexity"
 msgstr "Complexity"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3299
 msgid "Basic"
 msgstr "Basic"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3305
 msgid "Advanced"
 msgstr "Advanced"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3309
 msgid "Use this if you want regular repeating event"
-msgstr "Use this if you want a regular repeating event"
+msgstr "Use this if you want regular repeating event"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3311
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Use this if you need complex times like:\n"
-" Every Saturday and Sunday or \n"
-" First Tuesday every month"
+msgstr "Use this if you need complex times like:\n Every Saturday and Sunday or \n First Tuesday every month"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3317
 msgid "Frequency"
 msgstr "Frequency"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3323
 msgid "Each"
 msgstr "Each"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3330
 msgid "occurrence"
 msgstr "occurrence"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3334
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Limit frequency to certain interval.\n"
-" For example: Every third day:\n"
-" Frequency = Daily and Interval = 3"
+msgstr "Limit frequency to certain interval.\n For example: Every third day:\n Frequency = Daily and Interval = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3379
 msgid "Limit"
 msgstr "Limit"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3381
 msgid "Repeat forever"
 msgstr "Repeat forever"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3387
 msgid "Repeat "
 msgstr "Repeat "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3403
 msgid "Repeat until "
 msgstr "Repeat until "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3416
 msgid "Weekdays"
 msgstr "Weekdays"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3428
 msgid "Which day"
 msgstr "Which day"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3436
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1083,126 +1089,108 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Specify which weekday for monthly and yearly events.\n"
-" For example:\n"
-" Second Wednesday each month:\n"
-"\tFrequency = Monthly,\n"
-"\tWeekdays = check only Wednesday,\n"
-"\tWhich day = select 2 from the number below Wednesday"
+msgstr "Specify which weekday for monthly and yearly events.\n For example:\n Second Wednesday each month:\n\tFrequency = Monthly,\n\tWeekdays = check only Wednesday,\n\tWhich day = select 2 from the number below Wednesday"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3443
 msgid "TODO base"
 msgstr "TODO base"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3456
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
+msgstr "TODO reoccurs regularly starting on start time and repeating after each interval no matter when it was last completed"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3458
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3464
 msgid "Exceptions"
 msgstr "Exceptions"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3477
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
-"Remove by clicking the data."
-msgstr ""
-"Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
+msgstr "Add more exception dates by clicking the calendar days below.\nException is either exclusion(-) or inclusion(+) depending on the selection.\nRemove by clicking the data."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3482
 msgid "Add excluded date (-)"
 msgstr "Add excluded date (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3484
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr "Excluded days are full days where this appointment is not happening"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3490
 msgid "Add included time (+)"
 msgstr "Add included time (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3492
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"Included times have same timezone than start time, but they may have "
-"different time"
+msgstr "Included times have same timezone than start time, but they may have different time"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3509
 msgid "Action dates"
 msgstr "Action dates"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1056 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_View"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1075
 msgid "_Go"
 msgstr "_Go"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1121
 msgid "New"
 msgstr "New"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Back"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Today"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Back one week"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Back one day"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Forward one day"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Forward one week"
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Forward"
-
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1139
 msgid "Refresh"
 msgstr "Refresh"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1146 ../src/interface.c:834
 msgid "Close"
 msgstr "Close"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "       Number of days to show"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - day view"
 
@@ -1211,164 +1199,166 @@
 msgid "All day"
 msgstr "All day"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:583 ../src/event-list.c:1292
 msgid "Time"
 msgstr "Time"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:751
 msgid "No rows have been selected."
 msgstr "No rows have been selected."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:752
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Click a row to select it and after that you can copy it."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:920
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"You will permanently remove all\n"
-"selected appointments."
+msgstr "You will permanently remove all\nselected appointments."
+
+#: ../src/event-list.c:923
+msgid "Yes, remove them"
+msgstr "Yes, remove them"
 
 #: ../src/event-list.c:1130
+msgid "Back"
+msgstr "Back"
+
+#: ../src/event-list.c:1134
+msgid "Forward"
+msgstr "Forward"
+
+#: ../src/event-list.c:1141
 msgid "Find"
 msgstr "Find"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1148
 msgid "Dayview"
 msgstr "Dayview"
 
-#: ../src/event-list.c:1170
+#: ../src/event-list.c:1181
 msgid "Extra days to show "
 msgstr "Extra days to show "
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1212
 msgid "Journal entries starting from:"
 msgstr "Journal entries starting from:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1232
 msgid "Search"
 msgstr "Search"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1235
 msgid "Search text "
 msgstr "Search text "
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1300
 msgid "Flags"
 msgstr "Flags"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1308
 msgid "Title"
 msgstr "Title"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1334
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
-"\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
-"\t 3. Type: f=free B=Busy\n"
-"\t 4. Located in file:\n"
-"\t\tO=Orage A=Archive F=Foreign\n"
-"\t 5. Appointment type:\n"
-"\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Double click line to edit it.\n"
-"\n"
-"Flags in order:\n"
-"\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Pick the date"
+msgstr "Double click line to edit it.\n\nFlags in order:\n\t 1. Alarm: n=no alarm\n\t\t A=Alarm is set P=Persistent alarm is set\n\t 2. Recurrence: n=no recurrence\n\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n\t 3. Type: f=free B=Busy\n\t 4. Located in file:\n\t\tO=Orage A=Archive F=Foreign\n\t 5. Appointment type:\n\t\tE=Event T=Todo J=Journal"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tRecur ended, moving to archive file."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Archiving not enabled. Exiting"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Archiving threshold: %d month(s)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tArchiving events, which are older than: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Archiving uid: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tVTODO not complete; not archived"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tRecurring. End year: %04d, month: %02d, day: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Archiving done\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Starting archive removal."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tPHASE 1: reset recurring appointments"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tPHASE 2: return archived appointments"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Archive removal done\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Orage default alarm"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "Build alarm list: Added %d alarms. Processed %d events."
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr ""
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3183
 #, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
+msgid "\tAdded %d alarms. Processed %d events."
 msgstr ""
+
+#: ../src/ical-code.c:3185
+#, c-format
+msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
+msgstr "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1386,7 +1376,16 @@
 msgid "Import file preprocessing done"
 msgstr "Import file preprocessing done"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Calendar files"
 
@@ -1394,613 +1393,667 @@
 msgid "Current foreign files"
 msgstr "Current foreign files"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "READ ONLY"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "READ WRITE"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** No foreign files *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr ""
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Import/export"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Import"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Read from file:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Separate filenames with comma(,).\n"
-" NOTE: comma is not valid character in filenames for Orage."
+msgstr "Separate filenames with comma(,).\n NOTE: comma is not valid character in filenames for Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Export"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Write to file:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Select"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "All appointments"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Named appointments: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Note that only main file appointments are read.\n"
-"Archived and Foreign events are not exported."
+msgstr "Note that only main file appointments are read.\nArchived and Foreign events are not exported."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Note that only main file appointments are read.\n"
-"Foreign events are not exported."
+msgstr "Note that only main file appointments are read.\nForeign events are not exported."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "You can easily drag these from event-list window."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "Orage appointment UIDs separated by commas."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Archive"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Archive now (threshold: %d months)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "You can change archive threshold in parameters"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Revert archive now"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Return all archived events into main orage file and remove arch file.\n"
-"This is useful for example when doing export and moving orage\n"
-"appointments to another system."
+msgstr "Return all archived events into main orage file and remove arch file.\nThis is useful for example when doing export and moving orage\nappointments to another system."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Orage files"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Orage main calendar file"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Current file"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "New file"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Action options"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr ""
+
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Rename"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Orage internal file rename only.\n"
-"Does not touch external filesystem at all.\n"
-"New file must exist."
+msgstr "Orage internal file rename only.\nDoes not touch external filesystem at all.\nNew file must exist."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Copy"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr "Current file is copied and stays unmodified in the old place."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Move"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "Current file is moved and vanishes from the old place."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Archive file"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Foreign files"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Add new foreign file"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Foreign file:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Options"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Read only"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Set this if you want to make sure that this file is never modified by Orage.\nNote that modifying foreign files may make them incompatible with the original tool, where they came from!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Exchange data - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tThis is %s version %s\n"
-"\n"
+msgstr "\tThis is %s version %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tReleased under the terms of the GNU General Public License.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tCompiled against GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "using GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tUsing DBUS for import.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tNot using DBUS. Import works only partially.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tUsing libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tNot using libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tUsing automatic archiving.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tNot using archiving.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tUsing operating system package libical.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tUsing Orage local version of libical.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Usage: orage [options] [files]\n"
-"\n"
+msgstr "Usage: orage [options] [files]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Options:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tshow version of orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tprint this text\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \tshow preferences form\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr "--toggle (-t) \t\tmake orage visible/invisible\n"
+msgstr "--toggle (-t) \t\tmake orage visible/unvisible\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) file [RW] \tadd a foreign file\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) file \tremove a foreign file\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--export (-e) file [appointment...] \texport appointments from Orage to file\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "files=ical files to load into orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tdbus not included in orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
+msgstr "\twithout dbus [files] and foreign file options(-a & -r) can only be used when starting orage \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Unknown option %s\n"
-"\n"
+msgstr "\nUnknown option %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Exchange data"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "View selected _date"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "View selected _week"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Select _Today"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
 msgstr "Show _Globaltime"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Help"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "No title defined"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr " Location: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n Note:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Never"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Title: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "Title: %s\n%s Start:\t%s\n Due:\t%s\n Done:\t%s%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Title: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Title: %s\n%s Start:\t%s\n End:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>To do:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Events for %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>Events for %s - %s:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:486
 msgid "Main settings"
 msgstr "Main settings"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:492
 msgid "Timezone"
 msgstr "Timezone"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:507
 msgid "You should always define your local timezone."
 msgstr "You should always define your local timezone."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:515
 msgid "Archive threshold (months)"
 msgstr "Archive threshold (months)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:525
 msgid "(0 = no archiving)"
 msgstr "(0 = no archiving)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:528
 msgid "Archiving is used to save time and space when handling events."
 msgstr "Archiving is used to save time and space when handling events."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:536
 msgid "Sound command"
 msgstr "Sound command"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:551
 msgid "This command is given to shell to make sound in alarms."
 msgstr "This command is given to shell to make sound in alarms."
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "Display settings"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Calendar main window"
+#: ../src/parameters.c:590
+msgid "Calendar window"
+msgstr "Calendar window"
+
+#: ../src/parameters.c:597
+msgid "Calendar visual details"
+msgstr "Calendar visual details"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:603
 msgid "Show borders"
 msgstr "Show borders"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:608
 msgid "Show menu"
 msgstr "Show menu"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Show month and year"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:616
 msgid "Show day names"
 msgstr "Show day names"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:621
 msgid "Show week numbers"
 msgstr "Show week numbers"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:629
+msgid "Show month and year"
+msgstr "Show month and year"
+
+#: ../src/parameters.c:649
+msgid "Calendar info boxes"
+msgstr "Calendar info boxes"
+
+#: ../src/parameters.c:654
 msgid "Show todo list"
 msgstr "Show todo list"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:661
 msgid "Number of days to show in event window"
 msgstr "Number of days to show in event window"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:667
 msgid "0 = do not show event list at all"
 msgstr "0 = do not show event list at all"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:680
+msgid "Calendar visibility"
+msgstr "Calendar visibility"
+
+#: ../src/parameters.c:685
 msgid "Show on all desktops"
 msgstr "Show on all desktops"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:690
 msgid "Keep on top"
 msgstr "Keep on top"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:698
 msgid "Show in taskbar"
 msgstr "Show in taskbar"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:703
 msgid "Show in pager"
 msgstr "Show in pager"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:711
 msgid "Show in systray"
 msgstr "Show in systray"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:732
 msgid "Calendar start"
 msgstr "Calendar start"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:737
 msgid "Show"
 msgstr "Show"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:749
 msgid "Hide"
 msgstr "Hide"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:761
 msgid "Minimized"
 msgstr "Minimised"
 
-#: ../src/parameters.c:793
+#: ../src/parameters.c:781
+msgid "On calendar window open"
+msgstr "On calendar window open"
+
+#: ../src/parameters.c:786
+msgid "Select today's date"
+msgstr "Select today's date"
+
+#: ../src/parameters.c:799
+msgid "Select previously selected date"
+msgstr "Select previously selected date"
+
+#: ../src/parameters.c:817
+msgid "Calendar day double click shows"
+msgstr "Calendar day double click shows"
+
+#: ../src/parameters.c:822
+msgid "Days view"
+msgstr "Days view"
+
+#: ../src/parameters.c:834
+msgid "Event list"
+msgstr "Event list"
+
+#: ../src/parameters.c:856
 msgid "Extra settings"
 msgstr "Extra settings"
 
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr "On Calendar Window Open"
-
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "Select Today's Date"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr "Select Previously Selected Date"
+#: ../src/parameters.c:863
+msgid "Event list window extra days"
+msgstr "Event list window extra days"
+
+#: ../src/parameters.c:868
+msgid "Number of extra days to show in event list"
+msgstr "Number of extra days to show in event list"
+
+#: ../src/parameters.c:876
+msgid ""
+"This is just the default value, you can change it in the actual eventlist "
+"window."
+msgstr "This is just the default value, you can change it in the actual eventlist window."
+
+#: ../src/parameters.c:886
+msgid "Day view window default first day"
+msgstr "Day view window default first day"
+
+#: ../src/parameters.c:891
+msgid "First day of week"
+msgstr "First day of week"
+
+#: ../src/parameters.c:904
+msgid "Selected day"
+msgstr "Selected day"
 
-#: ../src/parameters.c:836
+#: ../src/parameters.c:922
 msgid "Use dynamic tray icon"
 msgstr "Use dynamic tray icon"
 
-#: ../src/parameters.c:841
+#: ../src/parameters.c:927
 msgid "Use dynamic icon"
 msgstr "Use dynamic icon"
 
-#: ../src/parameters.c:847
+#: ../src/parameters.c:933
 msgid "Dynamic icon shows current month and day of the month."
 msgstr "Dynamic icon shows current month and day of the month."
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Main Calendar double click shows"
+#: ../src/parameters.c:941 ../src/parameters.c:946
+msgid "Use wakeup timer"
+msgstr "Use wakeup timer"
 
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr "Days view"
+#: ../src/parameters.c:952
+msgid ""
+"Use this timer if Orage has problems waking up properly after suspend or "
+"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "Use this timer if Orage has problems waking up properly after suspend or hibernate. (For example tray icon not refreshed or alarms not firing.)"
 
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr "Event list"
+#: ../src/parameters.c:961
+msgid "Foreign file default visual alarm"
+msgstr "Foreign file default visual alarm"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr "Eventlist window"
+#: ../src/parameters.c:966
+msgid "Orage window"
+msgstr "Orage window"
 
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr "Number of extra days to show in event list"
+#: ../src/parameters.c:979
+msgid "Notify notification"
+msgstr "Notify notification"
 
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
+#: ../src/parameters.c:997
+msgid "Always quit when asked to close"
 msgstr ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
+#: ../src/parameters.c:1002
+msgid "Always quit"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:1008
 msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1024
 msgid "Orage Preferences"
 msgstr "Orage Preferences"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1136
 msgid "First Orage start. Searching default timezone."
 msgstr "First Orage start. Searching default timezone."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1155
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Default timezone set to %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1158
 msgid "Default timezone not found, please, set it manually."
 msgstr "Default timezone not found, please, set it manually."
 
@@ -2012,40 +2065,35 @@
 msgid "Open"
 msgstr "Open"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Reminder - Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Postpone"
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "Remind me again after the specified time"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr "Press <Execute> to remind me again after the specified time:"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Next active alarms:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d d %02d h %02d min to: %s"
+msgstr "\n%02d d %02d h %02d min to: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"No active alarms found"
+msgstr "\nNo active alarms found"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -3616,227 +3664,26 @@
 msgstr "Show time and date?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Calendar"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Orage Calendar Preferences"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Orage preferences"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Settings for the Xfce 4 Calendar Application (Orage)"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Desktop calendar"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Orage Calendar Preferences"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Calendar"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Orage Calendar"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-
-#~ msgid "Orage clock"
-#~ msgstr "Orage clock"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Original creator, retired maintainer"
-
-#~ msgid "Contributor"
-#~ msgstr "Contributor"
-
-#~ msgid "Info"
-#~ msgstr "Info"
-
-#~ msgid "Warning"
-#~ msgstr "Warning"
-
-#~ msgid "Error"
-#~ msgstr "Error"
-
-#~ msgid "Set sticked"
-#~ msgstr "Set sticked"
-
-#~ msgid "Select always today"
-#~ msgstr "Select always today"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Ending time adjustment mode"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Starting time adjustment mode"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "adjust to change minute"
-
-#~ msgid "Vary"
-#~ msgstr "Vary"
-
-#~ msgid "Select timezone"
-#~ msgstr "Select timezone"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Modify Clock "
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Modify Preferences"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr "Set any valid timezone (=TZ) value or pick one from the list."
-
-#~ msgid "show line _1:"
-#~ msgstr "show line _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "show line _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "show line _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Properties"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Failed to launch 'orage -p'"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-
-#~ msgid "Show event list"
-#~ msgstr "Show event list"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = use static icon)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Calendar Settings"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Xfce 4 Calendar Settings"
-
-#~ msgid ""
-#~ "Set this if you want to make sure that this file is never modified by "
-#~ "Orage."
-#~ msgstr ""
-#~ "Set this if you want to make sure that this file is never modified by "
-#~ "Orage."
-
-#~ msgid "Monday"
-#~ msgstr "Monday"
-
-#~ msgid "Tuesday"
-#~ msgstr "Tuesday"
-
-#~ msgid "Wednesday"
-#~ msgstr "Wednesday"
-
-#~ msgid "Thursday"
-#~ msgstr "Thursday"
-
-#~ msgid "Friday"
-#~ msgstr "Friday"
-
-#~ msgid "Saturday"
-#~ msgstr "Saturday"
-
-#~ msgid "Sunday"
-#~ msgstr "Sunday"
-
-#~ msgid "Ical week start day"
-#~ msgstr "Ical week start day"
-
-#~ msgid "Days"
-#~ msgstr "days"
-
-#~ msgid "recur"
-#~ msgstr "recur"
-
-#~ msgid "normal"
-#~ msgstr "normal"
-
-#~ msgid "Calendar Files"
-#~ msgstr "Xfcalendar"
-
-#~ msgid "Calendar borders"
-#~ msgstr "Xfcalendar"
-
-#~ msgid "Core developer"
-#~ msgstr "Core developer"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-
-#~ msgid "Clear"
-#~ msgstr "Clear"
-
-#~ msgid "This should not happen"
-#~ msgstr "This should not happen"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Cannot create MCS client channel"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Desktop calendar"
diff -Nru orage-4.8.3/po/eo.po orage-4.12.1/po/eo.po
--- orage-4.8.3/po/eo.po	2012-01-03 12:01:02.000000000 +0000
+++ orage-4.12.1/po/eo.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,16 +1,16 @@
-# Esperanto translations for the orage package.
-# Copyright (C) 2002-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Sylvain Vedrenne <gnu_sylvain@xfce.org>, 2005-2006.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2006-07-11 00:21+0200\n"
-"Last-Translator: Jarbas Araujo <jarbasaraujojr@yahoo.com.br>\n"
-"Language-Team: Esperanto <debian-l10n-esperanto@lists.debian.org>\n"
+"POT-Creation-Date: 2013-11-18 18:30+0100\n"
+"PO-Revision-Date: 2013-11-19 15:56+0000\n"
+"Last-Translator: Xfce <transifex@xfce.org>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/xfce/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,9 +34,8 @@
 msgstr ""
 
 #: ../globaltime/globaltime.c:386
-#, fuzzy
 msgid "Localtime"
-msgstr "Loko"
+msgstr ""
 
 #: ../globaltime/globaltime.c:464
 msgid ""
@@ -106,9 +105,8 @@
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "Parametroj de Oraĝo"
+msgstr ""
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -120,9 +118,8 @@
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:613
-#, fuzzy
 msgid "enter name of clock"
-msgstr "Oraĝa horloĝo"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
@@ -134,9 +131,8 @@
 
 #. ------------------------background-------------------------
 #: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
-#, fuzzy
 msgid "Background color:"
-msgstr "difinu la _Postkoloron:"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:656
 msgid "Click to change background colour for clock"
@@ -147,9 +143,8 @@
 #: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
 #: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
 #: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
-#, fuzzy
 msgid "Use default"
-msgstr "Kalendara antaŭsupoza alarmo"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
@@ -159,9 +154,8 @@
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
-#, fuzzy
 msgid "Foreground (=text) color:"
-msgstr "difinu la _antaŭkoloron:"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
@@ -234,30 +228,25 @@
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:1027
-#, fuzzy
 msgid "update preferences"
-msgstr "Parametroj de Oraĝo"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "Parametroj de Oraĝo"
+msgstr ""
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
-#, fuzzy
 msgid "General Preferences"
-msgstr "Parametroj de Oraĝo"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1077
-#, fuzzy
 msgid "Decorations:"
-msgstr "Daŭro"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1078
-#, fuzzy
 msgid "Standard"
-msgstr "Kalendaro"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1083
 msgid "Use normal decorations"
@@ -268,9 +257,8 @@
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:1100
-#, fuzzy
 msgid "Clock size:"
-msgstr "Fermu"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1101
 msgid "Equal"
@@ -281,18 +269,16 @@
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:1111
-#, fuzzy
 msgid "Varying"
-msgstr "Atentavizo"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1116
 msgid "Clock sizes vary"
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:1122
-#, fuzzy
 msgid "Local timezone:"
-msgstr "Elektu lokalan tempzonon"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:101
 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
@@ -307,15 +293,15 @@
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
-msgstr "horoj"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "%d mins"
-msgstr "minutoj"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
@@ -324,9 +310,8 @@
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-#, fuzzy
 msgid "forward"
-msgstr "Antaŭen"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
@@ -342,7 +327,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2771
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Loko"
@@ -403,20 +388,18 @@
 msgid "floating"
 msgstr "flosanta"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "Loko"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "Kalendaro"
+msgstr ""
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr ""
 
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr ""
+
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
 msgstr "Vidaspekto"
@@ -500,20 +483,11 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Ĉi tiu programo uzas la funkcion strftime por difini la tempon.\n"
-"Uzu ajnan validan kodon por konfiguri la tempon en via preferstilo.\n"
-"Jen kelkaj kutimaj kodoj:\n"
-"\t%A = tago de la semajno\t\t%B = mês\n"
-"\t%c = dato & horo\t\t\t%R = horo & minuto\n"
-"\t%V = numero de la semajno\t%Z = uzata tempozono\n"
-"\t%H = horoj\t\t\t\t%M = minuto\n"
-"\t%X = loka horaro\t\t%x = loka dato"
+msgstr "Ĉi tiu programo uzas la funkcion strftime por difini la tempon.\nUzu ajnan validan kodon por konfiguri la tempon en via preferstilo.\nJen kelkaj kutimaj kodoj:\n\t%A = tago de la semajno\t\t%B = mês\n\t%c = dato & horo\t\t\t%R = horo & minuto\n\t%V = numero de la semajno\t%Z = uzata tempozono\n\t%H = horoj\t\t\t\t%M = minuto\n\t%X = loka horaro\t\t%x = loka dato"
 
 #: ../panel-plugin/oc_config.c:457
-#, fuzzy
 msgid "Orage clock Preferences"
-msgstr "Parametroj de Oraĝo"
+msgstr ""
 
 #. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
@@ -524,7 +498,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr "%A, %Y %B %d[%V]"
@@ -534,14 +508,13 @@
 msgstr ""
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "Administru vian tempon kun Xfce4"
+msgstr ""
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2800
 msgid "End"
 msgstr "Fino"
 
@@ -549,13 +522,13 @@
 msgid "Due"
 msgstr ""
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Oraĝo"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Elektu dosieron..."
 
@@ -563,224 +536,273 @@
 msgid "Sound Files"
 msgstr "Sonaj dosieroj"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Ĉiuj dosieroj"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "La rendevua informo estis modifita"
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1282 ../src/event-list.c:921
 msgid "Do you want to continue?"
 msgstr "Ĉu vi volas daŭrigi?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr ""
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr ""
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "La fino de tiu rendevuo estas pli frua ol la komenco!"
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-#, fuzzy
+#: ../src/appointment.c:1035 ../src/appointment.c:1918
 msgid "Not set"
-msgstr "Noto"
+msgstr ""
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1220
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1221
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1231
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1232
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1281
 msgid "This appointment will be permanently removed."
 msgstr "Tiu ĉi rendevuo estos permanente forigita."
 
-#: ../src/appointment.c:1692
-#, fuzzy
+#: ../src/appointment.c:1283 ../src/event-list.c:922
+msgid "No, cancel the removal"
+msgstr ""
+
+#: ../src/appointment.c:1284
+msgid "Yes, remove it"
+msgstr ""
+
+#: ../src/appointment.c:1373 ../src/appointment.c:1388 ../src/day-view.c:457
+#: ../src/event-list.c:980
+msgid "Pick the date"
+msgstr "Elektu daton"
+
+#: ../src/appointment.c:1375 ../src/appointment.c:1390 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:982 ../src/event-list.c:1132
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Hodiaŭ"
+
+#: ../src/appointment.c:1798
 msgid "This appointment does not exist."
-msgstr "Tiu ĉi rendevuo estos permanente forigita."
+msgstr ""
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1799
 msgid "It was probably removed, please refresh your screen."
 msgstr ""
 
-#: ../src/appointment.c:1995
-#, fuzzy
+#: ../src/appointment.c:2100
 msgid "Current categories"
-msgstr "Arkiva dosiero"
+msgstr ""
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2115
 msgid "Add new category with color"
 msgstr ""
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2119
 msgid "Category:"
 msgstr ""
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2150
 msgid "Colors of categories - Orage"
 msgstr ""
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2196
 msgid " *** COPY ***"
 msgstr ""
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2461
 msgid "New appointment - Orage"
 msgstr "Novan rendevuon - Oraĝo"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2491 ../src/day-view.c:279 ../src/event-list.c:1033
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Dosiero"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2497
 msgid "Sav_e and close"
 msgstr "_Konservu kaj fermu"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2510 ../src/event-list.c:1039
 msgid "D_uplicate"
 msgstr "D_uobligita"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2697
 msgid "Save"
 msgstr "Konservu"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2699
 msgid "Save and close"
 msgstr "Konservu kaj fermu"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2704
 msgid "Revert"
 msgstr "Reversu"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2706 ../src/event-list.c:1123
 msgid "Duplicate"
 msgstr "Duobligita"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2711 ../src/event-list.c:1125
 msgid "Delete"
 msgstr "Forigu"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Free"
 msgstr "Libera"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Busy"
 msgstr "Okupita"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2733
 msgid "General"
 msgstr "Ĝeneralaĵoj"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2739
 msgid "Type "
 msgstr ""
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2741 ../src/event-list.c:1176
 msgid "Event"
 msgstr ""
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2744
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
 msgstr ""
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-#, fuzzy
+#: ../src/appointment.c:2747 ../src/event-list.c:1196
 msgid "Todo"
-msgstr "Hodiaŭ"
+msgstr ""
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2750
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
 msgstr ""
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2753 ../src/event-list.c:1209
 msgid "Journal"
 msgstr ""
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2757
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
 msgstr ""
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2764
 msgid "Title "
 msgstr "Titolo "
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2779
 msgid "All day event"
 msgstr "Ĉiutaga evento"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2785 ../src/appointment.c:3446 ../src/day-view.c:801
 msgid "Start"
 msgstr "Komenco"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2805
 msgid "Set      "
 msgstr ""
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2826
 msgid "Duration"
 msgstr "Daŭro"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2830 ../src/appointment.c:3020 ../src/reminder.c:758
 msgid "days"
 msgstr "tagoj"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2832 ../src/appointment.c:3022 ../src/reminder.c:760
 msgid "hours"
 msgstr "horoj"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2834 ../src/appointment.c:3024 ../src/reminder.c:762
 msgid "mins"
 msgstr "minutoj"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2846
 msgid "Availability"
 msgstr "Disponebleco"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2854 ../src/appointment.c:3452
 msgid "Completed"
 msgstr ""
 
-#: ../src/appointment.c:2749
-#, fuzzy
+#: ../src/appointment.c:2857
 msgid "Done"
-msgstr "Nenia"
+msgstr ""
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2878
 msgid "Categories"
 msgstr ""
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2890
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
 msgstr ""
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2895
 msgid "update colors for categories."
 msgstr ""
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2901
 msgid "Priority"
 msgstr ""
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2911
 msgid "Note"
 msgstr "Noto"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2932
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -789,38 +811,35 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before Start"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before End"
 msgstr ""
 
-#: ../src/appointment.c:2896
-#, fuzzy
+#: ../src/appointment.c:3004
 msgid "After Start"
-msgstr "Komenco"
+msgstr ""
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After End"
 msgstr ""
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3011
 msgid "Alarm"
 msgstr "Alarmo"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-#, fuzzy
+#: ../src/appointment.c:3017
 msgid "Alarm time"
-msgstr "Alarmo"
+msgstr ""
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3041
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
@@ -828,91 +847,88 @@
 " 3) after Todo start"
 msgstr ""
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3046
 msgid "Persistent alarm"
 msgstr ""
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3048
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
 msgstr ""
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3057
 msgid "Sound"
 msgstr "Sono"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3061 ../src/appointment.c:3181
 msgid "Use"
 msgstr ""
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3063
 msgid "Select this if you want audible alarm"
 msgstr ""
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3080
 msgid "Repeat alarm sound"
 msgstr "Ripetu la alarman sonon"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3096 ../src/appointment.c:3395
 msgid "times"
 msgstr "foje"
 
-#: ../src/appointment.c:3004
-#, fuzzy
+#: ../src/appointment.c:3112
 msgid "sec interval"
-msgstr "Ĝeneralaĵoj"
+msgstr ""
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3122
 msgid "Visual"
 msgstr ""
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3126
 msgid "Use Orage window"
 msgstr ""
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3128
 msgid "Select this if you want Orage window alarm"
 msgstr ""
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3140
 msgid "Use notification"
 msgstr ""
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3142
 msgid "Select this if you want notification alarm"
 msgstr ""
 
-#: ../src/appointment.c:3040
-#, fuzzy
+#: ../src/appointment.c:3148
 msgid "Set timeout"
-msgstr "Elektu tempzonon"
+msgstr ""
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3150
 msgid "Select this if you want notification to expire automatically"
 msgstr ""
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3161
 msgid "0 = system default expiration time"
 msgstr ""
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3166
 msgid "seconds"
 msgstr ""
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
-#, fuzzy
+#: ../src/appointment.c:3177
 msgid "Procedure"
-msgstr "Aspektoj"
+msgstr ""
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3183
 msgid "Select this if you want procedure or script alarm"
 msgstr ""
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3189
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -924,101 +940,96 @@
 "\t<&ET> appointment end time"
 msgstr ""
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3201
 msgid "Test this alarm by raising it now"
 msgstr ""
 
-#: ../src/appointment.c:3101
-#, fuzzy
+#: ../src/appointment.c:3208
 msgid "<b>Default alarm</b>"
-msgstr "Kalendara antaŭsupoza alarmo"
+msgstr ""
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3216
 msgid "Store current settings as default alarm"
 msgstr ""
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3221
 msgid "Set current settings from default alarm"
 msgstr ""
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "None"
 msgstr "Nenia"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Daily"
 msgstr "Tage"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Weekly"
 msgstr "Semajne"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Monthly"
 msgstr "Monate"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Yearly"
 msgstr "Jare"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Hourly"
 msgstr ""
 
-#: ../src/appointment.c:3178
-#, fuzzy
+#: ../src/appointment.c:3285
 msgid "Mon"
-msgstr "Monate"
+msgstr ""
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Tue"
 msgstr ""
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Wed"
 msgstr ""
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Thu"
 msgstr ""
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Fri"
 msgstr ""
 
-#: ../src/appointment.c:3178
-#, fuzzy
+#: ../src/appointment.c:3285
 msgid "Sat"
-msgstr "Komenco"
+msgstr ""
 
-#: ../src/appointment.c:3178
-#, fuzzy
+#: ../src/appointment.c:3285
 msgid "Sun"
-msgstr "Sono"
+msgstr ""
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3290
 msgid "Recurrence"
 msgstr "Ripeteco"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3296
 msgid "Complexity"
 msgstr ""
 
-#: ../src/appointment.c:3192
-#, fuzzy
+#: ../src/appointment.c:3299
 msgid "Basic"
-msgstr "Reen"
+msgstr ""
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3305
 msgid "Advanced"
 msgstr ""
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3309
 msgid "Use this if you want regular repeating event"
 msgstr ""
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3311
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
@@ -1026,54 +1037,51 @@
 msgstr ""
 
 #. frequency
-#: ../src/appointment.c:3211
-#, fuzzy
+#: ../src/appointment.c:3317
 msgid "Frequency"
-msgstr "Libera"
+msgstr ""
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3323
 msgid "Each"
 msgstr ""
 
-#: ../src/appointment.c:3224
-#, fuzzy
+#: ../src/appointment.c:3330
 msgid "occurrence"
-msgstr "Ripeteco"
+msgstr ""
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3334
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
 msgstr ""
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3379
 msgid "Limit"
 msgstr ""
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3381
 msgid "Repeat forever"
 msgstr "Ripetu ĉiam"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3387
 msgid "Repeat "
 msgstr "Ripetu "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3403
 msgid "Repeat until "
 msgstr "Ripetu ĝis "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-#, fuzzy
+#: ../src/appointment.c:3416
 msgid "Weekdays"
-msgstr "Semajne"
+msgstr ""
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3428
 msgid "Which day"
 msgstr ""
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3436
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1084,266 +1092,269 @@
 msgstr ""
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3443
 msgid "TODO base"
 msgstr ""
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3456
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
 msgstr ""
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3458
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 
 #. exceptions
-#: ../src/appointment.c:3361
-#, fuzzy
+#: ../src/appointment.c:3464
 msgid "Exceptions"
-msgstr "Horloĝopcioj"
+msgstr ""
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3477
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
 msgstr ""
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3482
 msgid "Add excluded date (-)"
 msgstr ""
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3484
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr ""
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3490
 msgid "Add included time (+)"
 msgstr ""
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3492
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
 msgstr ""
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3509
 msgid "Action dates"
 msgstr ""
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1056 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Vidu"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1075
 msgid "_Go"
 msgstr "_Ekiru"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1121
 msgid "New"
 msgstr "Novan"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Reen"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr ""
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Hodiaŭ"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Antaŭen"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1139
 msgid "Refresh"
 msgstr "Refreŝigu"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1146 ../src/interface.c:834
 msgid "Close"
 msgstr "Fermu"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr ""
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr ""
 
-#: ../src/day-view.c:935
-#, fuzzy
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
-msgstr "Kalendaro"
+msgstr ""
 
 #. date only appointment
 #: ../src/event-list.c:190
 msgid "All day"
 msgstr "Ĉiutage"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:583 ../src/event-list.c:1292
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:751
 msgid "No rows have been selected."
 msgstr ""
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:752
 msgid "Click a row to select it and after that you can copy it."
 msgstr ""
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:920
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
 msgstr ""
 
+#: ../src/event-list.c:923
+msgid "Yes, remove them"
+msgstr ""
+
 #: ../src/event-list.c:1130
+msgid "Back"
+msgstr "Reen"
+
+#: ../src/event-list.c:1134
+msgid "Forward"
+msgstr "Antaŭen"
+
+#: ../src/event-list.c:1141
 msgid "Find"
 msgstr ""
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1148
 msgid "Dayview"
 msgstr ""
 
-#: ../src/event-list.c:1170
+#: ../src/event-list.c:1181
 msgid "Extra days to show "
 msgstr ""
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1212
 msgid "Journal entries starting from:"
 msgstr ""
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1232
 msgid "Search"
 msgstr ""
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1235
 msgid "Search text "
 msgstr ""
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1300
 msgid "Flags"
 msgstr "Flagoj"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1308
 msgid "Title"
 msgstr "Titolo"
 
-#: ../src/event-list.c:1323
-#, fuzzy
+#: ../src/event-list.c:1334
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
-"Dukliku la linion por ĝin modifi.\n"
-"\n"
-"Opcioj en ordo:\n"
-"\t 1. Alarmo: n=nenia alarmo\n"
-"\t\tA=Vida Alarmo S=Ankaŭ Sona Alarmo\n"
-"\t 2. Real-alarmo: n=Nenia Real-alarmo\n"
-"\t\t D=Ĉiutaga W=Ĉiusemajna M=Ĉiumonata Y=Ĉiujara\n"
-"\t 3. Karaktero: f=libera B=okupita"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Elektu daton"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr ""
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr ""
 
-#: ../src/ical-archive.c:347
-#, fuzzy, c-format
+#: ../src/ical-archive.c:349
+#, c-format
 msgid "Archiving threshold: %d month(s)"
-msgstr "Arkiva sojlo"
+msgstr ""
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr ""
 
-#: ../src/ical-archive.c:377
-#, fuzzy, c-format
+#: ../src/ical-archive.c:379
+#, c-format
 msgid "Archiving uid: %s"
-msgstr "Arkivoj"
+msgstr ""
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr ""
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr ""
 
-#: ../src/ical-archive.c:405
-#, fuzzy
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
-msgstr "Arkivoj"
+msgstr ""
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
-#, fuzzy
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
-msgstr "Arkiva sojlo"
+msgstr ""
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr ""
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr ""
 
-#: ../src/ical-archive.c:470
-#, fuzzy
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
-msgstr "Arkiva sojlo"
+msgstr ""
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Kalendara antaŭsupoza alarmo"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr ""
+
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
+msgid "\tAdded %d alarms. Processed %d events."
 msgstr ""
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
@@ -1365,7 +1376,16 @@
 msgid "Import file preprocessing done"
 msgstr ""
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Kalendaraj dosieroj"
 
@@ -1373,323 +1393,345 @@
 msgid "Current foreign files"
 msgstr ""
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr ""
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr ""
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr ""
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr ""
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr ""
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr ""
 
-#: ../src/interface.c:986
-#, fuzzy
+#: ../src/interface.c:977
 msgid "Read from file:"
-msgstr "Arkiva dosiero"
+msgstr ""
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
 msgstr ""
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr ""
 
-#: ../src/interface.c:1013
-#, fuzzy
+#: ../src/interface.c:1004
 msgid "Write to file:"
-msgstr "Arkiva dosiero"
+msgstr ""
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
-msgstr "Forigu"
+msgstr ""
 
-#: ../src/interface.c:1037
-#, fuzzy
+#: ../src/interface.c:1028
 msgid "All appointments"
-msgstr "Novan rendevuon"
+msgstr ""
 
-#: ../src/interface.c:1050
-#, fuzzy
+#: ../src/interface.c:1041
 msgid "Named appointments: "
-msgstr "Novan rendevuon"
+msgstr ""
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr ""
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr ""
 
-#: ../src/interface.c:1076
-#, fuzzy
+#: ../src/interface.c:1067
 msgid "Archive"
-msgstr "Arkivoj"
+msgstr ""
 
-#: ../src/interface.c:1084
-#, fuzzy, c-format
+#: ../src/interface.c:1075
+#, c-format
 msgid "Archive now (threshold: %d months)"
-msgstr "Arkiva sojlo"
+msgstr ""
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr ""
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr ""
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
 msgstr ""
 
-#: ../src/interface.c:1118
-#, fuzzy
+#: ../src/interface.c:1109
 msgid "Orage files"
-msgstr "Parametroj de Oraĝo"
+msgstr ""
 
-#: ../src/interface.c:1125
-#, fuzzy
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
-msgstr "Kalendaro"
+msgstr ""
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "Arkiva dosiero"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
 
-#: ../src/interface.c:1137 ../src/interface.c:1202
-#, fuzzy
-msgid "New file"
-msgstr "Arkiva dosiero"
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
 
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
 msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr ""
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
 msgstr ""
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr ""
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr ""
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr ""
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr ""
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Arkiva dosiero"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr ""
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr ""
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr ""
 
-#: ../src/interface.c:1284
-#, fuzzy
-msgid "Options"
-msgstr "Horloĝopcioj"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr ""
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr ""
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
 msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr ""
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
 msgstr ""
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr ""
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr ""
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr ""
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr ""
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr ""
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr ""
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr ""
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr ""
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr ""
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr ""
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr ""
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
 msgstr ""
 
-#: ../src/main.c:307
-#, fuzzy, c-format
+#: ../src/main.c:314
+#, c-format
 msgid "Options:\n"
-msgstr "Horloĝopcioj"
+msgstr ""
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr ""
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr ""
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr ""
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr ""
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
 msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr ""
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
 msgstr ""
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr ""
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr ""
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
 msgstr ""
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
@@ -1697,279 +1739,321 @@
 "\n"
 msgstr ""
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr ""
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Modifu"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Vidu la elektitan _daton"
 
-#: ../src/mainbox.c:311
-#, fuzzy
+#: ../src/mainbox.c:329
 msgid "View selected _week"
-msgstr "Vidu la elektitan _daton"
+msgstr ""
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Elektu _Hodiaŭ"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Loko"
+msgstr ""
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Helpo"
 
-#: ../src/mainbox.c:448
-#, fuzzy
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr ""
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr ""
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr ""
+
+#: ../src/mainbox.c:489
 msgid "Never"
-msgstr "neniam"
+msgstr ""
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:495
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr ""
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr ""
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr ""
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:486
 msgid "Main settings"
-msgstr "Kalendaraj parametroj"
+msgstr ""
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:492
 msgid "Timezone"
 msgstr "Tempzono"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:507
 msgid "You should always define your local timezone."
 msgstr ""
 
-#: ../src/parameters.c:552
-#, fuzzy
+#: ../src/parameters.c:515
 msgid "Archive threshold (months)"
-msgstr "Arkiva sojlo"
+msgstr ""
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:525
 msgid "(0 = no archiving)"
 msgstr ""
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:528
 msgid "Archiving is used to save time and space when handling events."
 msgstr ""
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:536
 msgid "Sound command"
 msgstr ""
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:551
 msgid "This command is given to shell to make sound in alarms."
 msgstr ""
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Montrita"
-
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
-msgstr "Kalendara fenestro"
+#: ../src/parameters.c:590
+msgid "Calendar window"
+msgstr ""
+
+#: ../src/parameters.c:597
+msgid "Calendar visual details"
+msgstr ""
 
-#: ../src/parameters.c:618
-#, fuzzy
+#: ../src/parameters.c:603
 msgid "Show borders"
-msgstr "Montru la _konturlinion"
+msgstr ""
 
-#: ../src/parameters.c:625
-#, fuzzy
+#: ../src/parameters.c:608
 msgid "Show menu"
-msgstr "Montru la _konturlinion"
-
-#: ../src/parameters.c:632
-#, fuzzy
-msgid "Show month and year"
-msgstr "Montru en la paĝilo"
+msgstr ""
 
-#: ../src/parameters.c:639
-#, fuzzy
+#: ../src/parameters.c:616
 msgid "Show day names"
-msgstr "Montru la _konturlinion"
+msgstr ""
 
-#: ../src/parameters.c:646
-#, fuzzy
+#: ../src/parameters.c:621
 msgid "Show week numbers"
-msgstr "Montru la _konturlinion"
+msgstr ""
+
+#: ../src/parameters.c:629
+msgid "Show month and year"
+msgstr ""
 
-#: ../src/parameters.c:653
-#, fuzzy
+#: ../src/parameters.c:649
+msgid "Calendar info boxes"
+msgstr ""
+
+#: ../src/parameters.c:654
 msgid "Show todo list"
-msgstr "Montru la _konturlinion"
+msgstr ""
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:661
 msgid "Number of days to show in event window"
 msgstr ""
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:667
 msgid "0 = do not show event list at all"
 msgstr ""
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:680
+msgid "Calendar visibility"
+msgstr ""
+
+#: ../src/parameters.c:685
 msgid "Show on all desktops"
 msgstr ""
 
-#: ../src/parameters.c:683
-#, fuzzy
+#: ../src/parameters.c:690
 msgid "Keep on top"
-msgstr "difinu la tempzonon:"
+msgstr ""
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:698
 msgid "Show in taskbar"
 msgstr "Montru en la taskostrio"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:703
 msgid "Show in pager"
 msgstr "Montru en la paĝilo"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:711
 msgid "Show in systray"
 msgstr "Montru en la avizazono"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:732
 msgid "Calendar start"
 msgstr "Lanĉo de la Kalendaro"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:737
 msgid "Show"
 msgstr "Montru"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:749
 msgid "Hide"
 msgstr "Kaŝu"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:761
 msgid "Minimized"
 msgstr "Malmaksimumigita"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
+#: ../src/parameters.c:781
+msgid "On calendar window open"
 msgstr ""
 
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Kalendara fenestro"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "Elektu _Hodiaŭ"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:786
+msgid "Select today's date"
 msgstr ""
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
+#: ../src/parameters.c:799
+msgid "Select previously selected date"
 msgstr ""
 
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
+#: ../src/parameters.c:817
+msgid "Calendar day double click shows"
 msgstr ""
 
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
-
-#: ../src/parameters.c:861
+#: ../src/parameters.c:822
 msgid "Days view"
 msgstr ""
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:834
 msgid "Event list"
 msgstr ""
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
+#: ../src/parameters.c:856
+msgid "Extra settings"
+msgstr ""
+
+#: ../src/parameters.c:863
+msgid "Event list window extra days"
 msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:868
 msgid "Number of extra days to show in event list"
 msgstr ""
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:876
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
 msgstr ""
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:886
+msgid "Day view window default first day"
+msgstr ""
+
+#: ../src/parameters.c:891
+msgid "First day of week"
+msgstr ""
+
+#: ../src/parameters.c:904
+msgid "Selected day"
+msgstr ""
+
+#: ../src/parameters.c:922
+msgid "Use dynamic tray icon"
+msgstr ""
+
+#: ../src/parameters.c:927
+msgid "Use dynamic icon"
+msgstr ""
+
+#: ../src/parameters.c:933
+msgid "Dynamic icon shows current month and day of the month."
+msgstr ""
+
+#: ../src/parameters.c:941 ../src/parameters.c:946
 msgid "Use wakeup timer"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:952
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:961
+msgid "Foreign file default visual alarm"
+msgstr ""
+
+#: ../src/parameters.c:966
+msgid "Orage window"
+msgstr ""
+
+#: ../src/parameters.c:979
+msgid "Notify notification"
+msgstr ""
+
+#: ../src/parameters.c:997
+msgid "Always quit when asked to close"
+msgstr ""
+
+#: ../src/parameters.c:1002
+msgid "Always quit"
+msgstr ""
+
+#: ../src/parameters.c:1008
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr ""
+
+#: ../src/parameters.c:1024
 msgid "Orage Preferences"
 msgstr "Parametroj de Oraĝo"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1136
 msgid "First Orage start. Searching default timezone."
 msgstr ""
 
-#: ../src/parameters.c:1069
-#, fuzzy, c-format
+#: ../src/parameters.c:1155
+#, c-format
 msgid "Default timezone set to %s."
-msgstr "difinu la tempzonon:"
+msgstr ""
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1158
 msgid "Default timezone not found, please, set it manually."
 msgstr ""
 
@@ -1981,37 +2065,35 @@
 msgid "Open"
 msgstr ""
 
-#: ../src/reminder.c:722
-#, fuzzy
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
-msgstr "Memorigilo "
+msgstr ""
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
+#: ../src/reminder.c:803
+msgid "Postpone"
 msgstr ""
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
 msgstr ""
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr ""
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
 msgstr ""
 
-#: ../src/reminder.c:1166
-#, fuzzy, c-format
+#: ../src/reminder.c:1154
+#, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr "Ripetu la alarman sonon"
+msgstr ""
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2250,29 +2332,24 @@
 msgstr "Ameriko/Araguajno"
 
 #: ../src/timezone_names.c:95
-#, fuzzy
 msgid "America/Argentina/Buenos_Aires"
-msgstr "Ameriko/Bŭenos_Ajro"
+msgstr ""
 
 #: ../src/timezone_names.c:96
-#, fuzzy
 msgid "America/Argentina/Catamarca"
-msgstr "Ameriko/Katamarko"
+msgstr ""
 
 #: ../src/timezone_names.c:97
-#, fuzzy
 msgid "America/Argentina/Cordoba"
-msgstr "Ameriko/Kordobo"
+msgstr ""
 
 #: ../src/timezone_names.c:98
-#, fuzzy
 msgid "America/Argentina/Jujuy"
-msgstr "Ameriko/Jujuy"
+msgstr ""
 
 #: ../src/timezone_names.c:99
-#, fuzzy
 msgid "America/Argentina/Mendoza"
-msgstr "Ameriko/Mendozo"
+msgstr ""
 
 #: ../src/timezone_names.c:100
 msgid "America/Aruba"
@@ -3579,177 +3656,34 @@
 msgstr "Pri Oraĝo"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Orage Panel Clock"
-msgstr "Oraĝa Horloĝo"
+msgstr ""
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
 msgid "Show time and date?"
-msgstr "Kiomaj estas la nunaj horo kaj dato?"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Kalendaro"
+msgid "Orage preferences"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Parametroj de Oraĝo"
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Parametroj de Oraĝo"
+msgid "Orage Calendar Preferences"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Parametroj por la Xfce 4 Kalendara Aplikaĵo"
-
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Labortabla kalendaro"
-
 #: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
+msgid "Calendar"
 msgstr "Kalendaro"
 
-#~ msgid "Orage clock"
-#~ msgstr "Oraĝa horloĝo"
-
-#~ msgid "Contributor"
-#~ msgstr "Partoprenanto"
-
-#~ msgid "Warning"
-#~ msgstr "Atentavizo"
-
-#~ msgid "Display"
-#~ msgstr "Montru"
-
-#, fuzzy
-#~ msgid "Select always today"
-#~ msgstr "Elektu _Hodiaŭ"
-
-#, fuzzy
-#~ msgid "Vary"
-#~ msgstr "Jare"
-
-#~ msgid "Select timezone"
-#~ msgstr "Elektu tempzonon"
-
-#, fuzzy
-#~ msgid "Modify Preferences"
-#~ msgstr "Parametroj de Oraĝo"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr "Enskribu validan tempzonon (=TZ) aŭ elektu unu el la listo."
-
-#~ msgid "show line _1:"
-#~ msgstr "montru la linion _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "montru la linion _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "montru la linion _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Aspektoj"
-
-#, fuzzy
-#~ msgid "Show event list"
-#~ msgstr "Montru en la avizazono"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Xfce 4 Kalendaraj Parametroj"
-
-#, fuzzy
-#~ msgid "Monday"
-#~ msgstr "Hodiaŭ"
-
-#, fuzzy
-#~ msgid "Tuesday"
-#~ msgstr "Hodiaŭ"
-
-#, fuzzy
-#~ msgid "Wednesday"
-#~ msgstr "Semajne"
-
-#, fuzzy
-#~ msgid "Thursday"
-#~ msgstr "Hodiaŭ"
-
-#, fuzzy
-#~ msgid "Friday"
-#~ msgstr "tagoj"
-
-#, fuzzy
-#~ msgid "Sunday"
-#~ msgstr "Sono"
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "tagoj"
-
-#, fuzzy
-#~ msgid "normal"
-#~ msgstr "Ĝeneralaĵoj"
-
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%Y/%m/%d"
-
-#, fuzzy
-#~ msgid "Calendar Files"
-#~ msgstr "Kalendaraj dosieroj"
-
-#~ msgid "Calendar borders"
-#~ msgstr "Kalendaraj bordoj"
-
-#~ msgid "Hidden"
-#~ msgstr "Kaŝita"
-
-#~ msgid "3 months"
-#~ msgstr "3 monatoj"
-
-#~ msgid "6 months"
-#~ msgstr "6 monatoj"
-
-#~ msgid "1 year"
-#~ msgstr "1 jaro"
-
-#~ msgid "Application"
-#~ msgstr "Aplikaĵo"
-
-#~ msgid "Button Label|Orage"
-#~ msgstr "Buton-Nomo|Oraĝo"
-
-#~ msgid "Core developer"
-#~ msgstr "Ĉefa programisto"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Vi forigos ciujn informojn \n"
-#~ "rilatajn al tiu dato."
-
-#~ msgid "Clear"
-#~ msgstr "Purigu"
-
-#~ msgid "uid"
-#~ msgstr "Uzantmarko (uid)"
-
-#~ msgid "This should not happen"
-#~ msgstr "Tio ne devus okazi"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Ne eblas krei MCS-an klientan kanalon"
-
-#~ msgid "Open archive file..."
-#~ msgstr "Malfermu arkivan dosieron..."
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr ""
 
-#~ msgid "Close archive file"
-#~ msgstr "Fermu arkivan dosieron"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Labortabla kalendaro"
diff -Nru orage-4.8.3/po/es.po orage-4.12.1/po/es.po
--- orage-4.8.3/po/es.po	2012-01-03 12:01:02.000000000 +0000
+++ orage-4.12.1/po/es.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,29 +1,52 @@
-# Spanish translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Edscott Wilson Garcia <edscott@xfce.org>, 2004.
-# Abel Martín <abel.martin.ruiz@gmail.com>, 2008-2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Adolfo Jayme Barrientos, 2013
+# Adolfo Jayme Barrientos, 2013
+# Edscott Wilson Garcia <edscott@xfce.org>, 2004
+# gabrieltandil <gabriel.tandil@gmail.com>, 2014
+# gabrieltandil <gabriel.tandil@gmail.com>, 2014
+# mc <correomc2000-ing@yahoo.es>, 2013
+# Pablo Roberto Francisco Lezaeta Reyes <prflr88@gmail.com>, 2013-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2009-03-19 16:41+0100\n"
-"Last-Translator: Abel Martín <abel.martin.ruiz@gmail.com>\n"
-"Language-Team: Spanish/ES <xfce-i18n@xfce.org>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2015-03-16 02:11+0000\n"
+"Last-Translator: Manolo Díaz <diaz.manolo@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/xfce-apps/language/es/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "sin subrayado"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "simple"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "doble"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "bajo"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr "Mostrando ventana de hora global..."
+msgstr "Mostrando ventana de hora global…"
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
-msgstr "Fallo al mostrar la ventana de hora global"
+msgstr "No se pudo mostrar la ventana de hora global"
 
 #. ********** timezone tooltip **********
 #: ../globaltime/globaltime.c:277
@@ -31,9 +54,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"clic para modificar el reloj"
+msgstr "%s\npulse para modificar el reloj"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -43,20 +64,20 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"botón 1 para cambiar preferencias \n"
-"botón 2 para ajustar la hora de los relojes"
+msgstr "botón 1 para cambiar preferencias \nbotón 2 para ajustar la hora de los relojes"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
-msgstr "ajustar para cambiar horas"
+msgstr "ajuste para cambiar horas"
 
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"Ajustar para cambiar minutos. Haga clic en las flechas con el segundo botón "
-"para cambiar solo 1 minuto."
+msgstr "ajuste para cambiar minutos. Pulse en las flechas con el segundo botón para cambiar solamente 1 minuto."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Hora Global"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -64,11 +85,11 @@
 
 #: ../globaltime/gt_prefs.c:289
 msgid "NEW COPY"
-msgstr "NUEVA COPIA"
+msgstr "COPIA NUEVA"
 
 #: ../globaltime/gt_prefs.c:310
 msgid "Not possible to delete the last clock."
-msgstr "No fue posible borrar el último reloj."
+msgstr "No es posible eliminar el último reloj."
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
@@ -76,15 +97,15 @@
 
 #: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
 msgid "add new empty clock"
-msgstr "añadir nuevo reloj vacío"
+msgstr "añadir un reloj vacío nuevo"
 
 #: ../globaltime/gt_prefs.c:526
 msgid "add new clock using this clock as model"
-msgstr "añadir nuevo reloj usando este reloj como modelo"
+msgstr "añadir un reloj nuevo usando este como modelo"
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
-msgstr "borrar este reloj"
+msgstr "eliminar este reloj"
 
 #: ../globaltime/gt_prefs.c:539
 msgid "move this clock first"
@@ -104,8 +125,7 @@
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
-msgstr ""
-"establecer la zona horaria para este reloj para que sea la zona horaria local"
+msgstr "establecer el huso horario para este reloj para que sea el huso horario local"
 
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
@@ -126,11 +146,11 @@
 
 #: ../globaltime/gt_prefs.c:613
 msgid "enter name of clock"
-msgstr "introduzca nombre del reloj"
+msgstr "introduzca el nombre del reloj"
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
-msgstr "Zona horaria del reloj:"
+msgstr "Huso horario del reloj:"
 
 #: ../globaltime/gt_prefs.c:643
 msgid "Text Formatting"
@@ -143,7 +163,7 @@
 
 #: ../globaltime/gt_prefs.c:656
 msgid "Click to change background colour for clock"
-msgstr "Clic para cambiar el color de fondo del reloj"
+msgstr "Pulse para cambiar el color de fondo del reloj"
 
 #: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
 #: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
@@ -157,9 +177,7 @@
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
 #: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
 msgid "Cross this to use default instead of selected value"
-msgstr ""
-"Marcar con una cruz para utilizar el valor predeterminado en lugar del "
-"seleccionado"
+msgstr "Marcar con una cruz para utilizar el valor predeterminado en lugar del seleccionado"
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
@@ -168,7 +186,7 @@
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
-msgstr "Clic para cambiar el color de primer plano del reloj"
+msgstr "Pulse para cambiar el color de primer plano del reloj"
 
 #. ------------------------name font-------------------------
 #: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
@@ -177,7 +195,7 @@
 
 #: ../globaltime/gt_prefs.c:720
 msgid "Click to change font for clock name"
-msgstr "Clic para cambiar el tipo de letra del nombre del reloj"
+msgstr "Pulse para cambiar el tipo de letra del nombre del reloj"
 
 #. ------------------------time font-------------------------
 #: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
@@ -186,7 +204,7 @@
 
 #: ../globaltime/gt_prefs.c:753
 msgid "Click to change font for clock time"
-msgstr "Clic para cambiar el tipo de letra predeterminado de la hora del reloj"
+msgstr "Pulse para cambiar el tipo de letra predeterminado de la hora del reloj"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:780
@@ -204,31 +222,27 @@
 
 #: ../globaltime/gt_prefs.c:863
 msgid "Click to change default background colour for clocks"
-msgstr "Clic para cambiar el color de fondo predeterminado para los relojes"
+msgstr "Pulse para cambiar el color de fondo predeterminado para los relojes"
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
-"Marcar para usar el color de sistema predeterminado en lugar del seleccionado"
+msgstr "Marcar para usar el color de sistema predeterminado en lugar del seleccionado"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
-msgstr "Clic para cambiar el color de texto predeterminado para los relojes"
+msgstr "Pulse para cambiar el color de texto predeterminado para los relojes"
 
 #: ../globaltime/gt_prefs.c:929
 msgid "Click to change default font for clock name"
-msgstr "Clic para cambiar el tipo de letra predeterminado del nombre del reloj"
+msgstr "Pulse para cambiar el tipo de letra predeterminado del nombre del reloj"
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"Marcar para usar el tipo de letra predeterminado del sistema en lugar del "
-"tipo de letra seleccionado"
+msgstr "Marcar para usar el tipo de letra predeterminado del sistema en lugar del tipo de letra seleccionado"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
-msgstr ""
-"Clic para cambiar el tipo de letra predeterminado para la hora del reloj"
+msgstr "Pulse para cambiar el tipo de letra predeterminado para la hora del reloj"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:990
@@ -265,6 +279,10 @@
 msgid "Use normal decorations"
 msgstr "Usar decoraciones normales"
 
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Ninguno"
+
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
 msgstr "No mostrar decoración de ventana (bordes)"
@@ -291,7 +309,7 @@
 
 #: ../globaltime/gt_prefs.c:1122
 msgid "Local timezone:"
-msgstr "Zona horaria local:"
+msgstr "Huso horario local:"
 
 #: ../globaltime/timezone_selection.c:101
 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
@@ -340,10 +358,10 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
-msgstr "Lugar"
+msgstr "Localización"
 
 #: ../globaltime/timezone_selection.c:258
 #: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
@@ -371,7 +389,7 @@
 #: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
 #: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
 msgid "Pick timezone"
-msgstr "Escoja la zona horaria"
+msgstr "Escoja un huso horario"
 
 #: ../globaltime/timezone_selection.c:302
 #: ../globaltime/timezone_selection.c:312
@@ -401,99 +419,108 @@
 msgid "floating"
 msgstr "flotante"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Hora global"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Hora global de Orage"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
-msgstr "Muestra el relog de diferentes paises"
+msgstr "Muestra el reloj de diferentes países"
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Hora global"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Sin Rotación"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Rotar a la izquierda"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Rotar a la derecha"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "Apariencia"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
 msgstr "Mostrar _marco"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
 msgstr "establecer _color de primer plano"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
 msgstr "establecer color de _fondo"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
 msgstr "establecer _altura:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
-"Tenga en cuenta que no puede cambiar la altura de los paneles horizontales"
+msgstr "Tenga en cuenta que no puede cambiar la altura de los paneles horizontales"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
 msgstr "establecer a_nchura:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
-msgstr ""
-"Tenga en cuanta que no puede cambiar el ancho de los paneles verticales"
+msgstr "Tenga en cuanta que no puede cambiar el ancho de los paneles verticales"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Mostrar las líneas _verticalmente"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "Opciones de reloj"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
-msgstr "establecer zona horaria en:"
+msgstr "establecer el huso horario en:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "Línea %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
 msgstr "Introduzca cualquier parámetro válido de la función strftime."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
 msgstr "Cuadro emergente:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
-msgstr "corregir hora después de suspender/hibernar"
+msgstr "ajustar la hora después de suspender/hibernar"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Sólo necesita esto si hiberna o suspende el equipo por un corto periodo de "
-"tiempo (menos de 5 horas) y el tiempo visible no incluye segundos. Bajo "
-"estas circunstancias es posible que Orageclock muestre el tiempo de forma "
-"inexacta a menos que haya seleccionado esto. (Seleccionarlo evita que "
-"funcionen las funcionalidades de ahorro de CPU e interrupciones)."
+msgstr "Solamente necesita esto si hiberna o suspende el equipo por un corto periodo de tiempo (menos de 5 horas) y el tiempo visible no incluye segundos. Bajo estas circunstancias es posible que Reloj de Orage muestre el tiempo de forma inexacta a menos que haya seleccionado esto. (Al seleccionarlo impide el uso de las funciones de disminución de interrupciones y consumo energético de la cpu)."
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -503,22 +530,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Este programa usa la función strftime para obtener la hora.\n"
-"Use cualquier código válido para obtener la hora en el formato que "
-"prefiera.\n"
-"Algunos códigos comunes son:\n"
-"\t%A = día de la semana\t\t\t%B = mes\n"
-"\t%c = fecha & hora\t\t%R = hora & minuto\n"
-"\t%V = día de la semana (numérico)\t\t%Z = zona horaria en uso\n"
-"\t%H = hora \t\t\t\t%M = minuto\n"
-"\t%X = hora local\t\t\t%x = fecha local"
+msgstr "Este programa usa la función «strftime» para obtener la hora.\nUse cualquier código válido para obtener la hora en el formato que prefiera.\nAlgunos códigos comunes son:\n\t%A = día de la semana\t\t\t%B = mes\n\t%c = fecha & hora\t\t%R = hora & minuto\n\t%V = número de semana del año\t\t%Z = huso horario en uso\n\t%H = hora \t\t\t\t%M = minuto\n\t%X = hora local\t\t\t%x = fecha local"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
-msgstr "Preferencias de reloj de Oraje"
+msgstr "Preferencias del reloj Orage"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -527,8 +544,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
 
@@ -543,7 +559,7 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Fin"
 
@@ -551,241 +567,295 @@
 msgid "Due"
 msgstr "Fecha límite"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
-msgstr "Seleccione un archivo..."
+msgstr "Seleccione un archivo…"
 
 #: ../src/appointment.c:680
 msgid "Sound Files"
 msgstr "Archivos de sonido"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Todos los archivos"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "La información de la cita ha sido modificada."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "¿Desea continuar?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "No, no salir"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Si, ignorar modificaciones y salir"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "El fin de esta cita es anterior a su inicio."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "No establecido"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Agregar nueva cita a este archivo."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Archivo predeterminado de Orage"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "La adición de la cita ha fallado."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Ha ocurrido un error al agregar cita. Mire los detalles en el registro."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Actualización de la cita ha fallado."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Vea más detalles en el registro (¿Tal vez el archivo fue actualizado de forma externa a Orage?)."
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
 msgstr "Esta cita se eliminará permanentemente."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "No, cancele la remoción"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Si, remuévala"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Escoja la fecha"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Hoy"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "Esta cita no existe."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
-msgstr "Probablemente fue eliminado. Por favor, refresque la pantalla."
+msgstr "Probablemente fue eliminado. Por favor, refresque su pantalla."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Categorías actuales"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
-msgstr "Añadir una nueva categoría con color"
+msgstr "Añadir una categoría nueva con color"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Categoría:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Colores de categorías - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
-msgstr " *** COPIAR ***"
+msgstr " *** COPIA ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "Nueva cita - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "_Guardar y cerrar"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "D_uplicar"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Guardar"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Guardar y cerrar"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Revertir"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
-msgstr "Liberar"
+msgstr "Libre"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "General"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Tipo"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Evento que ocurrirá en algún momento. Por ejemplo:\n"
-"Cita, cumpleaños o programa de TV."
+msgstr "Evento que ocurrirá en algún momento. Por ejemplo:\nCita, cumpleaños o programa de TV."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
-msgstr "Tareas pendientes"
+msgstr "Quehacer"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Algo que debería hacer alguna ocasión. Por ejemplo:\n"
-"Lavar su coche o probar la nueva versión de Orage."
+msgstr "Algo que debería hacer alguna ocasión. Por ejemplo:\nLavar su automóvil o probar la nueva versión de Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Diario"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Tome nota cuando algo ocurra. Por ejemplo:\n"
-"Recuerde que su madre llamó o que cayó la primera nevada."
+msgstr "Tome nota cuando algo ocurra. Por ejemplo:\nRecuerde que su madre llamó o que cayó la primera nevada."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Título"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "Evento que dura todo el día"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Inicio"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Establecer"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Duración"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "días"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "horas"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
-msgstr "mins"
+msgstr "mins."
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Disponibilidad"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Completado"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "Hecho"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Categorías"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Ésta es una categoría especial que puede ser usada para colorear esta cita "
-"en las vistas como lista."
+msgstr "Esta es una categoría especial que puede utilizarse para colorear esta cita en las vistas como lista."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "actualizar colores de categorías."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "Prioridad"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Si establece este 8 o más, la cita no será mostrada en la lista de ventanas.\nPuede utilizar esta función para dar sorden a la lista de la ventanas, pero se hará más difícil encontrar dicha cita.\n(Las alarmas igualmente se activarán normalmente).\n(En este parámetro no está documentado de modo que puede cambiar el límite predeterminado de 8)."
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Nota"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -794,144 +864,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"Estos comandos abreviados tendrán efecto inmediatamente:\n"
-" <D> inserta la fecha actual en formato de fecha local\n"
-" <T> insserta hora y\n"
-" <DT> inserta hora y fecha.\n"
-"\n"
-"Estos se convierten solo cuando se ven:\n"
-" <&Ynnnn> se traduce como el año actual menos nnnn.\n"
-"(Esto puede usarse, por ejemplo, como recordatorios de cumpleaños para saber "
-"qué edad cumple la persona)."
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Estas órdenes abreviadas tendrán efecto inmediatamente:\n <D> inserta la fecha actual en formato de fecha local\n <T> inserta hora y\n <DT> inserta hora y fecha.\n\nEstos se convierten solamente cuando se ven:\n <&Ynnnn> se traduce como el año actual menos nnnn.\n(Esto puede usarse, por ejemplo, como recordatorios de cumpleaños para saber qué edad cumple la persona)."
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
-msgstr "Antes del inicio"
+msgstr "Antes del Inicio"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
-msgstr "Antes del fin"
+msgstr "Antes del Fin"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
-msgstr "Después del inicio"
+msgstr "Después del Inicio"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
-msgstr "Después del fin"
+msgstr "Después del Fin"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Alarma"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Hora de alarma"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"A veces desea que la alarma se active:\n"
-" 1) antes del inicio del evento\n"
-" 2) antes del fin de tareas pendientes\n"
-" 3) después del inicio de tareas pendientes"
+msgstr "A veces desea que la alarma se active:\n 1) antes del inicio del evento\n 2) antes del fin de Quehaceres pendientes\n 3) después del inicio de Quehaceres pendientes"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr "Alarma persistente"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Seleccione esta opción si quiere que Orage le avise incluso si no estaba "
-"activo cuando ocurrió la alarma."
+msgstr "Seleccione esta opción si quiere que Orage le avise incluso si no estaba activo cuando ocurrió la alarma."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Sonido"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
-msgstr "Usar"
+msgstr "Utilización"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
 msgstr "Seleccione esta opción si quiere una alarma sonora"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "Repetir sonido de alarma"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "veces"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
-msgstr "intervalo en seg."
+msgstr "intervalo en segundos"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "Visual"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Usar ventana de Orage"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
 msgstr "Seleccione esta opción si desea la ventana de alarma de Orage"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Usar notificación"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
 msgstr "Seleccione esta opción si desea la alarma de notificación"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "Establecer tiempo de expiración"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
-msgstr ""
-"Seleccione esta opción si quiere que las notificaciones expiren "
-"automáticamente"
+msgstr "Seleccione esta opción si quiere que las notificaciones expiren automáticamente"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 = tiempo de expiración predeterminado del sistema"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "segundos"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Procedimiento"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
-msgstr ""
-"Seleccione esta opción si desea una alarma mediante procedimiento o script"
+msgstr "Seleccione esta opción si desea una alarma mediante procedimiento o intérprete de órdenes"
 
-#: ../src/appointment.c:3082
-#, fuzzy
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -941,163 +991,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
-"Usted debe ingresar todos los caracteres, etc escapar de ti mismo \\ cadena "
-"nEste acaba de dar a shell para procesar \\ nLos siguientes comandos "
-"especiales son reemplazados en tiempo de ejecución:.. \\ N \\ t &lt;&amp; "
-"T&gt; título de cita \\ n \\ t &lt;+ D&gt; descripción de la cita \\ n \\ t "
-"&lt;&amp; A&gt; hora de la alarma \\ n \\ t &lt;&amp; ST&gt; hora de inicio "
-"del nombramiento \\ n \\ t &lt;&amp; ET&gt; nombramiento del tiempo del fin"
+msgstr "Debe ingresar todos los caracteres, etc. usted mismo.\nEsta cadena es enviada al intérprete de órdenes para procesar.\nLas siguientes órdenes especiales son remplazados en tiempo de ejecución:\n\t<&T> título de cita\n\t<&D> descripción de la cita\n\t<&AT> hora de la alarma\n\t<&ST> hora de inicio de cita\n\t<&ET> hora de fin de la cita "
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
 msgstr "Pruebe esta alarma activándola ahora"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "<b>Alarma predeterminada</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
 msgstr "Almacenar la configuración actual como alarma predeterminada"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
-msgstr ""
-"Establecer la configuración actual desde la de la alarma predeterminada"
+msgstr "Establecer la configuración actual desde la de la alarma predeterminada"
 
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Ninguno"
-
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
-msgstr "Diario"
+msgstr "Diariamente"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
-msgstr "Semanal"
+msgstr "Semanalmente"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
-msgstr "Mensual"
+msgstr "Mensualmente"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
-msgstr "Anual"
+msgstr "Anualmente"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
 msgstr "Cada hora"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
-msgstr "Lun"
+msgstr "lun"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
-msgstr "Mar"
+msgstr "mar"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
-msgstr "Mié"
+msgstr "mié"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
-msgstr "Jue"
+msgstr "jue"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
-msgstr "Vie"
+msgstr "vie"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
-msgstr "Sáb"
+msgstr "sáb"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
-msgstr "Dom"
+msgstr "dom"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Repetición"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Complejidad"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Básico"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "Use esta opción si desea la repetición regular del evento"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Use esta opción si necesita fechas complejas como:\n"
-" Cada sábado y domingo o \n"
-" el primer jueves de cada mes"
+msgstr "Use esta opción si necesita fechas complejas como:\n Cada sábado y domingo o \n el primer jueves de cada mes"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Frecuencia"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Cada"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "ocurrencia"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Limitar la frecuencia a un intervalo determinado.\n"
-" Por ejemplo: Cada tercer día:\n"
-" Frecuencia = Diaria e Intervalo = 3"
+msgstr "Limitar la frecuencia a un intervalo determinado.\n Por ejemplo: Cada tercer día:\n Frecuencia = Diaria e Intervalo = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Limitar"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Repetir para siempre"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Repetir "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Repetir hasta "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Días de la semana"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "Qué día"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1105,297 +1138,297 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Especificar días de la semana para eventos mensuales y anuales.\n"
-" Por ejemplo:\n"
-" El segundo miércoles de cada mes:\n"
-"\tFrecuencia = Mensual,\n"
-"\tDías de la semana = marque sólo el miércoles,\n"
-"\tQué día = seleccione 2 del número debajo de miércoles"
+msgstr "Especificar días de la semana para eventos mensuales y anuales.\n Por ejemplo:\n El segundo miércoles de cada mes:\n\tFrecuencia = Mensual,\n\tDías de la semana = marque solamente el miércoles,\n\tQué día = seleccione 2 del número debajo del miércoles"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
-msgstr "Base TODO"
+msgstr "Base para Quehacer"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"TODO vuelve a ocurrir regularmente comenzando con una hora de inicio y "
-"repitiéndose después de cada intervalo, independientemente de cuándo se "
-"completó el último"
-
-#: ../src/appointment.c:3354
-msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"La repeticion de TODO se basa en hora completa y se repite después del "
-"intervalo contando desde la última hora completada.\n"
-"(Tenga en cuenta no puede saber nada acerca de la historia de TODO, puesto "
-"que la base de repetición cambia después de cada finalización)."
+msgstr "La repetición de Quehacer vuelve a ocurrir regularmente comenzando con una hora de inicio y repitiéndose después de cada intervalo, independientemente de cuándo se completó el último"
+
+#: ../src/appointment.c:3465
+msgid ""
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "La repetición de Quehacer se basa por hora completa y se repite después del intervalo contando desde la última hora completada.\n(Tenga en cuenta que no puede saber nada acerca de la historia de Quehacer, puesto que la base de repetición cambia después de cada finalización)."
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "Excepciones"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"Añade más fechas de excepción haciendo clic en los días de calendario "
-"abajo.\n"
-"Una excepción es un exclusión(-) o una inclusión (+) dependiendo de la "
-"selección.\n"
-"Bórrelas haciendo clic en las fechas."
+msgstr "Añade más fechas de excepción pulsando en los días del calendario, abajo.\nUna excepción es un exclusión (-) o una inclusión (+), dependiendo de la selección.\nBórrelas pulsando en las fechas."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr "Añadir fecha excluida (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-"Los días excluidos son días completos en los que una cita no tiene lugar"
+msgstr "Los días excluidos son días completos en los que una cita no tiene lugar"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
-msgstr "Añadir hora incluida (-)"
+msgstr "Añadir hora incluida (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"Las horas incluidas tienen la misma zona horaria que la hora de inicio, pero "
-"pueden tener horas distintas."
+msgstr "Las horas incluidas tienen el mismo huso horario que la hora de inicio, pero pueden ser horas distintas."
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
 msgstr "Fechas de acción"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Ver"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Nuevo"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Atrás"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Hoy"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Adelante"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Una semana atrás"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Un día atrás"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Avance un día"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Avance una semana"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
-msgstr "Número de días a mostrar"
+msgstr "       Número de días a mostrar"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - Vista de día"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Todo el día"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "No se seleccionó ninguna fila."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
-msgstr ""
-"Haga clic en una fila para seleccionarla y para poder copiarla después."
+msgstr "Pulse en una fila para seleccionarla y para poder copiarla después."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"Eliminará permanentemente todas\n"
-"las citas seleccionadas."
+msgstr "Eliminará permanentemente todas\nlas citas seleccionadas."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Sí, eliminarlas también"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Atrás"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Adelante"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Buscar"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "Vista de día"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Días extra a mostrar"
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Días extras a mostrar:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "solamente primera repetición:"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Seleccione esta opción si solamente desea ver el primer evento repetitivo. Por omisión se muestran todos.\nTenga en cuenta que esto también muestra todas las urgencias.\nTambién que los eventos que se repiten pueden aparecer antes en la lista, así como que solamente el primer caso se enumerará."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "también antiguos"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Seleccione esta opción si desea ver los eventos antiguos también. Esto solamente se puede seleccionar después de «solamente primera cita» para evitar listas muy largas.\nTenga en cuenta que la selección de días extra todavía define si los nuevos nombramientos se enumerarán."
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "Comienzo de entradas de diario desde:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Buscar"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "Buscar texto"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Marcas"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Título"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Haga doble clic en una línea para editarla.\n"
-"\n"
-"Marcas en orden:\n"
-"\t 1. Alarma: n=sin alarma\n"
-"\t\t A=alarma visual S=también alarma sonora\n"
-"\t 2. Recurrencia: n=sin recurrencia\n"
-"\t\t D=diaria W=semanal M=mensual Y=anual\n"
-"\t 3. Tipo: f=libre B=ocupado\n"
-"\t 4. Situado en archivo:\n"
-"\t\tO=Orage A=archivo F=externo\n"
-"\t 5. Tipo de cita:\n"
-"\t\tE=evento T=tarea pendiente J=diario"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Escoja la fecha"
+msgstr "Haga doble pulsación en la línea para editarlo.\n\nBanderas en orden:\n\n\t1. Alarma: n = sin alarma\n\t\tA = Alarma está activada P = Se establece alarma como persistente\n\t2. Recurrencia: n = sin recurrencia\n\t\tH = Por hora D = Diaria W = Semanal M = Mensual Y = Anual\n\t3. Tipo: f = Libre B = Ocupado\n\t4. Situado en el archivo:\n\t\tO = Orage A = Archivo F = Externo\n\t5. Tipo de nombramiento:\n\t\tE = Evento T = Todo J = Diario"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tFinalizó la repetición, moviendo a un archivo."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Archivado no activado. Saliendo"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Umbral de archivado: %d mes(es)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tArchivando eventos más antiguos que: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Identificador de archivado: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
-msgstr "\tVTODO no completado; no archivado"
+msgstr "\tVPARA HACER no completado; no archivado"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tRepetitivo. Final de año: %04d, mes: %02d, día: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Archivado completado\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Comenzando eliminación del archivo."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tFASE 1: reiniciar citas repetitivas"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
-msgstr "\tPHASE 2: devuelve las citas archivadas"
+msgstr "\tFASE 2: devuelve las citas archivadas"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Eliminación del archivo finalizada\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Alarma predeterminada de Orage"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Crear lista de alarmas para el archivo principal de Orage:"
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Crear lista de alarmas para el archivo externo: %s (%s)"
+
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "Crear lista de alarmas: %d alarmas añadidas. %d eventos procesados."
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\tAgregar %d alarmas. Procesar %d eventos."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tSe encontraron %d alarmas, de las cuales %d están activas (%d alarmas "
-"repetitivas buscadas)."
+msgstr "\tSe encontraron %d alarmas, de las cuales %d están activas (%d alarmas repetitivas buscadas)."
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1403,17 +1436,26 @@
 
 #: ../src/ical-expimp.c:158
 msgid "... Patched DCREATED to be CREATED."
-msgstr "... DCREATED modificado para ser CREATED."
+msgstr "… DCREATED modificado para ser CREATED."
 
 #: ../src/ical-expimp.c:197
 msgid "... Patched timezone to Orage format."
-msgstr "... Zona horaria modificada con formato de Orage"
+msgstr "… Huso horario modificado con formato de Orage"
 
 #: ../src/ical-expimp.c:206
 msgid "Import file preprocessing done"
 msgstr "Preprocesado del archivo de importación terminado"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "El archivo %s fue actualizado externamente."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Actualizando y reinicializando alarmas debido a actualización del archivo externo."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Archivos de calendarios"
 
@@ -1421,666 +1463,710 @@
 msgid "Current foreign files"
 msgstr "Archivos externos actuales"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
-msgstr "SÓLO LECTURA"
+msgstr "SOLAMENTE LECTURA"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "LECTURA/ESCRITURA"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** No hay archivos externos *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Fallo al agregar archivo externo"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage solamente puede manejar 10 archivos externos a la vez. Se alcanzó dicho limite."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Nombre de archivo vacío."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "El nombre está vacío."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "El archivo no existe."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Ya existe un archivo con ese nombre en Orage."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Ya existe ese nombre en Orage."
+
+#: ../src/interface.c:965
 msgid "Import/export"
-msgstr "Importar/exportar"
+msgstr "Importar/Exportar"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Leer de archivo:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Separar nombres de archivo con coma (,).\n"
-" NOTA: la coma no es un carácter válido para nombres de archivo de Orage."
+msgstr "Separar nombres de archivo con coma (,).\nNOTA: la coma no es un carácter válido para nombres de archivo de Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Exportar"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Escribir a archivo:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Todas las citas"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Citas con nombre: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Tenga en cuenta que sólo se leen las citas del archivo principal.\n"
-"Los eventos archivados y los externos no se exportan."
+msgstr "Tenga en cuenta que solamente se leen las citas del archivo principal.\nLos eventos archivados y los externos no se exportan."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Tenga en cuenta que sólo se leen las citas del archivo principal.\n"
-"Los eventos externos no se exportan."
+msgstr "Tenga en cuenta que solamente se leen las citas del archivo principal.\nLos eventos externos no se exportan."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
-msgstr ""
-"Puede arrastrar estos fácilmente fuera de la ventana de lista de eventos."
+msgstr "Puede arrastrar estos fácilmente fuera de la ventana de lista de eventos."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "Identificadores de citas de Orage separados por comas."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Archivar"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Archivar ahora (umbral: %d meses)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Puede cambiar el umbral de archivado en los parámetros"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Recuperar archivo ahora"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Devolver todos los eventos archivados al fichero principal de Orage y "
-"eliminar el fichero de archivo.\n"
-"Esto es útil por ejemplo al exportar y mover citas de Orage\n"
-"a otro sistema."
+msgstr "Devolver todos los eventos archivados al fichero principal de Orage y eliminar el fichero de archivo.\nEsto es útil, por ejemplo, al exportar y mover citas de Orage a otro sistema."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Archivos de Orage"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Archivo de calendario principal de Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Archivo actual"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Nuevo archivo"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Opciones de acción"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Archivo actual:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Nuevo archivo:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Opciones de acción:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
-msgstr "Renombrar"
+msgstr "Cambiar el nombre"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Sólo renombra el archivo interno de Orage.\n"
-"No altera para nada el sistema de archivos externo.\n"
-"Un nuevo archivo debe existir."
+msgstr "Solamente cambia el nombre del archivo interno de Orage.\nNo altera para nada el sistema de archivos externo.\nUn nuevo archivo debe existir."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-"El archivo actual se copia y permanece sin modificaciones en su antiguo "
-"lugar."
+msgstr "El archivo actual se copia y permanece sin modificaciones en su antiguo lugar."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Mover"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "El archivo actual se mueve y desaparece de su antiguo lugar."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Fichero de archivo"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Archivos externos"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Añadir nuevo archivo externo"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Archivo externo:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Opciones"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Nombre visible:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
-msgstr "Sólo lectura"
+msgstr "Solamente lectura"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Active esta opción si desea asegurarse de que este archivo nunca será "
-"modificado por Orage.\n"
-"Tenga en cuenta que la modificación de archivos externos puede hacerlos "
-"incompatibles con la herramienta original con la que fueron generados."
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Active esta opción si desea asegurarse de que este archivo nunca será modificado por Orage.\nTenga en cuenta que la modificación de archivos externos puede hacerlos incompatibles con la herramienta original con la que fueron generados."
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Este nombre interno será mostrado en lugar del nombre del archivo."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Intercambio de datos - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tEsto es %s, versión %s\n"
-"\n"
+msgstr "\tEsto es %s, versión %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tDistribuido bajo los términos de la licencia GPL de GNU.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tCompilado con GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "usando GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tUsa DBUS para importación.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr "\tNo se usa DBUS. La importación funciona sólo parcialmente.\n"
+msgstr "\tNo se usa DBUS. La importación funciona solo parcialmente.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tUsa libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tNo se usa libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tUsa archivado automático.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tNo se usa archivado.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tUsando paquete del sistema operativo libical.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tUsando versión local de libical de Orage.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Uso: orage [opciones] [archivos]\n"
-"\n"
+msgstr "Uso: orage [opciones] [archivos]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Opciones:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
-msgstr "--version (-v) \t\tmuestra la versión de orage\n"
+msgstr "--version (-v) \t\tmuestra la versión de Orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tmuestra este texto\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
-msgstr "--preferences (-p) \tmostrar formulario de preferencias\n"
+msgstr "--preferences (-p) \tmuestra formulario de preferencias\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr "--toggle (-t) \t\thacer orage visible/invisible\n"
+msgstr "--toggle (-t) \t\thace Orage visible/invisible\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) archivo [RW] \tañadir un archivo externo\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) archivo [RW] [nombre]\tañadir un archivo externo\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr "--remove-foreign (-r) archivo \teliminar un archivo externo\n"
+msgstr "--remove-foreign (-r) archivo \telimina un archivo externo\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--exportar(-e)archvio[cita…] \texporta citas de Orage a archivo\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
-msgstr "archivos=archivos ical a cargar en orage\n"
+msgstr "archivos=archivos ical a cargar en Orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
-msgstr "\tdbus no incluido en orage.\n"
+msgstr "\tdbus no incluido en Orage.\n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tsin dbus las opciones (-a y -r) para [archivos] y archivos externos sólo "
-"pueden ser usadas al iniciar orage \n"
+msgstr "\tsin dbus las opciones (-a y -r) para [archivos] y archivos externos solamente pueden ser usadas al iniciar Orage \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Opción %s desconocida\n"
-"\n"
+msgstr "\nOpción %s desconocida\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Intercambiar datos"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Ver _fecha seleccionada"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Ver _semana seleccionada"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Seleccionar ho_y"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
 msgstr "Mostrar hora _global"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Sin título definido"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr "Ubicación: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\nNota:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Nunca"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Título: %s\n"
-" Inicio:\t%s\n"
-" Fin:\t%s\n"
-" Nota:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "Título: %s\n%s Inicio:\t%s\n Vencimiento:\t%s\n Completado:\t%s%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Título: %s\n"
-" Inicio:\t%s\n"
-" Fin:\t%s\n"
-" Nota:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Título: %s\n%s Inicio:\t%s\n Final:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Tareas pendientes:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Eventos para %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>Eventos para %s - %sº.</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "Opciones principales"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
-msgstr "Zona horaria"
+msgstr "Huso horario"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
-msgstr "Debería definir siempre su zona horaria local."
+msgstr "Debería definir siempre su huso horario local."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "Umbral de archivado (meses)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = sin archivado)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"El archivado se usa para ahorrar tiempo y espacio al tratar los eventos."
+msgstr "El archivado se usa para ahorrar tiempo y espacio al tratar los eventos."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
-msgstr "Comando de sonido"
+msgstr "Orden de sonido"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-"Este comando se ejecuta en el intérprete de comandos para hacer sonar las "
-"alarmas."
+msgstr "Esta orden se ejecuta en el intérprete de órdenes para hacer sonar las alarmas."
+
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Ventana del calendario"
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "Configuraciones"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Ventana principal de calendario"
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Detalles del calendario"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "Mostrar bordes"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "Mostrar menú"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Mostrar mes y año"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
 msgstr "Mostrar nombres de días"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
 msgstr "Mostrar números de semana"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Mostrar mes y año"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Cajas de información del calendario"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "Mostrar lista de tareas pendientes"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
 msgstr "Número de días a mostrar en la ventana de eventos"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
 msgstr "0 = no mostrar la lista de eventos"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Visibilidad del calendario"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
 msgstr "Mostrar en todas las áreas de trabajo"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
 msgstr "Siempre encima"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "Mostrar en la barra de tareas"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "Mostrar en el selector de área de trabajo"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "Mostrar en el área de notificación"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "Inicio de calendario"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Ocultar"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Minimizado"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr "Opciones extra"
-
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr "Al abrir la ventana del calendario"
-
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "Fijar fecha de hoy"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr "Fijar nuevamente la fecha anterior"
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "Usar icono de área de notificación dinámico"
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "Usar icono dinámico"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "El icono dinámico muestra el mes y el día actuales"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "Abrir en la ventana del calendario"
+
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Seleccione la fecha de hoy"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Seleccione las fechas previamente seleccionadas"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Una doble pulsación muestra el calendario de hoy"
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Doble clic sobre el calendario principal muestra"
-
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
 msgstr "Vista de días"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
 msgstr "Lista de eventos"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Opciones extra"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
 msgstr "Ventana de lista de eventos"
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
 msgstr "Número de días extra a mostrar en la lista de eventos"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
-msgstr ""
-"Este es solo el valor predeterminado. Puede cambiarlo en la ventana de lista "
-"de eventos."
+msgstr "Este es solo el valor predeterminado. Puede cambiarlo en la ventana de lista de eventos."
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Mostrar solamente la primera cita repetitiva"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Primer día predeterminado de ventana de vista de día"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Primer día de la semana"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Día seleccionado"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Usar icono de área de notificación dinámico"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Usar icono dinámico"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "El icono dinámico muestra el mes y el día actuales"
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
-msgstr ""
+msgstr "Utilizar temporizador de activación"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
+msgstr "Use este temporizador si Orage tiene problemas al activarse luego de suspender o hibernar. (Por ejemplo, el icono de la bandeja no se actualiza o las alarmas no se activan)"
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Alarma visual predeterminada de archivo externo"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Ventana de Orage"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Notificar notificación"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Siempre salir cuando se pida cerrar"
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Siempre salir"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Por omisión, Orage permanece abierto en el fondo cuando se le pide cerrar. Esta opción hace que Orage salga y nunca permanezca abierto en el fondo cuando es cerrado"
+
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Preferencias de Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
-msgstr "Primer inicio de Orage. Buscando zona horaria predeterminada."
+msgstr "Primer inicio de Orage. Buscando huso horario predeterminado."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
-msgstr "Zona horaria predeterminada configurada como %s."
+msgstr "Huso horario predeterminado configurado como %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
-msgstr "Zona horaria no encontrada. Por favor, configúrela manualmente."
+msgstr "Huso horario no encontrado. Por favor, configúrelo manualmente."
 
 #: ../src/reminder.c:562
 msgid "Reminder "
-msgstr "Recordatorio"
+msgstr "Recordatorio "
 
 #: ../src/reminder.c:591
 msgid "Open"
 msgstr "Abrir"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Recordatorio - Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Posponer"
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "Recuérdemelo otra vez después de un tiempo determinado"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-"Pulsar <Ejecutar> para recordarme otra vez después de un tiempo determinado:"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Siguientes alarmas activas:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d d %02d h %02d min para: %s"
+msgstr "\n%02d d %02d h %02d min para: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"No se encontró ninguna alarma activa"
+msgstr "\nNo se encontró ninguna alarma activa"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2088,1552 +2174,2244 @@
 
 #: ../src/timezone_names.c:37
 msgid "Africa/Abidjan"
-msgstr "África/Abidjan"
+msgstr "África/Abiyán"
 
 #: ../src/timezone_names.c:38
 msgid "Africa/Accra"
-msgstr "África/Accra"
+msgstr "África/Acra"
 
 #: ../src/timezone_names.c:39
 msgid "Africa/Addis_Ababa"
-msgstr "África/Adis Abeba"
+msgstr "África/Adís Abeba"
 
 #: ../src/timezone_names.c:40
 msgid "Africa/Algiers"
 msgstr "África/Argel"
 
 #: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
+msgid "Africa/Asmara"
 msgstr "África/Asmara"
 
 #: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr "África/Bamako"
+msgid "Africa/Asmera"
+msgstr "África/Asmara"
 
 #: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr "África/Bangui"
+msgid "Africa/Bamako"
+msgstr "África/Bámako"
 
 #: ../src/timezone_names.c:44
+msgid "Africa/Bangui"
+msgstr "África/Banguí"
+
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "África/Banjul"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
-msgstr "África/Bissau"
+msgstr "África/Bisáu"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
-msgstr "África/Blantyre"
+msgstr "África/Blantire"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "África/Brazzaville"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
-msgstr "África/Boujoumboura"
+msgstr "África/Buyumbura"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "África/El Cairo"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "África/Casablanca"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "África/Ceuta"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
-msgstr "África/Conakry"
+msgstr "África/Conakri"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "África/Dakar"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
-msgstr "África/Dar es Salaam"
+msgstr "África/Dar es-Salam"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
-msgstr "África/Djibouti"
+msgstr "África/Yibuti"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
-msgstr "África/Douala"
+msgstr "África/Duala"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
-msgstr "África/El Aaiun"
+msgstr "África/El Ayún"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "África/Freetown"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "África/Gaborone"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "África/Harare"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "África/Yuba"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "África/Johannesburgo"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "África/Kampala"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "África/Jartum"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "África/Kigali"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
-msgstr "África/Kinshasa"
+msgstr "África/Kinsasa"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "África/Lagos"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "África/Libreville"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "África/Lome"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "África/Luanda"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
-msgstr "África/Lubumbashi"
+msgstr "África/Lubumbasi"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "África/Lusaka"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "África/Malabo"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "África/Maputo"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "África/Maseru"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "África/Mbabane"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "África/Mogadiscio"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "África/Monrovia"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "África/Nairobi"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
-msgstr "África/Ndjamena"
+msgstr "África/Yamena"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "África/Niamey"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
-msgstr "África/Nouakchott"
+msgstr "África/Nuakchot"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "África/Uagadugú"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
-msgstr "África/Porto-Novo"
+msgstr "África/Pôrto Novo"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "África/Santo Tomé"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "África/Tombuctú"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
-msgstr "África/Trípoli"
+msgstr "África/Trípoli de Occidente"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "África/Túnez"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
-msgstr "África/Windhoek"
+msgstr "África/Vinjuc"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "América"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "América/Adak"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "América/Anchorage"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "América/Anguilla"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "América/Antigua"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
-msgstr "América/Araguaia"
+msgstr "América/Araguaína"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "América/Argentina/Buenos Aires"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "América/Argentina/Catamarca"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "América/Argentina/Comodoro Rivadavia"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "América/Argentina/Córdoba"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "América/Argentina/Jujuy"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "América/Argentina/La Rioja"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "América/Argentina/Mendoza"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "América/Argentina/Río Gallegos"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "América/Argentina/Salta"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "América/Argentina/San Juan"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "América/Argentina/San Luis"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "América/Argentina/Tucumán"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "América/Argentina/Ushuaia"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "América/Aruba"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "América/Asunción"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "América/Atikokan"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "América/Atka"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "América/Bahía"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "América/Bahía Banderas"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "América/Barbados"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "América/Belén"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
-msgstr "América/Belize"
+msgstr "América/Belice"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "América/Blanc-Sablon"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "América/Boa Vista"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "América/Bogotá"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "América/Boise"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "América/Buenos Aires"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
-msgstr "América/Cambridge Bay"
+msgstr "América/Bahía de Cambridge"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "América/Campo Grande"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "América/Cancún"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "América/Caracas"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "América/Catamarca"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
-msgstr "América/Cayenne"
+msgstr "América/Cayena"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "América/Caimán"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "América/Chicago"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "América/Chihuahua"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "América/Puerto de Coral"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "América/Córdoba"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "América/Costa Rica"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "América/Creston"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "América/Cuiabá"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
-msgstr "América/Curaçao"
+msgstr "América/Curasao"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "América/Danmarkshavn"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "América/Dawson"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "América/Dawson Creek"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
-msgstr "América/Denver"
+msgstr "América/Dénver"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "América/Detroit"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
-msgstr "América/Dominique"
+msgstr "América/Dominica"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "América/Edmonton"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "América/Ensenada"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "América/Eirunepé"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "América/San Salvador"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "América/Fortaleza"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "América/Fuerte Wayne"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
-msgstr "América/Glace Bay"
+msgstr "América/Bahía de Glace"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
-msgstr "América/Godthab"
+msgstr "América/Nuuk"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
-msgstr "América/Goose Bay"
+msgstr "América/Bahía de Goose"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
-msgstr "América/Grand Turk"
+msgstr "América/Gran Turk"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "América/Granada"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "América/Guadalupe"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "América/Guatemala"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "América/Guayaquil"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "América/Guyana"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "América/Halifax"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "América/La Habana"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "América/Hermosillo"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "América/Indiana/Indianápolis"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "América/Indiana/Knox"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "América/Indiana/Marengo"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "América/Indiana/Petersburgo"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "América/Indiana/Ciudad de Tell"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "América/Indiana/Vevay"
 
-#: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr "América/Indianapolis"
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "América/Indiana/Vincennes"
 
-#: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr "América/Inuvik"
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "América/Indiana/Winamac"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:171
+msgid "America/Indianapolis"
+msgstr "América/Indianápolis"
+
+#: ../src/timezone_names.c:172
+msgid "America/Inuvik"
+msgstr "América/Inuvik"
+
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
-msgstr "América/Iqaluit"
+msgstr "América/Icaluit"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "América/Jamaica"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "América/Jujuy"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "América/Juneau"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "América/Kentucky/Louisville"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "América/Kentucky/Monticello"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "América/Knox IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "América/Kralendijk"
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "América/La Paz"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "América/Lima"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "América/Los Ángeles"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "América/Louisville"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "América/Bajo Príncipes"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
-msgstr "América/Maceio"
+msgstr "América/Maceió"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "América/Managua"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "América/Manaos"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "América/Marigot"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "América/Martinica"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "América/Matamoros"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
-msgstr "América/Mazatlan"
+msgstr "América/Mazatlán"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "América/Mendoza"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
-msgstr "América/Menominee"
+msgstr "América/Menomini"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "América/Mérida"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "América/Metlakatla"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "América/México DF"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "América/Miquelón"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "América/Moncton"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "América/Monterrey"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "América/Montevideo"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "América/Montreal"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "América/Montserrat"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
-msgstr "América/Nassau"
+msgstr "América/Nasáu"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "América/Nueva York"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "América/Nipigon"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "América/Nome"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "América/Dakota del norte/Beulah"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "América/Dakota del norte/Centro"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "América/Dakota del norte/Nueva Sálem"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "América/Noronha"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "América/Ojinaga"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "América/Panamá"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "América/Pangnirtung"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "América/Paramaribo"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "América/Phoenix"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
-msgstr "América/Port-au-Prince"
+msgstr "América/Puerto Príncipe"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "América/Puerto España"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "América/Puerto Acre"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
-msgstr "América/Pôrto Velho"
+msgstr "América/Puerto Viejo"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "América/Puerto Rico"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
-msgstr "América/Rainy River"
+msgstr "América/Río Lluvioso"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "América/Rankin Inlet"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "América/Recife"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "América/Regina"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "América/Resolute"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
-msgstr "América/Rio Branco"
+msgstr "América/Río Blanco"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "América/Rosario"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "América/Santa Isabel"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "América/Santarem"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "América/Santiago"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "América/Santo Domingo"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "América/São Paulo"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
-msgstr "América/Scoresbysund"
+msgstr "América/Ittoqqortoormiit"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "América/Shiprock"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "América/Sitka"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "América/San Bartolomeo"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "América/San Juan"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
-msgstr "América/St. Kitts"
+msgstr "América/San Kitts"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
-msgstr "América/Sta. Lucía"
+msgstr "América/Santa Lucía"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
-msgstr "América/Sto Tomás"
+msgstr "América/Santo Tomás"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "América/San Vicente"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "América/Swift Current"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "América/Tegucigalpa"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
-msgstr "América/Thule"
+msgstr "América/Qaanaaq"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
-msgstr "América/Thunder Bay"
+msgstr "América/Bahía Trueno"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "América/Tijuana"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "América/Toronto"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "América/Tórtola"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
-msgstr "América/Vancouver"
+msgstr "América/Vancúver"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "América/Virgen"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "América/Whitehorse"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "América/Winnipeg"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "América/Yakutat"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "América/Yellowknife"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Antártida"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Antártida/Casey"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Antártida/Davis"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Antártida/Dumont D'Urville"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Atártica/Macquarie"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Antártida/Mawson"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Antártida/McMurdo"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Antártida/Palmer"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Antártica/Rothera"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Antártida/Polo Sur"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
-msgstr "Antártida/Syowa"
+msgstr "Antártida/Siowa"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Antártida/Vostok"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Ártico"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Ártico/Longyearbyen"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Asia"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
-msgstr "Asia/Aden"
+msgstr "Asia/Adén"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
-msgstr "Asia/Almati"
+msgstr "Asia/Almá-Atá"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Asia/Amán"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
-msgstr "Asia/Anadyr"
+msgstr "Asia/Anádir"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Asia/Aktau"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aktobe"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
-msgstr "Asia/Achkhabad"
+msgstr "Asia/Asjabad"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Asia/Asjabad"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "Asia/Bagdad"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
-msgstr "Asia/Bahréin"
+msgstr "Asia/Baréin"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
-msgstr "Asia/Baku"
+msgstr "Asia/Bakú"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
-msgstr "Asia/Bishkek"
+msgstr "Asia/Biskek"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
-msgstr "Asia/Brunei"
+msgstr "Asia/Brunéi"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Asia/Calcuta"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Asia/Choibalsan"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "Asia/Chonquín"
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
-msgstr "Asia/Chongqing"
+msgstr "Asia/Chunquín"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Asia/Colombo"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Asia/Daca"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
-msgstr "Asia/Damas"
+msgstr "Asia/Damasco"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
-msgstr "Asia/Dhaka"
+msgstr "Asia/Daca"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
-msgstr "Asia/Dubai"
+msgstr "Asia/Dubái"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dusambé"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
-msgstr "Asia/Harbin"
+msgstr "Asia/Harbín"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Asia/Hebrón"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong Kong"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Asia/Ho Chi Minh"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Asia/Hovd"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Asia/Estambul"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
-msgstr "Asia/Jakarta"
+msgstr "Asia/Yakarta"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Asia/Jerusalén"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamchatka"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Asia/Karachi"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
-msgstr "Asia/Kashgar"
+msgstr "Asia/Kasgar"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Asia/Katmandú"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Asia/Katmandú"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Asia/Kandiga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Asia/Calcuta"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnoyarsk"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala Lumpur"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
-msgstr "Asia/Kuching"
+msgstr "Asia/Cuchin"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Asia/Macao"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Asia/Magadán"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Asia/Macasar"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
-msgstr "Asia/Muscat"
+msgstr "Asia/Mascate"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Asia/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Asia/Oral"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
-msgstr "Asia/Phnom Penh"
+msgstr "Asia/Nom Pen"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
-msgstr "Asia/Pyongyang"
+msgstr "Asia/Pionyang"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
-msgstr "Asia/Qatar"
+msgstr "Asia/Catar"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Asia/Quizilordá"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangún"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Asia/Riad"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Asia/Riad87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Asia/Riad88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Asia/Riad89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Asia/Saigón"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Asia/Sajalín"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
-msgstr "Asia/Samarkanda"
+msgstr "Asia/Samarcanda"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Asia/Seúl"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
-msgstr "Asia/Shanghai"
+msgstr "Asia/Shanghái"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Asia/Singapur"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
-msgstr "Asia/Taipei"
+msgstr "Asia/Taipéi"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
-msgstr "Asia/Tachkent"
+msgstr "Asia/Taskent"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
-msgstr "Asia/Tbilisi"
+msgstr "Asia/Tiflis"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Asia/Teherán"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Asia/Tel Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Asia/Timbú"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
-msgstr "Asia/Thimbu"
+msgstr "Asia/Timbu"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
-msgstr "Asia/Tokyo"
+msgstr "Asia/Tokio"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
-msgstr "Asia/Ujung Pandang"
+msgstr "Asia/Macasar"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulán Bator"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Asia/Ulán Bator"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
-msgstr "Asia/Urumqi"
+msgstr "Asia/Urumchi"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Asia/Ust-Nera"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientián"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
-msgstr "Asia/Iakoutsk"
+msgstr "Asia/Yakutsk"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Ekaterimburgo"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Asia/Erevan"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Atlántico"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Atlántico/Azores"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Atlántico/Bermuda"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Atlántico/Canarias"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlántico/Cabo Verde"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "Atlántico/Feroe"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlántico/Feroe"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlántico/Jan Mayen"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "Atlántico/Madeira"
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
-msgstr "Atlántico/Reykjavik"
+msgstr "Atlántico/Reikiavik"
 
-#: ../src/timezone_names.c:306
+#: ../src/timezone_names.c:375
 msgid "Atlantic/South_Georgia"
 msgstr "Atlántico/Islas Georgias del Sur"
 
-#: ../src/timezone_names.c:307
+#: ../src/timezone_names.c:376
 msgid "Atlantic/St_Helena"
-msgstr "Atlántico/Sta. Helena"
+msgstr "Atlántico/Santa Helena"
 
-#: ../src/timezone_names.c:308
+#: ../src/timezone_names.c:377
 msgid "Atlantic/Stanley"
 msgstr "Atlántico/Stanley"
 
-#: ../src/timezone_names.c:309
+#: ../src/timezone_names.c:378
 msgid "Australia"
 msgstr "Australia"
 
-#: ../src/timezone_names.c:310
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Australia/ACT"
+
+#: ../src/timezone_names.c:380
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaida"
 
-#: ../src/timezone_names.c:311
+#: ../src/timezone_names.c:381
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: ../src/timezone_names.c:312
+#: ../src/timezone_names.c:382
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken Hill"
 
-#: ../src/timezone_names.c:313
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Australia/Currie"
+
+#: ../src/timezone_names.c:384
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: ../src/timezone_names.c:314
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Australia/Eucla"
+
+#: ../src/timezone_names.c:386
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: ../src/timezone_names.c:315
+#: ../src/timezone_names.c:387
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: ../src/timezone_names.c:316
+#: ../src/timezone_names.c:388
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord Howe"
 
-#: ../src/timezone_names.c:317
+#: ../src/timezone_names.c:389
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: ../src/timezone_names.c:318
+#: ../src/timezone_names.c:390
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: ../src/timezone_names.c:319
+#: ../src/timezone_names.c:391
 msgid "Australia/Sydney"
-msgstr "Australia/Sydney"
+msgstr "Australia/Sídney"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Basil"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Basil/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Basil/De Noroña"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Basil/Este"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Basil/Oeste"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Canadá"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Canadá/Atlántico"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Canadá/Central"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Canadá/Saskatchewan Este"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Canadá/Al este"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Canada/Montaña"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Canada/Nuevafoundland"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Canada/Pasífico"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Canada/Sasketchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Canada/Yukón"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Chile"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Chile/Continental"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Chile/Isla de pascua"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Universal"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Zulú"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Europa"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
-msgstr "Europa/Amsterdam"
+msgstr "Europa/Ámsterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Europa/Atenas"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrado"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Europa/Berlín"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Europa/Bruselas"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Europa/Bucarest"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Europa/Büsingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Europa/Copenhague"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
-msgstr "Europa/Dublin"
+msgstr "Europa/Dublín"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Europa/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Europa/Isla de Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Europa/Estambul"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Europa/Yérsey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrado"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisboa"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
-msgstr "Europa/Ljubljana"
+msgstr "Europa/Liubliana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Europa/Londres"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxemburgo"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Europa/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Europa/Mónaco"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Europa/Moscú"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Europa/París"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Europa/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Europa/Praga"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Europa/San Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
-msgstr "Europa/Simferopol"
+msgstr "Europa/Simferópol"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
-msgstr "Europa/Skopje"
+msgstr "Europa/Skopie"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Europa/Sofía"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Europa/Estocolmo"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallin"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Europa/Tiráspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
-msgstr "Europa/Uzhgorod"
+msgstr "Europa/Úzhgorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Europa/Vaticano"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Europa/Viena"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
-msgstr "Europa/Vilnius"
+msgstr "Europa/Vilna"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Europa/Volgogrado"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "Europa/Varsovia"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
-msgstr "Europa/Zaporozhye"
+msgstr "Europa/Zaporiyia"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
-msgstr "Europa/Zurich"
+msgstr "Europa/Zúrich"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Índico"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "Índico/Antananarivo"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "Índico/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "Índico/Navidad"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "Índico/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "Índico/Comores"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "Índico/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "Índico/Mahé"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "Índico/Maldivas"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "Índico/Mauricio"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
-msgstr "Índico/Mayotte"
+msgstr "Índico/Mahoré"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "Índico/Reunión"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "México"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "México/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "México/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "México/General"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Medioeste"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Medioeste/Riad87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Medioeste/Riad88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Medioeste/Riad89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Pacífico"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "Pacífico/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Pacífico/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Pacífico/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Pacífico/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "Pacífico/Pascua"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
-msgstr "Pacífico/Efate"
+msgstr "Pacífico/Éfaté"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
-msgstr "Pacífico/Enderbury"
+msgstr "Pacífico/Isla Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Pacífico/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
-msgstr "Pacífico/Fidji"
+msgstr "Pacífico/Fiyi"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Pacífico/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Pacífico/Galápagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Pacífico/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "Pacífico/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Pacífico/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Pacífico/Honolulú"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Pacífico/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "Pacífico/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "Pacífico/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
-msgstr "Pacífico/Kwajalein"
+msgstr "Pacífico/Kuajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Pacífico/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Pacífico/Marquesas"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Pacífico/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Pacífico/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Pacífico/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Pacífico/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
-msgstr "Pacífico/Noumea"
+msgstr "Pacífico/Numea"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Pacífico/Pago Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Pacífico/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
-msgstr "Pacífico/Pitcairn"
+msgstr "Pacífico/Islas Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Pacífico/Ponapé (Pohnpei)"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
-msgstr "Pacífico/Ponape"
+msgstr "Pacífico/Ponapé"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Pacífico/Port Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Pacífico/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Pacífico/Saipán"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pacífico/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Pacífico/Tahití"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Pacífico/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Pacífico/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Pacífico/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Pacífico/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Pacífico/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "US"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "EEUU/Alaska"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "EEUU/Islas Aleutianas"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "EEUU/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "EEUU/Central"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "EEUU/Del este"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "EEUU/Indiana Este"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "EEUU/Hawái"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "EEUU/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "EEUU/Míchigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "EEUU/Montaña"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "EEUU/Pacífico"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "EEUU/Nuevo Pacífico"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "EEUU/Samoa"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "Nueva cita"
@@ -3651,212 +4429,26 @@
 msgstr "¿Mostrar fecha y hora?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Calendario"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Preferencias de calendario de Orage"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Preferencias de Orage"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Configuración para la aplicación de calendario de Xfce 4 (Orage)"
+msgstr "Configuración para la aplicación de calendario de Xfce (Orage)"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Calendario de escritorio"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Preferencias de calendario de Orage"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Calendario"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Calendario Orage"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Título: %s\n"
-#~ " Inicio:\t%s\n"
-#~ " Fecha límite:\t%s\n"
-#~ " Finalizado:\t%s\n"
-#~ "Nota:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Debe introducir todos los caracteres de escape, etc. usted mismo.\n"
-#~ "Esta cadena se le pasa al intérprete de comandos para ser procesada"
-
-#~ msgid "Orage clock"
-#~ msgstr "Reloj Orage"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Creador original, mantenedor retirado"
-
-#~ msgid "Contributor"
-#~ msgstr "Colaborador"
-
-#~ msgid "Info"
-#~ msgstr "Información"
-
-#~ msgid "Warning"
-#~ msgstr "Atención"
-
-#~ msgid "Error"
-#~ msgstr "Error"
-
-#~ msgid "Set sticked"
-#~ msgstr "Mostrar en todas las áreas de trabajo"
-
-#~ msgid "Select always today"
-#~ msgstr "Siempre seleccionar hoy"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Al mostrar el calendario principal, colocar el puntero en el día "
-#~ "previamente seleccionado o siempre en el día actual."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Finalizando modo de ajuste de hora"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Iniciando modo de ajuste de hora"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "ajustar para cambiar minutos"
-
-#~ msgid "Vary"
-#~ msgstr "Variable"
-
-#~ msgid "Select timezone"
-#~ msgstr "Seleccionar zona horaria"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Modificar reloj"
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "introduzca zona horaria del reloj,\n"
-#~ "(=cualquier valor TZ válido)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Modificar preferencias"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Introduzca la zona horaria local (añadir +/- después de la hora para "
-#~ "indicar si la hora corresponde a una fecha posterior o anterior, "
-#~ "respectivamente)."
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr ""
-#~ "Establecer cualquier valor de zona horaria (=TZ) válido o escoja uno de "
-#~ "la lista."
-
-#~ msgid "show line _1:"
-#~ msgstr "mostrar línea _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "mostrar línea _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "mostrar línea _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Propiedades"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Fallo al ejecutar 'orage -p'"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> inserta la fecha actual con el formato de fecha local.\n"
-#~ "<T> inserta la hora y\n"
-#~ "<DT> inserta la fecha y la hora."
-
-#~ msgid "Show event list"
-#~ msgstr "Mostrar lista de eventos"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = usar icono estático)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "El icono dinámico muestra el día y mes actuales. Es visible sólo en el "
-#~ "área de notificación. Si el área de notificación es demasiado pequeña "
-#~ "para el tamaño\n"
-#~ "dinámico de icono, Orage lo convierte automáticamente en icono estático."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Configuración del calendario"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Configuración para el calendario de Xfce 4"
-
-#~ msgid "Monday"
-#~ msgstr "Hoy"
-
-#~ msgid "Tuesday"
-#~ msgstr "Hoy"
-
-#~ msgid "Wednesday"
-#~ msgstr "Hoy"
-
-#~ msgid "Thursday"
-#~ msgstr "Hoy"
-
-#~ msgid "Friday"
-#~ msgstr "Hoy"
-
-#~ msgid "Sunday"
-#~ msgstr "Hoy"
-
-#~ msgid "Days"
-#~ msgstr "Hoy"
-
-#~ msgid "Calendar Files"
-#~ msgstr "Calendario"
-
-#~ msgid "Calendar borders"
-#~ msgstr "Calendario"
-
-#~ msgid "Core developer"
-#~ msgstr "Desarrollador principal"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Ud. borrará cualquier información \n"
-#~ "relacionada con esta fecha."
-
-#~ msgid "Clear"
-#~ msgstr "Limpiar"
-
-#~ msgid "This should not happen"
-#~ msgstr "Esto no debería ocurrir"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "No se puede crear un canal cliente al MCS"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Calendario de escritorio"
diff -Nru orage-4.8.3/po/et.po orage-4.12.1/po/et.po
--- orage-4.8.3/po/et.po	2012-01-03 12:01:03.000000000 +0000
+++ orage-4.12.1/po/et.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,24 +1,24 @@
-# Translation of orage package into Estonian.
-# Copyright (C) 2002-2008 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Mart Tõnso <mart.tonso@ttu.ee>, 2004.
-# Peeter Vois <peeter.vois@proekspert.ee>, 2004, 2006.
-# Kristjan Siimson <epost@ksiimson.se>, 2008.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Kristjan Siimson <epost@ksiimson.se>, 2008
+# Mart Tõnso <mart.tonso@ttu.ee>, 2004
+# Peeter Vois <peeter.vois@proekspert.ee>, 2004,2006
 msgid ""
 msgstr ""
-"Project-Id-Version: Xfce4-trunk\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2008-09-30 10:53-0700\n"
-"Last-Translator: Kristjan Siimson <epost@ksiimson.se>\n"
-"Language-Team: Estonian <et@li.org>\n"
+"POT-Creation-Date: 2013-11-18 18:30+0100\n"
+"PO-Revision-Date: 2013-11-19 15:56+0000\n"
+"Last-Translator: Xfce <transifex@xfce.org>\n"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/xfce/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Narro 0.9.2 on http://tolge.pingviin.org\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -34,9 +34,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"kella muutmiseks klõpsa"
+msgstr "%s\nkella muutmiseks klõpsa"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -46,9 +44,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"1. klahv eelistuste muutmiseks \n"
-"2. klahv kellaaja sättimiseks"
+msgstr "1. klahv eelistuste muutmiseks \n2. klahv kellaaja sättimiseks"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -112,9 +108,8 @@
 msgstr "sulgeda aken ja väljuda"
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "uuendada eelistusi"
+msgstr ""
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -240,9 +235,8 @@
 msgstr "uuendada eelistusi"
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "Üldised eelistused"
+msgstr ""
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
@@ -302,15 +296,15 @@
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
-msgstr "tundi"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "%d mins"
-msgstr "minutit"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
@@ -319,9 +313,8 @@
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-#, fuzzy
 msgid "forward"
-msgstr "Edasi"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
@@ -337,7 +330,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2771
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Asukoht"
@@ -398,20 +391,18 @@
 msgid "floating"
 msgstr "nihkuv"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "Kohalik aeg"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "Orage - kalender"
+msgstr ""
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr ""
 
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr ""
+
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
 msgstr "Välimus"
@@ -495,21 +486,11 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Selles programmis kasutatakse aja hankimiseks strftime funktsiooni.\n"
-"Kasutage ükskõik millist korrektset koodi, et saada soovikohaselt "
-"vormistatud aeg.\n"
-"Mõned levinumad koodid on:\n"
-"\t%A = nädalapäev\t\t\t%B = kuu\n"
-"\t%c= kuupäev ja aeg\t\t%R = tund ja minut\n"
-"\t%V = nädalaarv\t\t%Z = kasutatav ajavöönd\n"
-"\t%H = tunnid \t\t\t\t%M = minut\n"
-"\t%X = kohalik aeg\t\t\t%x = kohalik kuupäev"
+msgstr "Selles programmis kasutatakse aja hankimiseks strftime funktsiooni.\nKasutage ükskõik millist korrektset koodi, et saada soovikohaselt vormistatud aeg.\nMõned levinumad koodid on:\n\t%A = nädalapäev\t\t\t%B = kuu\n\t%c= kuupäev ja aeg\t\t%R = tund ja minut\n\t%V = nädalaarv\t\t%Z = kasutatav ajavöönd\n\t%H = tunnid \t\t\t\t%M = minut\n\t%X = kohalik aeg\t\t\t%x = kohalik kuupäev"
 
 #: ../panel-plugin/oc_config.c:457
-#, fuzzy
 msgid "Orage clock Preferences"
-msgstr "Orage'i seadistused"
+msgstr ""
 
 #. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
@@ -520,7 +501,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr "%A. %d %B %Y/%V"
@@ -530,14 +511,13 @@
 msgstr "Hooldaja"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "Halda oma aega Xfce4 abil"
+msgstr ""
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2800
 msgid "End"
 msgstr "Lõpp"
 
@@ -545,13 +525,13 @@
 msgid "Due"
 msgstr "Tähtaeg"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Valige fail..."
 
@@ -559,226 +539,273 @@
 msgid "Sound Files"
 msgstr "Helifailid"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Kõik failid"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Kohtumise andmeid on muudetud."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1282 ../src/event-list.c:921
 msgid "Do you want to continue?"
 msgstr "Kas jätkata?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr ""
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr ""
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "Kohtumine lõpeb enne selle algust."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1918
 msgid "Not set"
 msgstr "Sättimata"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1220
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1221
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1231
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1232
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1281
 msgid "This appointment will be permanently removed."
 msgstr "See kohtumine eemaldatakse jäädavalt."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1283 ../src/event-list.c:922
+msgid "No, cancel the removal"
+msgstr ""
+
+#: ../src/appointment.c:1284
+msgid "Yes, remove it"
+msgstr ""
+
+#: ../src/appointment.c:1373 ../src/appointment.c:1388 ../src/day-view.c:457
+#: ../src/event-list.c:980
+msgid "Pick the date"
+msgstr "Valige kuupäev"
+
+#: ../src/appointment.c:1375 ../src/appointment.c:1390 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:982 ../src/event-list.c:1132
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Täna"
+
+#: ../src/appointment.c:1798
 msgid "This appointment does not exist."
 msgstr "Seda kohtumist pole olemas."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1799
 msgid "It was probably removed, please refresh your screen."
 msgstr "See on tõenäoliselt eemaldatud, palun värskenda oma ekraani."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2100
 msgid "Current categories"
 msgstr "Praegused jaotised"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2115
 msgid "Add new category with color"
 msgstr "Lisa uus värviga jaotis"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2119
 msgid "Category:"
 msgstr "Jaotis:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2150
 msgid "Colors of categories - Orage"
 msgstr "Jaotiste värvid - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2196
 msgid " *** COPY ***"
 msgstr " *** KOPEERI ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2461
 msgid "New appointment - Orage"
 msgstr "Uus kohtumine - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2491 ../src/day-view.c:279 ../src/event-list.c:1033
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Fail"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2497
 msgid "Sav_e and close"
 msgstr "Salv_estada ja sulgeda"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2510 ../src/event-list.c:1039
 msgid "D_uplicate"
 msgstr "_Kloonida"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2697
 msgid "Save"
 msgstr "Salvestada"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2699
 msgid "Save and close"
 msgstr "Salvestada ja sulgeda"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2704
 msgid "Revert"
 msgstr "Taastada"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2706 ../src/event-list.c:1123
 msgid "Duplicate"
 msgstr "Kloonida"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2711 ../src/event-list.c:1125
 msgid "Delete"
 msgstr "Kustutada"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Free"
 msgstr "Vaba"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Busy"
 msgstr "Hõivatud"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2733
 msgid "General"
 msgstr "Üldine"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2739
 msgid "Type "
 msgstr "Liik "
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2741 ../src/event-list.c:1176
 msgid "Event"
 msgstr "Sündmus"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2744
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Millalgi toimuv sündmus. Näiteks:\n"
-"Kohtumine, sünnipäev, või telekasaade."
+msgstr "Millalgi toimuv sündmus. Näiteks:\nKohtumine, sünnipäev, või telekasaade."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2747 ../src/event-list.c:1196
 msgid "Todo"
 msgstr "Agenda"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2750
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Asjad mida sa peaksid kunagi tegema. Näiteks:\n"
-"Autot pesta või uut Orage'i versiooni katsetada."
+msgstr "Asjad mida sa peaksid kunagi tegema. Näiteks:\nAutot pesta või uut Orage'i versiooni katsetada."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2753 ../src/event-list.c:1209
 msgid "Journal"
 msgstr "Päevik"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2757
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Juba toimunud sündmuste ülesmärkimine. Näiteks:\n"
-"Tähelda, et sinu ema helistas, või sadas esimest korda lund."
+msgstr "Juba toimunud sündmuste ülesmärkimine. Näiteks:\nTähelda, et sinu ema helistas, või sadas esimest korda lund."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2764
 msgid "Title "
 msgstr "Pealkiri"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2779
 msgid "All day event"
 msgstr "Terve päeva sündmus"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2785 ../src/appointment.c:3446 ../src/day-view.c:801
 msgid "Start"
 msgstr "Algus"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2805
 msgid "Set      "
 msgstr "Määrata      "
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2826
 msgid "Duration"
 msgstr "Kestvus"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2830 ../src/appointment.c:3020 ../src/reminder.c:758
 msgid "days"
 msgstr "päeva"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2832 ../src/appointment.c:3022 ../src/reminder.c:760
 msgid "hours"
 msgstr "tundi"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2834 ../src/appointment.c:3024 ../src/reminder.c:762
 msgid "mins"
 msgstr "minutit"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2846
 msgid "Availability"
 msgstr "Kättesaadavus"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2854 ../src/appointment.c:3452
 msgid "Completed"
 msgstr "Valmis"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2857
 msgid "Done"
 msgstr "Tehtud"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2878
 msgid "Categories"
 msgstr "Jaotised"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2890
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"See on erijaotis, mida kasutatakse selle kohtumise värvimiseks loendivaates."
+msgstr "See on erijaotis, mida kasutatakse selle kohtumise värvimiseks loendivaates."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2895
 msgid "update colors for categories."
 msgstr "uuendada jaotiste värve."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2901
 msgid "Priority"
 msgstr ""
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2911
 msgid "Note"
 msgstr "Märge"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2932
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -787,131 +814,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before Start"
 msgstr "Enne algust"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before End"
 msgstr "Enne lõppu"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After Start"
 msgstr "Pärast algust"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After End"
 msgstr "Pärast lõppu"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3011
 msgid "Alarm"
 msgstr "Alarm"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3017
 msgid "Alarm time"
 msgstr "Alarmi aeg"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3041
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Tavaliselt läheb sul alarmi vaja:\n"
-" 1) enne sündmuse algust\n"
-" 2) enne ülesande lõppu\n"
-" 3) pärast ülesande algust"
+msgstr "Tavaliselt läheb sul alarmi vaja:\n 1) enne sündmuse algust\n 2) enne ülesande lõppu\n 3) pärast ülesande algust"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3046
 msgid "Persistent alarm"
 msgstr "Järjekindel alarm"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3048
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Valige juhul, kui soovite meeletuletust, isegi kui Orage ei olnud alarmi "
-"ajal aktiivne."
+msgstr "Valige juhul, kui soovite meeletuletust, isegi kui Orage ei olnud alarmi ajal aktiivne."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3057
 msgid "Sound"
 msgstr "Helin"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3061 ../src/appointment.c:3181
 msgid "Use"
 msgstr "Kasutada"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3063
 msgid "Select this if you want audible alarm"
 msgstr "Valige juhul, kui soovite kuuldavat alarmi"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3080
 msgid "Repeat alarm sound"
 msgstr "Korrata alarmi helinat"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3096 ../src/appointment.c:3395
 msgid "times"
 msgstr "kordi"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3112
 msgid "sec interval"
 msgstr "ajavahemik sekundites"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3122
 msgid "Visual"
 msgstr "Visuaalne"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3126
 msgid "Use Orage window"
 msgstr "Kasutada Orage'i akent"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3128
 msgid "Select this if you want Orage window alarm"
 msgstr "Valige juhul, kui soovite alarmi Orage'i aknas"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3140
 msgid "Use notification"
 msgstr "Kasutada märguannet"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3142
 msgid "Select this if you want notification alarm"
 msgstr "Valige juhul, kui soovite alarmi märguandena"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3148
 msgid "Set timeout"
 msgstr "Määrata ajakatkestus"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3150
 msgid "Select this if you want notification to expire automatically"
 msgstr "Valige juhul, kui soovite automaatselt aeguvat märguannet"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3161
 msgid "0 = system default expiration time"
 msgstr "0 = süsteemi vaikimisi aegumisperiood"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3166
 msgid "seconds"
 msgstr "sekundit"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3177
 msgid "Procedure"
 msgstr "Toiming"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3183
 msgid "Select this if you want procedure or script alarm"
 msgstr "Valige juhul, kui soovite protseduuri- või skriptialarmi"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3189
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -923,155 +943,148 @@
 "\t<&ET> appointment end time"
 msgstr ""
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3201
 msgid "Test this alarm by raising it now"
 msgstr ""
 
-#: ../src/appointment.c:3101
-#, fuzzy
+#: ../src/appointment.c:3208
 msgid "<b>Default alarm</b>"
-msgstr "Vaikimisi alarm"
+msgstr ""
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3216
 msgid "Store current settings as default alarm"
 msgstr "Säilitada käesolevad seadistused vaikimisi alarmina"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3221
 msgid "Set current settings from default alarm"
 msgstr "Määrata käesolevad seadistused vaikimisi alarmi põhjal"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "None"
 msgstr "Puudub"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Daily"
 msgstr "Päeviti"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Weekly"
 msgstr "Nädalati"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Monthly"
 msgstr "Kuiselt"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Yearly"
 msgstr "Aastati"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Hourly"
 msgstr ""
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Mon"
 msgstr "Esmp"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Tue"
 msgstr "Teisip"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Wed"
 msgstr "Kolmap"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Thu"
 msgstr "Neljap"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Fri"
 msgstr "Reede"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sat"
 msgstr "Laup"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sun"
 msgstr "Pühap"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3290
 msgid "Recurrence"
 msgstr "Korduvus"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3296
 msgid "Complexity"
 msgstr "Keerukus"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3299
 msgid "Basic"
 msgstr "Algeline"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3305
 msgid "Advanced"
 msgstr "Täpsem"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3309
 msgid "Use this if you want regular repeating event"
 msgstr "Kasutada kui soovid regulaarselt korduvat sündmust"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3311
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Kasutada kui vajate keerukamaid aegu nagu:\n"
-" Iga laupäev ja pühapäev või \n"
-" Iga kuu esimene teisipäev"
+msgstr "Kasutada kui vajate keerukamaid aegu nagu:\n Iga laupäev ja pühapäev või \n Iga kuu esimene teisipäev"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3317
 msgid "Frequency"
 msgstr "Sagedus"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3323
 msgid "Each"
 msgstr "Iga"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3330
 msgid "occurrence"
 msgstr "juhtum"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3334
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Piirata sagedus kindla vahemikuga.\n"
-" Näiteks: Iga kolmas päev:\n"
-" Sagedus = Iga päev ja Vahemik = 3"
+msgstr "Piirata sagedus kindla vahemikuga.\n Näiteks: Iga kolmas päev:\n Sagedus = Iga päev ja Vahemik = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3379
 msgid "Limit"
 msgstr "Piir"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3381
 msgid "Repeat forever"
 msgstr "Korrata lõpmatult"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3387
 msgid "Repeat "
 msgstr "Korrata "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3403
 msgid "Repeat until "
 msgstr "Korrata kuni "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3416
 msgid "Weekdays"
 msgstr "Nädalapäevad"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3428
 msgid "Which day"
 msgstr "Milline päev"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3436
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1079,116 +1092,108 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Määrake igakuustele- ja aastastele sündmustele nädalapäev.\n"
-" Näiteks:\n"
-" Iga kuu teine kolmapäev:\n"
-"\tSagedus = Iga kuu,\n"
-"\tNädalapäevad = vali ainult kolmapäev,\n"
-"\tMilline päev = vali kolmapäeva all olevast numbrist 2"
+msgstr "Määrake igakuustele- ja aastastele sündmustele nädalapäev.\n Näiteks:\n Iga kuu teine kolmapäev:\n\tSagedus = Iga kuu,\n\tNädalapäevad = vali ainult kolmapäev,\n\tMilline päev = vali kolmapäeva all olevast numbrist 2"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3443
 msgid "TODO base"
 msgstr ""
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3456
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
 msgstr ""
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3458
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 
 #. exceptions
-#: ../src/appointment.c:3361
-#, fuzzy
+#: ../src/appointment.c:3464
 msgid "Exceptions"
-msgstr "Valikud"
+msgstr ""
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3477
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
 msgstr ""
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3482
 msgid "Add excluded date (-)"
 msgstr ""
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3484
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr ""
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3490
 msgid "Add included time (+)"
 msgstr ""
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3492
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
 msgstr ""
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
-#, fuzzy
+#: ../src/appointment.c:3509
 msgid "Action dates"
-msgstr "Tegevuse valikud"
+msgstr ""
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1056 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Vaade"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1075
 msgid "_Go"
 msgstr "_Liikuda"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1121
 msgid "New"
 msgstr "Uus"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Tagasi"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr ""
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Täna"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Edasi"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
+
+#: ../src/day-view.c:395 ../src/event-list.c:1139
 msgid "Refresh"
 msgstr "Värskendada"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1146 ../src/interface.c:834
 msgid "Close"
 msgstr "Sulgeda"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr ""
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - päevavaade"
 
@@ -1197,164 +1202,166 @@
 msgid "All day"
 msgstr "Terve päev"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:583 ../src/event-list.c:1292
 msgid "Time"
 msgstr "Aeg"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:751
 msgid "No rows have been selected."
 msgstr "Ühtegi veergu pole valitud."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:752
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Klõpsake veerul, et see välja valida, siis saate seda kopeerida."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:920
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
+msgstr "Kustutate jäädavalt kõik\nvalitud kohtumised."
+
+#: ../src/event-list.c:923
+msgid "Yes, remove them"
 msgstr ""
-"Kustutate jäädavalt kõik\n"
-"valitud kohtumised."
 
 #: ../src/event-list.c:1130
+msgid "Back"
+msgstr "Tagasi"
+
+#: ../src/event-list.c:1134
+msgid "Forward"
+msgstr "Edasi"
+
+#: ../src/event-list.c:1141
 msgid "Find"
 msgstr "Leia"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1148
 msgid "Dayview"
 msgstr "Päevavaade"
 
-#: ../src/event-list.c:1170
+#: ../src/event-list.c:1181
 msgid "Extra days to show "
 msgstr "Näidata liigseid päevi "
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1212
 msgid "Journal entries starting from:"
 msgstr "Päeviku sissekanded algavad alates:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1232
 msgid "Search"
 msgstr "Otsida"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1235
 msgid "Search text "
 msgstr "Otsida teksti "
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1300
 msgid "Flags"
 msgstr "Lipud"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1308
 msgid "Title"
 msgstr "Pealkiri"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1334
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
-"Rea toimetamiseks topeltklõpsake.\n"
-"\n"
-"Järjestatud valikud:\n"
-"\t 1. Alarm: n=Alarmi pole\n"
-"\t\t A=Nähtav alarm S=Ka helialarm\n"
-"\t 2. Kordumine: n=ei kordu\n"
-"\t\t D=Päevas W=Nädalas M=Kuus Y=Aastas\n"
-"\t 3. Liik: f=Vaba B=Hõivatud\n"
-"\t 4. Paikneb failis:\n"
-"\t\tO=Orage A=Arhiiv F=Väline\n"
-"\t 5. Kohtumise liik:\n"
-"\t\tE=Sündmus T=Ülesanne J=Päevik"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Valige kuupäev"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tKordamine läbi, liigutatakse arhiivifaili."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Arhiivimine pole lubatud. Väljumine"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Arhiivimise lävi: %d kuu(d)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tSündmuste arhiveerimine, mis on vanemad kui: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Arhiivimise uid: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tAGENDA pole lõpetatud; ei arhiveeritud"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tKorduv. Lõpuaasta: %04d, -kuu: %02d, -päev: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Arhiivimine tehtud\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Arhiivieemalduse alustamine."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\t1. FAAS: korduvkohtumiste lähtestamine"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\t2. FAAS: tagastada arhiveeritud kohtumised"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Arhiivieemaldus valmis\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Orage'i vaikimisi alarm"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr ""
+
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "Alarmide loendi koostamine: Lisatud %d alarmi. Käideldud %d sündmust."
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr ""
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tLeitud %d alarmi, millest %d on aktiivsed. (Leitud %d korduvat alarmi.)"
+msgstr "\tLeitud %d alarmi, millest %d on aktiivsed. (Leitud %d korduvat alarmi.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1372,7 +1379,16 @@
 msgid "Import file preprocessing done"
 msgstr "Imporditud faili eelkäitlus sai tehtud"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Kalendri failid"
 
@@ -1380,625 +1396,667 @@
 msgid "Current foreign files"
 msgstr "Välisfailid hetkel"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "AINULT LUGEMISEKS"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "LUGEMINE KIRJUTAMINE"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Pole välisfaile *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr ""
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Importida/eksportida"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Importida"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Lugeda failist:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Failinimed eraldatakse komaga(,).\n"
-" MÄRKUS: koma ei ole kehtiv tähemärk Orage'i failinimedes."
+msgstr "Failinimed eraldatakse komaga(,).\n MÄRKUS: koma ei ole kehtiv tähemärk Orage'i failinimedes."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Eksportida"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Kirjutada faili:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Valida"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Kõik kohtumised"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Nimetatud kohtumised: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Pange tähele, et kohtumisi loetakse ainult põhifailist.\n"
-"Arhiveeritud ja väliseid nimesid ei ekspordita."
+msgstr "Pange tähele, et kohtumisi loetakse ainult põhifailist.\nArhiveeritud ja väliseid nimesid ei ekspordita."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Pange tähele, et kohtumisi loetakse ainult põhifailist.\n"
-"Väliseid sündmuseid ei ekspordita."
+msgstr "Pange tähele, et kohtumisi loetakse ainult põhifailist.\nVäliseid sündmuseid ei ekspordita."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "Saate neid vaevata lohistada sündmusteloendi aknast."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "Orage'i kohtumiste UID-d, eraldatud komadega."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Arhiiv"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Arhiveerida nüüd (lävi: %d kuud)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Arhiiveerimise lävi saate muuta parameetrite alt"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Tühistada arhiiv kohe"
 
-#: ../src/interface.c:1107
-#, fuzzy
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
 msgstr ""
-"Tagastada kõik arhiveeritud sündmused Orage'i põhifaili ja eemalda "
-"arhiivifail.\n"
-"See on kasulik näiteks Orage'i kohtumiste eksportimisel\n"
-"või teise süsteemi liigutamisel."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Orage'i failid"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Orage'i põhikalendri fail"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Käsilolev fail"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Uus fail"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Tegevuse valikud"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Nimetada ümber"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Ainult Orage'i sisefaili nime muutmine.\n"
-"Ei mõjuta mingil määral välist failisüsteemi.\n"
-"Uus fail peab olemas olema."
+msgstr "Ainult Orage'i sisefaili nime muutmine.\nEi mõjuta mingil määral välist failisüsteemi.\nUus fail peab olemas olema."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Kopeerida"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr "Käesolevat faili kopeeritakse ja see jääb muutumatuna vanasse kohta."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Liigutada"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "Käesolevat faili liigutatakse ja see kaob vanast kohast."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Arhiivida fail"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Välisfailid"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Lisada uus välisfail"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Välisfail:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Valikud"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Ainult lugemiseks"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Valige, kui soovite veenduda, et Orage ei muudaks kunagi seda faili.\n"
-"Panna tähele, et välisfailide muutmine võib need muuta kasutuskõlbmatuks "
-"algsetes vahendites, kust need pärinevad!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Valige, kui soovite veenduda, et Orage ei muudaks kunagi seda faili.\nPanna tähele, et välisfailide muutmine võib need muuta kasutuskõlbmatuks algsetes vahendites, kust need pärinevad!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Andmevahetus - Orage"
 
-#: ../src/main.c:268
-#, fuzzy, c-format
+#: ../src/main.c:275
+#, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
 msgstr ""
-"\tSee on %s versioon %s Xfce-le %s\n"
-"\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tVälja antud GNU Üldise Avaliku Litsentsi tingimustel.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tKompileerimisel kasutatud GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "kasutades GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tImportimiseks kasutatakse DBUS-i.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tDBUS-i ei kasutata. Importimine toimib ainult osaliselt.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tKasutatakse libnotify'd.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tEi kasutata libnotify'd.\n"
 
-#: ../src/main.c:286
-#, fuzzy, c-format
+#: ../src/main.c:293
+#, c-format
 msgid "\tUsing automatic archiving.\n"
-msgstr "\tKasutatakse automaatset arhiveerimist.\n"
+msgstr ""
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tArhiveerimist ei kasutata.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr ""
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr ""
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Kasutamine: orage [valikud] [failid]\n"
-"\n"
+msgstr "Kasutamine: orage [valikud] [failid]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Valikud:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tnäidata orage'i versiooni\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\ttrükkida see tekst\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \tnäidata eelistuste ankeeti\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\tmuuta orage nähtavaks/nähtamatuks\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) fail [RW] \tlisada välisfail\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) fail \teemaldada välisfail\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
 msgstr ""
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "failid=Orage'i laaditavad ical failid\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\torage ei sisalda dbusi. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tilma dbus-ita [failid] ja välisfailide valikuteta saab orage'i "
-"käivitamisel kaustada ainult (-a ja -r) \n"
+msgstr "\tilma dbus-ita [failid] ja välisfailide valikuteta saab orage'i käivitamisel kaustada ainult (-a ja -r) \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Tundmatu valik %s\n"
-"\n"
+msgstr "\nTundmatu valik %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "Andm_evahetus"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "Toim_etada"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Vaa_data valitud kuupäeva"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "_Vaadata selekteeritud nädalat"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Selek_teerida tänane päev"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Kohalik aeg"
+msgstr ""
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Abi"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr ""
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr ""
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr ""
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Mitte kunagi"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
-"Pealkiri: %s\n"
-" Algus:\t%s\n"
-" Lõpp:\t%s\n"
-" Märkus:\n"
-"%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
-"Pealkiri: %s\n"
-" Algus:\t%s\n"
-" Lõpp:\t%s\n"
-" Märkus:\n"
-"%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Agenda:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>%s sündmused:</b>"
 
-#: ../src/mainbox.c:593
-#, fuzzy, c-format
+#: ../src/mainbox.c:660
+#, c-format
 msgid "<b>Events for %s - %s:</b>"
-msgstr "<b>%s sündmused:</b>"
+msgstr ""
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:486
 msgid "Main settings"
-msgstr "Põhiseadistused"
+msgstr ""
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:492
 msgid "Timezone"
 msgstr "Ajavöönd"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:507
 msgid "You should always define your local timezone."
 msgstr "Peaksite alati oma kohaliku ajavööndi defineerima."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:515
 msgid "Archive threshold (months)"
 msgstr "Arhiveerimise lävi (kuudes)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:525
 msgid "(0 = no archiving)"
 msgstr "(0 = ei arhiveerita)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:528
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Arhiveerimist kasutatakse aja ja ruumi säästmiseks sündmuste käsitlemisel."
+msgstr "Arhiveerimist kasutatakse aja ja ruumi säästmiseks sündmuste käsitlemisel."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:536
 msgid "Sound command"
 msgstr "Heli käsk"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:551
 msgid "This command is given to shell to make sound in alarms."
 msgstr "See käsk edastatakse Shellile, et alarmides heli tekitada."
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Ekraan"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Kalendri põhiaken"
+#: ../src/parameters.c:590
+msgid "Calendar window"
+msgstr ""
+
+#: ../src/parameters.c:597
+msgid "Calendar visual details"
+msgstr ""
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:603
 msgid "Show borders"
 msgstr "Näidata raame"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:608
 msgid "Show menu"
 msgstr "Näidata menüüd"
 
-#: ../src/parameters.c:632
-#, fuzzy
-msgid "Show month and year"
-msgstr "Näidata piiparis"
-
-#: ../src/parameters.c:639
-#, fuzzy
+#: ../src/parameters.c:616
 msgid "Show day names"
-msgstr "_Näidata raami"
+msgstr ""
 
-#: ../src/parameters.c:646
-#, fuzzy
+#: ../src/parameters.c:621
 msgid "Show week numbers"
-msgstr "Näidata raame"
+msgstr ""
+
+#: ../src/parameters.c:629
+msgid "Show month and year"
+msgstr ""
+
+#: ../src/parameters.c:649
+msgid "Calendar info boxes"
+msgstr ""
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:654
 msgid "Show todo list"
 msgstr "Näidata agendat"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:661
 msgid "Number of days to show in event window"
 msgstr ""
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:667
 msgid "0 = do not show event list at all"
 msgstr ""
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:680
+msgid "Calendar visibility"
+msgstr ""
+
+#: ../src/parameters.c:685
 msgid "Show on all desktops"
 msgstr ""
 
-#: ../src/parameters.c:683
-#, fuzzy
+#: ../src/parameters.c:690
 msgid "Keep on top"
-msgstr "Määrata pealmiseks"
+msgstr ""
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:698
 msgid "Show in taskbar"
 msgstr "Näidata tegumiribal"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:703
 msgid "Show in pager"
 msgstr "Näidata piiparis"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:711
 msgid "Show in systray"
 msgstr "Näidata teatealas"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:732
 msgid "Calendar start"
 msgstr "Kalendri algus"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:737
 msgid "Show"
 msgstr "Näidata"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:749
 msgid "Hide"
 msgstr "Peita"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:761
 msgid "Minimized"
 msgstr "Minimeeritud"
 
-#: ../src/parameters.c:793
-#, fuzzy
-msgid "Extra settings"
-msgstr "Lisaseadistused"
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Kalendri põhiaken"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "Selek_teerida tänane päev"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:781
+msgid "On calendar window open"
 msgstr ""
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
+#: ../src/parameters.c:786
+msgid "Select today's date"
 msgstr ""
 
-#: ../src/parameters.c:841
-#, fuzzy
-msgid "Use dynamic icon"
-msgstr "Dünaamiline ikoonisuurus"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
+#: ../src/parameters.c:799
+msgid "Select previously selected date"
 msgstr ""
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Topeltklõpsates põhikalendrile näidatakse"
+#: ../src/parameters.c:817
+msgid "Calendar day double click shows"
+msgstr ""
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:822
 msgid "Days view"
 msgstr "Päevavaade"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:834
 msgid "Event list"
 msgstr "Sündmuste loend"
 
-#: ../src/parameters.c:890
-#, fuzzy
-msgid "Eventlist window"
-msgstr "Sündmuste loend"
+#: ../src/parameters.c:856
+msgid "Extra settings"
+msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:863
+msgid "Event list window extra days"
+msgstr ""
+
+#: ../src/parameters.c:868
 msgid "Number of extra days to show in event list"
 msgstr ""
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:876
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
 msgstr ""
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:886
+msgid "Day view window default first day"
+msgstr ""
+
+#: ../src/parameters.c:891
+msgid "First day of week"
+msgstr ""
+
+#: ../src/parameters.c:904
+msgid "Selected day"
+msgstr ""
+
+#: ../src/parameters.c:922
+msgid "Use dynamic tray icon"
+msgstr ""
+
+#: ../src/parameters.c:927
+msgid "Use dynamic icon"
+msgstr ""
+
+#: ../src/parameters.c:933
+msgid "Dynamic icon shows current month and day of the month."
+msgstr ""
+
+#: ../src/parameters.c:941 ../src/parameters.c:946
 msgid "Use wakeup timer"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:952
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:961
+msgid "Foreign file default visual alarm"
+msgstr ""
+
+#: ../src/parameters.c:966
+msgid "Orage window"
+msgstr ""
+
+#: ../src/parameters.c:979
+msgid "Notify notification"
+msgstr ""
+
+#: ../src/parameters.c:997
+msgid "Always quit when asked to close"
+msgstr ""
+
+#: ../src/parameters.c:1002
+msgid "Always quit"
+msgstr ""
+
+#: ../src/parameters.c:1008
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr ""
+
+#: ../src/parameters.c:1024
 msgid "Orage Preferences"
 msgstr "Orage'i seadistused"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1136
 msgid "First Orage start. Searching default timezone."
 msgstr ""
 
-#: ../src/parameters.c:1069
-#, fuzzy, c-format
+#: ../src/parameters.c:1155
+#, c-format
 msgid "Default timezone set to %s."
-msgstr "määrata ajavööndiks:"
+msgstr ""
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1158
 msgid "Default timezone not found, please, set it manually."
 msgstr ""
 
@@ -2010,40 +2068,35 @@
 msgid "Open"
 msgstr "Avada"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Meeldetuletus - Orage"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
+#: ../src/reminder.c:803
+msgid "Postpone"
 msgstr ""
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
 msgstr ""
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Järgmised aktiivsed alarmid:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d p %02d t %02d min kuni: %s"
+msgstr "\n%02d p %02d t %02d min kuni: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Aktiivseid alarme ei leitud"
+msgstr "\nAktiivseid alarme ei leitud"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -3606,177 +3659,34 @@
 msgstr "Orage'i teave"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Orage Panel Clock"
-msgstr "Orage'i kell"
+msgstr ""
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
 msgid "Show time and date?"
-msgstr "Mis aeg on?"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Kalender"
+msgid "Orage preferences"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Orage'i seadistused"
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Orage'i seadistused"
+msgid "Orage Calendar Preferences"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Xfce 4 kalendri seaded"
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Kalender"
+
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr ""
 
 #: ../xfcalendar.desktop.in.h:2
 msgid "Desktop calendar"
 msgstr "Töölaua kalender"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "Orage - kalender"
-
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Pealkiri: %s\n"
-#~ " Algus:\t%s\n"
-#~ " Tähtaeg:\t%s\n"
-#~ " Tehtud:\t%s\n"
-#~ "Märkus:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Peate ise kõik katkestusmärgid jms. sisestama.\n"
-#~ " Sõne edastatakse lihtsalt Shellile käsitlemiseks"
-
-#~ msgid "Orage clock"
-#~ msgstr "Orage'i kell"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Algne looja, endine hooldaja"
-
-#~ msgid "Contributor"
-#~ msgstr "Kaasaaitaja"
-
-#~ msgid "Info"
-#~ msgstr "Teave"
-
-#~ msgid "Warning"
-#~ msgstr "Hoiatus"
-
-#~ msgid "Error"
-#~ msgstr "Viga"
-
-#~ msgid "Set sticked"
-#~ msgstr "Määrata kinnistatuks"
-
-#~ msgid "Select always today"
-#~ msgstr "Alati selekteerida tänane päev"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Näidates peakalendrit, määratakse osuti kas eelnevalt välja valitud "
-#~ "päevale, või alati käesolevale päevale."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Ajasättimisviisi lõpetamine"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Ajasättimisviisi alustamine"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "sättida minutite muutmiseks"
-
-#~ msgid "Vary"
-#~ msgstr "Vahelduv"
-
-#~ msgid "Select timezone"
-#~ msgstr "Valige ajavöönd välja"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Muuta kella "
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "sisestage kellale ajavöönd,\n"
-#~ "(=iga korrektne TZ väärtus)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Muuta eelistusi"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Sisestage kohalik ajavöönd.(kasutatakse näitamaks kas aeg on eelmisel(-) "
-#~ "või järgmisel kuupäeval(+) lisades pärast aega vastavalt + või -)"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr ""
-#~ "Määrake ajavööndile korrektne (=TZ) väärtus või valige see loendist."
-
-#~ msgid "show line _1:"
-#~ msgstr "näidata _1. rida:"
-
-#~ msgid "show line _2:"
-#~ msgstr "näidata _2. rida:"
-
-#~ msgid "show line _3:"
-#~ msgstr "näidata _3. rida:"
-
-#~ msgid "Properties"
-#~ msgstr "Omadused"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "'orage -p' käivitamine ebaõnnestus"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> sisestab käesoleva kuupäeva kohalikus ajavormingus.\n"
-#~ "<T> sisestab aja ja\n"
-#~ "<DT> sisestab kuupäeva ja aja."
-
-#~ msgid "Show event list"
-#~ msgstr "Näidata sündmuste loendit"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = kasutada staatilist ikooni)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Dünaamiline ikoon näitab käesolevat päeva ja kuud. Seda näeb ainult "
-#~ "salvest. Kui salv on dünaamilise ikoonisuuruse jaoks liiga pisike, siis "
-#~ "Orage lülitab staatilise ikooni uuesti sisse."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Kalendri seaded"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Xfce 4 kalendri seaded"
diff -Nru orage-4.8.3/po/eu.po orage-4.12.1/po/eu.po
--- orage-4.8.3/po/eu.po	2012-01-03 12:01:03.000000000 +0000
+++ orage-4.12.1/po/eu.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,23 +1,24 @@
-# translation of eu.po to Euskara
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-#
-# Piarres Beobide Egaña <pi@beobide.net>, 2004, 2005, 2006, 2008, 2009.
-# Piarres Beobide <pi+debian@beobide.net>, 2010.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Piarres Beobide <pi@beobide.net>, 2004-2006,2008-2009
+# Piarres Beobide <pi@beobide.net>, 2013
+# Piarres Beobide <pi+debian@beobide.net>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: eu\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2010-01-29 09:22+0100\n"
-"Last-Translator: Piarres Beobide <pi+debian@beobide.net>\n"
-"Language-Team: Basque <debian-l10n-basque@lists.debian.org>\n"
+"POT-Creation-Date: 2013-11-18 18:30+0100\n"
+"PO-Revision-Date: 2013-11-19 15:56+0000\n"
+"Last-Translator: Xfce <transifex@xfce.org>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/xfce/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.0\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -33,9 +34,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"klikatu ordua aldatzeko"
+msgstr "%s\nklikatu ordua aldatzeko"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -45,9 +44,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"1 botoia hobespenak aldatzeko \n"
-"2 botoia ordulariak doitzeko"
+msgstr "1 botoia hobespenak aldatzeko \n2 botoia ordulariak doitzeko"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -56,9 +53,7 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"doitu minutua aldatzeko. Sakatu geziak 2 botoiarekin minutu bakar bat "
-"aldatzeko."
+msgstr "doitu minutua aldatzeko. Sakatu geziak 2 botoiarekin minutu bakar bat aldatzeko."
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -207,9 +202,7 @@
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
-"Gurutze baten bidez markatu hautatutakoaren ordez sisteman lehenetsitako "
-"kolorea erabiltzeko"
+msgstr "Gurutze baten bidez markatu hautatutakoaren ordez sisteman lehenetsitako kolorea erabiltzeko"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
@@ -221,9 +214,7 @@
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"Gurutze baten bidez markatu hautatutakoaren ordez sisteman lehenetsitako "
-"letra-tipoa erabiltzeko"
+msgstr "Gurutze baten bidez markatu hautatutakoaren ordez sisteman lehenetsitako letra-tipoa erabiltzeko"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -339,7 +330,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2771
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Kokalekua"
@@ -400,18 +391,18 @@
 msgid "floating"
 msgstr "mugikorra"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Ordu-globala"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Orage ordu-globala"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "Ikusi herrialde ezberdinetako ordulariak"
 
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Ordu-globala"
+
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
 msgstr "Itxura"
@@ -483,12 +474,7 @@
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Hau zuk ordenagailua epe labur baterako (5 ordu baino gutxiago) eseki edo "
-"hibernatu baduzu eta zure erlojuan segundoak ageri ez badira bakarrik "
-"beharko duzu. Egoera horretan posible da orage-ordulariak ordua doitu gabe "
-"erakustea ha hautatzen ez baduzu. (Hautatzeak CPU et eten-eskaera "
-"ezaugarriak ez funtzionatzea eragiten du.)"
+msgstr "Hau zuk ordenagailua epe labur baterako (5 ordu baino gutxiago) eseki edo hibernatu baduzu eta zure erlojuan segundoak ageri ez badira bakarrik beharko duzu. Egoera horretan posible da orage-ordulariak ordua doitu gabe erakustea ha hautatzen ez baduzu. (Hautatzeak CPU et eten-eskaera ezaugarriak ez funtzionatzea eragiten du.)"
 
 #: ../panel-plugin/oc_config.c:432
 msgid ""
@@ -500,15 +486,7 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Programa honek strftime erabiltzen du ordua eskuratzeko.\n"
-"Baliozko kode bat erabili ordua nahiago duzu formatuan jasotzeko.\n"
-"Kode arrunt batzuk hauek dira:\n"
-"\t%A = asteko eguna\t\t\t%B = hilabetea\n"
-"\t%c = data eta ordua\t\t%R = ordu eta minutu\n"
-"\t%V = aste zenbakia\t\t%Z = ordu zonaldea\n"
-"\t%H = ordu \t\t\t\t%M = minutu\n"
-"\t%X = lokala time\t\t\t%x = data lokala"
+msgstr "Programa honek strftime erabiltzen du ordua eskuratzeko.\nBaliozko kode bat erabili ordua nahiago duzu formatuan jasotzeko.\nKode arrunt batzuk hauek dira:\n\t%A = asteko eguna\t\t\t%B = hilabetea\n\t%c = data eta ordua\t\t%R = ordu eta minutu\n\t%V = aste zenbakia\t\t%Z = ordu zonaldea\n\t%H = ordu \t\t\t\t%M = minutu\n\t%X = lokala time\t\t\t%x = data lokala"
 
 #: ../panel-plugin/oc_config.c:457
 msgid "Orage clock Preferences"
@@ -523,7 +501,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr "%A, %Y/%V-eko %B %d"
@@ -539,7 +517,7 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2800
 msgid "End"
 msgstr "Amaitu"
 
@@ -547,13 +525,13 @@
 msgid "Due"
 msgstr "Arte"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Fitxategi bat hautatu..."
 
@@ -561,227 +539,273 @@
 msgid "Sound Files"
 msgstr "Soinu fitxategiak"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Fitxategi Guztiak"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Hitzordu informazioa aldatua izan da."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1282 ../src/event-list.c:921
 msgid "Do you want to continue?"
 msgstr "Aurrera jarraitu nahi al duzu?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr ""
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr ""
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "Hitzordu honen amaiera hasiera baino lehenago da."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1918
 msgid "Not set"
 msgstr "Ezarri gabe"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1220
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1221
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1231
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1232
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1281
 msgid "This appointment will be permanently removed."
 msgstr "Hitzordua betirako ezabatua izango da."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1283 ../src/event-list.c:922
+msgid "No, cancel the removal"
+msgstr ""
+
+#: ../src/appointment.c:1284
+msgid "Yes, remove it"
+msgstr ""
+
+#: ../src/appointment.c:1373 ../src/appointment.c:1388 ../src/day-view.c:457
+#: ../src/event-list.c:980
+msgid "Pick the date"
+msgstr "Data aukeratu"
+
+#: ../src/appointment.c:1375 ../src/appointment.c:1390 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:982 ../src/event-list.c:1132
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Gaur"
+
+#: ../src/appointment.c:1798
 msgid "This appointment does not exist."
 msgstr "Hitzordu hau ez dago."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1799
 msgid "It was probably removed, please refresh your screen."
 msgstr "Ziurrenik ezabaturik dago, mesedez freskatu pantaila."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2100
 msgid "Current categories"
 msgstr "Kategoriak"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2115
 msgid "Add new category with color"
 msgstr "Gehitu kategoria berria kolore honez:"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2119
 msgid "Category:"
 msgstr "Kategoria:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2150
 msgid "Colors of categories - Orage"
 msgstr "Kategorien koloreak - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2196
 msgid " *** COPY ***"
 msgstr " *** KOPIA ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2461
 msgid "New appointment - Orage"
 msgstr "Hitzordu berria - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2491 ../src/day-view.c:279 ../src/event-list.c:1033
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Fitxategia"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2497
 msgid "Sav_e and close"
 msgstr "Gord_e eta itxi"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2510 ../src/event-list.c:1039
 msgid "D_uplicate"
 msgstr "B_ikouztu"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2697
 msgid "Save"
 msgstr "Gorde"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2699
 msgid "Save and close"
 msgstr "Gorde eta itxi"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2704
 msgid "Revert"
 msgstr "Itzuli"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2706 ../src/event-list.c:1123
 msgid "Duplicate"
 msgstr "Bikoiztu"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2711 ../src/event-list.c:1125
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Free"
 msgstr "Libre"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Busy"
 msgstr "Okupatua"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2733
 msgid "General"
 msgstr "Orokorra"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2739
 msgid "Type "
 msgstr "Mota "
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2741 ../src/event-list.c:1176
 msgid "Event"
 msgstr "Gertaera"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2744
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Noizbait gertatuko den gertaera bat. Adibidez:\n"
-"Bilera bat edo urtemuga bat edo TB saio bat."
+msgstr "Noizbait gertatuko den gertaera bat. Adibidez:\nBilera bat edo urtemuga bat edo TB saio bat."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2747 ../src/event-list.c:1196
 msgid "Todo"
 msgstr "Egitekoak"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2750
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Noizbait egin behar duzun zerbait. Adibidez:\n"
-"Kotxea garbitu edo Orage bertsio berria probatu."
+msgstr "Noizbait egin behar duzun zerbait. Adibidez:\nKotxea garbitu edo Orage bertsio berria probatu."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2753 ../src/event-list.c:1209
 msgid "Journal"
 msgstr "Egunkaria"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2757
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Gertatu den zerbaiten ohar bat egin. Adibidez:\n"
-"Lehen elur jarioa edo amaren deia."
+msgstr "Gertatu den zerbaiten ohar bat egin. Adibidez:\nLehen elur jarioa edo amaren deia."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2764
 msgid "Title "
 msgstr "Izenburua "
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2779
 msgid "All day event"
 msgstr "Egun osoko gertaera"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2785 ../src/appointment.c:3446 ../src/day-view.c:801
 msgid "Start"
 msgstr "Hasi"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2805
 msgid "Set      "
 msgstr "Ezarri      "
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2826
 msgid "Duration"
 msgstr "Iraupena"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2830 ../src/appointment.c:3020 ../src/reminder.c:758
 msgid "days"
 msgstr "egun"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2832 ../src/appointment.c:3022 ../src/reminder.c:760
 msgid "hours"
 msgstr "ordu"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2834 ../src/appointment.c:3024 ../src/reminder.c:762
 msgid "mins"
 msgstr "minutu"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2846
 msgid "Availability"
 msgstr "Erabilgarritasuna"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2854 ../src/appointment.c:3452
 msgid "Completed"
 msgstr "Osatua"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2857
 msgid "Done"
 msgstr "Eginda"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2878
 msgid "Categories"
 msgstr "Kategoriak"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2890
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Hau kategoria berezi bat da, zerrenda ikuspegietan hitzordu hau kolorez "
-"ipintzeko erabili daitekeena."
+msgstr "Hau kategoria berezi bat da, zerrenda ikuspegietan hitzordu hau kolorez ipintzeko erabili daitekeena."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2895
 msgid "update colors for categories."
 msgstr "eguneratu kategoria koloreak"
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2901
 msgid "Priority"
 msgstr "Lehentasuna"
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2911
 msgid "Note"
 msgstr "Oharra"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2932
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -790,131 +814,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before Start"
 msgstr "Hasi aurretik"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before End"
 msgstr "Amaitu aurretik"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After Start"
 msgstr "Hasi ondoren"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After End"
 msgstr "Amaitu ondoren"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3011
 msgid "Alarm"
 msgstr "Alarma"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3017
 msgid "Alarm time"
 msgstr "Alarma ordua"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3041
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Sarri alarma aktibatu:\n"
-" 1) Gertaera gertatu aurretik\n"
-" 2) Egiteko amaitu aurretik\n"
-" 3) Egitekoa hasi ondoren"
+msgstr "Sarri alarma aktibatu:\n 1) Gertaera gertatu aurretik\n 2) Egiteko amaitu aurretik\n 3) Egitekoa hasi ondoren"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3046
 msgid "Persistent alarm"
 msgstr "Alarma iraunkorra"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3048
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Hautatu hau Orage nahiz alarma gertatzen denean aktibo ez egon gogoaraztea "
-"nahi baduzu"
+msgstr "Hautatu hau Orage nahiz alarma gertatzen denean aktibo ez egon gogoaraztea nahi baduzu"
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3057
 msgid "Sound"
 msgstr "Soinua"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3061 ../src/appointment.c:3181
 msgid "Use"
 msgstr "Erabili"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3063
 msgid "Select this if you want audible alarm"
 msgstr "Hau hautatu soinu bidezko alarma nahi izanez gero"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3080
 msgid "Repeat alarm sound"
 msgstr "Errepikatu abisu soinua"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3096 ../src/appointment.c:3395
 msgid "times"
 msgstr "aldiz"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3112
 msgid "sec interval"
 msgstr "segundoro"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3122
 msgid "Visual"
 msgstr "Bisuala"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3126
 msgid "Use Orage window"
 msgstr "Erabili Orage leihoa"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3128
 msgid "Select this if you want Orage window alarm"
 msgstr "Hautatu hau Orage alarma leiho bat nahi baduzu"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3140
 msgid "Use notification"
 msgstr "Erabili berri-ematea"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3142
 msgid "Select this if you want notification alarm"
 msgstr "Hautatu hau alarma jakinarazpena nahi baduzu"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3148
 msgid "Set timeout"
 msgstr "Ezarri denbora-muga"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3150
 msgid "Select this if you want notification to expire automatically"
 msgstr "Hautatu hau jakinarazpena automatikoki iraungitzea nahi baduzu"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3161
 msgid "0 = system default expiration time"
 msgstr "0 = sistemako lehenetsitako iraungitzea"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3166
 msgid "seconds"
 msgstr "segundo"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3177
 msgid "Procedure"
 msgstr "Prozedura"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3183
 msgid "Select this if you want procedure or script alarm"
 msgstr "hautatu hau prozedura edo script bidezko alarma nahi baduzu"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3189
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -924,156 +941,150 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
+msgstr "Irteera karaktere guztiak idatzi behar dituzu.\n Kate hau shell-era bidaliko da prozesarzeko.\n Hurrengo komando bereziak ordeztuko dira exekuzio garaian:\n\t"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3201
 msgid "Test this alarm by raising it now"
 msgstr "Probatu alarma hau orain jo-arazten"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3208
 msgid "<b>Default alarm</b>"
 msgstr "<b>Lehenetsiriko alarma</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3216
 msgid "Store current settings as default alarm"
 msgstr "Gorde ezarpen hauek lehenetsitako alarma gisa"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3221
 msgid "Set current settings from default alarm"
 msgstr "Ezarri ezarpenak lehenetsitako alarmatik"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "None"
 msgstr "Batez"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Daily"
 msgstr "Egunero"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Weekly"
 msgstr "Astero"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Monthly"
 msgstr "Hilabetero"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Yearly"
 msgstr "Urtero"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Hourly"
 msgstr "Orduro"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Mon"
 msgstr "Al."
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Tue"
 msgstr "Ar."
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Wed"
 msgstr "Az."
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Thu"
 msgstr "Og."
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Fri"
 msgstr "Or."
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sat"
 msgstr "Lar"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sun"
 msgstr "Iga"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3290
 msgid "Recurrence"
 msgstr "Errepikatzea"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3296
 msgid "Complexity"
 msgstr "Konplexutasuna"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3299
 msgid "Basic"
 msgstr "Oinarrizkoa"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3305
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3309
 msgid "Use this if you want regular repeating event"
 msgstr "Hau erabili errepikapen erregularreko gertaera bat nahi baduzu"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3311
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Aukera hau erabili horrelako data konplexuak nahi badituzu:\n"
-" Larunbat edo igandero edo \n"
-" hilabeteko lehen osteguna"
+msgstr "Aukera hau erabili horrelako data konplexuak nahi badituzu:\n Larunbat edo igandero edo \n hilabeteko lehen osteguna"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3317
 msgid "Frequency"
 msgstr "Maiztasuna"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3323
 msgid "Each"
 msgstr "Bakoitza"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3330
 msgid "occurrence"
 msgstr "errepikatzea"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3334
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Mugatu maiztasuna tarte jakin batetara.\n"
-" Adibidez; Hiru egunetik behin:\n"
-" Maiztasuna = Edun eta tartea = 3"
+msgstr "Mugatu maiztasuna tarte jakin batetara.\n Adibidez; Hiru egunetik behin:\n Maiztasuna = Edun eta tartea = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3379
 msgid "Limit"
 msgstr "Mugatu"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3381
 msgid "Repeat forever"
 msgstr "Betirako errepikatu"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3387
 msgid "Repeat "
 msgstr "Errepikatu "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3403
 msgid "Repeat until "
 msgstr "Errepikapenak: "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3416
 msgid "Weekdays"
 msgstr "Asteko egunak"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3428
 msgid "Which day"
 msgstr "Zein egun"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3436
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1081,118 +1092,108 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Ezarri asteko zein egun hilabeteroko edo urteroko gertaeratan.\n"
-" Adibidez:\n"
-" Hilabete bakoitzeko bigarren asteazkenean:\n"
-"\tMaiztasuna = Hilabetero\tAsteko-egunak = Asteazkena bakarrik hautatu,\n"
-"\tZein egun= 2 hautatu asteazkenaren azpiko zenbakietan"
+msgstr "Ezarri asteko zein egun hilabeteroko edo urteroko gertaeratan.\n Adibidez:\n Hilabete bakoitzeko bigarren asteazkenean:\n\tMaiztasuna = Hilabetero\tAsteko-egunak = Asteazkena bakarrik hautatu,\n\tZein egun= 2 hautatu asteazkenaren azpiko zenbakietan"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3443
 msgid "TODO base"
 msgstr "EGITEKO oinarria"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3456
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
 msgstr ""
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3458
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3464
 msgid "Exceptions"
 msgstr "Salbuespenak"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3477
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"Salbuespen data gehiago gehitu beheko egutegi egunak klikatuaz.\\ "
-"Salbuespenak edo kentzea (-) edo jartzea (+) dira hautapenaren arabera.\n"
-"Ezabatzeko data klikatu."
+msgstr "Salbuespen data gehiago gehitu beheko egutegi egunak klikatuaz.\\ Salbuespenak edo kentzea (-) edo jartzea (+) dira hautapenaren arabera.\nEzabatzeko data klikatu."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3482
 msgid "Add excluded date (-)"
 msgstr "Gehitu kendutako data (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3484
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr "Kendutako egunak egun osoak dira gertaera ez denean gertatzen ari"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3490
 msgid "Add included time (+)"
 msgstr "Gehitu gehituriko denbora (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3492
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"Txertatuko orduak hasiera orduaren ordu-zonalde berdina dute, baina ordu "
-"ezberdina eduki dezakete"
+msgstr "Txertatuko orduak hasiera orduaren ordu-zonalde berdina dute, baina ordu ezberdina eduki dezakete"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3509
 msgid "Action dates"
 msgstr "Ekintza datak"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1056 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Ikusi"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1075
 msgid "_Go"
 msgstr "_Joan"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1121
 msgid "New"
 msgstr "Berria"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Atzera"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr ""
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Gaur"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Aurrera"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1139
 msgid "Refresh"
 msgstr "Freskatu"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1146 ../src/interface.c:834
 msgid "Close"
 msgstr "Itxi"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "       Bistaratzeko egun kopurua"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - egun ikuspegia"
 
@@ -1201,165 +1202,166 @@
 msgid "All day"
 msgstr "Egun osoa"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:583 ../src/event-list.c:1292
 msgid "Time"
 msgstr "Ordua"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:751
 msgid "No rows have been selected."
 msgstr "Ez da errenkadarik hautatu"
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:752
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Klikatu herrenkada bat kopiatu aurretik berau hautatzeko"
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:920
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
+msgstr "Betirako kenduko dituzu hautatutako\nhitzordu guztiak."
+
+#: ../src/event-list.c:923
+msgid "Yes, remove them"
 msgstr ""
-"Betirako kenduko dituzu hautatutako\n"
-"hitzordu guztiak."
 
 #: ../src/event-list.c:1130
+msgid "Back"
+msgstr "Atzera"
+
+#: ../src/event-list.c:1134
+msgid "Forward"
+msgstr "Aurrera"
+
+#: ../src/event-list.c:1141
 msgid "Find"
 msgstr "Bilatu"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1148
 msgid "Dayview"
 msgstr "Egun-ikuspegia"
 
-#: ../src/event-list.c:1170
+#: ../src/event-list.c:1181
 msgid "Extra days to show "
 msgstr "Ikusteko egun gehigarriak "
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1212
 msgid "Journal entries starting from:"
 msgstr "Eguneko sarrera hasiera:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1232
 msgid "Search"
 msgstr "Bilatu"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1235
 msgid "Search text "
 msgstr "Bilatu testua "
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1300
 msgid "Flags"
 msgstr "Markak"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1308
 msgid "Title"
 msgstr "Izenburua"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1334
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
-"Klik bikoitza lerroan berau editatzeko.\n"
-"\n"
-"Banderak ordenean:\n"
-"\t 1. Alarm: n=alarmarik ez\n"
-"\t\tA=Ikusteko Alarma S=Entzutezko Alarma ere\n"
-"\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Egunero W=astero M=Hilabetero Y=Urtero\n"
-"\t 3. Type: f=Libre B=Lanpeturik\n"
-"\t 4. Fitxategian kokaturik:\n"
-"\t\tO=Orage A=Artxiboa F=Kanpokoa\n"
-"\t 5. Hitzordu mota:\n"
-"\t\tE=Gertaera T=Egiteko J=Egunekoa"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Data aukeratu"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tErrepikapena amaitu da, fitxategi batetara mugitzen."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Artxibatzea ez dago gaiturik. Uzten"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Artxibatze muga: %d hilabete"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tHau baino zaharragoak diren gertaerak artxibatzen: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Artxibatze uid-a: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tVTODO ez da osatu, ez da artxibatuko"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tErrepikapena. Amaiera urtea: %04d, hilabetea: %02d eguna: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Artxibatzea eginda\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Artxibo ezabatzea abiarazten."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\t1 URRATSA: berrabiarazi hitzordu errepikapenak"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\t2 URRATSA: berreskuratu artxibatutako hitzorduak"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Artxibo ezabatzea eginda\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Orage lehenetsiriko alarma"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
+msgid "Created alarm list for foreign file: %s (%s)"
 msgstr ""
-"Alarma zerrenda eraikia. %d alarma gehitu dira. %d gertaera prozesatu dira."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr ""
+
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\t%d alarma aurkitu dira, %d aktibo daude. (%d alarma errepikapen bilatuak)"
+msgstr "\t%d alarma aurkitu dira, %d aktibo daude. (%d alarma errepikapen bilatuak)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1377,7 +1379,16 @@
 msgid "Import file preprocessing done"
 msgstr "Inportazio fitxategi aurreprozesatzea eginda"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Egutegi fitxategiak"
 
@@ -1385,617 +1396,667 @@
 msgid "Current foreign files"
 msgstr "Uneko kanpo fitxategiak"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "IRAKURRI BAKARRIK"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "IRAKURRI-IDATZI"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** ez dago kanpo fitxategirik *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr ""
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Inportatu/esportatu"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Inportatu"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Irakurri fitxategitik:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Bereizi fitxategi-izenak gako(,) bidez.\n"
-" OHARRA: gakoa ezinda Oragerekin fitxategi-izenetan erabili."
+msgstr "Bereizi fitxategi-izenak gako(,) bidez.\n OHARRA: gakoa ezinda Oragerekin fitxategi-izenetan erabili."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Esportatu"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Idatzi fitxategian:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Hautatu"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Hitzordu guztiak"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Izena duten hitzorduak: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Kontutan izan fitxategi nagusiko hitzorduak bakarrik irakurriko direla.\n"
-"Artxibatutako eta kanpoko gertaerak ez dira esportatuko."
+msgstr "Kontutan izan fitxategi nagusiko hitzorduak bakarrik irakurriko direla.\nArtxibatutako eta kanpoko gertaerak ez dira esportatuko."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Kontutan izan fitxategi nagusiko hitzorduak bakarrik irakurriko direla.\n"
-"Kanpoko gertaerak ez dira esportatuko."
+msgstr "Kontutan izan fitxategi nagusiko hitzorduak bakarrik irakurriko direla.\nKanpoko gertaerak ez dira esportatuko."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "Erraz arrastatu ditzakezu gertaera-zerrenda leihotik."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "Orage hitzordua UIDak gakoz bereizirik."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Gorde"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Gorde orain (tartea: %d hilabete)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Gordetze muga parametroetan aldatu dezakezu"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Berreskuratu artxiboa orain"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Itzuli artxibatutako gertaera guztiak orage fitxategi nagusira eta kendu "
-"artxibo fitxategia\n"
-"Hau erabilgarri da adibidez orage hitzorduak beste sistema batetara "
-"mugitzeko esportatzeko."
+msgstr "Itzuli artxibatutako gertaera guztiak orage fitxategi nagusira eta kendu artxibo fitxategia\nHau erabilgarri da adibidez orage hitzorduak beste sistema batetara mugitzeko esportatzeko."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Orage fitxategiak"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Orage egutegi nagusi fitxategia"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Uneko fitxategia"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Fitxategi berria"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Ekintza aukerak"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Berrizendatu"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Orage barne fitxategia bakarrik berrizendatu.\n"
-"Ez ukitu urruneko fitxategi sistemarik.\n"
-"Fitxategi berria egon behar da."
+msgstr "Orage barne fitxategia bakarrik berrizendatu.\nEz ukitu urruneko fitxategi sistemarik.\nFitxategi berria egon behar da."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Kopiatu"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-"Uneko fitxategia kopiatua izango da eta aldatu gabe lehengo kokalekuan "
-"gordeko da."
+msgstr "Uneko fitxategia kopiatua izango da eta aldatu gabe lehengo kokalekuan gordeko da."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Lekuz aldatu"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "Uneko fitxategia kopiatu eta lehengo kokalekutik desagertuko da."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Artxibo fitxategia"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Kanpoko fitxategiak"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Gehitu kanpoko fitxategi berria"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Kanpo fitxategia:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Aukerak"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Irakurtzeko soilik"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Hau ezarri Orage-k inoiz fitxategia aldatuko ez duela ziurtatzeko.\n"
-"Kontutan izan urruneko fitxategien aldaketak jatorrizko tresnarekin "
-"bateraezin bihurtu ditzakeela!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Hau ezarri Orage-k inoiz fitxategia aldatuko ez duela ziurtatzeko.\nKontutan izan urruneko fitxategien aldaketak jatorrizko tresnarekin bateraezin bihurtu ditzakeela!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Datu trukaketa - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tHau  %s %s bertsioa da\n"
-"\n"
+msgstr "\tHau  %s %s bertsioa da\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
-"\tGNU lizentzia publiko orokorrak ezartzen dituen baldintzetan "
-"argitaraturik.\n"
+msgstr "\tGNU lizentzia publiko orokorrak ezartzen dituen baldintzetan argitaraturik.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tGTK+-%d.%d.%d bidez konpilaturik, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "GTK+-%d.%d.%d erabiltzen.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tDBUS erabiltzen inportatzeko.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tEz da DBUS erabiliko. Inportatzeak ez du guztiz funtzionatuko.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tlibnotify erabiltzen.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tlibnotify ez erabiltzen.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tArtxibatze automatikoa erabiliaz.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tArtxibatzea erabili gabe.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tSistema eragilearen libical erabiltzen.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tLibical-en Orage bertsio lokala erabiltzen.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Erabilera: orage [aukerak] [fitxategiak]\n"
-"\n"
+msgstr "Erabilera: orage [aukerak] [fitxategiak]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Aukerak:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tikusi orage bertsioa\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tinprimatu testu hau\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \tikusi hobespen inprimakia\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\torage ezkutatu/erakutsi\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) fitx [RW] \tgehitu kanpoko fitxategia\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) file \tkendu kanpo fitxategi bat\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
 msgstr "--export (-e) fitx [zita...] \tesportatu zitak Oragetik fitxategira\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "Fitxategiak=oragen kargatzeko ical fitxategiak\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tdbus ez dago oragen barneraturik. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tdbus gabe fitxategi aukerak (-a eta -r) orage abiaraztean bakarrik erabili "
-"daitezke \n"
+msgstr "\tdbus gabe fitxategi aukerak (-a eta -r) orage abiaraztean bakarrik erabili daitezke \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Aukera ezezaguna: %s\n"
-"\n"
+msgstr "\nAukera ezezaguna: %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Trukatze datuak"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Bistarazi hautaturiko _data"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Bistarazi hautaturiko _astea"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Hautatu _Gaur"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
 msgstr "Ikusi ordu-globala"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr ""
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr ""
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr ""
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Inoiz"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
-"Izenburua: %s\n"
-" Hasiera:\t%s\n"
-" Amaiera:\t%s\n"
-" Oharra:\n"
-"%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
-"Izenburua: %s\n"
-" Hasiera:\t%s\n"
-" Amaiera:\t%s\n"
-" Oharra:\n"
-"%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Egiteko:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>%s-ren geraterak:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>%s - %s-ren gertaerak:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:486
 msgid "Main settings"
 msgstr "Konfigurazio nagusiak"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:492
 msgid "Timezone"
 msgstr "Ordu-zonaldea"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:507
 msgid "You should always define your local timezone."
 msgstr "Beti zehaztu beharko zenuke zure ordu-zonaldea."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:515
 msgid "Archive threshold (months)"
 msgstr "Artxibo Muga (hilabeteak)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:525
 msgid "(0 = no archiving)"
 msgstr "(0 = ez gordetzen)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:528
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Artxibatzea gerftaerak kudeatzean denbora eta lekua aurrezteko erabiltzen da."
+msgstr "Artxibatzea gerftaerak kudeatzean denbora eta lekua aurrezteko erabiltzen da."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:536
 msgid "Sound command"
 msgstr "Soinu komandoa"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:551
 msgid "This command is given to shell to make sound in alarms."
 msgstr "Komando hau bidaltzen zaio shell-ari alarmetan soinua egin dezan"
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "Bistarazi ezarpenak"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Egutegi leiho nagusia"
+#: ../src/parameters.c:590
+msgid "Calendar window"
+msgstr ""
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:597
+msgid "Calendar visual details"
+msgstr ""
+
+#: ../src/parameters.c:603
 msgid "Show borders"
 msgstr "Ikusi ertzak"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:608
 msgid "Show menu"
 msgstr "Ikusi menua"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Ikusi hilabete eta ordua"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:616
 msgid "Show day names"
 msgstr "Ikusi egun izenak"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:621
 msgid "Show week numbers"
 msgstr "Ikusi aste zenbakiak"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:629
+msgid "Show month and year"
+msgstr "Ikusi hilabete eta ordua"
+
+#: ../src/parameters.c:649
+msgid "Calendar info boxes"
+msgstr ""
+
+#: ../src/parameters.c:654
 msgid "Show todo list"
 msgstr "Ikusi egitekoen zerrenda"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:661
 msgid "Number of days to show in event window"
 msgstr "Gertaera leihoan ikusi beharreko egun kopurua"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:667
 msgid "0 = do not show event list at all"
 msgstr "0 = ez erakutsi gertaera zerrenda"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:680
+msgid "Calendar visibility"
+msgstr ""
+
+#: ../src/parameters.c:685
 msgid "Show on all desktops"
 msgstr "Ikusi mahaigain guztietan"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:690
 msgid "Keep on top"
 msgstr "Mantendu goian"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:698
 msgid "Show in taskbar"
 msgstr "Ikusi ataza-barran"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:703
 msgid "Show in pager"
 msgstr "Ikusi orrialdekatzailean"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:711
 msgid "Show in systray"
 msgstr "Ikusi sistema-barran"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:732
 msgid "Calendar start"
 msgstr "Egutegia abiarazi"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:737
 msgid "Show"
 msgstr "Ikusi"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:749
 msgid "Hide"
 msgstr "Ezkutatu"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:761
 msgid "Minimized"
 msgstr "Txikiturik"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr "Ezarpen gehigarriak"
-
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr "Egutegi leiho nagusia irekian"
-
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "Hautatu gaurko data"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr "Hautatu auretik autatutako data"
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "Erabiliko ataza-barra ikono dinamikoa"
+#: ../src/parameters.c:781
+msgid "On calendar window open"
+msgstr ""
 
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "Erabili Ikono dinamikoa"
+#: ../src/parameters.c:786
+msgid "Select today's date"
+msgstr ""
 
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "Ikono dinamikoak hilabetea eta hilabeteko egunak bistaratzen ditu."
+#: ../src/parameters.c:799
+msgid "Select previously selected date"
+msgstr ""
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Egutegi orokorrean klik bikoitza egitean"
+#: ../src/parameters.c:817
+msgid "Calendar day double click shows"
+msgstr ""
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:822
 msgid "Days view"
 msgstr "Egun ikuspegia"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:834
 msgid "Event list"
 msgstr "Gertaera zerrenda"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr "Gertaera-zerrenda leihoa"
+#: ../src/parameters.c:856
+msgid "Extra settings"
+msgstr "Ezarpen gehigarriak"
+
+#: ../src/parameters.c:863
+msgid "Event list window extra days"
+msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:868
 msgid "Number of extra days to show in event list"
 msgstr "Gertaera zerrenda ikusi behar diren egun gehigarri kopurua"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:876
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
+msgstr "Hau lehenetsitako balioa da, berau gertaera-zerrenda leihoan aldatu dezakezu."
+
+#: ../src/parameters.c:886
+msgid "Day view window default first day"
 msgstr ""
-"Hau lehenetsitako balioa da, berau gertaera-zerrenda leihoan aldatu dezakezu."
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
+#: ../src/parameters.c:891
+msgid "First day of week"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:904
+msgid "Selected day"
+msgstr ""
+
+#: ../src/parameters.c:922
+msgid "Use dynamic tray icon"
+msgstr "Erabiliko ataza-barra ikono dinamikoa"
+
+#: ../src/parameters.c:927
+msgid "Use dynamic icon"
+msgstr "Erabili Ikono dinamikoa"
+
+#: ../src/parameters.c:933
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Ikono dinamikoak hilabetea eta hilabeteko egunak bistaratzen ditu."
+
+#: ../src/parameters.c:941 ../src/parameters.c:946
+msgid "Use wakeup timer"
+msgstr "Erabili esnatze ordularia"
+
+#: ../src/parameters.c:952
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "Ordulari hau erabili Oragek hibernatu edo eseki ondoren esnatzean arazoak baditu. (Adibidez ataza ikonoa eguneratzen ez bada edo alarmak ez badabiltza.)"
+
+#: ../src/parameters.c:961
+msgid "Foreign file default visual alarm"
+msgstr ""
+
+#: ../src/parameters.c:966
+msgid "Orage window"
+msgstr ""
+
+#: ../src/parameters.c:979
+msgid "Notify notification"
+msgstr ""
+
+#: ../src/parameters.c:997
+msgid "Always quit when asked to close"
+msgstr ""
+
+#: ../src/parameters.c:1002
+msgid "Always quit"
+msgstr ""
+
+#: ../src/parameters.c:1008
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1024
 msgid "Orage Preferences"
 msgstr "Orage hobespenak"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1136
 msgid "First Orage start. Searching default timezone."
 msgstr "Lehen Orage abiaraztea. Lehenetsitako ordu-zonaldea bilatzen."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1155
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Lehenetsitako ordu-zonaldea %s-ra ezarri."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1158
 msgid "Default timezone not found, please, set it manually."
 msgstr "Ez da lehenetsitako ordu-zonaldea aurkitu, mesedez ezarri ezazu."
 
@@ -2007,40 +2068,35 @@
 msgid "Open"
 msgstr "Ireki"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Gogorarazlea - Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr ""
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "Gogoratu berriz ezarritako denboraren ondoren"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr "<Exekutatu> sakatu ezarritako denbora ondoren ni gogorarazteko. "
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Hurrengo alarma aktiboak:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d e %02d o %02d minututan: %s"
+msgstr "\n%02d e %02d o %02d minututan: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Ez da alarma aktiborik aurkitu"
+msgstr "\nEz da alarma aktiborik aurkitu"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -3611,162 +3667,26 @@
 msgstr "Ikusi data eta ordua?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Egutegia"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Orage egutegi hobespenak"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Orage hobespenak"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Xfce 4 egutegi aplikazioaren (Orage) ezarpenak"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Idazmahai egutegia"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Orage egutegi hobespenak"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Egutegia"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Orage egutegia"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Izenburua: %s\n"
-#~ " Hasiera:\t%s\n"
-#~ " Amaiera data:\t%s\n"
-#~ " Eginda:\t%s\n"
-#~ " Oharra:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Irteera etab karaktere guztiak idatzi behar dituzu.\n"
-#~ " Kate hau shell-era bidaltzen da prozesatzeko"
-
-#~ msgid "Orage clock"
-#~ msgstr "Orage ordularia"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Jatorrizko garatzailea, erretiratutako mantentzea"
-
-#~ msgid "Contributor"
-#~ msgstr "Laguntzailea"
-
-#~ msgid "Info"
-#~ msgstr "Informazioa"
-
-#~ msgid "Warning"
-#~ msgstr "Abisua"
-
-#~ msgid "Error"
-#~ msgstr "Errorea"
-
-#~ msgid "Set sticked"
-#~ msgstr "Ezarri itsatsirik"
-
-#~ msgid "Select always today"
-#~ msgstr "Bati gaur hautatu"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Egutegi nagusia ikustean markatzailea aurretik hautatutako egunean edo "
-#~ "beti egunekora joatea ezarri."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Ordu doitze modua amaitzen"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Ordu doitze modua abiarazten"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "doitu minutuak aldatzeko"
-
-#~ msgid "Vary"
-#~ msgstr "Alda"
-
-#~ msgid "Select timezone"
-#~ msgstr "Ordu zonaldea aukeratu"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Aldatu ordularia "
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "idatzi orudlariaren ordu zonaldea,\n"
-#~ "(=edozein baliozko OZ balio)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Aldatu hobespenak"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Idatzi ordu-zonalde lokala. (ordua aurrekoa edo beranduagokoa den +/- "
-#~ "erabiliaz ezartzeko)"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr "Ezarri balioz ordu zonalde bat (=TZ) edo zerrendako bat aukeratu."
-
-#~ msgid "show line _1:"
-#~ msgstr "_1 lerroa bistarazi:"
-
-#~ msgid "show line _2:"
-#~ msgstr "_2 lerroa bistarazi:"
-
-#~ msgid "show line _3:"
-#~ msgstr "_3 lerroa bistarazi:"
-
-#~ msgid "Properties"
-#~ msgstr "Propietateak"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Huts 'orage -p' abiaraztean"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> txertatu uneko data ordu lokal formatuan.\n"
-#~ "<T> txertatu ordua eta\n"
-#~ "<DT> txertatu ordua eta data."
-
-#~ msgid "Show event list"
-#~ msgstr "Ikusi gertaera zerrenda"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = erabili ikono finkoa)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Ikono dinamikoak eguna eta hilabetea erakusten ditu. Erretiluan bakarrik "
-#~ "ikus daiteke. Erretilua ikono dinamikoaren tamainarako txikiegia bada "
-#~ "automatikoki ikono finkoa erabiliko da."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Egutegi Ezarpenak"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Xfce 4 Egutegi Ezarpenak"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Idazmahai egutegia"
diff -Nru orage-4.8.3/po/fa.po orage-4.12.1/po/fa.po
--- orage-4.8.3/po/fa.po	2012-01-03 12:01:03.000000000 +0000
+++ orage-4.12.1/po/fa.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,3628 +0,0 @@
-# Persian translation of orage.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Abbas Izad <abbasizad@hotmail.com>, 2003, 2004.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2005-09-14 01:49+0900\n"
-"Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
-"Language-Team: Persian <translation-team-fa@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fa\n"
-"X-Generator: KBabel 1.3\n"
-
-#: ../globaltime/globaltime.c:100
-msgid "Raising GlobalTime window..."
-msgstr ""
-
-#: ../globaltime/globaltime.c:102
-msgid "GlobalTime window raise failed"
-msgstr ""
-
-#. ********** timezone tooltip **********
-#: ../globaltime/globaltime.c:277
-#, c-format
-msgid ""
-"%s\n"
-"click to modify clock"
-msgstr ""
-
-#: ../globaltime/globaltime.c:386
-msgid "Localtime"
-msgstr ""
-
-#: ../globaltime/globaltime.c:464
-msgid ""
-"button 1 to change preferences \n"
-"button 2 to adjust time of clocks"
-msgstr ""
-
-#: ../globaltime/globaltime.c:480
-msgid "adjust to change hour"
-msgstr ""
-
-#: ../globaltime/globaltime.c:496
-msgid ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
-msgid "NEW"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:289
-msgid "NEW COPY"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:310
-msgid "Not possible to delete the last clock."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:516
-msgid "update this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
-msgid "add new empty clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:526
-msgid "add new clock using this clock as model"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:531
-msgid "delete this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:539
-msgid "move this clock first"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:544
-msgid "move this clock left"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:549
-msgid "move this clock right"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:554
-msgid "move this clock last"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:562
-msgid "set the timezone of this clock to be local timezone"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
-msgid "close window and exit"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:590
-#, fuzzy
-msgid "Globaltime preferences "
-msgstr "ترجیحات"
-
-#. -----------------------HEADING-------------------------------------------
-#: ../globaltime/gt_prefs.c:603
-msgid "Clock Parameters"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:607
-msgid "Name of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:613
-msgid "enter name of clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:616
-msgid "Timezone of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:643
-msgid "Text Formatting"
-msgstr ""
-
-#. ------------------------background-------------------------
-#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
-msgid "Background color:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:656
-msgid "Click to change background colour for clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
-#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
-#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
-#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
-#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
-msgid "Use default"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
-#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
-#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
-msgid "Cross this to use default instead of selected value"
-msgstr ""
-
-#. ------------------------foreground-------------------------
-#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
-msgid "Foreground (=text) color:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:688
-msgid "Click to change foreground colour for clock"
-msgstr ""
-
-#. ------------------------name font-------------------------
-#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
-msgid "Font for name of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:720
-msgid "Click to change font for clock name"
-msgstr ""
-
-#. ------------------------time font-------------------------
-#: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
-msgid "Font for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:753
-msgid "Click to change font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:780
-msgid "Underline name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:810
-msgid "Underline time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:850
-msgid "Text Default Formatting"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:863
-msgid "Click to change default background colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
-msgid "Cross this to use system default instead of selected color"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:896
-msgid "Click to change default text colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:929
-msgid "Click to change default font for clock name"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
-msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:963
-msgid "Click to change default font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:990
-msgid "Underline for name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:1004
-msgid "Underline for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1027
-#, fuzzy
-msgid "update preferences"
-msgstr "ترجیحات"
-
-#: ../globaltime/gt_prefs.c:1062
-#, fuzzy
-msgid "Globaltime Preferences"
-msgstr "ترجیحات"
-
-#. -----------------------HEADING--------------------------------------
-#: ../globaltime/gt_prefs.c:1073
-#, fuzzy
-msgid "General Preferences"
-msgstr "ترجیحات"
-
-#: ../globaltime/gt_prefs.c:1077
-msgid "Decorations:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1078
-#, fuzzy
-msgid "Standard"
-msgstr "تقویمXf"
-
-#: ../globaltime/gt_prefs.c:1083
-msgid "Use normal decorations"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1094
-msgid "Do not show window decorations (borders)"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1100
-msgid "Clock size:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1101
-msgid "Equal"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1106
-msgid "All clocks have same size"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1111
-#, fuzzy
-msgid "Varying"
-msgstr "هشدار"
-
-#: ../globaltime/gt_prefs.c:1116
-msgid "Clock sizes vary"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1122
-msgid "Local timezone:"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:101
-#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
-msgid " Other"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:156
-#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
-#, c-format
-msgid "%d hour %d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:159
-#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, c-format
-msgid "%d hour"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:161
-#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, c-format
-msgid "%d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:167
-#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
-msgid "backward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:170
-#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-msgid "forward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:194
-#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
-msgid "not changed"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:195
-#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
-msgid "not changing"
-msgstr ""
-
-#. location
-#: ../globaltime/timezone_selection.c:247
-#: ../globaltime/timezone_selection.c:252
-#: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
-#: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
-msgid "Location"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:258
-#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
-msgid "GMT Offset"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:264
-#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
-msgid "Previous/Next Change"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:269
-#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
-msgid "Country"
-msgstr ""
-
-#. We are actually setting the g_par parameter. In other words
-#. we are setting the global default timezone for Orage. This is
-#. done very seldom and we do not want to allow "floating" here.
-#. This test is ugly, but it is not worth an extra parameter.
-#. this is normal appointment
-#: ../globaltime/timezone_selection.c:299
-#: ../globaltime/timezone_selection.c:309
-#: ../panel-plugin/timezone_selection.c:300
-#: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
-#: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
-msgid "Pick timezone"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:302
-#: ../globaltime/timezone_selection.c:312
-#: ../panel-plugin/timezone_selection.c:303
-#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
-#: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
-msgid "Change mode"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:303
-#: ../globaltime/timezone_selection.c:313
-#: ../globaltime/timezone_selection.c:352
-#: ../panel-plugin/timezone_selection.c:304
-#: ../panel-plugin/timezone_selection.c:314
-#: ../panel-plugin/timezone_selection.c:353 ../src/timezone_selection.c:320
-#: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
-#: ../src/timezone_selection.c:379
-msgid "UTC"
-msgstr ""
-
-#. NOTE: this exists only if ical timezones are being used
-#: ../globaltime/timezone_selection.c:304
-#: ../globaltime/timezone_selection.c:357
-#: ../panel-plugin/timezone_selection.c:305
-#: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
-#: ../src/timezone_selection.c:384
-msgid "floating"
-msgstr ""
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "ترجیحات"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
-msgid "Orage Globaltime"
-msgstr "تقویمXf"
-
-#: ../globaltime/globaltime.desktop.in.h:3
-msgid "Show clocks from different countries"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:224
-msgid "Appearance"
-msgstr ""
-
-#. show frame
-#: ../panel-plugin/oc_config.c:229
-msgid "Show _frame"
-msgstr ""
-
-#. foreground color
-#: ../panel-plugin/oc_config.c:239
-msgid "set foreground _color:"
-msgstr ""
-
-#. background color
-#: ../panel-plugin/oc_config.c:253
-msgid "set _background color:"
-msgstr ""
-
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
-msgid "set _height:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:277
-msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:282
-msgid "set _width:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:293
-msgid "Note that you can not change the width of vertical panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:316
-msgid "Clock Options"
-msgstr ""
-
-#. timezone
-#: ../panel-plugin/oc_config.c:326
-msgid "set timezone to:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:347
-#, c-format
-msgid "Line %d:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:357
-msgid "Enter any valid strftime function parameter."
-msgstr ""
-
-#. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
-msgid "Tooltip:"
-msgstr ""
-
-#. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
-msgid "fix time after suspend/hibernate"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:415
-msgid ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:432
-msgid ""
-"This program uses strftime function to get time.\n"
-"Use any valid code to get time in the format you prefer.\n"
-"Some common codes are:\n"
-"\t%A = weekday\t\t\t%B = month\n"
-"\t%c = date & time\t\t%R = hour & minute\n"
-"\t%V = week number\t\t%Z = timezone in use\n"
-"\t%H = hours \t\t\t\t%M = minute\n"
-"\t%X = local time\t\t\t%x = local date"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:457
-#, fuzzy
-msgid "Orage clock Preferences"
-msgstr "ترجیحات"
-
-#. no lines yet
-#. TRANSLATORS: Use format characters from strftime(3)
-#. * to get the proper string for your locale.
-#. * I used these:
-#. * %A  : full weekday name
-#. * %d  : day of the month
-#. * %B  : full month name
-#. * %Y  : four digit year
-#. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
-msgid "%A %d %B %Y/%V"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:40
-msgid "Maintainer"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:47
-#, fuzzy
-msgid "Manage your time with Orage"
-msgstr "سازماندهی زمان‌تان با Xfce4"
-
-#. if (gtk_toggle_button_get_active(
-#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
-#. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
-msgid "End"
-msgstr ""
-
-#: ../src/appointment.c:333
-msgid "Due"
-msgstr ""
-
-#: ../src/appointment.c:493 ../src/mainbox.c:783
-msgid "Orage"
-msgstr ""
-
-#. to avoid timing problems when updating entry
-#. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
-msgid "Select a file..."
-msgstr ""
-
-#: ../src/appointment.c:680
-msgid "Sound Files"
-msgstr ""
-
-#: ../src/appointment.c:687 ../src/interface.c:290
-msgid "All Files"
-msgstr ""
-
-#: ../src/appointment.c:739
-msgid "The appointment information has been modified."
-msgstr ""
-
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
-msgid "Do you want to continue?"
-msgstr ""
-
-#: ../src/appointment.c:767
-msgid "The end of this appointment is earlier than the beginning."
-msgstr ""
-
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-msgid "Not set"
-msgstr ""
-
-#: ../src/appointment.c:1193
-msgid "This appointment will be permanently removed."
-msgstr ""
-
-#: ../src/appointment.c:1692
-msgid "This appointment does not exist."
-msgstr ""
-
-#: ../src/appointment.c:1693
-msgid "It was probably removed, please refresh your screen."
-msgstr ""
-
-#: ../src/appointment.c:1995
-#, fuzzy
-msgid "Current categories"
-msgstr "تقویمXf"
-
-#: ../src/appointment.c:2010
-msgid "Add new category with color"
-msgstr ""
-
-#: ../src/appointment.c:2014
-msgid "Category:"
-msgstr ""
-
-#: ../src/appointment.c:2045
-msgid "Colors of categories - Orage"
-msgstr ""
-
-#: ../src/appointment.c:2092
-msgid " *** COPY ***"
-msgstr ""
-
-#: ../src/appointment.c:2353
-#, fuzzy
-msgid "New appointment - Orage"
-msgstr "وقت ملاقات"
-
-#. File menu stuff
-#. ********* File menu *********
-#. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
-msgid "_File"
-msgstr "_پرونده"
-
-#: ../src/appointment.c:2388
-msgid "Sav_e and close"
-msgstr ""
-
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
-msgid "D_uplicate"
-msgstr ""
-
-#: ../src/appointment.c:2589
-msgid "Save"
-msgstr ""
-
-#: ../src/appointment.c:2591
-msgid "Save and close"
-msgstr ""
-
-#: ../src/appointment.c:2596
-msgid "Revert"
-msgstr ""
-
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
-msgid "Duplicate"
-msgstr ""
-
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
-msgid "Delete"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Free"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Busy"
-msgstr ""
-
-#: ../src/appointment.c:2625
-msgid "General"
-msgstr ""
-
-#. type
-#: ../src/appointment.c:2631
-msgid "Type "
-msgstr ""
-
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
-msgid "Event"
-msgstr ""
-
-#: ../src/appointment.c:2636
-msgid ""
-"Event that will happen sometime. For example:\n"
-"Meeting or birthday or TV show."
-msgstr ""
-
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-#, fuzzy
-msgid "Todo"
-msgstr "امروز"
-
-#: ../src/appointment.c:2642
-msgid ""
-"Something that you should do sometime. For example:\n"
-"Wash your car or test new version of Orage."
-msgstr ""
-
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
-msgid "Journal"
-msgstr ""
-
-#: ../src/appointment.c:2649
-msgid ""
-"Make a note that something happened. For example:\n"
-"Remark that your mother called or first snow came."
-msgstr ""
-
-#. title
-#: ../src/appointment.c:2656
-msgid "Title "
-msgstr ""
-
-#: ../src/appointment.c:2671
-msgid "All day event"
-msgstr ""
-
-#. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
-msgid "Start"
-msgstr ""
-
-#: ../src/appointment.c:2697
-msgid "Set      "
-msgstr ""
-
-#: ../src/appointment.c:2718
-msgid "Duration"
-msgstr ""
-
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
-#, fuzzy
-msgid "days"
-msgstr "امروز"
-
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
-msgid "hours"
-msgstr ""
-
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
-msgid "mins"
-msgstr ""
-
-#. Availability (only for EVENT)
-#: ../src/appointment.c:2738
-msgid "Availability"
-msgstr ""
-
-#. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
-msgid "Completed"
-msgstr ""
-
-#: ../src/appointment.c:2749
-msgid "Done"
-msgstr ""
-
-#. categories
-#: ../src/appointment.c:2770
-msgid "Categories"
-msgstr ""
-
-#: ../src/appointment.c:2782
-msgid ""
-"This is special category, which can be used to color this appointment in "
-"list views."
-msgstr ""
-
-#: ../src/appointment.c:2787
-msgid "update colors for categories."
-msgstr ""
-
-#. priority
-#: ../src/appointment.c:2793
-msgid "Priority"
-msgstr ""
-
-#. note
-#: ../src/appointment.c:2803
-msgid "Note"
-msgstr ""
-
-#: ../src/appointment.c:2824
-msgid ""
-"These shorthand commands take effect immediately:\n"
-"    <D> inserts current date in local date format\n"
-"    <T> inserts time and\n"
-"    <DT> inserts date and time.\n"
-"\n"
-"These are converted only later when they are seen:\n"
-"    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before Start"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before End"
-msgstr ""
-
-#: ../src/appointment.c:2896
-msgid "After Start"
-msgstr ""
-
-#: ../src/appointment.c:2896
-msgid "After End"
-msgstr ""
-
-#: ../src/appointment.c:2903
-msgid "Alarm"
-msgstr ""
-
-#. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-msgid "Alarm time"
-msgstr ""
-
-#: ../src/appointment.c:2933
-msgid ""
-"Often you want to get alarm:\n"
-" 1) before Event start\n"
-" 2) before Todo end\n"
-" 3) after Todo start"
-msgstr ""
-
-#: ../src/appointment.c:2938
-msgid "Persistent alarm"
-msgstr ""
-
-#: ../src/appointment.c:2940
-msgid ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
-msgstr ""
-
-#. **** Audio Alarm ****
-#: ../src/appointment.c:2949
-msgid "Sound"
-msgstr ""
-
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
-msgid "Use"
-msgstr ""
-
-#: ../src/appointment.c:2955
-msgid "Select this if you want audible alarm"
-msgstr ""
-
-#: ../src/appointment.c:2972
-msgid "Repeat alarm sound"
-msgstr ""
-
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
-msgid "times"
-msgstr ""
-
-#: ../src/appointment.c:3004
-msgid "sec interval"
-msgstr ""
-
-#. **** Display Alarm ****
-#: ../src/appointment.c:3014
-msgid "Visual"
-msgstr ""
-
-#: ../src/appointment.c:3018
-msgid "Use Orage window"
-msgstr ""
-
-#: ../src/appointment.c:3020
-msgid "Select this if you want Orage window alarm"
-msgstr ""
-
-#: ../src/appointment.c:3032
-msgid "Use notification"
-msgstr ""
-
-#: ../src/appointment.c:3034
-msgid "Select this if you want notification alarm"
-msgstr ""
-
-#: ../src/appointment.c:3040
-msgid "Set timeout"
-msgstr ""
-
-#: ../src/appointment.c:3043
-msgid "Select this if you want notification to expire automatically"
-msgstr ""
-
-#: ../src/appointment.c:3054
-msgid "0 = system default expiration time"
-msgstr ""
-
-#: ../src/appointment.c:3059
-msgid "seconds"
-msgstr ""
-
-#. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
-msgid "Procedure"
-msgstr ""
-
-#: ../src/appointment.c:3076
-msgid "Select this if you want procedure or script alarm"
-msgstr ""
-
-#: ../src/appointment.c:3082
-msgid ""
-"You must enter all escape etc characters yourself.\n"
-"This string is just given to shell to process.\n"
-"The following special commands are replaced at run time:\n"
-"\t<&T>  appointment title\n"
-"\t<&D>  appointment description\n"
-"\t<&AT> alarm time\n"
-"\t<&ST> appointment start time\n"
-"\t<&ET> appointment end time"
-msgstr ""
-
-#: ../src/appointment.c:3094
-msgid "Test this alarm by raising it now"
-msgstr ""
-
-#: ../src/appointment.c:3101
-msgid "<b>Default alarm</b>"
-msgstr ""
-
-#: ../src/appointment.c:3109
-msgid "Store current settings as default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3114
-msgid "Set current settings from default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Daily"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Weekly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Monthly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Yearly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Hourly"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Mon"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Tue"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Wed"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Thu"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Fri"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Sat"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Sun"
-msgstr ""
-
-#: ../src/appointment.c:3183
-msgid "Recurrence"
-msgstr ""
-
-#. complexity
-#: ../src/appointment.c:3189
-msgid "Complexity"
-msgstr ""
-
-#: ../src/appointment.c:3192
-msgid "Basic"
-msgstr ""
-
-#: ../src/appointment.c:3198
-msgid "Advanced"
-msgstr ""
-
-#: ../src/appointment.c:3202
-msgid "Use this if you want regular repeating event"
-msgstr ""
-
-#: ../src/appointment.c:3204
-msgid ""
-"Use this if you need complex times like:\n"
-" Every Saturday and Sunday or \n"
-" First Tuesday every month"
-msgstr ""
-
-#. frequency
-#: ../src/appointment.c:3211
-msgid "Frequency"
-msgstr ""
-
-#: ../src/appointment.c:3217
-msgid "Each"
-msgstr ""
-
-#: ../src/appointment.c:3224
-msgid "occurrence"
-msgstr ""
-
-#: ../src/appointment.c:3228
-msgid ""
-"Limit frequency to certain interval.\n"
-" For example: Every third day:\n"
-" Frequency = Daily and Interval = 3"
-msgstr ""
-
-#: ../src/appointment.c:3274
-msgid "Limit"
-msgstr ""
-
-#: ../src/appointment.c:3276
-msgid "Repeat forever"
-msgstr ""
-
-#: ../src/appointment.c:3282
-msgid "Repeat "
-msgstr ""
-
-#: ../src/appointment.c:3298
-msgid "Repeat until "
-msgstr ""
-
-#. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-#, fuzzy
-msgid "Weekdays"
-msgstr "امروز"
-
-#: ../src/appointment.c:3323
-msgid "Which day"
-msgstr ""
-
-#: ../src/appointment.c:3331
-msgid ""
-"Specify which weekday for monthly and yearly events.\n"
-" For example:\n"
-" Second Wednesday each month:\n"
-"\tFrequency = Monthly,\n"
-"\tWeekdays = check only Wednesday,\n"
-"\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-
-#. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
-msgid "TODO base"
-msgstr ""
-
-#: ../src/appointment.c:3352
-msgid ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
-msgstr ""
-
-#: ../src/appointment.c:3354
-msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-
-#. exceptions
-#: ../src/appointment.c:3361
-msgid "Exceptions"
-msgstr ""
-
-#: ../src/appointment.c:3374
-msgid ""
-"Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
-"Remove by clicking the data."
-msgstr ""
-
-#: ../src/appointment.c:3379
-msgid "Add excluded date (-)"
-msgstr ""
-
-#: ../src/appointment.c:3381
-msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-
-#: ../src/appointment.c:3387
-msgid "Add included time (+)"
-msgstr ""
-
-#: ../src/appointment.c:3389
-msgid ""
-"Included times have same timezone than start time, but they may have "
-"different time"
-msgstr ""
-
-#. calendars showing the action days
-#: ../src/appointment.c:3406
-msgid "Action dates"
-msgstr ""
-
-#. ********* View menu *********
-#. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
-msgid "_View"
-msgstr ""
-
-#. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
-msgid "_Go"
-msgstr ""
-
-#: ../src/day-view.c:319 ../src/event-list.c:1110
-msgid "New"
-msgstr ""
-
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr ""
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "امروز"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr ""
-
-#: ../src/day-view.c:333 ../src/event-list.c:1128
-msgid "Refresh"
-msgstr ""
-
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
-msgid "Close"
-msgstr ""
-
-#: ../src/day-view.c:454
-msgid "Unknown"
-msgstr ""
-
-#: ../src/day-view.c:704
-msgid "       Number of days to show"
-msgstr ""
-
-#: ../src/day-view.c:935
-#, fuzzy
-msgid "Orage - day view"
-msgstr "تقویمXf"
-
-#. date only appointment
-#: ../src/event-list.c:190
-msgid "All day"
-msgstr ""
-
-#: ../src/event-list.c:580 ../src/event-list.c:1281
-msgid "Time"
-msgstr ""
-
-#: ../src/event-list.c:748
-msgid "No rows have been selected."
-msgstr ""
-
-#: ../src/event-list.c:749
-msgid "Click a row to select it and after that you can copy it."
-msgstr ""
-
-#: ../src/event-list.c:918
-msgid ""
-"You will permanently remove all\n"
-"selected appointments."
-msgstr ""
-
-#: ../src/event-list.c:1130
-msgid "Find"
-msgstr ""
-
-#: ../src/event-list.c:1137
-msgid "Dayview"
-msgstr ""
-
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr ""
-
-#: ../src/event-list.c:1201
-msgid "Journal entries starting from:"
-msgstr ""
-
-#: ../src/event-list.c:1221
-msgid "Search"
-msgstr ""
-
-#: ../src/event-list.c:1224
-msgid "Search text "
-msgstr ""
-
-#: ../src/event-list.c:1289
-msgid "Flags"
-msgstr ""
-
-#: ../src/event-list.c:1297
-msgid "Title"
-msgstr ""
-
-#: ../src/event-list.c:1323
-msgid ""
-"Double click line to edit it.\n"
-"\n"
-"Flags in order:\n"
-"\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
-"\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
-"\t 3. Type: f=free B=Busy\n"
-"\t 4. Located in file:\n"
-"\t\tO=Orage A=Archive F=Foreign\n"
-"\t 5. Appointment type:\n"
-"\t\tE=Event T=Todo J=Journal"
-msgstr ""
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr ""
-
-#. remove since it has ended
-#: ../src/ical-archive.c:267
-msgid "\tRecur ended, moving to archive file."
-msgstr ""
-
-#: ../src/ical-archive.c:329
-msgid "Archiving not enabled. Exiting"
-msgstr ""
-
-#: ../src/ical-archive.c:347
-#, c-format
-msgid "Archiving threshold: %d month(s)"
-msgstr ""
-
-#. yy mon day
-#: ../src/ical-archive.c:350
-#, c-format
-msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr ""
-
-#: ../src/ical-archive.c:377
-#, c-format
-msgid "Archiving uid: %s"
-msgstr ""
-
-#. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
-msgid "\tVTODO not complete; not archived"
-msgstr ""
-
-#. it is recurrent event
-#: ../src/ical-archive.c:388
-#, c-format
-msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr ""
-
-#: ../src/ical-archive.c:405
-msgid "Archiving done\n"
-msgstr ""
-
-#. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
-msgid "Starting archive removal."
-msgstr ""
-
-#: ../src/ical-archive.c:422
-msgid "\tPHASE 1: reset recurring appointments"
-msgstr ""
-
-#. PHASE 2: go through archive file and add everything back to base orage.
-#. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
-msgid "\tPHASE 2: return archived appointments"
-msgstr ""
-
-#: ../src/ical-archive.c:470
-msgid "Archive removal done\n"
-msgstr ""
-
-#: ../src/ical-code.c:932
-msgid "Orage default alarm"
-msgstr ""
-
-#: ../src/ical-code.c:3115
-#, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-
-#: ../src/ical-code.c:3117
-#, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-
-#: ../src/ical-expimp.c:123
-msgid "Starting import file preprocessing"
-msgstr ""
-
-#: ../src/ical-expimp.c:158
-msgid "... Patched DCREATED to be CREATED."
-msgstr ""
-
-#: ../src/ical-expimp.c:197
-msgid "... Patched timezone to Orage format."
-msgstr ""
-
-#: ../src/ical-expimp.c:206
-msgid "Import file preprocessing done"
-msgstr ""
-
-#: ../src/interface.c:284
-#, fuzzy
-msgid "Calendar files"
-msgstr "تقویمXf"
-
-#: ../src/interface.c:631
-msgid "Current foreign files"
-msgstr ""
-
-#: ../src/interface.c:643
-msgid "READ ONLY"
-msgstr ""
-
-#: ../src/interface.c:645
-msgid "READ WRITE"
-msgstr ""
-
-#: ../src/interface.c:663
-msgid "***** No foreign files *****"
-msgstr ""
-
-#: ../src/interface.c:974
-msgid "Import/export"
-msgstr ""
-
-#: ../src/interface.c:981
-msgid "Import"
-msgstr ""
-
-#: ../src/interface.c:986
-msgid "Read from file:"
-msgstr ""
-
-#: ../src/interface.c:1003
-msgid ""
-"Separate filenames with comma(,).\n"
-" NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-
-#: ../src/interface.c:1008
-msgid "Export"
-msgstr ""
-
-#: ../src/interface.c:1013
-msgid "Write to file:"
-msgstr ""
-
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
-msgid "Select"
-msgstr "انتخاب کردن _امروز"
-
-#: ../src/interface.c:1037
-#, fuzzy
-msgid "All appointments"
-msgstr "وقت ملاقات"
-
-#: ../src/interface.c:1050
-#, fuzzy
-msgid "Named appointments: "
-msgstr "وقت ملاقات"
-
-#: ../src/interface.c:1062
-msgid ""
-"Note that only main file appointments are read.\n"
-"Archived and Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1065
-msgid ""
-"Note that only main file appointments are read.\n"
-"Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1068
-msgid "You can easily drag these from event-list window."
-msgstr ""
-
-#: ../src/interface.c:1070
-msgid "Orage appointment UIDs separated by commas."
-msgstr ""
-
-#: ../src/interface.c:1076
-msgid "Archive"
-msgstr ""
-
-#: ../src/interface.c:1084
-#, c-format
-msgid "Archive now (threshold: %d months)"
-msgstr ""
-
-#: ../src/interface.c:1094
-msgid "You can change archive threshold in parameters"
-msgstr ""
-
-#: ../src/interface.c:1101
-msgid "Revert archive now"
-msgstr ""
-
-#: ../src/interface.c:1107
-msgid ""
-"Return all archived events into main orage file and remove arch file.\n"
-"This is useful for example when doing export and moving orage\n"
-"appointments to another system."
-msgstr ""
-
-#: ../src/interface.c:1118
-#, fuzzy
-msgid "Orage files"
-msgstr "ترجیحات"
-
-#: ../src/interface.c:1125
-#, fuzzy
-msgid "Orage main calendar file"
-msgstr "تقویمXf"
-
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "تقویمXf"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr ""
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr ""
-
-#: ../src/interface.c:1156 ../src/interface.c:1222
-msgid "Rename"
-msgstr ""
-
-#: ../src/interface.c:1160
-msgid ""
-"Orage internal file rename only.\n"
-"Does not touch external filesystem at all.\n"
-"New file must exist."
-msgstr ""
-
-#: ../src/interface.c:1164 ../src/interface.c:1227
-msgid "Copy"
-msgstr ""
-
-#: ../src/interface.c:1168
-msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-
-#: ../src/interface.c:1172 ../src/interface.c:1232
-msgid "Move"
-msgstr ""
-
-#: ../src/interface.c:1176
-msgid "Current file is moved and vanishes from the old place."
-msgstr ""
-
-#: ../src/interface.c:1190
-msgid "Archive file"
-msgstr ""
-
-#: ../src/interface.c:1254
-msgid "Foreign files"
-msgstr ""
-
-#: ../src/interface.c:1261
-msgid "Add new foreign file"
-msgstr ""
-
-#: ../src/interface.c:1266
-msgid "Foreign file:"
-msgstr ""
-
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr ""
-
-#: ../src/interface.c:1286
-msgid "Read only"
-msgstr ""
-
-#: ../src/interface.c:1294
-msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-
-#: ../src/interface.c:1308
-msgid "Exchange data - Orage"
-msgstr ""
-
-#: ../src/main.c:268
-#, c-format
-msgid ""
-"\tThis is %s version %s\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:270
-#, c-format
-msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
-
-#: ../src/main.c:271
-#, c-format
-msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
-
-#: ../src/main.c:273
-#, c-format
-msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
-
-#: ../src/main.c:276
-#, c-format
-msgid "\tUsing DBUS for import.\n"
-msgstr ""
-
-#: ../src/main.c:278
-#, c-format
-msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
-
-#: ../src/main.c:281
-#, c-format
-msgid "\tUsing libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:283
-#, c-format
-msgid "\tNot using libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:286
-#, c-format
-msgid "\tUsing automatic archiving.\n"
-msgstr ""
-
-#: ../src/main.c:288
-#, c-format
-msgid "\tNot using archiving.\n"
-msgstr ""
-
-#: ../src/main.c:291
-#, c-format
-msgid "\tUsing operating system package libical.\n"
-msgstr ""
-
-#: ../src/main.c:293
-#, c-format
-msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
-
-#: ../src/main.c:306
-#, c-format
-msgid ""
-"Usage: orage [options] [files]\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:307
-#, c-format
-msgid "Options:\n"
-msgstr ""
-
-#: ../src/main.c:308
-#, c-format
-msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
-
-#: ../src/main.c:309
-#, c-format
-msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
-
-#: ../src/main.c:310
-#, c-format
-msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
-
-#: ../src/main.c:311
-#, c-format
-msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
-
-#: ../src/main.c:312
-#, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:313
-#, c-format
-msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:314
-#, c-format
-msgid ""
-"--export (-e) file [appointment...] \texport appointments from Orage to "
-"file\n"
-msgstr ""
-
-#: ../src/main.c:316
-#, c-format
-msgid "files=ical files to load into orage\n"
-msgstr ""
-
-#: ../src/main.c:318
-#, c-format
-msgid "\tdbus not included in orage. \n"
-msgstr ""
-
-#: ../src/main.c:319
-#, c-format
-msgid ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
-msgstr ""
-
-#: ../src/main.c:511
-#, c-format
-msgid ""
-"\n"
-"Unknown option %s\n"
-"\n"
-msgstr ""
-
-#: ../src/mainbox.c:287
-msgid "_Exchange data"
-msgstr ""
-
-#. Edit menu
-#: ../src/mainbox.c:298
-msgid "_Edit"
-msgstr ""
-
-#: ../src/mainbox.c:308
-msgid "View selected _date"
-msgstr ""
-
-#: ../src/mainbox.c:311
-msgid "View selected _week"
-msgstr ""
-
-#: ../src/mainbox.c:317
-msgid "Select _Today"
-msgstr "انتخاب کردن _امروز"
-
-#: ../src/mainbox.c:323
-#, fuzzy
-msgid "Show _Globaltime"
-msgstr "ترجیحات"
-
-#. Help menu
-#: ../src/mainbox.c:327
-msgid "_Help"
-msgstr "_راهنما"
-
-#: ../src/mainbox.c:448
-msgid "Never"
-msgstr ""
-
-#: ../src/mainbox.c:453
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:460
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:546
-msgid "<b>To do:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:582
-#, c-format
-msgid "<b>Events for %s:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:593
-#, c-format
-msgid "<b>Events for %s - %s:</b>"
-msgstr ""
-
-#: ../src/parameters.c:522
-#, fuzzy
-msgid "Main settings"
-msgstr "تن_ظیمات"
-
-#: ../src/parameters.c:528
-msgid "Timezone"
-msgstr ""
-
-#: ../src/parameters.c:543
-msgid "You should always define your local timezone."
-msgstr ""
-
-#: ../src/parameters.c:552
-msgid "Archive threshold (months)"
-msgstr ""
-
-#: ../src/parameters.c:562
-msgid "(0 = no archiving)"
-msgstr ""
-
-#: ../src/parameters.c:565
-msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-
-#: ../src/parameters.c:574
-msgid "Sound command"
-msgstr ""
-
-#: ../src/parameters.c:589
-msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "تن_ظیمات"
-
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
-msgstr "بستن پن_جره"
-
-#: ../src/parameters.c:618
-msgid "Show borders"
-msgstr ""
-
-#: ../src/parameters.c:625
-msgid "Show menu"
-msgstr ""
-
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr ""
-
-#: ../src/parameters.c:639
-msgid "Show day names"
-msgstr ""
-
-#: ../src/parameters.c:646
-msgid "Show week numbers"
-msgstr ""
-
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr ""
-
-#: ../src/parameters.c:660
-msgid "Number of days to show in event window"
-msgstr ""
-
-#: ../src/parameters.c:666
-msgid "0 = do not show event list at all"
-msgstr ""
-
-#: ../src/parameters.c:676
-msgid "Show on all desktops"
-msgstr ""
-
-#: ../src/parameters.c:683
-msgid "Keep on top"
-msgstr ""
-
-#: ../src/parameters.c:690
-msgid "Show in taskbar"
-msgstr ""
-
-#: ../src/parameters.c:697
-msgid "Show in pager"
-msgstr ""
-
-#: ../src/parameters.c:704
-msgid "Show in systray"
-msgstr ""
-
-#: ../src/parameters.c:739
-#, fuzzy
-msgid "Calendar start"
-msgstr "تقویمXf"
-
-#: ../src/parameters.c:744
-msgid "Show"
-msgstr ""
-
-#: ../src/parameters.c:756
-msgid "Hide"
-msgstr ""
-
-#: ../src/parameters.c:768
-msgid "Minimized"
-msgstr ""
-
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr ""
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "بستن پن_جره"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "انتخاب کردن _امروز"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr ""
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
-
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr ""
-
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr ""
-
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr ""
-
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr ""
-
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
-
-#: ../src/parameters.c:921
-msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-
-#: ../src/parameters.c:938
-#, fuzzy
-msgid "Orage Preferences"
-msgstr "ترجیحات"
-
-#: ../src/parameters.c:1050
-msgid "First Orage start. Searching default timezone."
-msgstr ""
-
-#: ../src/parameters.c:1069
-#, c-format
-msgid "Default timezone set to %s."
-msgstr ""
-
-#: ../src/parameters.c:1072
-msgid "Default timezone not found, please, set it manually."
-msgstr ""
-
-#: ../src/reminder.c:562
-#, fuzzy
-msgid "Reminder "
-msgstr "یادآور"
-
-#: ../src/reminder.c:591
-msgid "Open"
-msgstr ""
-
-#: ../src/reminder.c:722
-#, fuzzy
-msgid "Reminder - Orage"
-msgstr "یادآور"
-
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
-
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-
-#: ../src/reminder.c:1099
-msgid "Next active alarms:"
-msgstr ""
-
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
-#, c-format
-msgid ""
-"\n"
-"%02d d %02d h %02d min to: %s"
-msgstr ""
-
-#: ../src/reminder.c:1166
-#, c-format
-msgid ""
-"\n"
-"No active alarms found"
-msgstr ""
-
-#: ../src/timezone_names.c:36
-msgid "Africa"
-msgstr ""
-
-#: ../src/timezone_names.c:37
-msgid "Africa/Abidjan"
-msgstr ""
-
-#: ../src/timezone_names.c:38
-msgid "Africa/Accra"
-msgstr ""
-
-#: ../src/timezone_names.c:39
-msgid "Africa/Addis_Ababa"
-msgstr ""
-
-#: ../src/timezone_names.c:40
-msgid "Africa/Algiers"
-msgstr ""
-
-#: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr ""
-
-#: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr ""
-
-#: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr ""
-
-#: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr ""
-
-#: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr ""
-
-#: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr ""
-
-#: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr ""
-
-#: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr ""
-
-#: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr ""
-
-#: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr ""
-
-#: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr ""
-
-#: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr ""
-
-#: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr ""
-
-#: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr ""
-
-#: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr ""
-
-#: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr ""
-
-#: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr ""
-
-#: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr ""
-
-#: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr ""
-
-#: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr ""
-
-#: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr ""
-
-#: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr ""
-
-#: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr ""
-
-#: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr ""
-
-#: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr ""
-
-#: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr ""
-
-#: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr ""
-
-#: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr ""
-
-#: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr ""
-
-#: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr ""
-
-#: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr ""
-
-#: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr ""
-
-#: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr ""
-
-#: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr ""
-
-#: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr ""
-
-#: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr ""
-
-#: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr ""
-
-#: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr ""
-
-#: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr ""
-
-#: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr ""
-
-#: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr ""
-
-#: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr ""
-
-#: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr ""
-
-#: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr ""
-
-#: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr ""
-
-#: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr ""
-
-#: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr ""
-
-#: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr ""
-
-#: ../src/timezone_names.c:89
-msgid "America"
-msgstr ""
-
-#: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr ""
-
-#: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr ""
-
-#: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr ""
-
-#: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr ""
-
-#: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr ""
-
-#: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:96
-msgid "America/Argentina/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:97
-msgid "America/Argentina/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:98
-msgid "America/Argentina/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:99
-msgid "America/Argentina/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr ""
-
-#: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr ""
-
-#: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr ""
-
-#: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr ""
-
-#: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr ""
-
-#: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr ""
-
-#: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr ""
-
-#: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr ""
-
-#: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr ""
-
-#: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr ""
-
-#: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr ""
-
-#: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr ""
-
-#: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr ""
-
-#: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr ""
-
-#: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr ""
-
-#: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr ""
-
-#: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr ""
-
-#: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr ""
-
-#: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr ""
-
-#: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr ""
-
-#: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr ""
-
-#: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr ""
-
-#: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr ""
-
-#: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr ""
-
-#: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr ""
-
-#: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr ""
-
-#: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr ""
-
-#: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr ""
-
-#: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr ""
-
-#: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr ""
-
-#: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr ""
-
-#: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr ""
-
-#: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr ""
-
-#: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr ""
-
-#: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr ""
-
-#: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr ""
-
-#: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr ""
-
-#: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr ""
-
-#: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr ""
-
-#: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr ""
-
-#: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr ""
-
-#: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr ""
-
-#: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr ""
-
-#: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr ""
-
-#: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr ""
-
-#: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr ""
-
-#: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr ""
-
-#: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr ""
-
-#: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr ""
-
-#: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr ""
-
-#: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr ""
-
-#: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr ""
-
-#: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr ""
-
-#: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr ""
-
-#: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr ""
-
-#: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr ""
-
-#: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr ""
-
-#: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr ""
-
-#: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr ""
-
-#: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr ""
-
-#: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr ""
-
-#: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr ""
-
-#: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr ""
-
-#: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr ""
-
-#: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr ""
-
-#: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr ""
-
-#: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr ""
-
-#: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr ""
-
-#: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr ""
-
-#: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr ""
-
-#: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr ""
-
-#: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr ""
-
-#: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr ""
-
-#: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr ""
-
-#: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr ""
-
-#: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr ""
-
-#: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr ""
-
-#: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr ""
-
-#: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr ""
-
-#: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr ""
-
-#: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr ""
-
-#: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr ""
-
-#: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr ""
-
-#: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr ""
-
-#: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr ""
-
-#: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr ""
-
-#: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr ""
-
-#: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr ""
-
-#: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr ""
-
-#: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr ""
-
-#: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr ""
-
-#: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr ""
-
-#: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr ""
-
-#: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr ""
-
-#: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr ""
-
-#: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr ""
-
-#: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr ""
-
-#: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr ""
-
-#: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr ""
-
-#: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr ""
-
-#: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr ""
-
-#: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr ""
-
-#: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr ""
-
-#: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr ""
-
-#: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr ""
-
-#: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr ""
-
-#: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr ""
-
-#: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr ""
-
-#: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr ""
-
-#: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr ""
-
-#: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr ""
-
-#: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr ""
-
-#: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr ""
-
-#: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr ""
-
-#: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr ""
-
-#: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr ""
-
-#: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr ""
-
-#: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr ""
-
-#: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr ""
-
-#: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr ""
-
-#: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr ""
-
-#: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr ""
-
-#: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr ""
-
-#: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr ""
-
-#: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr ""
-
-#: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr ""
-
-#: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr ""
-
-#: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr ""
-
-#: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr ""
-
-#: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr ""
-
-#: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr ""
-
-#: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr ""
-
-#: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr ""
-
-#: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr ""
-
-#: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr ""
-
-#: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr ""
-
-#: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr ""
-
-#: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr ""
-
-#: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr ""
-
-#: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr ""
-
-#: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr ""
-
-#: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr ""
-
-#: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr ""
-
-#: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr ""
-
-#: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr ""
-
-#: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr ""
-
-#: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr ""
-
-#: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr ""
-
-#: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr ""
-
-#: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr ""
-
-#: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr ""
-
-#: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr ""
-
-#: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr ""
-
-#: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr ""
-
-#: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr ""
-
-#: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr ""
-
-#: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr ""
-
-#: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr ""
-
-#: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr ""
-
-#: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr ""
-
-#: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr ""
-
-#: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr ""
-
-#: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr ""
-
-#: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr ""
-
-#: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr ""
-
-#: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr ""
-
-#: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr ""
-
-#: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr ""
-
-#: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr ""
-
-#: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr ""
-
-#: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr ""
-
-#: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr ""
-
-#: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr ""
-
-#: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr ""
-
-#: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr ""
-
-#: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr ""
-
-#: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr ""
-
-#: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr ""
-
-#: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr ""
-
-#: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr ""
-
-#: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr ""
-
-#: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr ""
-
-#: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr ""
-
-#: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr ""
-
-#: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr ""
-
-#: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr ""
-
-#: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr ""
-
-#: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr ""
-
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr ""
-
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr ""
-
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr ""
-
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr ""
-
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr ""
-
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr ""
-
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr ""
-
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr ""
-
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr ""
-
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr ""
-
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr ""
-
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr ""
-
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr ""
-
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr ""
-
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr ""
-
-#: ../src/timezone_names.c:320
-msgid "Europe"
-msgstr ""
-
-#: ../src/timezone_names.c:321
-msgid "Europe/Amsterdam"
-msgstr ""
-
-#: ../src/timezone_names.c:322
-msgid "Europe/Andorra"
-msgstr ""
-
-#: ../src/timezone_names.c:323
-msgid "Europe/Athens"
-msgstr ""
-
-#: ../src/timezone_names.c:324
-msgid "Europe/Belfast"
-msgstr ""
-
-#: ../src/timezone_names.c:325
-msgid "Europe/Belgrade"
-msgstr ""
-
-#: ../src/timezone_names.c:326
-msgid "Europe/Berlin"
-msgstr ""
-
-#: ../src/timezone_names.c:327
-msgid "Europe/Bratislava"
-msgstr ""
-
-#: ../src/timezone_names.c:328
-msgid "Europe/Brussels"
-msgstr ""
-
-#: ../src/timezone_names.c:329
-msgid "Europe/Bucharest"
-msgstr ""
-
-#: ../src/timezone_names.c:330
-msgid "Europe/Budapest"
-msgstr ""
-
-#: ../src/timezone_names.c:331
-msgid "Europe/Chisinau"
-msgstr ""
-
-#: ../src/timezone_names.c:332
-msgid "Europe/Copenhagen"
-msgstr ""
-
-#: ../src/timezone_names.c:333
-msgid "Europe/Dublin"
-msgstr ""
-
-#: ../src/timezone_names.c:334
-msgid "Europe/Gibraltar"
-msgstr ""
-
-#: ../src/timezone_names.c:335
-msgid "Europe/Helsinki"
-msgstr ""
-
-#: ../src/timezone_names.c:336
-msgid "Europe/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:337
-msgid "Europe/Kaliningrad"
-msgstr ""
-
-#: ../src/timezone_names.c:338
-msgid "Europe/Kiev"
-msgstr ""
-
-#: ../src/timezone_names.c:339
-msgid "Europe/Lisbon"
-msgstr ""
-
-#: ../src/timezone_names.c:340
-msgid "Europe/Ljubljana"
-msgstr ""
-
-#: ../src/timezone_names.c:341
-msgid "Europe/London"
-msgstr ""
-
-#: ../src/timezone_names.c:342
-msgid "Europe/Luxembourg"
-msgstr ""
-
-#: ../src/timezone_names.c:343
-msgid "Europe/Madrid"
-msgstr ""
-
-#: ../src/timezone_names.c:344
-msgid "Europe/Malta"
-msgstr ""
-
-#: ../src/timezone_names.c:345
-msgid "Europe/Minsk"
-msgstr ""
-
-#: ../src/timezone_names.c:346
-msgid "Europe/Monaco"
-msgstr ""
-
-#: ../src/timezone_names.c:347
-msgid "Europe/Moscow"
-msgstr ""
-
-#: ../src/timezone_names.c:348
-msgid "Europe/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:349
-msgid "Europe/Oslo"
-msgstr ""
-
-#: ../src/timezone_names.c:350
-msgid "Europe/Paris"
-msgstr ""
-
-#: ../src/timezone_names.c:351
-msgid "Europe/Prague"
-msgstr ""
-
-#: ../src/timezone_names.c:352
-msgid "Europe/Riga"
-msgstr ""
-
-#: ../src/timezone_names.c:353
-msgid "Europe/Rome"
-msgstr ""
-
-#: ../src/timezone_names.c:354
-msgid "Europe/Samara"
-msgstr ""
-
-#: ../src/timezone_names.c:355
-msgid "Europe/San_Marino"
-msgstr ""
-
-#: ../src/timezone_names.c:356
-msgid "Europe/Sarajevo"
-msgstr ""
-
-#: ../src/timezone_names.c:357
-msgid "Europe/Simferopol"
-msgstr ""
-
-#: ../src/timezone_names.c:358
-msgid "Europe/Skopje"
-msgstr ""
-
-#: ../src/timezone_names.c:359
-msgid "Europe/Sofia"
-msgstr ""
-
-#: ../src/timezone_names.c:360
-msgid "Europe/Stockholm"
-msgstr ""
-
-#: ../src/timezone_names.c:361
-msgid "Europe/Tallinn"
-msgstr ""
-
-#: ../src/timezone_names.c:362
-msgid "Europe/Tirane"
-msgstr ""
-
-#: ../src/timezone_names.c:363
-msgid "Europe/Uzhgorod"
-msgstr ""
-
-#: ../src/timezone_names.c:364
-msgid "Europe/Vaduz"
-msgstr ""
-
-#: ../src/timezone_names.c:365
-msgid "Europe/Vatican"
-msgstr ""
-
-#: ../src/timezone_names.c:366
-msgid "Europe/Vienna"
-msgstr ""
-
-#: ../src/timezone_names.c:367
-msgid "Europe/Vilnius"
-msgstr ""
-
-#: ../src/timezone_names.c:368
-msgid "Europe/Warsaw"
-msgstr ""
-
-#: ../src/timezone_names.c:369
-msgid "Europe/Zagreb"
-msgstr ""
-
-#: ../src/timezone_names.c:370
-msgid "Europe/Zaporozhye"
-msgstr ""
-
-#: ../src/timezone_names.c:371
-msgid "Europe/Zurich"
-msgstr ""
-
-#: ../src/timezone_names.c:372
-msgid "Indian"
-msgstr ""
-
-#: ../src/timezone_names.c:373
-msgid "Indian/Antananarivo"
-msgstr ""
-
-#: ../src/timezone_names.c:374
-msgid "Indian/Chagos"
-msgstr ""
-
-#: ../src/timezone_names.c:375
-msgid "Indian/Christmas"
-msgstr ""
-
-#: ../src/timezone_names.c:376
-msgid "Indian/Cocos"
-msgstr ""
-
-#: ../src/timezone_names.c:377
-msgid "Indian/Comoro"
-msgstr ""
-
-#: ../src/timezone_names.c:378
-msgid "Indian/Kerguelen"
-msgstr ""
-
-#: ../src/timezone_names.c:379
-msgid "Indian/Mahe"
-msgstr ""
-
-#: ../src/timezone_names.c:380
-msgid "Indian/Maldives"
-msgstr ""
-
-#: ../src/timezone_names.c:381
-msgid "Indian/Mauritius"
-msgstr ""
-
-#: ../src/timezone_names.c:382
-msgid "Indian/Mayotte"
-msgstr ""
-
-#: ../src/timezone_names.c:383
-msgid "Indian/Reunion"
-msgstr ""
-
-#: ../src/timezone_names.c:384
-msgid "Pacific"
-msgstr ""
-
-#: ../src/timezone_names.c:385
-msgid "Pacific/Apia"
-msgstr ""
-
-#: ../src/timezone_names.c:386
-msgid "Pacific/Auckland"
-msgstr ""
-
-#: ../src/timezone_names.c:387
-msgid "Pacific/Chatham"
-msgstr ""
-
-#: ../src/timezone_names.c:388
-msgid "Pacific/Easter"
-msgstr ""
-
-#: ../src/timezone_names.c:389
-msgid "Pacific/Efate"
-msgstr ""
-
-#: ../src/timezone_names.c:390
-msgid "Pacific/Enderbury"
-msgstr ""
-
-#: ../src/timezone_names.c:391
-msgid "Pacific/Fakaofo"
-msgstr ""
-
-#: ../src/timezone_names.c:392
-msgid "Pacific/Fiji"
-msgstr ""
-
-#: ../src/timezone_names.c:393
-msgid "Pacific/Funafuti"
-msgstr ""
-
-#: ../src/timezone_names.c:394
-msgid "Pacific/Galapagos"
-msgstr ""
-
-#: ../src/timezone_names.c:395
-msgid "Pacific/Gambier"
-msgstr ""
-
-#: ../src/timezone_names.c:396
-msgid "Pacific/Guadalcanal"
-msgstr ""
-
-#: ../src/timezone_names.c:397
-msgid "Pacific/Guam"
-msgstr ""
-
-#: ../src/timezone_names.c:398
-msgid "Pacific/Honolulu"
-msgstr ""
-
-#: ../src/timezone_names.c:399
-msgid "Pacific/Johnston"
-msgstr ""
-
-#: ../src/timezone_names.c:400
-msgid "Pacific/Kiritimati"
-msgstr ""
-
-#: ../src/timezone_names.c:401
-msgid "Pacific/Kosrae"
-msgstr ""
-
-#: ../src/timezone_names.c:402
-msgid "Pacific/Kwajalein"
-msgstr ""
-
-#: ../src/timezone_names.c:403
-msgid "Pacific/Majuro"
-msgstr ""
-
-#: ../src/timezone_names.c:404
-msgid "Pacific/Marquesas"
-msgstr ""
-
-#: ../src/timezone_names.c:405
-msgid "Pacific/Midway"
-msgstr ""
-
-#: ../src/timezone_names.c:406
-msgid "Pacific/Nauru"
-msgstr ""
-
-#: ../src/timezone_names.c:407
-msgid "Pacific/Niue"
-msgstr ""
-
-#: ../src/timezone_names.c:408
-msgid "Pacific/Norfolk"
-msgstr ""
-
-#: ../src/timezone_names.c:409
-msgid "Pacific/Noumea"
-msgstr ""
-
-#: ../src/timezone_names.c:410
-msgid "Pacific/Pago_Pago"
-msgstr ""
-
-#: ../src/timezone_names.c:411
-msgid "Pacific/Palau"
-msgstr ""
-
-#: ../src/timezone_names.c:412
-msgid "Pacific/Pitcairn"
-msgstr ""
-
-#: ../src/timezone_names.c:413
-msgid "Pacific/Ponape"
-msgstr ""
-
-#: ../src/timezone_names.c:414
-msgid "Pacific/Port_Moresby"
-msgstr ""
-
-#: ../src/timezone_names.c:415
-msgid "Pacific/Rarotonga"
-msgstr ""
-
-#: ../src/timezone_names.c:416
-msgid "Pacific/Saipan"
-msgstr ""
-
-#: ../src/timezone_names.c:417
-msgid "Pacific/Tahiti"
-msgstr ""
-
-#: ../src/timezone_names.c:418
-msgid "Pacific/Tarawa"
-msgstr ""
-
-#: ../src/timezone_names.c:419
-msgid "Pacific/Tongatapu"
-msgstr ""
-
-#: ../src/timezone_names.c:420
-msgid "Pacific/Truk"
-msgstr ""
-
-#: ../src/timezone_names.c:421
-msgid "Pacific/Wake"
-msgstr ""
-
-#: ../src/timezone_names.c:422
-msgid "Pacific/Wallis"
-msgstr ""
-
-#: ../src/timezone_names.c:423
-msgid "Pacific/Yap"
-msgstr ""
-
-#: ../src/tray_icon.c:469
-#, fuzzy
-msgid "New appointment"
-msgstr "وقت ملاقات"
-
-#: ../src/tray_icon.c:485
-msgid "About Orage"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-msgid "Orage Panel Clock"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-msgid "Show time and date?"
-msgstr ""
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-#, fuzzy
-msgid "Calendar"
-msgstr "تقویمXf"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "ترجیحات"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "ترجیحات"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr ""
-
-#: ../xfcalendar.desktop.in.h:2
-#, fuzzy
-msgid "Desktop calendar"
-msgstr "درباره‌ی تقویمXf"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "تقویمXf"
-
-#~ msgid "Contributor"
-#~ msgstr "اهداگر"
-
-#~ msgid "Warning"
-#~ msgstr "هشدار"
-
-#, fuzzy
-#~ msgid "Select always today"
-#~ msgstr "انتخاب کردن _امروز"
-
-#, fuzzy
-#~ msgid "Modify Preferences"
-#~ msgstr "ترجیحات"
-
-#, fuzzy
-#~ msgid "Monday"
-#~ msgstr "امروز"
-
-#, fuzzy
-#~ msgid "Tuesday"
-#~ msgstr "امروز"
-
-#, fuzzy
-#~ msgid "Wednesday"
-#~ msgstr "امروز"
-
-#, fuzzy
-#~ msgid "Thursday"
-#~ msgstr "امروز"
-
-#, fuzzy
-#~ msgid "Friday"
-#~ msgstr "امروز"
-
-#, fuzzy
-#~ msgid "Sunday"
-#~ msgstr "امروز"
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "امروز"
-
-#, fuzzy
-#~ msgid "Calendar Files"
-#~ msgstr "تقویمXf"
-
-#, fuzzy
-#~ msgid "Calendar borders"
-#~ msgstr "تقویمXf"
-
-#~ msgid "Core developer"
-#~ msgstr "توسعه دهنده‌ی اصلی"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "شما همه‌ی اطلاعات مربوط به این\n"
-#~ "تاریخ را بر خواهید داشت."
-
-#~ msgid "Clear"
-#~ msgstr "پاک کردن"
-
-#~ msgid "This should not happen"
-#~ msgstr "این نباید اتفاق می‌افتاد"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "نمی‌توان کانال کارگیر MCS را ایجاد کرد"
diff -Nru orage-4.8.3/po/fi.po orage-4.12.1/po/fi.po
--- orage-4.8.3/po/fi.po	2012-01-03 12:04:16.000000000 +0000
+++ orage-4.12.1/po/fi.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,29 +1,47 @@
-# Translation of orage to Finnish
-# This file is distributed under the same license as the orage package.
-# Copyright (C) 2003-2006 The Xfce Development Team.
-# Juha Kautto <juha@xfce.org>, 2004, 2006, 2010-2011
-# Jari Rahkonen <jari.rahkonen@pp2.inet.fi>, 2005-2009
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Juhani Numminen <juhaninumminen0@gmail.com>, 2013
+# Pasi Lallinaho <pasi@shimmerproject.org>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.8.2\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2011-12-05 23:21+0200\n"
-"Last-Translator: Juha Kautto <juha.kautto@xfce.org>\n"
-"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2015-02-26 00:17+0000\n"
+"Last-Translator: Pasi Lallinaho <pasi@shimmerproject.org>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/xfce-apps/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "ei alleviivausta"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr ""
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr ""
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "matala"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr "Näytetään GlobalTime-ikkuna..."
+msgstr "Nostetaan Maailmanlaajuinen aika -ikkunaa"
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
-msgstr "GlobalTime-ikkunan näyttäminen epäonnistui"
+msgstr "Maailmanlaajuinen aika -ikkunan nostaminen epäonnistui"
 
 #. ********** timezone tooltip **********
 #: ../globaltime/globaltime.c:277
@@ -31,9 +49,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"Napsauta muokataksesi kelloa"
+msgstr "%s\nNapsauta muuttaaksesi kelloa"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -43,20 +59,20 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"Painike 1 muokkaa asetuksia\n"
-"Painike 2 säätää kellojen aikaa"
+msgstr "Painike 1 muuttaa asetuksia\nPainike 2 säätää kellonaikaa"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
-msgstr "Säädä tunteja"
+msgstr "Säädä vaihtaaksesi tuntia"
 
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"Muuta minuutteja. Napauta pikkunuolia hiiren 2 painikkeella (=rulla), jos "
-"haluat muuttaa vain yhden minuutin kerrallaan."
+msgstr "Säädä vaihtaaksesi minuuttia. Napsauta nuolia painikkeella 2 siirtääksesi vain yhdellä minuutilla."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Kansainvälinen aika"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -68,19 +84,19 @@
 
 #: ../globaltime/gt_prefs.c:310
 msgid "Not possible to delete the last clock."
-msgstr "Et voi poistaa viimeistä kelloa."
+msgstr "Viimeisen kellon poistaminen ei ole mahdollista."
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
-msgstr "Muuta tätä kelloa"
+msgstr "Säädä tätä kelloa"
 
 #: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
 msgid "add new empty clock"
-msgstr "Lisää uusi kello"
+msgstr "Lisää uusi tyhjä kello"
 
 #: ../globaltime/gt_prefs.c:526
 msgid "add new clock using this clock as model"
-msgstr "Luo kello tämän pohjalta"
+msgstr "Lisää uusi kello ja käytä tätä mallina"
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
@@ -88,36 +104,36 @@
 
 #: ../globaltime/gt_prefs.c:539
 msgid "move this clock first"
-msgstr "Siirrä kello ensimmäiseksi"
+msgstr "Siirrä tämä kello ensimmäiseksi"
 
 #: ../globaltime/gt_prefs.c:544
 msgid "move this clock left"
-msgstr "Siirrä kelloa vasemmalle"
+msgstr "Siirrä tätä kelloa vasemmalle"
 
 #: ../globaltime/gt_prefs.c:549
 msgid "move this clock right"
-msgstr "Siirrä kelloa oikealle"
+msgstr "Siirrä tätä kelloa oikealle"
 
 #: ../globaltime/gt_prefs.c:554
 msgid "move this clock last"
-msgstr "Siirrä kello viimeiseksi"
+msgstr "Siirrä tämä kello viimeiseksi"
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
-msgstr "Aseta paikallinen aika tämän kellon mukaan"
+msgstr "Aseta kellon aikavyöhykkeeksi paikallinen aika"
 
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
-msgstr "Sulje ikkuna ja poistu"
+msgstr "Sulje ikkuna ja lopeta"
 
 #: ../globaltime/gt_prefs.c:590
 msgid "Globaltime preferences "
-msgstr "Globatimen asetukset "
+msgstr "Maailmanlaajuisen ajan asetukset"
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
 msgid "Clock Parameters"
-msgstr "Kellon asetukset"
+msgstr "Kellon parametrit"
 
 #: ../globaltime/gt_prefs.c:607
 msgid "Name of the clock:"
@@ -125,7 +141,7 @@
 
 #: ../globaltime/gt_prefs.c:613
 msgid "enter name of clock"
-msgstr "Aseta kellon nimi"
+msgstr "Kirjoita kellon nimi"
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
@@ -133,7 +149,7 @@
 
 #: ../globaltime/gt_prefs.c:643
 msgid "Text Formatting"
-msgstr "Tekstin muoto"
+msgstr "Tekstin muotoilu"
 
 #. ------------------------background-------------------------
 #: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
@@ -150,22 +166,22 @@
 #: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
 #: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
 msgid "Use default"
-msgstr "Oletusarvo"
+msgstr "Käytä oletusta"
 
 #: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
 #: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
 msgid "Cross this to use default instead of selected value"
-msgstr "Valitse käyttääksesi järjestelmän oletusta valitun arvon sijaan"
+msgstr "Valitse tämä käyttääksesi oletusta valitun arvon sijaan"
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
 msgid "Foreground (=text) color:"
-msgstr "Tekstin väri:"
+msgstr "Edustan (tekstin) väri:"
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
-msgstr "Napsauta vaihtaaksesi kellon tekstin väriä"
+msgstr "Napsauta vaihtaaksesi kellon edustaväriä"
 
 #. ------------------------name font-------------------------
 #: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
@@ -174,7 +190,7 @@
 
 #: ../globaltime/gt_prefs.c:720
 msgid "Click to change font for clock name"
-msgstr "Napsauta vaihtaaksesi kellon nimen kirjasinta"
+msgstr "Napsauta vaihtaaksesi kellon nimen fonttia"
 
 #. ------------------------time font-------------------------
 #: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
@@ -183,7 +199,7 @@
 
 #: ../globaltime/gt_prefs.c:753
 msgid "Click to change font for clock time"
-msgstr "Napsauta vaihtaaksesi kellonajan kirjasinta"
+msgstr "Napsauta vaihtaaksesi kellon näyttämän ajan kirjasinta"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:780
@@ -201,27 +217,27 @@
 
 #: ../globaltime/gt_prefs.c:863
 msgid "Click to change default background colour for clocks"
-msgstr "Napsauta vaihtaaksesi kellojen taustan oletusväriä"
+msgstr "Napsauta vaihtaaksesi kellojen oletustaustaväriä"
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr "Valitse käyttääksesi järjestelmän oletusta valitun värin sijaan"
+msgstr "Valitse tämä käyttääksesi järjestelmän oletusta valtun värin sijaan"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
-msgstr "Napsauta vaihtaaksesi kellojen tekstin oletusväriä"
+msgstr "Napsauta vaihtaaksesi kellojen oletustekstiväriä"
 
 #: ../globaltime/gt_prefs.c:929
 msgid "Click to change default font for clock name"
-msgstr "Napsauta vaihtaaksesi kellojen nimien oletuskirjasinta"
+msgstr "Napsauta vaihtaaksesi kellon nimen oletuskirjasinta"
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr "Valitse käyttääksesi järjestelmän oletusta valitun kirjasimen sijaan"
+msgstr "Valitse tämä käyttääksesi järjestelmän oletuskirjasinta valitun kirjasimen sijaan"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
-msgstr "Napsauta vaihtaaksesi kellonaikojen oletuskirjasinta"
+msgstr "Napsauta vaihtaaksesi kellonajan oletuskirjasinta"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:990
@@ -235,11 +251,11 @@
 
 #: ../globaltime/gt_prefs.c:1027
 msgid "update preferences"
-msgstr "Tallenna oletusarvot"
+msgstr "Päivitä asetuksia"
 
 #: ../globaltime/gt_prefs.c:1062
 msgid "Globaltime Preferences"
-msgstr "Globaltimen asetukset"
+msgstr "Maailmanlaajuisen ajan asetukset"
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
@@ -248,35 +264,39 @@
 
 #: ../globaltime/gt_prefs.c:1077
 msgid "Decorations:"
-msgstr "Kehykset:"
+msgstr "Koristelut:"
 
 #: ../globaltime/gt_prefs.c:1078
 msgid "Standard"
-msgstr "Normaali"
+msgstr "Tavallinen"
 
 #: ../globaltime/gt_prefs.c:1083
 msgid "Use normal decorations"
-msgstr "Käytä tavallisia kehyksiä"
+msgstr "Käytä normaaleita koristeluja"
+
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Ei mitään"
 
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
-msgstr "Älä näytä ikkunan kehyksiä"
+msgstr "Älä näytä ikkunoiden reunukset"
 
 #: ../globaltime/gt_prefs.c:1100
 msgid "Clock size:"
-msgstr "Kellojen koko:"
+msgstr "Kellon koko:"
 
 #: ../globaltime/gt_prefs.c:1101
 msgid "Equal"
-msgstr "Samat"
+msgstr "Samankokoinen"
 
 #: ../globaltime/gt_prefs.c:1106
 msgid "All clocks have same size"
-msgstr "Kellot ovat samankokoisia"
+msgstr "Kaikki kellot ovat samankokoisia"
 
 #: ../globaltime/gt_prefs.c:1111
 msgid "Varying"
-msgstr "Vaihtelee"
+msgstr "Vaihteleva"
 
 #: ../globaltime/gt_prefs.c:1116
 msgid "Clock sizes vary"
@@ -284,18 +304,18 @@
 
 #: ../globaltime/gt_prefs.c:1122
 msgid "Local timezone:"
-msgstr "Valitse aikavyöhykkeesi:"
+msgstr "Paikallinen aikavyöhyke:"
 
 #: ../globaltime/timezone_selection.c:101
 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
 msgid " Other"
-msgstr " Muut"
+msgstr "Muu"
 
 #: ../globaltime/timezone_selection.c:156
 #: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
 #, c-format
 msgid "%d hour %d mins"
-msgstr " %d tuntia &d minuuttia"
+msgstr "%d tuntia %d minuuttia"
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
@@ -307,33 +327,33 @@
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
 #, c-format
 msgid "%d mins"
-msgstr "%d minuuttia"
+msgstr "%d minuttia"
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
 msgid "backward"
-msgstr "taaksepäin"
+msgstr "Taaksepäin"
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
 msgid "forward"
-msgstr "eteenpäin"
+msgstr "Eteenpäin"
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
 msgid "not changed"
-msgstr "ei muutoksia"
+msgstr "Ei muutettu"
 
 #: ../globaltime/timezone_selection.c:195
 #: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
 msgid "not changing"
-msgstr "ei muutoksia"
+msgstr "Ei muuteta"
 
 #. location
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Sijainti"
@@ -341,12 +361,12 @@
 #: ../globaltime/timezone_selection.c:258
 #: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
 msgid "GMT Offset"
-msgstr "GMT ero"
+msgstr "Ero GMT:hen"
 
 #: ../globaltime/timezone_selection.c:264
 #: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
 msgid "Previous/Next Change"
-msgstr "Edellinen/seuraava muutos"
+msgstr "Edellinen/Seuraava vaihto"
 
 #: ../globaltime/timezone_selection.c:269
 #: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
@@ -372,7 +392,7 @@
 #: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
 #: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
 msgid "Change mode"
-msgstr "Muutostila"
+msgstr "Muuta tilaa"
 
 #: ../globaltime/timezone_selection.c:303
 #: ../globaltime/timezone_selection.c:313
@@ -392,98 +412,110 @@
 #: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
 #: ../src/timezone_selection.c:384
 msgid "floating"
-msgstr "vaihtuva"
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Maailman aika"
+msgstr "Kelluva"
 
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "Orage - maailmankello"
+msgstr "Oragen maailmanlaajuinen aika"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
-msgstr "Näytä kellonaika eri maissa"
+msgstr "Näytä muiden maiden kellot"
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Maailmanlaajuinen aika"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Ei kääntöä"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Käännä vasemmalle"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Käännä oikealle"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "Ulkoasu"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
 msgstr "Näytä _kehys"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
-msgstr "Tekstin _väri:"
+msgstr "Aseta edusta_väri:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
-msgstr "_Taustaväri:"
+msgstr "Aseta _taustaväri:"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
-msgstr "K_orkeus"
+msgstr "Aseta _korkeus:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
-msgstr "Huomaa ettet voi muuttaa korkeutta vaakasuorassa paneelissa"
+msgstr "Huomaa, että vaakasuuntaisten paneelien korkeutta ei voi muuttaa"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
-msgstr "_Leveys"
+msgstr "Aseta _leveys:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
-msgstr "Huomaa ettet voi muuttaa leveyttä pystysuorassa paneelissa"
+msgstr "Huomaa, että pystysuuntaisten paneelien leveyttä ei voi muuttaa"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Näytä rivit _pystysuunnassa"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "Kellon asetukset"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
-msgstr "Aikavyöhyke:"
+msgstr "Aseta akavyöhykkeen arvoksi:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "Rivi %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
-msgstr "Syötä kelvollinen strftime-funktion parametri."
+msgstr "Kirjoita mikä tahansa strftime-funtiolle kelpaava parametri."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
 msgstr "Työkaluvihje:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
-msgstr "Korjaa aika lepo/keskeytystilan jälkeen"
+msgstr "Korjaa aika lepo- tai keskeytilan jälkeen"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Aseta tämä ainoastaan jos käytät lepo- tai keskeytystilaa lyhyissä (alle 5 "
-"tunnin) jaksoissa ja kellosi ei näytä sekunteja. Jos tätä ei ole valittu, "
-"Oragen kello saattaa tällöin näyttää hieman virheellistä aikaa. (Valinta "
-"estää eräiden virransäästöominaisuuksien toiminnan.) "
+msgstr "Sinun tarvitsee tehdä tämä vain jos käytät lyhyen aikavälin (alle 5 tuntia) keskeytys- tai lepotilaa ja näkyvä aikasi ei sisällä sekunteja. Tässä tapauksessa Orage-kello voi näyttää ajan epätarkasti ellet ole valinnut tätä. (Tämän valitseminen estää prosessoria ja keskeytyksiä estämästä ominaisuuksien toimintaa.)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -493,21 +525,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Sovellus noutaa ajan strftime-funktiolla.\n"
-"Voit määrittää ajan esitystavan käyttäen haluamiasi koodeja.\n"
-"Eräitä yleisiä koodeja:\n"
-"\t%A = viikonpäivä\t\t%B = kuukausi\n"
-"\t%c = pvm ja aika\t\t%R = tunti ja minuutti\n"
-"\t%V = viikon numero\t%Z = käytettävä aikavyöhyke\n"
-"\t%H = tunti \t\t\t%M = minuutti\n"
-"\t%X = paikallinen aika\t%x = paikallinen päivämäärä"
+msgstr "Tämä ohjelma hakee ajan strftime-funtion avulla.\nKäytä mitä tahansa käypiä koodeja ajan saamiseksi siinä muodossa missä haluat.\nYleisiä koodeja:\n\t%A = viikonpäivä\t\t\t%B = kuukausi\n\t%c = päivämäärä ja aika\t\t%R = tunti ja minuutti\n\t%V = viikon numero\t\t%Z = käytettävä aikavyöhyke\n\t%H = tunnit \t\t\t\t%M = minuutti\n\t%X = paikallinen aika\t\t\t%x = paikallinen päiväys"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
-msgstr "Orage kellon asetukset"
+msgstr "Orage-kellon asetukset"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -516,10 +539,9 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
-msgstr "%A %d %B %Y/%V"
+msgstr "%d. %Ata, %B 2014 (vk %V)"
 
 #: ../src/about-xfcalendar.c:40
 msgid "Maintainer"
@@ -527,26 +549,26 @@
 
 #: ../src/about-xfcalendar.c:47
 msgid "Manage your time with Orage"
-msgstr "Hallitse ajankäyttöäsi Orage:n avulla"
+msgstr "Hallitse aikaasi Oragella"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
-msgstr "Päättyy"
+msgstr "Loppuajankohta"
 
 #: ../src/appointment.c:333
 msgid "Due"
-msgstr "Määräaika"
+msgstr "Viimeistään"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Valitse tiedosto..."
 
@@ -554,226 +576,281 @@
 msgid "Sound Files"
 msgstr "Äänitiedostot"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
-msgstr "Tapahtumatiedot ovat muuttuneet."
+msgstr "Tapaamisen tiedot muutettiin."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "Haluatko jatkaa?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Ei, älä poistu"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Kyllä, unohda muutokset ja poistu"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
-msgstr "Tapahtuman päättymisaika on ennen alkamisaikaa."
+msgstr "Tämän tapaamisen loppuajankohta on ennen sen alkamisajankohtaa."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
-msgstr "Ei asetettu"
+msgstr "Ei määritetty"
+
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Lisää uusi tapaaminen tähän tiedostoon."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Oragen oletustiedosto"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Tapaamisen lisääminen epäonnistui."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Virhe lisättäessä tapaamista. Katso lisätietoja lokitiedostosta."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Tapaamisen päivittäminen epäonnistui."
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Katso lisätietoja lokitiedostosta. (Ehkä jokin muu sovellus kuin Orage päivitti tiedostoa?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
-msgstr "Tapahtuma poistetaan pysyvästi."
+msgstr "Tämä tapaaminen poistetaan lopullisesti."
+
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Ei, peruuta poistaminen"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Kyllä, poista tapaaminen"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Valitse päivä"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Tänään"
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
-msgstr "Tapahtumaa ei ole olemassa."
+msgstr "Tätä tapaamista ei ole olemassa."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
-msgstr "Se on luultavasti poistettu. Virkistä näyttösi."
+msgstr "Tapahtuma on todennäköisesti poistettu, päivitä näyttösi."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
-msgstr "Nykyiset luokat"
+msgstr "Nykyiset kategoriat"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
-msgstr "Lisää uusi luokka värillä"
+msgstr "Lisää uusi kategoria värillä"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
-msgstr "Luokka:"
+msgstr "Kategoria:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
-msgstr "Luokkien värit - Orage"
+msgstr "Kategorioiden värit - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
-msgstr " *** KOPIO ***"
+msgstr "*** KOPIO ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
-msgstr "Uusi tapahtuma - Orage"
+msgstr "Uusi tapaaminen - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
-msgstr "Ta_llenna ja sulje"
+msgstr "_Tallenna ja sulje"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
-msgstr "K_opioi"
+msgstr "_Kopioi"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Tallenna ja sulje"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Palauta"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Kopioi"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Vapaa"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
-msgstr "Varattu"
+msgstr "Kiireinen"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
-msgstr "Yleiset"
+msgstr "Yleinen"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
-msgstr "Tyyppi "
+msgstr "Tyyppi"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Asia, joka tapahtuu joskus. Esimerkiksi:\n"
-"Kokous tai syntymäpäivä tai TV-ohjelma"
+msgstr "Tapahtuma joka tapahtuu joskus. Esimerkiksi:\nTapaaminen tai syntymäpäivä tai TV-ohjelma."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
-msgstr "Tehtävä"
+msgstr "Tekemättä"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Asia, joka pitää tehdä määräaikaan mennessä. Esimerkiksi:\n"
-"Pese autosi tai testaa uutta Oragen versiota."
+msgstr "Jotain mitä sinun pitäisi tehdä. Esimerkiksi:\nPese auto tai testaa Oragen uutta versiota."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
-msgstr "Muistio"
+msgstr "Päiväkirja"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Merkitse muistiin jokin tapahtunut asia. Esimerkiksi:\n"
-"Kirjaa ylös puhelu äidiltäsi tai ensilumen sataminen."
+msgstr "Merkintä tapahtuneesta. Esimerkiksi:\nÄitisi soitti tai ensilumi satoi."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
-msgstr "Nimi "
+msgstr "Otsikko"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
-msgstr "Kokopäiväinen tapahtuma"
+msgstr "Koko päivän tapahtuma"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
-msgstr "Alkaa"
+msgstr "Aloitusajankohta"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Aseta"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Kesto"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "päivää"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "tuntia"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "minuuttia"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Saatavuus"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
-msgstr "Tehty"
+msgstr "tehty"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
-msgstr "Tehty"
+msgstr "Valmis"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
-msgstr "Luokat"
+msgstr "Kategoriat"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Tämä on erityisluokka, jonka avulla voit värittää tapahtuman listanäkymissä."
+msgstr "Tämä on erikoiskategoria, jolla tätä tapaamista voi värittää listoissa."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
-msgstr "Päivitä luokkien värejä."
+msgstr "päivitä kategorioiden värit."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
-msgstr "Kiireellisyys"
+msgstr "Tärkeys"
+
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Jos tämä arvo on 8 tai suurempi, tapaamsita EI näytetä listoissa.\nVoit käyttää tätä ominaisuutta pitääksesi listasi puhtaina, mutta tapaamisen löytäminen on vaikeampaa.\n(Hälytykset laukaistaan silti normaalisti.)\n(On olemassa dokumentoimaton arvo, jolla tätä raja-arvoia voidaan muuttaa.)"
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
-msgstr "Huomioitavaa"
+msgstr "Merkintä"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -782,141 +859,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"Nämä erikoiskomennot vaikuttavat heti:\n"
-"    <D> lisää nykyisen päiväyksen\n"
-"    <T> lisää kellonajan\n"
-"    <DT> lisää päiväyksen ja kellonajan.\n"
-"\n"
-"Nämä erikoiskomennot vaikuttavat vasta myöhemmin ajoaikana:\n"
-"    <&Ynnnn> tarkoittaa tätä vuotta vähennettynä nnnn:llä.\n"
-"(Hyödyllinen esimerkiksi syntymäpäivissä kertomassa kuinka paljon henkilö "
-"täyttää.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Nämä lyhytkomennot otetaan käyttöön välittömästi:\n<D> lisää nykyisen päivämäärän paikallisessa päivämäärämuodossa\n<T> lisää ajan ja\n<DT> lisää päivämäärän ja ajan.\n\nNämä muutetaan vasta myöhemmin kun ne näytetään:\n<&Ynnnn> muutetaan nykyiseksi vuodeksi arvolla nnnn vähennettynä.\n(Tätä voi käyttää esimerkiksi syntymäpäivämuistutuksissa kertomaan kuinka vanha syntymäpäiväsankari on.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
-msgstr "Ennen alkua"
+msgstr "Ennen alkamisaikaa"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
-msgstr "Ennen loppua"
+msgstr "Ennen päättymisaikaa"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
-msgstr "Alun jälkeen"
+msgstr "Alkamisajan jälkeen"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
-msgstr "Lopun jälkeen"
+msgstr "Päättymisajan jälkeen"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Hälytys"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Hälytysaika"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Usein haluat saada hälytyksen:\n"
-" 1) ennen tapahtuman alkua\n"
-" 2) ennen tehtävän loppua\n"
-" 3) tehtävän alun jälkeen"
+msgstr "Usein haluat saada hälytyksen:\n1) ennen tapahtuman alkamista\n2) ennen tehtävälistan kohdan päättymisaikaa\n3) tehtävälistan kohdan alkamisajan jälkeen"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
-msgstr "Kestohälytys"
+msgstr "Jatkuva hälytys"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Valitse tämä, jos haluat Oragen muistuttavan, vaikka se ei olisi ollut "
-"toiminnassa määritettyyn hälytysaikaan."
+msgstr "Valitse tämä jos haluat että Orage muistuttaa sinua vaikka se ei olisi ollut päällä silloin kun hälytys tapahtui."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Ääni"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "Käytä"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
-msgstr "Valitse tämä jos halut äänihälytyksen"
+msgstr "Käytä tätä jos haluat äänihälytyksen"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
-msgstr "Toista hälytysääntä"
+msgstr "Toista hälytysääni"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "kertaa"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
-msgstr "sekunnin välein"
+msgstr "sek välein"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
-msgstr "Näkyvä"
+msgstr "Visuaalinen"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Käytä Oragen ikkunaa"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
-msgstr "Valitse tämä jos haluat hälytyksen Oragen ikkunassa"
+msgstr "Valitse tämä jos haluat hälytyksen Oragen ikkunaan"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
-msgstr "Käytä huomautusta"
+msgstr "Käytä ilmoitusta"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
-msgstr "Valitse tämä jos haluat hälytyksen huomautuksena"
+msgstr "Käytä tätä jos haluat ilmoitushälytyksen"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
-msgstr "Aseta esitysaika"
+msgstr "Määritä aikakatkaisu"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
-msgstr "Valitse tämä jos haluat ilmoituksen katoavan automaattisesti"
+msgstr "Valitse tämä jos haluat että ilmoitus erääntyy automaattisesti"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
-msgstr "0 = järjestelmän oletusesitysaika"
+msgstr "0 = järjestelmän oletuserääntymisaika"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "sekuntia"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
-msgstr "Komento"
+msgstr "Järjestelmällinen"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
-msgstr ""
-"Valitse tämä, jos haluat hälytyksen suorittavan komennon tai komentosarjan"
+msgstr "Valitse tämä jos haluat järjestelmällisen tai ohjelmoitavan hälytyksen"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -926,165 +986,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
-"Kaikki erikoismerkit pitää laittaa tähän itse.\n"
-"Merkkijono välitetään komentotulkille sellaisenaan.\n"
-"Seuraavat komennot korvataan vastaavilla arvoilla ajoaikana:\n"
-"\t<&T>  tapahtuman nimi kenttä\n"
-"\t<&D>  tapahtuman huomioitavaa kenttä\n"
-"\t<&AT> hälytysaika\n"
-"\t<&ST> tapahtuman aloitusaika\n"
-"\t<&ET> tapahtuman lopetusaika"
+msgstr "Sinun täytyy syöttää kaikki escape yms. -merkit itse.\nTämä teksti annetaan suoraan käsiteltäväksi.\nSeuraavat erikoiskomennot korvataan ajon aikana:\n\t<&T>  tapaamisen otsikko\n\t<&D>  tapaamisen kuvaus\n\t<&AT> hälytyksen ajankohta\n\t<&ST> tapaamisen alkamisaika\n\t<&ET> tapaamisen päättymisaika"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
-msgstr "Testaa tätä hälytystä käynnistämällä se nyt heti"
+msgstr "Kokeile tätä hälytystä kutsumalla se nyt"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
-msgstr "<b>Oragen oletushälytys</b>"
+msgstr "<b>Oletushälytys</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
-msgstr "Tallenna nämä asetukset oletuksiksi"
+msgstr "Tallenna nykyiset asetukset oletushälytykseksi"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
-msgstr "Aseta oletusasetuksiksi"
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Ei lainkaan"
+msgstr "Lataa asetukset oletushälytyksestä"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Päivittäin"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
-msgstr "Viikoittain"
+msgstr "Viikottain"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Kuukausittain"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Vuosittain"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
-msgstr "Tunneittain"
+msgstr "Joka tunti"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Ma"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Ti"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Ke"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "To"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Pe"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "La"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "Su"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
-msgstr "Toisto"
+msgstr "Toistuminen"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
-msgstr "Vaativuus"
+msgstr "Monimutkaisuus"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
-msgstr "Tavanomainen"
+msgstr "Perus"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Edistynyt"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
-msgstr "Valitse tämä jos tavanomaiset toisto-ominaisuudet riittävät"
+msgstr "Käytä tätä jos haluat yksinkertaisen toistuvan tapahtuman"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Valitse tämä jos tarvitset vaativampia toistoja kuten:\n"
-" joka toinen viikko tai\n"
-" joka lauantai ja sunnuntai tai\n"
-" jokaisen kuukauden ensimmäinen tiistai"
+msgstr "Käytä tätä jos tarvitset monimutkaisia ajankohtia kuten:\njoka lauantai ja sunnuntai tai\njoka kuukauden ensimmäinen tiistai"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
-msgstr "Toisto"
+msgstr "Toistumistiheys"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Joka"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
-msgstr "kerta"
+msgstr "esiintymä"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Aseta toistoväli.\n"
-" Esimerkiksi: Joka kolmas päivä:\n"
-" Toisto = Päivittäin ja Toistoväli = 3"
+msgstr "Määritä toistoille tietty aikaväli.\nEsimerksi: joka kolmas päivä:\nToistumistiheys = Päivittäin ja Aikaväli = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
-msgstr "Lopetus"
+msgstr "Rajoitus"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
-msgstr "Toista rajattomasti"
+msgstr "Toista ikuisesti"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
-msgstr "Toista "
+msgstr "Toista"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
-msgstr "Toisto päättyy "
+msgstr "Toista asti"
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
-msgstr "Viikonpäivät"
+msgstr "Arkipäivät"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
-msgstr "Monesko päivä"
+msgstr "Mikä päivä"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1092,300 +1133,305 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Määritä viikonpäivänä kuukausittaiselle tai vuosittaiselle tapahtumalle.\n"
-" Esimerkiksi:\n"
-" Joka kuukauden toinen keskiviikko:\n"
-"\tToisto = Kuukausittain,\n"
-"\tViikonpäivät = valitse vain keskiviikko,\n"
-"\tMonesko päivä = valitse 2 keskiviikon alapuolisesta laatikosta"
+msgstr "Määritä viikonpäivä kuukausittaisille ja vuosittaisille tapahtumille.\nEsimerkiksi:\nJoka kuukauden toinen keskiviikko:\nToistumistiheys = kuukausittain,\nViikonpäivät = valitse vain keskiviikkoisin,\nMikä päivä = valitse numero 2 keskiviikon alapuolelta"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
-msgstr "Tehtävän toisto"
+msgstr "Tehtävän toistuminen"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"Tehtävä toistuu aloituspäivästä alkaen aina määritellyn aikavälin jälkeen "
-"riippumatta milloin se on toteutettu"
+msgstr "Tehtävä toistuu säännöllisesti alkaen aloitusajasta ja toistuu jokaisen aikavälin jälkeen riippumatta siitä, koska tehtävä suoritetttiin viimeksi"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"Tehtävän toisto perustuu toteutusaikaan ja tehdään uudelleen kun määritelty "
-"aika viimeisestä toteutusajasta on kulunut.\n"
-"(Huomaa, että historiaa ei tällöin ylläpidetä koska edellinen päivä muuttuu "
-"aina toteutuksen mukaan.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "Tehtävän uudelleenesiintyminen perustuu tehtävän suoritusaikaan ja toistuu tietyn aikavälimäärn jälkeen siitä, kun tehtävä suoritettiin viimeksi.\n(Huomaa että tehtävähistoriasta ei voida kertoa mitään koska uudelleenesiintymisen lähtöpäivä muuttuu jokaisen suorituskerran jäkeen.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "Poikkeukset"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"Lisää uusi poikkeuspäivä klikkaamalla alla olevaa kalenteria.\n"
-"Poikkeus voi olla joko poisto(-) tai lisäys(+) valinnastasi riippuen.\n"
-"Poista poikkeus näpäyttämällä tietoa."
+msgstr "Lisää poissuljettuja päiviä napsauttamalla kalenteripäiviä alla.\nPoikkeus on joko poissuljettu (-) tai sisällytetty (+) riippuen valinnasta.\nPoista napsauttamalla tietoja."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
-msgstr "Lisää poisto päivä (-)"
+msgstr "Lisää poissuljettu päivä (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr "Poistopäivät ovat koko päiviä, jolloin tapahtumaa ei ole"
+msgstr "Poissuljetut päivät jolloin tämä tapaaminen ei tapahdu"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
-msgstr "Lisää uusi aika (+)"
+msgstr "Lisää sisällytetty aika (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"Lisäajoilla on sama aikavyöhyke kuin tapahtuman alkuajalla, mutta aika voi "
-"olla eri"
+msgstr "Sisällytetyillä ajoilla on sama aikavyöhyke kuin aloitusajalla, mutta niillä voi olla eri aika"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
-msgstr "Toimintapäivät"
+msgstr "Tapahtumapäivät"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Näytä"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "_Siirry"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Uusi"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Edellinen"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Tämä päivä"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Seuraava"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Yksi viikko taaksepäin"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Yksi päivä taaksepäin"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Yksi päivä eteenpäin"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Yksi viikko eteenpäin"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
-msgstr "Virkistä"
+msgstr "Päivitä"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Sulje"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
-msgstr "      Näytettävien päivien lukumäärä"
+msgstr "Näytettävien päivien määrä"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - päivänäkymä"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
-msgstr "Kokopäiväinen tapahtuma"
+msgstr "Koko päivä"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Aika"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "Yhtään riviä ei ole valittu."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
-msgstr "Valitse rivi napsauttamalla, minkä jälkeen voit kopioida sen."
+msgstr "Napsauta rivi valitaaksesi sen, jonka jälkeen voit kopioida sen."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"Valitut tapahtumat hävitetään\n"
-"lopullisesti."
+msgstr "Poistat lopullisesti kaikki\nvalitut tapaamiset."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Kyllä, poista"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Takaisin"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Eteenpäin"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Etsi"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "Päivänäkymä"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Näytettävät lisäpäivät "
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Näytettävät lisäpäivät:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "vain ensimmäinen toistuva"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Valitse tämä jos haluat nähdä vain ensimmäisen toistuvan tapahtuman. Oletuksena kaikki näytetään.\nHuomaa että tämä näyttä myös kaikki kiirellisyydet.\nHuomaa että toistuvat tapahtuvat voivat esiintyä aiemmin listassa koska vain ensimmäinen esiintymä näytetään."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "myös vanhat"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Valitse tämä jos haluat nähdä myös vanhat tapahtumat. Tämän voi valita vain jos 'vain ensimmäinen toistuva' on valittu erittäin pitkien listojen välttämiseksi.\nHuomaa että lisäpäivien valinnalla voi silti määrittää näytetäänkö uudemmat tapaamiset."
+
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
-msgstr "Muistiot alkaen:"
+msgstr "Päiväkirjamerkinnät alkaen:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Etsi"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
-msgstr "Hakuteksti"
+msgstr "Hakusanat"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
-msgstr "Liput"
+msgstr "Nimikkeet"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
-msgstr "Nimi"
+msgstr "Otsikko"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Kaksoisnapsauta riviä muokataksesi sitä.\n"
-"\n"
-"Liput järjestyksessä:\n"
-"\t 1. Hälytys: n=ei hälytystä,\n"
-"\t\tA=visuaalinen hälytys, S=myös äänihälytys\n"
-"\t 2. Toistuvuus: n=ei toistoa, D=päivittäin,\n"
-"\t\tW=viikoittain, M=kuukausittain, Y=vuosittain\n"
-"\t 3. Tyyppi: f=vapaa, B=varattu\n"
-"\t 4. Tiedostossa: O=Orage,\n"
-"\t\tA=Arkisto, F=Vieras\n"
-"\t 5. Tapahtuman tyyppi:\n"
-"\t\tE=Tapahtuma, T=Tehtävä, J=Muistiinpano"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Valitse päivä"
+msgstr "Kaksoisnapsauta riviä muokataksesi sitä.\n\nNimikkeet järjestyksessä:\n\t 1. Hälyys: n=ei hälytystä\n\t\t A=hälytys asetettu P=jatkuva hälytys asetettu\n\t 2. Toistuminen: n=ei toistoa\n\t\t H=tunneittan D=päivittäin W=viikottain M=kuukausittain Y=vuosittain\n\t 3. Tyyppi: f=vapaa B=kiireinen\n\t 4. Sijaitsee tiedostossa:\n\t\tO=Orage A=arkisto F=ulkoinen\n\t 5. Tapaamisen tyyypi:\n\t\tE=tapahtuma T=tehtävä J=päiväkirja"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
-msgstr "\tToisto päättynyt, siirretään arkistoon."
+msgstr "\tToisto päättyi, siirretään arkistotiedostoon."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
-msgstr "Arkistointi ei ole käytössä. Lopetetaan."
+msgstr "Arkistointi ei ole käytössä. Poistutaan"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
-msgstr "Arkistointiraja: %d kuukautta"
+msgstr "Arkiston pituus: %d kuukautta"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr "\tArkistoidaan tapahtumia, jotka edeltävät aikaa: %04d-%02d-%02d"
+msgstr "\tArkistoidaan tapahtumat, jotka ovat vanhempia kuin: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
-msgstr "Arkistoin tunnusta: %s"
+msgstr "Arkistoidaan uid: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
-msgstr "\tVTODO ei ole tehty; ei arkistoitu"
+msgstr "\tVTODO ei valmis; ei arkistoitu"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr "\tToistuva. Lopetusvuosi: %04d, kuukausi: %02d. päivä: %02d"
+msgstr "\tToistuva. Päättymisajankohta: vuosi: %04d, kuukausi: %02d, päivä: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Arkistointi tehty\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Aloitetaan arkiston poisto."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
-msgstr "\tVAIHE 1: toistuvien tapahtumien käsittely"
+msgstr "\tVAIHE 1: alustetaan toistuvat tapaamiset"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
-msgstr "\tVAIHE 2: palautetaan arkistoidut tapahtumat"
+msgstr "\tVAIHE 2: palautetaan arkistoidut tapaamiset"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
-msgstr "Arkisto poistettu\n"
+msgstr "Arkiston poisto tehty\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Oragen oletushälytys"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Luotiin hälytyslista Oragen päätiedostoon:"
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Luotiin hälytyslista ulkoiseen tiedostoon: %s (%s)"
+
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "Hälytyslista: Lisätty %d hälytystä. Käsitelty %d tapahtumaa."
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\tLisättiin %d hälytys(tä). Prosessoitiin %d tapahtuma(a)."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tLöytyi %d hälytystä, joista %d on aktiivisia. (Etsitty %d toistuvaa "
-"hälytystä.)"
+msgstr "\tLöydettiing %d hälytystä joista %d on kytketty päälle. (Etsittiin %d toistuvasta hälytyksestä.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
-msgstr "Aloitetaan tuontitiedoston esikäsittely"
+msgstr "Aloitetaan tuontitiedoston alustus"
 
 #: ../src/ical-expimp.c:158
 msgid "... Patched DCREATED to be CREATED."
-msgstr "... Muutettu DCREATED muotoon CREATED"
+msgstr "... Muutettu DCREATED; nyt CREATED."
 
 #: ../src/ical-expimp.c:197
 msgid "... Patched timezone to Orage format."
@@ -1393,2231 +1439,2977 @@
 
 #: ../src/ical-expimp.c:206
 msgid "Import file preprocessing done"
-msgstr "Tuontiedoston esikäsittely tehty"
+msgstr "Tuontitiedoston alustus tehty"
+
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Löydettiin ulkoinen muutos tiedostossa %s."
 
-#: ../src/interface.c:284
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Päivitetään hälytyksiä ja kalenteria ulkoisen tiedoston päivityksen takia."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Kalenteritiedostot"
 
 #: ../src/interface.c:631
 msgid "Current foreign files"
-msgstr "Nykyiset vieraat tiedostot"
+msgstr "Nykyiset ulkoiset tiedostot"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "VAIN LUKU"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
-msgstr "LUKU ja KIRJOITUS"
+msgstr "LUKU JA KIRJOITUS"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
-msgstr "***** Ei vierastiedostoja *****"
+msgstr "***** Ei ulkoisia tiedostoja *****"
+
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Ulkoisen tiedoston lisääminen epäonnistui"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage voi hallita vain 10 ulkoista tiedostoa. Raja saavutettu."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Tiedoston nimi on tyhjä."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Nimi on tyhjä."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Tiedostoa ei ole olemassa."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Sama tiedosto on jo Oragessa."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Sama nimi on jo Oragessa."
 
-#: ../src/interface.c:974
+#: ../src/interface.c:965
 msgid "Import/export"
-msgstr "Vienti/Tuonti"
+msgstr "Tuo/vie"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
-msgstr "Tuonti"
+msgstr "Tuo"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Lue tiedostosta:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Erottele tiedostot pilkulla (,).\n"
-" HUOM: pilkkua ei saa käyttää Oragen tiedostonimissä."
+msgstr "Erota tiedostonimet pilkulla (,).\nHUOMAA: pilkkua ei voi käyttää Oragen käyttämien tiedostojen nimissä."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
-msgstr "Vienti"
+msgstr "Vie"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Kirjoita tiedostoon:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Valitse"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Kaikki tapahtumat"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
-msgstr "Nimetyt tapahtumat:"
+msgstr "Nimetyt tapaamiset:"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Huom: vain Oragen tiedostossa olevat tapahtumat luetaan.\n"
-"Arkistoituja ja vieraita tapahtumia ei viedä."
+msgstr "Huomioi että vain päätiedoston tapaamiset luetaan.\nArkistoituja ja ulkoisia tapahtumia ei viedä."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Huom: vain Oragen tiedostossa olevat tapahtumat luetaan.\n"
-"Vieraita tapahtumia ei viedä."
+msgstr "Huomioi että vain päätiedoston tapaamiset luetaan.\nUlkoisia tapahtumia ei viedä."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
-msgstr "Voit raahata nämä tapahtumalista-ikkunasta."
+msgstr "Voit helposti vetää ja pudottaa nämä tapahtumalistaikkunasta."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
-msgstr "Oragen tapahtumien tunnukset pilkuin erotettuina."
+msgstr "Oragen tapaamis-UID:t pilkuilla erotettuina."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Arkisto"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
-msgstr "Arkistoi nyt (Arkistointiraja: %d kuukautta)"
+msgstr "Arkisto nyt (pituus: %d kuukautta)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
-msgstr "Voit muuttaa arkistointirajaa asetuksista"
+msgstr "Voit vaihtaa arkiston pituutta muuttujin"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Palauta arkisto nyt"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Palauta kaikki arkistoidut tapahtumat päätiedostoon ja poista arkisto.\n"
-"Tästä on hyötyä esimerkiksi kun haluat siirtää tapahtumia toiseen \n"
-"järjestelmään."
+msgstr "Palauta kaikki arkistoidut tapahtumat Oragen päätiedostoon ja poista arkistointitiedosto.\nTämä on kätevää esimerkiksi viedessä Oragen\ntapaamisia toiseen järjestelmään."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
-msgstr "Oragen tiedostot"
+msgstr "Orage-tiedostot"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Oragen pääkalenteritiedosto"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Nykyinen tiedosto"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Uusi tiedosto"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Toimintovaihtoehdot"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Nykyinen tiedosto:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Uusi tiedosto:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Toiminnon asetukset:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Ainoastaan Oragen sisäisen tiedostonimen vaihto.\n"
-"Ei koske lainkaan käyttöjärjestelmän tiedostoihin.\n"
-"Uuden tiedoston täytyy olla jo olemassa."
+msgstr "Vain Oragen sisäisen tiedoston uudelleennimeäminen.\nEi tee muutoksia tiedostojärjestelmään lainkaan.\nUuden tiedoston pitää olla olemassa."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Kopioi"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr "Nykyinen tiedosto kopioidaan ja alkuperäinen säilyy koskemattomana."
+msgstr "Nykyinen tiedosto kopioitiin ja pysyy muuttamattomana vanhassa paikassa."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Siirrä"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
-msgstr "Nykyinen tiedosto siirretään ja katoaa vanhasta sijainnista."
+msgstr "Nykyinen tiedosto siirrettiin ja katoaa vanhasta paikasta."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Arkistotiedosto"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
-msgstr "Vieraat tiedostot"
+msgstr "Ulkoiset tiedostot"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
-msgstr "Lisää uusi vieras tiedosto"
+msgstr "Lisää uusi ulkoinen tiedosto"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
-msgstr "Vieras tiedosto:"
+msgstr "Ulkoinen tiedosto:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Asetukset"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Näkyvä nimi:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Vain luku"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Valitse tämä, jos haluat olla varma, ettei Orage koskaan muokkaa tätä "
-"tiedostoa.\n"
-"Huomaa, että vieraan tiedoston muokkaaminen saattaa tehdä siitä "
-"yhteensopimattoman lähdesovelluksen kanssa!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Valitse tämä jos haluat varmistaa ettei Orage koskaa muuta tätä tiedostoa.\nHuomaa että ulkoisten tiedostojen muokkaminen voi tehdä ne epäyhteensopiviksi alkuperäisen työkalun kanssa!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Tämä sisäinen nimi näytetään käyttäjälle tiedoston nimen sijasta."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
-msgstr "Siirrä tietoa - Orage"
+msgstr "Vaihtotiedot - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tTämä on %s versio %s\n"
-"\n"
+msgstr "\tTämä on %s versio %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr "\tLevitetty GNU lisenssin alaisuudessa.\n"
+msgstr "Julkaistu GNU GPL -lisenssin version 2 ehdoilla\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr "\tKäännetty versiolla: GTK+-%d.%d.%d,  "
+msgstr "\tKäännetty versiolle GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
-msgstr "Nyt käytössä GTK+-%d.%d.%d.\n"
+msgstr "käyttäen versiota GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
-msgstr "\tKäyttää DBUS:ia tuontiin.\n"
+msgstr "\tKäytetään DBusia tuomiseen.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr "\tEi käytä DBUS:ia. Tuonti toimii vain osittain.\n"
+msgstr "\tEi käytetä DBusia. Tuominen toimii vain osittain.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
-msgstr "\tKäyttää libnotify-kirjastoa.\n"
+msgstr "\tKäytetään libnotifyä.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
-msgstr "\tEi käytä libnotify-kirjastoa.\n"
+msgstr "\tEi käytetä libnotifyä.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
-msgstr "\tAutomaattinen arkistointi on käytössä.\n"
+msgstr "\tKäytetään automaattista arkistointia.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
-msgstr "\tArkistointi ei ole käytössä.\n"
+msgstr "\tEi käytetä arkistointia.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
-msgstr "\tKäytetään systeemin libical pakettia.\n"
+msgstr "\tKäytetään käyttöjärjestelmän libical-pakettia.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
-msgstr "\tKäytetään Oragen omaa libical versiota.\n"
+msgstr "\tKäytetään Oragen paikallista libical-versiota.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Käyttö: orage [valitsimet] [tiedostot]\n"
-"\n"
+msgstr "Käyttö: orage [valinnat] [tiedostot]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
-msgstr "Valitsimet:\n"
+msgstr "Valinnat:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
-msgstr "--version (-v) \t\tNäytä Oragen versio\n"
+msgstr "--version (-v) \t\tnäytä Oragen versio\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
-msgstr "--help (-h) \t\tTulosta tämä teksti\n"
+msgstr "--help (-h) \t\tnäytä tämä teksti\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
-msgstr "--preferences (-p) \tNäytä asetusikkuna\n"
+msgstr "--preferences (-p) \tnäytä asetukset\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\tnäytä/piilota Orage\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) tiedosto [RW] \tlisää vieras tiedosto\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) tiedosto [RW] [nimi] \tlisää ulkoinen tiedosto\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr "--remove-foreign (-r) tiedosto \tpoista vieraat tiedosto\n"
+msgstr "--remove-foreign (-r) tiedosto \tpoista ulkoinen tiedosto\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
-"--export (-e) tiedosto [tapahtuma...] \tkopioi tapahtumia Oragesta "
-"tiedostoon\n"
+msgstr "--export (-e) tiedosto [tapaaminen...] \tvie tapaamiset Oragesta tiedostoon\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
-msgstr "files=Orageen luettavat ical-tiedostot\n"
+msgstr "tiedostot=iCal-tiedostot jotka ladataan Orageen\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
-msgstr "\tdbus ei sisälly Orageen.\n"
+msgstr "\tDBus ei sisälly Orageen. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tIlman dbus:ia [tiedostot] ja vierastiedostovalinnat(-a & -r) kelpaavat "
-"vain Oragen käynnistyksen yhteydessä\n"
+msgstr "\tilman DBusia [tiedostot] ja ulkoisten tiedostojen valintoja (-a & -r) voi käyttää vain kun Orage käynnistetään \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"tuntematon valitsin %s\n"
-"\n"
+msgstr "\nTuntematon valinta %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
-msgstr "_Tiedostojen käsittely"
+msgstr "_Vaihtotiedot"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
-msgstr "Näytä valittu _päivämäärä"
+msgstr "Näytä valittu _päivä"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
-msgstr "Näytä valittu v_iikko"
+msgstr "Näytä valittu _viikko"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
-msgstr "_Valitse tämä päivä"
+msgstr "Valitse _tämä päivä"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "_Maailman aika"
+msgstr "Näytä _maailmanlaajuinen aika"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Ohje"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Otsikkoa ei määritelty"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr "Sijainti: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n Huomaa:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:495
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Otsikko: %s\n"
-" Sijanti: %s\n"
-" Alkaa:\t   %s\n"
-" Määräaika:%s\n"
-" Tehty:\t   %s\n"
-" Huomautukset:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "Otsikko: %s\n%s Alkamisaika:\t%s\n Tehtävä ennen:\t%s\n Tila:\t%s%s"
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Otsikko: %s\n"
-" Sijanti: %s\n"
-" Alkaa:\t   %s\n"
-" Määräaika:%s\n"
-" Huomautukset:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Otsikko: %s\n%s Alkamisaika:\t%s\n Päättymisaika:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
-msgstr "<b>Tehtävät:</b>"
+msgstr "<b>Tehtävälista:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
-msgstr "<b>Tapahtumat %s:</b>"
+msgstr "<b>Tapahtumat - %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
-msgstr "<b>Tapahtumat %s - %s:</b>"
+msgstr "<b>Tapahtumat ajalle %s - %s:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "Pääasetukset"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
-msgstr "On suositeltavaa aina asettaa oma aikavyöhyke."
+msgstr "Sinun tulisi aina määrittää paikallinen aikavyöhykkeesi."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
-msgstr "Arkistointiraja (kuukautta)"
+msgstr "Arkiston pituus (kuukausia)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = ei arkistointia)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr "Arkistointi säästää aikaa ja tilaa."
+msgstr "Arkistointia käytetään säästämään aikaa ja tilaa käsitellessä tapahtumia."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Äänikomento"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr "Komento välitetään komentotulkille hälytysäänen tuottamiseksi."
+msgstr "Tämä komento suoritetaan äänihälytysten aktivoituessa."
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "Näkymät"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Kalenteri-ikkuna"
 
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Kalenterin pääikkuna"
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Kalenterin visuaaliset yksityiskohdat"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
-msgstr "Näytä kehys"
+msgstr "Näytä reunukset"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "Näytä valikko"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Näytä kuukausi ja vuosi"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
 msgstr "Näytä päivien nimet"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
-msgstr "Näytä viikon numerot"
+msgstr "Näytä viikkonumerot"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Näytä kuukausi ja vuosi"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Kalenteri tietolaatikot"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "Näytä tehtävälista"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
-msgstr "Tapahtumalistassa näytettävien päivien lukumäärä"
+msgstr "Tapahtumalistassa näytettyjen päivien määrä"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
 msgstr "0 = älä näytä tapahtumalistaa lainkaan"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Kalenterin näkyminen"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
-msgstr "Näytä kaikissa työpöydissä"
+msgstr "Näytä kaikilla työpöydillä"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
-msgstr "Pidä päällimmäisenä"
+msgstr "Pidä päällä"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
-msgstr "Näytä tehtäväpalkissa"
+msgstr "Näytä sovelluspalkissa"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "Näytä työtilan vaihtajassa"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
-msgstr "Näytä ilmoitusalueella"
+msgstr "Näytä järjestelmän ilmoitusalueella"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
-msgstr "Kalenterin käynnistys"
+msgstr "Kalenterin alku"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Näytä"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Piilota"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
-msgstr "Pienennä"
-
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr "Lisäasetukset"
+msgstr "Pienennetty"
 
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr "Avatessa kalenterin pääikkuna"
-
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "Valitse tämä päivä"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr "Muista edellinen päivävalinta"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "Kun kalenteri-ikkuna avataan"
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "Käytä muuttuvaa kuvaketta"
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "Käytä muuttuvaa kuvaketta"
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Valitse kuluva päivä"
 
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "Muuttuva kuvake näyttää kuluvan kuukauden ja päivän."
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Valitse aiemmin valittu päivä"
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Pääkalenterin kaksoisnapsautus näyttää"
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Kalenteripäivän kaksoisnapsauttaminen näyttää"
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
-msgstr "Päivänäkymän"
+msgstr "Päivänäkymä"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
-msgstr "Tapahtumalistan"
+msgstr "Tapahtumalista"
+
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Lisäasetukset"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr "Tapahtumalista ikkunan"
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Tapahtumalistaikkuna"
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
-msgstr "Näytettävien lisäpäivien määrä"
+msgstr "Tapahtumalistassa näytettyjen lisäpäivien määrä"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
-msgstr ""
-"Tämä on vain oletusarvo. Sitä voi muuttaa tarpeen mukaan tapahtumalista "
-"ikkunassa."
+msgstr "Tämä on vain oletusarvo, voit vaihtaa sen tapahtumalistaikkunassa."
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Näytä vain ensimmäinen toistuva tapahtuma"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Päivänäkymän ikkunan ensimmäinen oletuspäivä"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Viikon ensimmäinen päivä"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Valittu päivä"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Käytä dynaamista ilmoitusalueen kuvaketta"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Käytä dynaamista kuvaketta"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Dynaaminen kuvake näyttää nykyisen kuukauden ja päivän."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
-msgstr "Käytä horrosajastinta"
+msgstr "Käytä herätysajastinta"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-"Aseta tämä, jos Oragella on vaikeuksia herätä uni- tai horrostilasta. "
-"(Esimerkiksi ilmoitusalueen ikonissa on väärä päivä tai hälytys ei laukea.)"
+msgstr "Käytä tätä ajastinta jos Oragella on vaikeuksia käynnistyä keskeytys- tai lepotilassa palautuessa. (Esimerkiksi ilmoitusalueen kuvake ei päivity tai hälytykset eivät aktivoidu.)"
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Ulkoisen tiedoston visuaalinen oletushälytys"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Orage-ikkuna"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Ilmoitushuomautus"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Lopeta aina kun pyydetään sulkemaan"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Lopeta aina"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Oletuksena Orage pidetään käynnissä taustalla kun se suljetaan. Jos valitset tämän valinnan, Orage ei jää käyntiin taustalle vaan se suljetaan kokonaan kun sen ikkuna suljetaan."
+
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Oragen asetukset"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
-msgstr "Oragen ensimmäinen käynnistys. Etsitään aikavyöhykettä."
+msgstr "Ensimmäinen Oragen käynnistys. Etsitään oletusaikavyöhykettä."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
-msgstr "Aikavyöhyke asetettu arvoon %s."
+msgstr "Oletusaikavyöhykkeeksi asetettu %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
-msgstr "Aikavyöhykettä ei löytynyt. Ole hyvä ja aseta se käsin."
+msgstr "Oletusaikavyöhykettä ei löytynyt, ole hyvä ja aseta aikavyöhyke manuaalisesti."
 
 #: ../src/reminder.c:562
 msgid "Reminder "
-msgstr "Muistutus "
+msgstr "Muistutus"
 
 #: ../src/reminder.c:591
 msgid "Open"
 msgstr "Avaa"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Muistutus - Orage"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr "Muistuta uudelleen yllä olevan ajan jälkeen"
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Siirrä myöhemmäksi"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr "Paina <Suorita> muistuttaaksesi uudelleen halutun ajan jälkeen:"
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
+msgstr "Muistuta minua uudelleen määritetyn ajan päästä"
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
-msgstr "Seuraavat hälytykset:"
+msgstr "Seuraavat päälle kytketyt hälytykset:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d pv %02d t %02d min kuluttua: %s"
+msgstr "\n%02d päivää %02d tuntia %02d minuuttia tapahtumaan: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Hälytyksiä ei löytynyt"
+msgstr "\nPäälle kytkettyjä hälytyksiä ei löytynyt"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
-msgstr "Afrikka"
+msgstr "Africa"
 
 #: ../src/timezone_names.c:37
 msgid "Africa/Abidjan"
-msgstr "Afrikka/Abidjan"
+msgstr "Africa/Abidjan"
 
 #: ../src/timezone_names.c:38
 msgid "Africa/Accra"
-msgstr "Afrikka/Accra"
+msgstr "Africa/Accra"
 
 #: ../src/timezone_names.c:39
 msgid "Africa/Addis_Ababa"
-msgstr "Afrikka/Addis Abeba"
+msgstr "Africa/Addis_Ababa"
 
 #: ../src/timezone_names.c:40
 msgid "Africa/Algiers"
-msgstr "Afrikka/Alger"
+msgstr "Africa/Algiers"
 
 #: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr "Afrikka/Asmera"
+msgid "Africa/Asmara"
+msgstr "Africa/Asmara"
 
 #: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr "Afrikka/Bamako"
+msgid "Africa/Asmera"
+msgstr "Africa/Asmera"
 
 #: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr "Afrikka/Bangui"
+msgid "Africa/Bamako"
+msgstr "Africa/Bamako"
 
 #: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr "Afrikka/Banjul"
+msgid "Africa/Bangui"
+msgstr "Africa/Bangui"
 
 #: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr "Afrikka/Bissau"
+msgid "Africa/Banjul"
+msgstr "Africa/Banjul"
 
 #: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr "Afrikka/Blantyre"
+msgid "Africa/Bissau"
+msgstr "Africa/Bissau"
 
 #: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr "Afrikka/Brazzaville"
+msgid "Africa/Blantyre"
+msgstr "Africa/Blantyre"
 
 #: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr "Afrikka/Bujumbura"
+msgid "Africa/Brazzaville"
+msgstr "Africa/Brazzaville"
 
 #: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr "Afrikka/Kairo"
+msgid "Africa/Bujumbura"
+msgstr "Africa/Bujumbura"
 
 #: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr "Afrikka/Casablanca"
+msgid "Africa/Cairo"
+msgstr "Africa/Cairo"
 
 #: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr "Afrikka/Ceuta"
+msgid "Africa/Casablanca"
+msgstr "Africa/Casablanca"
 
 #: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr "Afrikka/Conakry"
+msgid "Africa/Ceuta"
+msgstr "Africa/Ceuta"
 
 #: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr "Afrikka/Dakar"
+msgid "Africa/Conakry"
+msgstr "Africa/Conakry"
 
 #: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr "Afrikka/Dar es Salaam"
+msgid "Africa/Dakar"
+msgstr "Africa/Dakar"
 
 #: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr "Afrikka/Djibouti"
+msgid "Africa/Dar_es_Salaam"
+msgstr "Africa/Dar_es_Salaam"
 
 #: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr "Afrikka/Douala"
+msgid "Africa/Djibouti"
+msgstr "Africa/Djibouti"
 
 #: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr "Afrikka/El Aaiún"
+msgid "Africa/Douala"
+msgstr "Africa/Douala"
 
 #: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr "Afrikka/Freetown"
+msgid "Africa/El_Aaiun"
+msgstr "Africa/El_Aaiun"
 
 #: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr "Afrikka/Gaborone"
+msgid "Africa/Freetown"
+msgstr "Africa/Freetown"
 
 #: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr "Afrikka/Harare"
+msgid "Africa/Gaborone"
+msgstr "Africa/Gaborone"
 
 #: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr "Afrikka/Johannesburg"
+msgid "Africa/Harare"
+msgstr "Africa/Harare"
 
 #: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr "Afrikka/Kampala"
+msgid "Africa/Juba"
+msgstr "Africa/Juba"
 
 #: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr "Afrikka/Khartum"
+msgid "Africa/Johannesburg"
+msgstr "Africa/Johannesburg"
 
 #: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr "Afrikka/Kigali"
+msgid "Africa/Kampala"
+msgstr "Africa/Kampala"
 
 #: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr "Afrikka/Kinshasa"
+msgid "Africa/Khartoum"
+msgstr "Africa/Khartoum"
 
 #: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr "Afrikka/Lagos"
+msgid "Africa/Kigali"
+msgstr "Africa/Kigali"
 
 #: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr "Afrikka/Libreville"
+msgid "Africa/Kinshasa"
+msgstr "Africa/Kinshasa"
 
 #: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr "Afrikka/Lomé"
+msgid "Africa/Lagos"
+msgstr "Africa/Lagos"
 
 #: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr "Afrikka/Luanda"
+msgid "Africa/Libreville"
+msgstr "Africa/Libreville"
 
 #: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr "Afrikka/Lubumbashi"
+msgid "Africa/Lome"
+msgstr "Africa/Lome"
 
 #: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr "Afrikka/Lusaka"
+msgid "Africa/Luanda"
+msgstr "Africa/Luanda"
 
 #: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr "Afrikka/Malabo"
+msgid "Africa/Lubumbashi"
+msgstr "Africa/Lubumbashi"
 
 #: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr "Afrikka/Maputo"
+msgid "Africa/Lusaka"
+msgstr "Africa/Lusaka"
 
 #: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr "Afrikka/Maseru"
+msgid "Africa/Malabo"
+msgstr "Africa/Malabo"
 
 #: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr "Afrikka/Mbabane"
+msgid "Africa/Maputo"
+msgstr "Africa/Maputo"
 
 #: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr "Afrikka/Mogadishu"
+msgid "Africa/Maseru"
+msgstr "Africa/Maseru"
 
 #: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr "Afrikka/Monrovia"
+msgid "Africa/Mbabane"
+msgstr "Africa/Mbabane"
 
 #: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr "Afrikka/Nairobi"
+msgid "Africa/Mogadishu"
+msgstr "Africa/Mogadishu"
 
 #: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr "Afrikka/Ndjamena"
+msgid "Africa/Monrovia"
+msgstr "Africa/Monrovia"
 
 #: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr "Afrikka/Niamey"
+msgid "Africa/Nairobi"
+msgstr "Africa/Nairobi"
 
 #: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr "Afrikka/Nouakchott"
+msgid "Africa/Ndjamena"
+msgstr "Africa/Ndjamena"
 
 #: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr "Afrikka/Ouagadougou"
+msgid "Africa/Niamey"
+msgstr "Africa/Niamey"
 
 #: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr "Afrikka/Porto-Novo"
+msgid "Africa/Nouakchott"
+msgstr "Africa/Nouakchott"
 
 #: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr "Afrikka/São Tomé"
+msgid "Africa/Ouagadougou"
+msgstr "Africa/Ouagadougou"
 
 #: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr "Afrikka/Timbuktu"
+msgid "Africa/Porto-Novo"
+msgstr "Africa/Porto-Novo"
 
 #: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr "Afrikka/Tripoli"
+msgid "Africa/Sao_Tome"
+msgstr "Africa/Sao_Tome"
 
 #: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr "Afrikka/Tunis"
+msgid "Africa/Timbuktu"
+msgstr "Africa/Timbuktu"
 
 #: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr "Afrikka/Windhoek"
+msgid "Africa/Tripoli"
+msgstr "Africa/Tripoli"
 
 #: ../src/timezone_names.c:89
-msgid "America"
-msgstr "Amerikka"
+msgid "Africa/Tunis"
+msgstr "Africa/Tunis"
 
 #: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr "Amerikka/Adak"
+msgid "Africa/Windhoek"
+msgstr "Africa/Windhoek"
 
 #: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr "Amerikka/Anchorage"
+msgid "America"
+msgstr "America"
 
 #: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr "Amerikka/Anguilla"
+msgid "America/Adak"
+msgstr "America/Adak"
 
 #: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr "Amerikka/Antigua"
+msgid "America/Anchorage"
+msgstr "America/Anchorage"
 
 #: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr "Amerikka/Araguaina"
+msgid "America/Anguilla"
+msgstr "America/Anguilla"
 
 #: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr "Amerikka/Argentiina/Buenos Aires"
+msgid "America/Antigua"
+msgstr "America/Antigua"
 
 #: ../src/timezone_names.c:96
-msgid "America/Argentina/Catamarca"
-msgstr "Amerikka/Argentiina/Catamarca"
+msgid "America/Araguaina"
+msgstr "America/Araguaina"
 
 #: ../src/timezone_names.c:97
-msgid "America/Argentina/Cordoba"
-msgstr "Amerikka/Argentiina/Córdoba"
+msgid "America/Argentina/Buenos_Aires"
+msgstr "America/Argentina/Buenos_Aires"
 
 #: ../src/timezone_names.c:98
-msgid "America/Argentina/Jujuy"
-msgstr "Amerikka/Argentiina/Jujuy"
+msgid "America/Argentina/Catamarca"
+msgstr "America/Argentina/Catamarca"
 
 #: ../src/timezone_names.c:99
-msgid "America/Argentina/Mendoza"
-msgstr "Amerikka/Argentiina/Mendoza"
+msgid "America/Argentina/ComodRivadavia"
+msgstr "America/Argentina/ComodRivadavia"
 
 #: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr "Amerikka/Aruba"
+msgid "America/Argentina/Cordoba"
+msgstr "America/Argentina/Cordoba"
 
 #: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr "Amerikka/Asunción"
+msgid "America/Argentina/Jujuy"
+msgstr "America/Argentina/Jujuy"
 
 #: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr "Amerikka/Barbados"
+msgid "America/Argentina/La_Rioja"
+msgstr "America/Argentina/La_Rioja"
 
 #: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr "Amerikka/Belém"
+msgid "America/Argentina/Mendoza"
+msgstr "America/Argentina/Mendoza"
 
 #: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr "Amerikka/Belize"
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "America/Argentina/Rio_Gallegos"
 
 #: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr "Amerikka/Boa Vista"
+msgid "America/Argentina/Salta"
+msgstr "America/Argentina/Salta"
 
 #: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr "Amerikka/Bogotá"
+msgid "America/Argentina/San_Juan"
+msgstr "America/Argentina/San_Juan"
 
 #: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr "Amerikka/Boise"
+msgid "America/Argentina/San_Luis"
+msgstr "America/Argentina/San_Luis"
 
 #: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr "Amerikka/Buenos Aires"
+msgid "America/Argentina/Tucuman"
+msgstr "America/Argentina/Tucuman"
 
 #: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr "Amerikka/Cambridge Bay"
+msgid "America/Argentina/Ushuaia"
+msgstr "America/Argentina/Ushuaia"
 
 #: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr "Amerikka/Cancún"
+msgid "America/Aruba"
+msgstr "America/Aruba"
 
 #: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr "Amerikka/Caracas"
+msgid "America/Asuncion"
+msgstr "America/Asuncion"
 
 #: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr "Amerikka/Catamarca"
+msgid "America/Atikokan"
+msgstr "America/Atikokan"
 
 #: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr "Amerikka/Cayenne"
+msgid "America/Atka"
+msgstr "America/Atka"
 
 #: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr "Amerikka/Cayman"
+msgid "America/Bahia"
+msgstr "America/Bahia"
 
 #: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr "Amerikka/Chicago"
+msgid "America/Bahia_Banderas"
+msgstr "America/Bahia_Banderas"
 
 #: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr "Amerikka/Chihuahua"
+msgid "America/Barbados"
+msgstr "America/Barbados"
 
 #: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr "Amerikka/Córdoba"
+msgid "America/Belem"
+msgstr "America/Belem"
 
 #: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr "Amerikka/Costa Rica"
+msgid "America/Belize"
+msgstr "America/Belize"
 
 #: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr "Amerikka/Cuiaba"
+msgid "America/Blanc-Sablon"
+msgstr "America/Blanc-Sablon"
 
 #: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr "Amerikka/Curaçao"
+msgid "America/Boa_Vista"
+msgstr "America/Boa_Vista"
 
 #: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr "Amerikka/Dawson"
+msgid "America/Bogota"
+msgstr "America/Bogota"
 
 #: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr "Amerikka/Dawson Creek"
+msgid "America/Boise"
+msgstr "America/Boise"
 
 #: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr "Amerikka/Denver"
+msgid "America/Buenos_Aires"
+msgstr "America/Buenos_Aires"
 
 #: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr "Amerikka/Detroit"
+msgid "America/Cambridge_Bay"
+msgstr "America/Cambridge_Bay"
 
 #: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr "Amerikka/Dominica"
+msgid "America/Campo_Grande"
+msgstr "America/Campo_Grande"
 
 #: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr "Amerikka/Edmonton"
+msgid "America/Cancun"
+msgstr "America/Cancun"
 
 #: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr "Amerikka/Eirunepe"
+msgid "America/Caracas"
+msgstr "America/Caracas"
 
 #: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr "Amerikka/El Salvador"
+msgid "America/Catamarca"
+msgstr "America/Catamarca"
 
 #: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr "Amerikka/Fortaleza"
+msgid "America/Cayenne"
+msgstr "America/Cayenne"
 
 #: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr "Amerikka/Glace Bay"
+msgid "America/Cayman"
+msgstr "America/Cayman"
 
 #: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr "Amerikka/Godthåb"
+msgid "America/Chicago"
+msgstr "America/Chicago"
 
 #: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr "Amerikka/Goose Bay"
+msgid "America/Chihuahua"
+msgstr "America/Chihuahua"
 
 #: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr "Amerikka/Grand Turk"
+msgid "America/Coral_Harbour"
+msgstr "America/Coral_Harbour"
 
 #: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr "Amerikka/Grenada"
+msgid "America/Cordoba"
+msgstr "America/Cordoba"
 
 #: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr "Amerikka/Guadeloupe"
+msgid "America/Costa_Rica"
+msgstr "America/Costa_Rica"
 
 #: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr "Amerikka/Guatemala"
+msgid "America/Creston"
+msgstr "America/Creston"
 
 #: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr "Amerikka/Guayaquil"
+msgid "America/Cuiaba"
+msgstr "America/Cuiaba"
 
 #: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr "Amerikka/Guyana"
+msgid "America/Curacao"
+msgstr "America/Curacao"
 
 #: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr "Amerikka/Halifax"
+msgid "America/Danmarkshavn"
+msgstr "America/Danmarkshavn"
 
 #: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr "Amerikka/Havanna"
+msgid "America/Dawson"
+msgstr "America/Dawson"
 
 #: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr "Amerikka/Hermosillo"
+msgid "America/Dawson_Creek"
+msgstr "America/Dawson_Creek"
 
 #: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr "Amerikka/Indiana/Indianapolis"
+msgid "America/Denver"
+msgstr "America/Denver"
 
 #: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr "Amerikka/Indiana/Knox"
+msgid "America/Detroit"
+msgstr "America/Detroit"
 
 #: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr "Amerikka/Indiana/Marengo"
+msgid "America/Dominica"
+msgstr "America/Dominica"
 
 #: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr "Amerikka/Indiana/Vevay"
+msgid "America/Edmonton"
+msgstr "America/Edmonton"
 
 #: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr "Amerikka/Indianapolis"
+msgid "America/Ensenada"
+msgstr "America/Ensenada"
 
 #: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr "Amerikka/Inuvik"
+msgid "America/Eirunepe"
+msgstr "America/Eirunepe"
 
 #: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr "Amerikka/Iqaluit"
+msgid "America/El_Salvador"
+msgstr "America/El_Salvador"
 
 #: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr "Amerikka/Jamaica"
+msgid "America/Fortaleza"
+msgstr "America/Fortaleza"
 
 #: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr "Amerikka/Jujuy"
+msgid "America/Fort_Wayne"
+msgstr "America/Fort_Wayne"
 
 #: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr "Amerikka/Juneau"
+msgid "America/Glace_Bay"
+msgstr "America/Glace_Bay"
 
 #: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr "Amerikka/Kentucky/Louisville"
+msgid "America/Godthab"
+msgstr "America/Godthab"
 
 #: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr "Amerikka/Kentucky/Monticello"
+msgid "America/Goose_Bay"
+msgstr "America/Goose_Bay"
 
 #: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr "Amerikka/La Paz"
+msgid "America/Grand_Turk"
+msgstr "America/Grand_Turk"
 
 #: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr "Amerikka/Lima"
+msgid "America/Grenada"
+msgstr "America/Grenada"
 
 #: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr "Amerikka/Los Angeles"
+msgid "America/Guadeloupe"
+msgstr "America/Guadeloupe"
 
 #: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr "Amerikka/Louisville"
+msgid "America/Guatemala"
+msgstr "America/Guatemala"
 
 #: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr "Amerikka/Maceió"
+msgid "America/Guayaquil"
+msgstr "America/Guayaquil"
 
 #: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr "Amerikka/Managua"
+msgid "America/Guyana"
+msgstr "America/Guyana"
 
 #: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr "Amerikka/Manaus"
+msgid "America/Halifax"
+msgstr "America/Halifax"
 
 #: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr "Amerikka/Martinique"
+msgid "America/Havana"
+msgstr "America/Havana"
 
 #: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr "Amerikka/Mazatlán"
+msgid "America/Hermosillo"
+msgstr "America/Hermosillo"
 
 #: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr "Amerikka/Mendoza"
+msgid "America/Indiana/Indianapolis"
+msgstr "America/Indiana/Indianapolis"
 
 #: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr "Amerikka/Menominee"
+msgid "America/Indiana/Knox"
+msgstr "America/Indiana/Knox"
 
 #: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr "Amerikka/Mérida"
+msgid "America/Indiana/Marengo"
+msgstr "America/Indiana/Marengo"
 
 #: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr "Amerikka/Mexico City"
+msgid "America/Indiana/Petersburg"
+msgstr "America/Indiana/Petersburg"
 
 #: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr "Amerikka/Miquelon"
+msgid "America/Indiana/Tell_City"
+msgstr "America/Indiana/Tell_City"
 
 #: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr "Amerikka/Monterrey"
+msgid "America/Indiana/Vevay"
+msgstr "America/Indiana/Vevay"
 
 #: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr "Amerikka/Montevideo"
+msgid "America/Indiana/Vincennes"
+msgstr "America/Indiana/Vincennes"
 
 #: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr "Amerikka/Montreal"
+msgid "America/Indiana/Winamac"
+msgstr "America/Indiana/Winamac"
 
 #: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr "Amerikka/Montserrat"
+msgid "America/Indianapolis"
+msgstr "America/Indianapolis"
 
 #: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr "Amerikka/Nassau"
+msgid "America/Inuvik"
+msgstr "America/Inuvik"
 
 #: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr "Amerikka/New York"
+msgid "America/Iqaluit"
+msgstr "America/Iqaluit"
 
 #: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr "Amerikka/Nipigon"
+msgid "America/Jamaica"
+msgstr "America/Jamaica"
 
 #: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr "Amerikka/Nome"
+msgid "America/Jujuy"
+msgstr "America/Jujuy"
 
 #: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr "Amerikka/Noronha"
+msgid "America/Juneau"
+msgstr "America/Juneau"
 
 #: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr "Amerikka/Panama"
+msgid "America/Kentucky/Louisville"
+msgstr "America/Kentucky/Louisville"
 
 #: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr "Amerikka/Pangnirtung"
+msgid "America/Kentucky/Monticello"
+msgstr "America/Kentucky/Monticello"
 
 #: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr "Amerikka/Paramaribo"
+msgid "America/Knox_IN"
+msgstr "America/Knox_IN"
 
 #: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr "Amerikka/Phoenix"
+msgid "America/Kralendijk"
+msgstr "America/Kralendijk"
 
 #: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr "Amerikka/Port-au-Prince"
+msgid "America/La_Paz"
+msgstr "America/La_Paz"
 
 #: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr "Amerikka/Port of Spain"
+msgid "America/Lima"
+msgstr "America/Lima"
 
 #: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr "Amerikka/Porto Velho"
+msgid "America/Los_Angeles"
+msgstr "America/Los_Angeles"
 
 #: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr "Amerikka/Puerto Rico"
+msgid "America/Louisville"
+msgstr "America/Louisville"
 
 #: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr "Amerikka/Rainy River"
+msgid "America/Lower_Princes"
+msgstr "America/Lower_Princes"
 
 #: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr "Amerikka/Rankin Inlet"
+msgid "America/Maceio"
+msgstr "America/Maceio"
 
 #: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr "Amerikka/Recife"
+msgid "America/Managua"
+msgstr "America/Managua"
 
 #: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr "Amerikka/Regina"
+msgid "America/Manaus"
+msgstr "America/Manaus"
 
 #: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr "Amerikka/Rio Branco"
+msgid "America/Marigot"
+msgstr "America/Marigot"
 
 #: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr "Amerikka/Rosario"
+msgid "America/Martinique"
+msgstr "America/Martinique"
 
 #: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr "Amerikka/Santiago"
+msgid "America/Matamoros"
+msgstr "America/Matamoros"
 
 #: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr "Amerikka/Santo Domingo"
+msgid "America/Mazatlan"
+msgstr "America/Mazatlan"
 
 #: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr "Amerikka/São Paulo"
+msgid "America/Mendoza"
+msgstr "America/Mendoza"
 
 #: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr "Amerikka/Scoresbysund"
+msgid "America/Menominee"
+msgstr "America/Menominee"
 
 #: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr "Amerikka/Shiprock"
+msgid "America/Merida"
+msgstr "America/Merida"
 
 #: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr "Amerikka/St Johns"
+msgid "America/Metlakatla"
+msgstr "America/Metlakatla"
 
 #: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr "Amerikka/St Kitts"
+msgid "America/Mexico_City"
+msgstr "America/Mexico_City"
 
 #: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr "Amerikka/St Lucia"
+msgid "America/Miquelon"
+msgstr "America/Miquelon"
 
 #: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr "Amerikka/St Thomas"
+msgid "America/Moncton"
+msgstr "America/Moncton"
 
 #: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr "Amerikka/St Vincent"
+msgid "America/Monterrey"
+msgstr "America/Monterrey"
 
 #: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr "Amerikka/Swift Current"
+msgid "America/Montevideo"
+msgstr "America/Montevideo"
 
 #: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr "Amerikka/Tegucigalpa"
+msgid "America/Montreal"
+msgstr "America/Montreal"
 
 #: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr "Amerikka/Thule"
+msgid "America/Montserrat"
+msgstr "America/Montserrat"
 
 #: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr "Amerikka/Thunder Bay"
+msgid "America/Nassau"
+msgstr "America/Nassau"
 
 #: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr "Amerikka/Tijuana"
+msgid "America/New_York"
+msgstr "America/New_York"
 
 #: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr "Amerikka/Tortola"
+msgid "America/Nipigon"
+msgstr "America/Nipigon"
 
 #: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr "Amerikka/Vancouver"
+msgid "America/Nome"
+msgstr "America/Nome"
 
 #: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr "Amerikka/Whitehorse"
+msgid "America/North_Dakota/Beulah"
+msgstr "America/North_Dakota/Beulah"
 
 #: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr "Amerikka/Winnipeg"
+msgid "America/North_Dakota/Center"
+msgstr "America/North_Dakota/Center"
 
 #: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr "Amerikka/Yakutat"
+msgid "America/North_Dakota/New_Salem"
+msgstr "America/North_Dakota/New_Salem"
 
 #: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr "Amerikka/Yellowknife"
+msgid "America/Noronha"
+msgstr "America/Noronha"
 
 #: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr "Etelämanner"
+msgid "America/Ojinaga"
+msgstr "America/Ojinaga"
 
 #: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr "Etelämanner/Casey"
+msgid "America/Panama"
+msgstr "America/Panama"
 
 #: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr "Etelämanner/Davis"
+msgid "America/Pangnirtung"
+msgstr "America/Pangnirtung"
 
 #: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr "Etelämanner/Dumont d'Urville"
+msgid "America/Paramaribo"
+msgstr "America/Paramaribo"
 
 #: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr "Etelämanner/Mawson"
+msgid "America/Phoenix"
+msgstr "America/Phoenix"
 
 #: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr "Etelämanner/McMurdo"
+msgid "America/Port-au-Prince"
+msgstr "America/Port-au-Prince"
 
 #: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr "Etelämanner/Palmer"
+msgid "America/Port_of_Spain"
+msgstr "America/Port_of_Spain"
 
 #: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr "Etelämanner/Etelänapa"
+msgid "America/Porto_Acre"
+msgstr "America/Porto_Acre"
 
 #: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr "Etelämanner/Shōwa"
+msgid "America/Porto_Velho"
+msgstr "America/Porto_Velho"
 
 #: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr "Etelämanner/Vostok"
+msgid "America/Puerto_Rico"
+msgstr "America/Puerto_Rico"
 
 #: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr "Pohjoismanner"
+msgid "America/Rainy_River"
+msgstr "America/Rainy_River"
 
 #: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr "Pohjoismanner/Longyearbyen"
+msgid "America/Rankin_Inlet"
+msgstr "America/Rankin_Inlet"
 
 #: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr "Aasia"
+msgid "America/Recife"
+msgstr "America/Recife"
 
 #: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr "Aasia/Aden"
+msgid "America/Regina"
+msgstr "America/Regina"
 
 #: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr "Aasia/Almaty"
+msgid "America/Resolute"
+msgstr "America/Resolute"
 
 #: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr "Aasia/Amman"
+msgid "America/Rio_Branco"
+msgstr "America/Rio_Branco"
 
 #: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr "Aasia/Anadyr"
+msgid "America/Rosario"
+msgstr "America/Rosario"
 
 #: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr "Aasia/Aqtau"
+msgid "America/Santa_Isabel"
+msgstr "America/Santa_Isabel"
 
 #: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr "Aasia/Aqtöbe"
+msgid "America/Santarem"
+msgstr "America/Santarem"
 
 #: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr "Aasia/Ashgabat"
+msgid "America/Santiago"
+msgstr "America/Santiago"
 
 #: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr "Aasia/Bagdad"
+msgid "America/Santo_Domingo"
+msgstr "America/Santo_Domingo"
 
 #: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr "Aasia/Bahrain"
+msgid "America/Sao_Paulo"
+msgstr "America/Sao_Paulo"
 
 #: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr "Aasia/Baku"
+msgid "America/Scoresbysund"
+msgstr "America/Scoresbysund"
 
 #: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr "Aasia/Bangkok"
+msgid "America/Shiprock"
+msgstr "America/Shiprock"
 
 #: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr "Aasia/Beirut"
+msgid "America/Sitka"
+msgstr "America/Sitka"
 
 #: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr "Aasia/Biškek"
+msgid "America/St_Barthelemy"
+msgstr "America/St_Barthelemy"
 
 #: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr "Aasia/Brunei"
+msgid "America/St_Johns"
+msgstr "America/St_Johns"
 
 #: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr "Aasia/Kolkata"
+msgid "America/St_Kitts"
+msgstr "America/St_Kitts"
 
 #: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr "Aasia/Chongqing"
+msgid "America/St_Lucia"
+msgstr "America/St_Lucia"
 
 #: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr "Aasia/Colombo"
+msgid "America/St_Thomas"
+msgstr "America/St_Thomas"
 
 #: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr "Aasia/Damaskos"
+msgid "America/St_Vincent"
+msgstr "America/St_Vincent"
 
 #: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr "Aasia/Dhaka"
+msgid "America/Swift_Current"
+msgstr "America/Swift_Current"
 
 #: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr "Aasia/Dili"
+msgid "America/Tegucigalpa"
+msgstr "America/Tegucigalpa"
 
 #: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr "Aasia/Dubai"
+msgid "America/Thule"
+msgstr "America/Thule"
 
 #: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr "Aasia/Dušanbe"
+msgid "America/Thunder_Bay"
+msgstr "America/Thunder_Bay"
 
 #: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr "Aasia/Gaza"
+msgid "America/Tijuana"
+msgstr "America/Tijuana"
 
 #: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr "Aasia/Harbin"
+msgid "America/Toronto"
+msgstr "America/Toronto"
 
 #: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr "Aasia/Hongkong"
+msgid "America/Tortola"
+msgstr "America/Tortola"
 
 #: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr "Aasia/Hovd"
+msgid "America/Vancouver"
+msgstr "America/Vancouver"
 
 #: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr "Aasia/Irkutsk"
+msgid "America/Virgin"
+msgstr "America/Virgin"
 
 #: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr "Aasia/Istanbul"
+msgid "America/Whitehorse"
+msgstr "America/Whitehorse"
 
 #: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr "Aasia/Jakarta"
+msgid "America/Winnipeg"
+msgstr "America/Winnipeg"
 
 #: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr "Aasia/Jayapura"
+msgid "America/Yakutat"
+msgstr "America/Yakutat"
 
 #: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr "Aasia/Jerusalem"
+msgid "America/Yellowknife"
+msgstr "America/Yellowknife"
 
 #: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr "Aasia/Kabul"
+msgid "Antarctica"
+msgstr "Antarctica"
 
 #: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr "Aasia/Kamtšatka"
+msgid "Antarctica/Casey"
+msgstr "Antarctica/Casey"
 
 #: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr "Aasia/Karachi"
+msgid "Antarctica/Davis"
+msgstr "Antarctica/Davis"
 
 #: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr "Aasia/Kashgar"
+msgid "Antarctica/DumontDUrville"
+msgstr "Antarctica/DumontDUrville"
 
 #: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr "Aasia/Katmandu"
+msgid "Antarctica/Macquarie"
+msgstr "Antarctica/Macquarie"
 
 #: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr "Aasia/Krasnojarsk"
+msgid "Antarctica/Mawson"
+msgstr "Antarctica/Mawson"
 
 #: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr "Aasia/Kuala Lumpur"
+msgid "Antarctica/McMurdo"
+msgstr "Antarctica/McMurdo"
 
 #: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr "Aasia/Kuching"
+msgid "Antarctica/Palmer"
+msgstr "Antarctica/Palmer"
 
 #: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr "Aasia/Kuwait"
+msgid "Antarctica/Rothera"
+msgstr "Antarctica/Rothera"
 
 #: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr "Aasia/Macao"
+msgid "Antarctica/South_Pole"
+msgstr "Antarctica/South_Pole"
 
 #: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr "Aasia/Magadan"
+msgid "Antarctica/Syowa"
+msgstr "Antarctica/Syowa"
 
 #: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr "Aasia/Manila"
+msgid "Antarctica/Vostok"
+msgstr "Antarctica/Vostok"
 
 #: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr "Aasia/Masqat"
+msgid "Arctic"
+msgstr "Arctic"
 
 #: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr "Aasia/Nikosia"
+msgid "Arctic/Longyearbyen"
+msgstr "Arctic/Longyearbyen"
 
 #: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr "Aasia/Novosibirsk"
+msgid "Asia"
+msgstr "Asia"
 
 #: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr "Aasia/Omsk"
+msgid "Asia/Aden"
+msgstr "Asia/Aden"
 
 #: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr "Aasia/Phnom Penh"
+msgid "Asia/Almaty"
+msgstr "Asia/Almaty"
 
 #: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr "Aasia/Pontianak"
+msgid "Asia/Amman"
+msgstr "Asia/Amman"
 
 #: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr "Aasia/Pjongjang"
+msgid "Asia/Anadyr"
+msgstr "Asia/Anadyr"
 
 #: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr "Aasia/Qatar"
+msgid "Asia/Aqtau"
+msgstr "Asia/Aqtau"
 
 #: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr "Aasia/Yangôn"
+msgid "Asia/Aqtobe"
+msgstr "Asia/Aqtobe"
 
 #: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr "Aasia/Riad"
+msgid "Asia/Ashgabat"
+msgstr "Asia/Ashgabat"
 
 #: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr "Aasia/Ho Chi Minh"
+msgid "Asia/Ashkhabad"
+msgstr "Asia/Ashkhabad"
 
 #: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr "Aasia/Samarkand"
+msgid "Asia/Baghdad"
+msgstr "Asia/Baghdad"
 
 #: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr "Aasia/Soul"
+msgid "Asia/Bahrain"
+msgstr "Asia/Bahrain"
 
 #: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr "Aasia/Shanghai"
+msgid "Asia/Baku"
+msgstr "Asia/Baku"
 
 #: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr "Aasia/Singapore"
+msgid "Asia/Bangkok"
+msgstr "Asia/Bangkok"
 
 #: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr "Aasia/Taipei"
+msgid "Asia/Beirut"
+msgstr "Asia/Beirut"
 
 #: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr "Aasia/Taškent"
+msgid "Asia/Bishkek"
+msgstr "Asia/Bishkek"
 
 #: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr "Aasia/Tbilisi"
+msgid "Asia/Brunei"
+msgstr "Asia/Brunei"
 
 #: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr "Aasia/Teheran"
+msgid "Asia/Calcutta"
+msgstr "Asia/Calcutta"
 
 #: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr "Aasia/Thimphu"
+msgid "Asia/Choibalsan"
+msgstr "Asia/Choibalsan"
 
 #: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr "Aasia/Tokio"
+msgid "Asia/Chongqing"
+msgstr "Asia/Chongqing"
 
 #: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr "Aasia/Makassar"
+msgid "Asia/Chungking"
+msgstr "Asia/Chungking"
 
 #: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr "Aasia/Ulan Bator"
+msgid "Asia/Colombo"
+msgstr "Asia/Colombo"
 
 #: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr "Aasia/Ürümqi"
+msgid "Asia/Dacca"
+msgstr "Asia/Dacca"
 
 #: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr "Aasia/Vientiane"
+msgid "Asia/Damascus"
+msgstr "Asia/Damascus"
 
 #: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr "Aasia/Vladivostok"
+msgid "Asia/Dhaka"
+msgstr "Asia/Dhaka"
 
 #: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr "Aasia/Jakutsk"
+msgid "Asia/Dili"
+msgstr "Asia/Dili"
 
 #: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr "Aasia/Jekaterinburg"
+msgid "Asia/Dubai"
+msgstr "Asia/Dubai"
 
 #: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr "Aasia/Jerevan"
+msgid "Asia/Dushanbe"
+msgstr "Asia/Dushanbe"
 
 #: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr "Atlantti"
+msgid "Asia/Gaza"
+msgstr "Asia/Gaza"
 
 #: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr "Atlantti/Azorit"
+msgid "Asia/Harbin"
+msgstr "Asia/Harbin"
 
 #: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr "Atlantti/Bermuda"
+msgid "Asia/Hebron"
+msgstr "Asia/Hebron"
 
 #: ../src/timezone_names.c:300
+msgid "Asia/Hong_Kong"
+msgstr "Asia/Hong_Kong"
+
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Asia/Ho_Chi_Minh"
+
+#: ../src/timezone_names.c:302
+msgid "Asia/Hovd"
+msgstr "Asia/Hovd"
+
+#: ../src/timezone_names.c:303
+msgid "Asia/Irkutsk"
+msgstr "Asia/Irkutsk"
+
+#: ../src/timezone_names.c:304
+msgid "Asia/Istanbul"
+msgstr "Asia/Istanbul"
+
+#: ../src/timezone_names.c:305
+msgid "Asia/Jakarta"
+msgstr "Asia/Jakarta"
+
+#: ../src/timezone_names.c:306
+msgid "Asia/Jayapura"
+msgstr "Asia/Jayapura"
+
+#: ../src/timezone_names.c:307
+msgid "Asia/Jerusalem"
+msgstr "Asia/Jerusalem"
+
+#: ../src/timezone_names.c:308
+msgid "Asia/Kabul"
+msgstr "Asia/Kabul"
+
+#: ../src/timezone_names.c:309
+msgid "Asia/Kamchatka"
+msgstr "Asia/Kamchatka"
+
+#: ../src/timezone_names.c:310
+msgid "Asia/Karachi"
+msgstr "Asia/Karachi"
+
+#: ../src/timezone_names.c:311
+msgid "Asia/Kashgar"
+msgstr "Asia/Kashgar"
+
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Asia/Kathmandu"
+
+#: ../src/timezone_names.c:313
+msgid "Asia/Katmandu"
+msgstr "Asia/Katmandu"
+
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Asia/Khandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Asia/Kolkata"
+
+#: ../src/timezone_names.c:316
+msgid "Asia/Krasnoyarsk"
+msgstr "Asia/Krasnoyarsk"
+
+#: ../src/timezone_names.c:317
+msgid "Asia/Kuala_Lumpur"
+msgstr "Asia/Kuala_Lumpur"
+
+#: ../src/timezone_names.c:318
+msgid "Asia/Kuching"
+msgstr "Asia/Kuching"
+
+#: ../src/timezone_names.c:319
+msgid "Asia/Kuwait"
+msgstr "Asia/Kuwait"
+
+#: ../src/timezone_names.c:320
+msgid "Asia/Macao"
+msgstr "Asia/Macao"
+
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Asia/Macau"
+
+#: ../src/timezone_names.c:322
+msgid "Asia/Magadan"
+msgstr "Asia/Magadan"
+
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Asia/Makassar"
+
+#: ../src/timezone_names.c:324
+msgid "Asia/Manila"
+msgstr "Asia/Manila"
+
+#: ../src/timezone_names.c:325
+msgid "Asia/Muscat"
+msgstr "Asia/Muscat"
+
+#: ../src/timezone_names.c:326
+msgid "Asia/Nicosia"
+msgstr "Asia/Nicosia"
+
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Asia/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
+msgid "Asia/Novosibirsk"
+msgstr "Asia/Novosibirsk"
+
+#: ../src/timezone_names.c:329
+msgid "Asia/Omsk"
+msgstr "Asia/Omsk"
+
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Asia/Oral"
+
+#: ../src/timezone_names.c:331
+msgid "Asia/Phnom_Penh"
+msgstr "Asia/Phnom_Penh"
+
+#: ../src/timezone_names.c:332
+msgid "Asia/Pontianak"
+msgstr "Asia/Pontianak"
+
+#: ../src/timezone_names.c:333
+msgid "Asia/Pyongyang"
+msgstr "Asia/Pyongyang"
+
+#: ../src/timezone_names.c:334
+msgid "Asia/Qatar"
+msgstr "Asia/Qatar"
+
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Asia/Qyzylorda"
+
+#: ../src/timezone_names.c:336
+msgid "Asia/Rangoon"
+msgstr "Asia/Rangoon"
+
+#: ../src/timezone_names.c:337
+msgid "Asia/Riyadh"
+msgstr "Asia/Riyadh"
+
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Asia/Riyadh87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Asia/Riyadh88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Asia/Riyadh89"
+
+#: ../src/timezone_names.c:341
+msgid "Asia/Saigon"
+msgstr "Asia/Saigon"
+
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Asia/Sakhalin"
+
+#: ../src/timezone_names.c:343
+msgid "Asia/Samarkand"
+msgstr "Asia/Samarkand"
+
+#: ../src/timezone_names.c:344
+msgid "Asia/Seoul"
+msgstr "Asia/Seoul"
+
+#: ../src/timezone_names.c:345
+msgid "Asia/Shanghai"
+msgstr "Asia/Shanghai"
+
+#: ../src/timezone_names.c:346
+msgid "Asia/Singapore"
+msgstr "Asia/Singapore"
+
+#: ../src/timezone_names.c:347
+msgid "Asia/Taipei"
+msgstr "Asia/Taipei"
+
+#: ../src/timezone_names.c:348
+msgid "Asia/Tashkent"
+msgstr "Asia/Tashkent"
+
+#: ../src/timezone_names.c:349
+msgid "Asia/Tbilisi"
+msgstr "Asia/Tbilisi"
+
+#: ../src/timezone_names.c:350
+msgid "Asia/Tehran"
+msgstr "Asia/Tehran"
+
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Asia/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Asia/Thimbu"
+
+#: ../src/timezone_names.c:353
+msgid "Asia/Thimphu"
+msgstr "Asia/Thimphu"
+
+#: ../src/timezone_names.c:354
+msgid "Asia/Tokyo"
+msgstr "Asia/Tokyo"
+
+#: ../src/timezone_names.c:355
+msgid "Asia/Ujung_Pandang"
+msgstr "Asia/Ujung_Pandang"
+
+#: ../src/timezone_names.c:356
+msgid "Asia/Ulaanbaatar"
+msgstr "Asia/Ulaanbaatar"
+
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Asia/Ulan_Bator"
+
+#: ../src/timezone_names.c:358
+msgid "Asia/Urumqi"
+msgstr "Asia/Urumqi"
+
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Asia/Ust-Nera"
+
+#: ../src/timezone_names.c:360
+msgid "Asia/Vientiane"
+msgstr "Asia/Vientiane"
+
+#: ../src/timezone_names.c:361
+msgid "Asia/Vladivostok"
+msgstr "Asia/Vladivostok"
+
+#: ../src/timezone_names.c:362
+msgid "Asia/Yakutsk"
+msgstr "Asia/Yakutsk"
+
+#: ../src/timezone_names.c:363
+msgid "Asia/Yekaterinburg"
+msgstr "Asia/Yekaterinburg"
+
+#: ../src/timezone_names.c:364
+msgid "Asia/Yerevan"
+msgstr "Asia/Yerevan"
+
+#: ../src/timezone_names.c:365
+msgid "Atlantic"
+msgstr "Atlantic"
+
+#: ../src/timezone_names.c:366
+msgid "Atlantic/Azores"
+msgstr "Atlantic/Azores"
+
+#: ../src/timezone_names.c:367
+msgid "Atlantic/Bermuda"
+msgstr "Atlantic/Bermuda"
+
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
-msgstr "Atlantti/Kanariansaaret"
+msgstr "Atlantic/Canary"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
-msgstr "Atlantti/Kap Verde"
+msgstr "Atlantic/Cape_Verde"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
-msgstr "Atlantti/Färsaaret"
+msgstr "Atlantic/Faeroe"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlantic/Faroe"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
-msgstr "Atlantti/Jan Mayen"
+msgstr "Atlantic/Jan_Mayen"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
-msgstr "Atlantti/Madeira"
+msgstr "Atlantic/Madeira"
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
-msgstr "Atlantti/Reykjavík"
+msgstr "Atlantic/Reykjavik"
 
-#: ../src/timezone_names.c:306
+#: ../src/timezone_names.c:375
 msgid "Atlantic/South_Georgia"
-msgstr "Atlantti/Etelä-Georgia"
+msgstr "Atlantic/South_Georgia"
 
-#: ../src/timezone_names.c:307
+#: ../src/timezone_names.c:376
 msgid "Atlantic/St_Helena"
-msgstr "Atlantti/St Helena"
+msgstr "Atlantic/St_Helena"
 
-#: ../src/timezone_names.c:308
+#: ../src/timezone_names.c:377
 msgid "Atlantic/Stanley"
-msgstr "Atlantti/Stanley"
+msgstr "Atlantic/Stanley"
 
-#: ../src/timezone_names.c:309
+#: ../src/timezone_names.c:378
 msgid "Australia"
 msgstr "Australia"
 
-#: ../src/timezone_names.c:310
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Australia/ACT"
+
+#: ../src/timezone_names.c:380
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaide"
 
-#: ../src/timezone_names.c:311
+#: ../src/timezone_names.c:381
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: ../src/timezone_names.c:312
+#: ../src/timezone_names.c:382
 msgid "Australia/Broken_Hill"
-msgstr "Australia/Broken Hill"
+msgstr "Australia/Broken_Hill"
 
-#: ../src/timezone_names.c:313
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Australia/Currie"
+
+#: ../src/timezone_names.c:384
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: ../src/timezone_names.c:314
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Australia/Eucla"
+
+#: ../src/timezone_names.c:386
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: ../src/timezone_names.c:315
+#: ../src/timezone_names.c:387
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: ../src/timezone_names.c:316
+#: ../src/timezone_names.c:388
 msgid "Australia/Lord_Howe"
-msgstr "Australia/Lord Howe"
+msgstr "Australia/Lord_Howe"
 
-#: ../src/timezone_names.c:317
+#: ../src/timezone_names.c:389
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: ../src/timezone_names.c:318
+#: ../src/timezone_names.c:390
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: ../src/timezone_names.c:319
+#: ../src/timezone_names.c:391
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brazil"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brazil/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brazil/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brazil/East"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brazil/West"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Canada"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Canada/Atlantic"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Canada/Central"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Canada/East-Saskatchewan"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Canada/Eastern"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Canada/Mountain"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Canada/Newfoundland"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Canada/Pacific"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Canada/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Canada/Yukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Chile"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Chile/Continental"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Chile/EasterIsland"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Universal"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Zulu"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
-msgstr "Eurooppa"
+msgstr "Europe"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
-msgstr "Eurooppa/Amsterdam"
+msgstr "Europe/Amsterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
-msgstr "Eurooppa/Andorra"
+msgstr "Europe/Andorra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
-msgstr "Eurooppa/Ateena"
+msgstr "Europe/Athens"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
-msgstr "Eurooppa/Belfast"
+msgstr "Europe/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
-msgstr "Eurooppa/Belgrad"
+msgstr "Europe/Belgrade"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
-msgstr "Eurooppa/Berliini"
+msgstr "Europe/Berlin"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
-msgstr "Eurooppa/Bratislava"
+msgstr "Europe/Bratislava"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
-msgstr "Eurooppa/Bryssel"
+msgstr "Europe/Brussels"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
-msgstr "Eurooppa/Bukarest"
+msgstr "Europe/Bucharest"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
-msgstr "Eurooppa/Budapest"
+msgstr "Europe/Budapest"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Europe/Busingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
-msgstr "Eurooppa/Chişinău"
+msgstr "Europe/Chisinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
-msgstr "Eurooppa/Kööpenhamina"
+msgstr "Europe/Copenhagen"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
-msgstr "Eurooppa/Dublin"
+msgstr "Europe/Dublin"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
-msgstr "Eurooppa/Gibraltar"
+msgstr "Europe/Gibraltar"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Europe/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
-msgstr "Eurooppa/Helsinki"
+msgstr "Europe/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Europe/Isle_of_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
-msgstr "Eurooppa/Istanbul"
+msgstr "Europe/Istanbul"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Europe/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
-msgstr "Eurooppa/Kaliningrad"
+msgstr "Europe/Kaliningrad"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
-msgstr "Eurooppa/Kiova"
+msgstr "Europe/Kiev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
-msgstr "Eurooppa/Lissabon"
+msgstr "Europe/Lisbon"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
-msgstr "Eurooppa/Ljubljana"
+msgstr "Europe/Ljubljana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
-msgstr "Eurooppa/Lontoo"
+msgstr "Europe/London"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
-msgstr "Eurooppa/Luxemburg"
+msgstr "Europe/Luxembourg"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
-msgstr "Eurooppa/Madrid"
+msgstr "Europe/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
-msgstr "Eurooppa/Malta"
+msgstr "Europe/Malta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Europe/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
-msgstr "Eurooppa/Minsk"
+msgstr "Europe/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
-msgstr "Eurooppa/Monaco"
+msgstr "Europe/Monaco"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
-msgstr "Eurooppa/Moskova"
+msgstr "Europe/Moscow"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
-msgstr "Eurooppa/Nikosia"
+msgstr "Europe/Nicosia"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
-msgstr "Eurooppa/Oslo"
+msgstr "Europe/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
-msgstr "Eurooppa/Pariisi"
+msgstr "Europe/Paris"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Europe/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
-msgstr "Eurooppa/Praha"
+msgstr "Europe/Prague"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
-msgstr "Eurooppa/Riika"
+msgstr "Europe/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
-msgstr "Eurooppa/Rooma"
+msgstr "Europe/Rome"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
-msgstr "Eurooppa/Samara"
+msgstr "Europe/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
-msgstr "Eurooppa/San Marino"
+msgstr "Europe/San_Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
-msgstr "Eurooppa/Sarajevo"
+msgstr "Europe/Sarajevo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
-msgstr "Eurooppa/Simferopol"
+msgstr "Europe/Simferopol"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
-msgstr "Eurooppa/Skopje"
+msgstr "Europe/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
-msgstr "Eurooppa/Sofia"
+msgstr "Europe/Sofia"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
-msgstr "Eurooppa/Tukholma"
+msgstr "Europe/Stockholm"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
-msgstr "Eurooppa/Tallinna"
+msgstr "Europe/Tallinn"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
-msgstr "Eurooppa/Tirana"
+msgstr "Europe/Tirane"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Europe/Tiraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
-msgstr "Eurooppa/Uzhgorod"
+msgstr "Europe/Uzhgorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
-msgstr "Eurooppa/Vaduz"
+msgstr "Europe/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
-msgstr "Eurooppa/Vatikaani"
+msgstr "Europe/Vatican"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
-msgstr "Eurooppa/Wien"
+msgstr "Europe/Vienna"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
-msgstr "Eurooppa/Vilna"
+msgstr "Europe/Vilnius"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Europe/Volgograd"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
-msgstr "Eurooppa/Varsova"
+msgstr "Europe/Warsaw"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
-msgstr "Eurooppa/Zagreb"
+msgstr "Europe/Zagreb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
-msgstr "Eurooppa/Zaporižžja"
+msgstr "Europe/Zaporozhye"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
-msgstr "Eurooppa/Zürich"
+msgstr "Europe/Zurich"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
-msgstr "Intianmeri"
+msgstr "Indian"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
-msgstr "Intianmeri/Antananarivo"
+msgstr "Indian/Antananarivo"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
-msgstr "Intianmeri/Chagos-saaret"
+msgstr "Indian/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
-msgstr "Intianmeri/Joulusaari"
+msgstr "Indian/Christmas"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
-msgstr "Intianmeri/Kookossaari"
+msgstr "Indian/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
-msgstr "Intianmeri/Komorit"
+msgstr "Indian/Comoro"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
-msgstr "Intianmeri/Kerguelen-saaret"
+msgstr "Indian/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
-msgstr "Intianmeri/Mahé"
+msgstr "Indian/Mahe"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
-msgstr "Intianmeri/Malediivit"
+msgstr "Indian/Maldives"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
-msgstr "Intianmeri/Mauritius"
+msgstr "Indian/Mauritius"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
-msgstr "Intianmeri/Mayotte"
+msgstr "Indian/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
-msgstr "Intianmeri/Reunion"
+msgstr "Indian/Reunion"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Mexico"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Mexico/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Mexico/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Mexico/General"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Mideast"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Mideast/Riyadh87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Mideast/Riyadh88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Mideast/Riyadh89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
-msgstr "Tyynimeri"
+msgstr "Pacific"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
-msgstr "Tyynimeri/Apia"
+msgstr "Pacific/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
-msgstr "Tyynimeri/Auckland"
+msgstr "Pacific/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
-msgstr "Tyynimeri/Chatham"
+msgstr "Pacific/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Pacific/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
-msgstr "Tyynimeri/Pääsiäissaari"
+msgstr "Pacific/Easter"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
-msgstr "Tyynimeri/Efate"
+msgstr "Pacific/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
-msgstr "Tyynimeri/Enderbury"
+msgstr "Pacific/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
-msgstr "Tyynimeri/Fakaofo"
+msgstr "Pacific/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
-msgstr "Tyynimeri/Fidži"
+msgstr "Pacific/Fiji"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
-msgstr "Tyynimeri/Funafuti"
+msgstr "Pacific/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
-msgstr "Tyynimeri/Galápagossaaret"
+msgstr "Pacific/Galapagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
-msgstr "Tyynimeri/Gambiersaaret"
+msgstr "Pacific/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
-msgstr "Tyynimeri/Guadalcanal"
+msgstr "Pacific/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
-msgstr "Tyynimeri/Guam"
+msgstr "Pacific/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
-msgstr "Tyynimeri/Honolulu"
+msgstr "Pacific/Honolulu"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
-msgstr "Tyynimeri/Johnston"
+msgstr "Pacific/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
-msgstr "Tyynimeri/Kiritimati"
+msgstr "Pacific/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
-msgstr "Tyynimeri/Kosrae"
+msgstr "Pacific/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
-msgstr "Tyynimeri/Kwajalein"
+msgstr "Pacific/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
-msgstr "Tyynimeri/Majuro"
+msgstr "Pacific/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
-msgstr "Tyynimeri/Marquesassaaret"
+msgstr "Pacific/Marquesas"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
-msgstr "Tyynimeri/Midwaysaaret"
+msgstr "Pacific/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
-msgstr "Tyynimeri/Nauru"
+msgstr "Pacific/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
-msgstr "Tyynimeri/Niue"
+msgstr "Pacific/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
-msgstr "Tyynimeri/Norfolk"
+msgstr "Pacific/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
-msgstr "Tyynimeri/Nouméa"
+msgstr "Pacific/Noumea"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
-msgstr "Tyynimeri/Pago Pago"
+msgstr "Pacific/Pago_Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
-msgstr "Tyynimeri/Palau"
+msgstr "Pacific/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
-msgstr "Tyynimeri/Pitcairn"
+msgstr "Pacific/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Pacific/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
-msgstr "Tyynimeri/Pohnpei"
+msgstr "Pacific/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
-msgstr "Tyynimeri/Port Moresby"
+msgstr "Pacific/Port_Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
-msgstr "Tyynimeri/Rarotonga"
+msgstr "Pacific/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
-msgstr "Tyynimeri/Saipan"
+msgstr "Pacific/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pacific/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
-msgstr "Tyynimeri/Tahiti"
+msgstr "Pacific/Tahiti"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
-msgstr "Tyynimeri/Tarawa"
+msgstr "Pacific/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
-msgstr "Tyynimeri/Tongatapu"
+msgstr "Pacific/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
-msgstr "Tyynimeri/Chuuk"
+msgstr "Pacific/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
-msgstr "Tyynimeri/Wakensaari"
+msgstr "Pacific/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
-msgstr "Tyynimeri/Wallis"
+msgstr "Pacific/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
-msgstr "Tyynimeri/Yap"
+msgstr "Pacific/Yap"
+
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "US"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "US/Alaska"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "US/Aleutian"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "US/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "US/Central"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "US/Eastern"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "US/East-Indiana"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "US/Hawaii"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "US/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "US/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "US/Mountain"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "US/Pacific"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "US/Pacific-New"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "US/Samoa"
 
 #: ../src/tray_icon.c:469
 msgid "New appointment"
-msgstr "Uusi tapahtuma"
+msgstr "Uusi tapaminen"
 
 #: ../src/tray_icon.c:485
 msgid "About Orage"
@@ -3625,55 +4417,33 @@
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
 msgid "Orage Panel Clock"
-msgstr "Orage-kello"
+msgstr "Orage -paneelikello"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
 msgid "Show time and date?"
-msgstr "Näytä kellonaika ja päivämäärä."
+msgstr "Näytä aika ja päiväys?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Kalenteri"
+msgid "Orage preferences"
+msgstr "Oragen asetukset"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Orage kalenterin asetukset"
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr "Asetukset Xfce 4:n kalenterisovellukselle (Orage)"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-msgid "Orage preferences"
-msgstr "Oragen asetukset"
+msgid "Orage Calendar Preferences"
+msgstr "Orage-kalenterin asetukset"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Xfce 4 kalenterisovelluksen (Orage) asetukset"
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Kalenteri"
+
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr "Orage-kalenteri"
 
 #: ../xfcalendar.desktop.in.h:2
 msgid "Desktop calendar"
 msgstr "Työpöytäkalenteri"
-
-#: ../xfcalendar.desktop.in.h:3
-msgid "Orage Calendar"
-msgstr "Orage - Kalenteri"
-
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Otsikko: %s\n"
-#~ " Alkaa:\t %s\n"
-#~ " Määräaika:%s\n"
-#~ " Tehty:\t%s\n"
-#~ "Huomautukset:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Syötä itse tarvittavat erikoismerkit.\n"
-#~ " Komento välitetään komentotulkille sellaisenaan"
diff -Nru orage-4.8.3/po/fr.po orage-4.12.1/po/fr.po
--- orage-4.8.3/po/fr.po	2012-01-03 12:01:03.000000000 +0000
+++ orage-4.12.1/po/fr.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,23 +1,46 @@
-# French translation for the orage package.
-# Copyright (C) 2003-2008 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Mickaël Graf <korbinus@linux.se>, 2003.
-# Gérald Barré <g.barre@free.fr>, 2006.
-# Maximilian Schleiss <maximilian@xfce.org>, 2008.
-# Douart patrick <patrick.2@laposte.net> 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Anthony Jorion <pingax@frugalware.org>, 2013
+# Gérald Barré <g.barre@free.fr>, 2006
+# jc1 <jc1.quebecos@gmail.com>, 2013
+# jc1 <jc1.quebecos@gmail.com>, 2013-2014
+# jc <jc>, 2013
+# Louis Moureaux <m_louis30@yahoo.com>, 2014
+# Maximilian Schleiss <maximilian@xfce.org>, 2008
+# Mickaël Graf <korbinus@linux.se>, 2003
+# Yannick Le Guen <leguen.yannick@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: Orage\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2010-02-11 15:44+0100\n"
-"Last-Translator: Douart Patrick <patrick.2@laposte.net>\n"
-"Language-Team: French <xfce-i18n@xfce.org>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2015-02-27 08:27+0000\n"
+"Last-Translator: Yannick Le Guen <leguen.yannick@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/xfce-apps/language/fr/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "sans interligne"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "simple"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "double"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "bas"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -33,9 +56,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"Modifier l'horloge"
+msgstr "%s\ncliquer pour modifier l'horloge"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -45,21 +66,20 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"Bouton 1 pour modifier les préférences \n"
-"Bouton 2 pour ajuster le l'heure"
+msgstr "bouton 1 pour modifier les préférences \nbouton 2 pour ajuster l'heure des horloges"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
 msgstr "ajuster pour changer l'heure"
 
 #: ../globaltime/globaltime.c:496
-#, fuzzy
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"Ajuster pour changer les minutes. Cliquez sur les flèches avec la touche 2 "
-"pour changer seulement 1 minute."
+msgstr "ajuster pour changer les minutes. Cliquer sur les flèches avec le bouton 2 pour changer seulement 1 minute."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Temps Global"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -71,15 +91,15 @@
 
 #: ../globaltime/gt_prefs.c:310
 msgid "Not possible to delete the last clock."
-msgstr "La dernière horloge ne peut être supprimée."
+msgstr "Impossible de supprimer la dernière horloge."
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
-msgstr "mettre cette horloge à jour"
+msgstr "mettre à jour cette horloge"
 
 #: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
 msgid "add new empty clock"
-msgstr "Ajouter une nouvelle horloge"
+msgstr "ajouter une nouvelle horloge vide"
 
 #: ../globaltime/gt_prefs.c:526
 msgid "add new clock using this clock as model"
@@ -87,7 +107,7 @@
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
-msgstr "Supprimer cette horloge"
+msgstr "supprimer cette horloge"
 
 #: ../globaltime/gt_prefs.c:539
 msgid "move this clock first"
@@ -107,16 +127,15 @@
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
-msgstr "Définir le fuseau horaire de cette horloge comme heure locale"
+msgstr "définir le fuseau horaire de cette horloge comme heure locale"
 
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
-msgstr "Fermer la fenêtre et quitter"
+msgstr "fermer la fenêtre et quitter"
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "Mettre à jour les préférences"
+msgstr "Préférences heure globale"
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -129,7 +148,7 @@
 
 #: ../globaltime/gt_prefs.c:613
 msgid "enter name of clock"
-msgstr "Entrez le nom de l'horloge"
+msgstr "entrer le nom de l'horloge"
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
@@ -142,11 +161,11 @@
 #. ------------------------background-------------------------
 #: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
 msgid "Background color:"
-msgstr "Couleur d'arrière-plan :"
+msgstr "Couleur d’arrière-plan :"
 
 #: ../globaltime/gt_prefs.c:656
 msgid "Click to change background colour for clock"
-msgstr "Cliquez pour changer la couleur de fond de l'horloge"
+msgstr "Cliquer pour changer la couleur d’arrière-plan de l'horloge"
 
 #: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
 #: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
@@ -160,7 +179,7 @@
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
 #: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
 msgid "Cross this to use default instead of selected value"
-msgstr "Cochez pour utiliser la valeur par défaut"
+msgstr "Cocher cette option pour utiliser la valeur par défaut au lieu de la valeur sélectionnée"
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
@@ -169,7 +188,7 @@
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
-msgstr "Cliquez pour changer la couleur de premier plan de l'horloge"
+msgstr "Cliquer pour changer la couleur de premier plan de l'horloge"
 
 #. ------------------------name font-------------------------
 #: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
@@ -178,7 +197,7 @@
 
 #: ../globaltime/gt_prefs.c:720
 msgid "Click to change font for clock name"
-msgstr "Cliquez pour changer la police d'écriture du nom de l'horloge"
+msgstr "Cliquer pour changer la police du nom de l'horloge"
 
 #. ------------------------time font-------------------------
 #: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
@@ -187,7 +206,7 @@
 
 #: ../globaltime/gt_prefs.c:753
 msgid "Click to change font for clock time"
-msgstr "Cliquez pour changer la police d'écriture de l'horloge"
+msgstr "Cliquer pour changer la police de l'horloge"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:780
@@ -205,15 +224,15 @@
 
 #: ../globaltime/gt_prefs.c:863
 msgid "Click to change default background colour for clocks"
-msgstr "Cliquez pour changer la couleur de fond par défaut des horloges"
+msgstr "Cliquer pour changer la couleur d’arrière-plan par défaut des horloges"
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr "Cochez pour utiliser les couleurs par défaut du système"
+msgstr "Cocher cette option pour utiliser la valeur par défaut du système au lieu de la couleur sélectionnée"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
-msgstr "Cliquez pour changer la couleur par défaut du texte pour les horloges"
+msgstr "Cliquer pour changer la couleur par défaut du texte pour les horloges"
 
 #: ../globaltime/gt_prefs.c:929
 msgid "Click to change default font for clock name"
@@ -221,7 +240,7 @@
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr "Cocher pour utiliser la police par défaut du système"
+msgstr "Cocher cette option pour utiliser la valeur par défaut du système au lieu de la police sélectionnée"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -242,9 +261,8 @@
 msgstr "Mettre à jour les préférences"
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "Préférences principales"
+msgstr "Préférences heure globale"
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
@@ -263,6 +281,10 @@
 msgid "Use normal decorations"
 msgstr "Utiliser des décorations normales"
 
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Aucune"
+
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
 msgstr "Ne pas afficher les décorations de la fenêtre (bordures)"
@@ -281,7 +303,7 @@
 
 #: ../globaltime/gt_prefs.c:1111
 msgid "Varying"
-msgstr "Changeant"
+msgstr "Varier"
 
 #: ../globaltime/gt_prefs.c:1116
 msgid "Clock sizes vary"
@@ -306,7 +328,7 @@
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
 #, c-format
 msgid "%d hour"
-msgstr "Heures"
+msgstr "%d heures"
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
@@ -317,7 +339,7 @@
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
 msgid "backward"
-msgstr "Reculer"
+msgstr "reculer"
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
@@ -327,21 +349,21 @@
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
 msgid "not changed"
-msgstr "N'a pas changé"
+msgstr "pas changé"
 
 #: ../globaltime/timezone_selection.c:195
 #: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
 msgid "not changing"
-msgstr "Ne change pas"
+msgstr "ne change pas"
 
 #. location
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
-msgstr "Localisation"
+msgstr "Lieu"
 
 #: ../globaltime/timezone_selection.c:258
 #: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
@@ -399,104 +421,108 @@
 msgid "floating"
 msgstr "flottante"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "Heure locale"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "Calendrier - Orage"
+msgstr "Heure globale Orage"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
-msgstr "Voir horloges de différents pays"
+msgstr "Afficher les horloges de différents pays"
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Heure globale"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Pas de rotation"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Rotation vers la gauche"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Rotation vers la droite"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "Apparence"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
-msgstr "Afficher l'_image"
+msgstr "Afficher le _cadre"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
-msgstr "Paramétrer la _couleur de texte :"
+msgstr "définir la _couleur du premier plan :"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
-msgstr "Paramétrer la couleur d'_arrière-plan :"
+msgstr "définir la couleur d'_arrière-plan :"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
-msgstr "Définir la _hauteur :"
+msgstr "définir la _hauteur :"
 
-#: ../panel-plugin/oc_config.c:277
-#, fuzzy
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
-"Notez que vous ne pouvez pas modifier la hauteur des panneaux horizontaux"
+msgstr "Notez que vous ne pouvez pas modifier la hauteur des tableaux de bord horizontaux."
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
 msgstr "Définir la _largeur :"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
-msgstr ""
-"Notez que vous ne pouvez pas modifier la largeur des panneaux verticaux"
+msgstr "Notez que vous ne pouvez pas modifier la largeur des tableaux de bord verticaux."
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Afficher les lignes _verticalement"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "Options d'Horloge"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
-msgstr "choisir la zone horaire :"
+msgstr "régler la zone horaire sur :"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "Ligne %d :"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
-msgstr "Entrer un paramètre valide de la fonction strftime."
+msgstr "Entrez n'importe quel paramètre de la fonction strftime valide."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
 msgstr "Infobulle :"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
-msgstr "ajuster l'heure après une mise en veille/veille prolongée"
+msgstr "ajuster l'heure après une mise en veille/mise en veille prolongée"
 
-#: ../panel-plugin/oc_config.c:415
-#, fuzzy
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Vous avez besoin de cela si vous le faite sur un temps court (moins de 5 "
-"heures) suspendre ou hiberner et votre temps disponible ne comprend pas les "
-"seconds. Dans ces circonstances, il est possible que Orageclock montre le "
-"temps inexactement par rapport à celui vous avez cette sélectionné. (La "
-"sélection de ce processeur et empêche les fonctions d'économie "
-"d'interruption de travail.)"
+msgstr "Cela ne vous sera utile que si vous effectuez des mises en veille / mises en veille prolongées de courte durée (moins de 5 heures) et que l’heure affichée n’inclut pas les secondes. Dans ces circonstances, il est possible que l'horloge Orage affiche l’heure de manière imprécise, à moins d’avoir sélectionné cette option. (Sélectionner cette option empêche le fonctionnement du processeur et des fonctionnalités d'interruption de veille)."
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -506,22 +532,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Ce programme utilise la fonction strftime pour récupérer date et heure.\n"
-"Prendre un code valide correspondant au format souhaité.\n"
-"Quelques codes souvent employés :\n"
-"\t%A = jour de  la semaine\t\t\t%B = mois\n"
-"\t%c = date & heure\t\t%R = heure & minute\n"
-"\t%V = numéro de semaine\t\t%Z = zone horaire utilisée\n"
-"\t%H = heures \t\t\t\t%M = minute\n"
-"\t%X = heure locale\t\t\t%x = date locale"
+msgstr "Ce programme utilise la fonction strftime pour récupérer la date et l'heure.\nUtilisez un code valide pour obtenir l'heure dans le format que vous préférez.\nQuelques codes souvent employés :\n\t%A = jour de  la semaine\t\t\t%B = mois\n\t%c = date & heure\t\t%R = heure & minute\n\t%V = numéro de semaine\t\t%Z = fuseau horaire utilisé\n\t%H = heures \t\t\t\t%M = minute\n\t%X = heure locale\t\t\t%x = date locale"
 
-#: ../panel-plugin/oc_config.c:457
-#, fuzzy
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
-msgstr "Préférences d'Orage"
+msgstr "Préférences de l'horloge Orage"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -530,8 +546,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
 
@@ -540,14 +555,13 @@
 msgstr "Développeur"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "Gérer votre temps avec Xfce4"
+msgstr "Gérer votre temps avec Orage"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Fin"
 
@@ -555,241 +569,295 @@
 msgid "Due"
 msgstr "Échéance"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Choisir un fichier..."
 
 #: ../src/appointment.c:680
 msgid "Sound Files"
-msgstr "Fichier Son"
+msgstr "Fichiers son"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Tous les fichiers"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Les infos du rendez-vous ont été modifiées."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
-msgstr "Voulez vous continuer?"
+msgstr "Voulez-vous continuer ?"
+
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Non, ne pas quitter"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Oui, ignorer les modifications et quitter"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
-msgstr "L'heure de fin du rendez-vous précède l'heure de début. "
+msgstr "L'heure de fin du rendez-vous précède l'heure de début."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "Non défini"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Ajouter un nouveau rendez-vous pour ce fichier."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Fichier par défaut Orage"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Échec lors de l’ajout du rendez-vous."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "L'erreur s'est produite lors de l'ajout d'un rendez-vous. Voir plus de détails dans le fichier du journal."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Échec lors de la mise à jour du rendez-vous."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Voir plus de détails dans le fichier du journal (peut-être que le fichier a été mis à jour de façon externe à Orage ?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
-msgstr "Ce rendez-vous sera enlevé définitivement."
+msgstr "Ce rendez-vous sera supprimé définitivement."
+
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Non, annuler la suppression"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Oui, supprimez-le"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Choisir la date"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Aujourd'hui"
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "Ce rendez-vous n'existe pas."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
-msgstr "Il a été retiré, veuillez rafraîchir l'écran."
+msgstr "Il a probablement été supprimé, veuillez rafraichir l’écran."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Catégories actuelles"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Ajouter une nouvelle catégorie avec couleur"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Catégorie :"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Couleurs des catégories - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr " *** COPIER ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "Nouveau rendez-vous - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "Enr_egistrer et fermer"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "D_upliquer"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Enregistrer et fermer"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Revenir"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Dupliquer"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Effacer"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Libre"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Occupé"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
-msgstr "Infos générales"
+msgstr "Générale"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Type"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Événement"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Évènement à venir. Par exemple :\n"
-"Rendez-vous ou anniversaire ou programme TV."
+msgstr "Évènement à venir. Par exemple :\nRendez-vous ou anniversaire ou programme TV."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "À faire"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Quelque chose à faire une fois ou l'autre. Par exemple :\n"
-"Laver la voiture ou tester la nouvelle version d'Orage."
+msgstr "Action à réaliser. Par exemple :\nLaver la voiture ou tester la nouvelle version d'Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Journal"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Faire une note pour annoncer un évènement. Par exemple :\n"
-"Notifier que votre mère a appelé ou que la première neige est tombée."
+msgstr "Faire une note pour annoncer un évènement. Par exemple :\nNotifier que votre mère a appelé ou que la première neige est tombée."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Titre"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
-msgstr "Évènement du quotidien"
+msgstr "Évènement sur la journée"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Début"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Définir"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Durée"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "jours"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "heures"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "mins"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Disponibilité"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Terminé"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "Fait"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Catégories"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Ceci est une catégorie spéciale servant à l'ajout de couleur aux rendez-vous "
-"dans la vue en liste."
+msgstr "Ceci est une catégorie spéciale servant à l'ajout de couleur aux rendez-vous dans la vue liste."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "mettre à jour les couleurs pour les catégories."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "Priorité"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Si vous définissez ceci à 8 ou plus, le rendez-vous NE figure PAS dans les fenêtres de la liste.\nVous pouvez utiliser cette fonctionnalité pour désencombrer vos fenêtres de la liste, mais elle rend plus difficile de trouver ce rendez-vous.\n(Les alarmes seront toujours tirer normalement.)\n(Ceci est un paramètre non-documenté afin que vous puissiez modifier la limite par défaut de 8.)"
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Note"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -798,136 +866,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Ces raccourcies de commandes prennent effet immédiatement :\n     <D> insère la date actuelle dans le format de la date locale\n    <T> inserts l'heure et\n    <DT> inserts la date et l'heure.\n\nCeux-ci sont convertis seulement plus tard, quand ils sont vus :\n    <& Ynnnn> est traduit dans l'année en cours nnnn.\n(Ceci peut être utilisé par exemple dans les rappels d'anniversaire pour dire quel âge la personne aura)."
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "Avant le début"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "Avant la fin"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "Après le début"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "Après la fin"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Alarme"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Heure d'alarme"
 
-#: ../src/appointment.c:2933
-#, fuzzy
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Il arrive de vouloir une alarme :\n"
-" 1) avant le début de l'évènement\n"
-" 2) avant la fin du Todo\n"
-" 3) après le début du Todo"
+msgstr "Il arrive de vouloir une alarme :\n 1) avant le début de l'évènement\n 2) avant la fin du Todo\n 3) après le début du Todo"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
-msgstr "Alarme persistente"
+msgstr "Alarme persistante"
 
-#: ../src/appointment.c:2940
-#, fuzzy
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Sélectionnez cette option si vous voulez que Orage vous le rappele, même si "
-"elle n'a pas été actif lorsque l'alarme s'est passé."
+msgstr "Sélectionner ceci si vous voulez qu'Orage vous le rappelle, même si Orage n'était pas actif au moment où l'alarme aurait dû se déclencher."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Son"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "Utiliser"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
-msgstr "Sélectionnez cette option si vous voulez alarme sonore"
+msgstr "Sélectionner cette option si vous voulez une alarme sonore"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "Répéter le son de l'alarme"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "fois"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "intervalle sec."
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "Visuel"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Utiliser la fenêtre d'Orage"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
-msgstr "Sélectionnez cette option si vous voulez une fenêtre d'alarme Orage"
+msgstr "Sélectionner ceci si vous voulez une fenêtre d'alarme Orage"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Utiliser la notification"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
-msgstr "Sélectionnez cette option si vous voulez une notification d'alarme"
+msgstr "Sélectionner ceci si vous voulez une notification d'alarme"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
-msgstr "Définir temps mort"
+msgstr "Définir le délai"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
-msgstr ""
-"Sélectionnez cette option si vous voulez que la notification expire "
-"automatiquement"
+msgstr "Sélectionner ceci option si vous voulez que la notification expire automatiquement"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 = temps d'expiration par défaut du système"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "secondes"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Procédure"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
-msgstr ""
-"Sélectionnez cette option si vous voulez procédure ou un script d'alarme"
+msgstr "Sélectionnez ceci si vous voulez une alarme procédure ou script"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -937,157 +993,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
+msgstr "Vous devez entrer tous les caractères etc d'échappement vous-même.\nCette chaine est simplement donnée l'invite de commande pour traitement.\nLes commandes spéciales suivantes sont remplacées lors de l'exécution: \n\t<&T> du rendez-vous\n\t <&D> description du rendez-vous\n\t<&AT> heure de l'alarme\n\t<&ST> heure de début du rendez-vous\n\t<&ET> heure de fin du rendez-vous"
 
-#: ../src/appointment.c:3094
-#, fuzzy
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
-msgstr "Test de cette alarme par la questionnant maintenant"
+msgstr "Tester cette alarme en l’activant maintenant"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "<b>Alarme par défaut</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
-msgstr "Enregistrer les paramètres comme alarme par défaut"
+msgstr "Enregistrer les paramètres actuels comme alarme par défaut"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
-msgstr "Définissez les paramètres actuels de l'alarme par défaut"
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Aucune"
+msgstr "Définir les paramètres actuels de l'alarme par défaut"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Quotidienne"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Hebdomadaire"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
-msgstr "Mensuel"
+msgstr "Mensuelle"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Annuelle"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
-msgstr ""
+msgstr "Toutes les heures"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Lun"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Mar"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Mer"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Jeu"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Ven"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "Sam"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "Dim"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
-msgstr "Périodicité"
+msgstr "Répétition"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Complexité"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "De base"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Avancé"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
-msgstr "Utilisez ceci pour un événement régulier et répété"
+msgstr "Utiliser ceci pour un évènement régulier et répété"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Utilisez ceci pour des fréquences complexes comme : \n"
-" Tous les Samedis et Dimanches ou \n"
-" Le premier Mardi de chaque mois"
+msgstr "Utilisez ceci pour des fréquences complexes comme : \n Tous les samedis et dimanches ou\n Le premier mardi de chaque mois"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Fréquence"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Chacun"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "périodicité"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Limiter la fréquence à un intervalle défini.\n"
-" Par exemple : Tous les trois jours :\n"
-" Fréquence = Quotidienne et Intervalle = 3"
+msgstr "Limiter la fréquence à certains intervalles.\n Par exemple : Tous les trois jours :\n Fréquence = Quotidienne et Intervalle = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Limite"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
-msgstr "Répéter sans arrêt"
+msgstr "Répéter indéfiniment"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Répéter"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Répéter jusqu'au"
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Jours de la semaine"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "Quel jour"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1095,304 +1140,305 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Spécifier quel jour de la semaine pour des événements mensuels ou annuels.\n"
-" Par exemple : \n"
-" Le second Mercredi de chaque mois : \n"
-"\tFréquence = Mensuelle,\n"
-"\tJour de la semaine = cocher seulement Mercredi, \n"
-"\tQuel jour = choisir 2 sous Mercredi"
+msgstr "Spécifier quel jour de la semaine pour des évènements mensuels ou annuels.\n Par exemple : \n Le second mercredi de chaque mois : \n\tFréquence = Mensuelle,\n\tJour de la semaine = cocher seulement mercredi, \n\tQuel jour = choisir 2 depuis le numéro en-dessous de mercredi"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
-msgstr "TODO base"
+msgstr "base TODO"
 
-#: ../src/appointment.c:3352
-#, fuzzy
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"TODO réapparaît régulièrement au démarrage et se répéte après chaque "
-"intervalle, peu importe si elle a été achevée"
+msgstr "TODO réapparait régulièrement au démarrage et se répète après chaque intervalle, peu importe s'il a été achevé"
 
-#: ../src/appointment.c:3354
-#, fuzzy
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"TODO est basé sur le temps complet et se répète après l'interval compté de "
-"la dernière fois achevée.\\ n(Notez que vous ne pouvez pas dire quelque "
-"chose sur l'histoire de la TODO puisque les changements de base ne se "
-"reproduisent qu' après chaque exécution.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "TODO est basé sur le temps complet et se répète après intervalle compté depuis la dernière fois achevée.\n(Notez que vous ne pouvez pas dire quelque chose sur l'histoire du TODO puisque les changements de base ne se reproduisent qu'après chaque exécution.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "Exceptions"
 
-#: ../src/appointment.c:3374
-#, fuzzy
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"Ajouter d'avantage de dates exception en cliquant sur les jours du "
-"calendrier ci-dessous. \\ nException est soit l'exclusion (-) ou l'inclusion "
-"(+) en fonction de la sélection. \\ nEnlever en cliquant sur les données."
+msgstr "Ajouter davantage de dates exceptionnelles en cliquant sur les jours du calendrier ci-dessous.\n Exception est soit l'exclusion (-), soit l'inclusion (+) en fonction de la sélection.\nSupprimer en cliquant sur les données."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
-msgstr "Ajouter la date exclue (-)"
+msgstr "Ajouter un jour exclu (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
+msgstr "Les jours exclus sont des journées complètes où ce rendez-vous n'est pas arriver"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
-msgstr "Ajour la date inclue (-)"
+msgstr "Ajouter une heure inclue (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
+msgstr "Les heures inclues ont le même fuseau horaire que l'heure de début, mais elles peuvent avoir des temps différents"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
-#, fuzzy
+#: ../src/appointment.c:3516
 msgid "Action dates"
-msgstr "Options des actions"
+msgstr "Dates des actions"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
-msgstr "_Voir"
+msgstr "_Vue"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "_Aller"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Nouveau"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Revenir"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Aujourd'hui"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Avancer"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Reculer d'une semaine"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Reculer d'un jour"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Avancer d'un jour"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Avancer d'une semaine"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Fermer"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "       Nombre de jours à afficher"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - vue journalière"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Toute la journée"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Temps"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
-msgstr "Aucune rangée n'a été sélectionnée."
+msgstr "Aucune ligne n'a été sélectionnée."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
-msgstr ""
-"Cliquez sur une ligne pour la sélectionner, ensuite, vous pourez la copier."
+msgstr "Cliquer sur une ligne pour la sélectionner, ensuite vous pourrez la copier."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr "Tous les rendez-vous seront supprimés."
+msgstr "Vous allez supprimer définitivement tous\nles rendez-vous sélectionnés."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Oui, retirez-les"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Revenir"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Avancer"
+
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Trouver"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
-msgstr "Apercu journalier"
+msgstr "Aperçu journalier"
+
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Jours supplémentaires à afficher :"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "seulement la première répétition"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Cocher cette case si vous ne voulez voir que le premier évènement récurrent. Par défaut, tous sont vus. \nNoter que cela montre aussi toutes les urgences. \nNoter que les évènements récurrents peuvent apparaitre plus tôt dans la liste quand « seulement la première répétition » est listée."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "aussi les anciens"
 
-#: ../src/event-list.c:1170
-#, fuzzy
-msgid "Extra days to show "
-msgstr "Pour afficher une barre de menu cachée :"
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Cocher cette case si vous voulez voir les anciens évènements aussi. Cela ne peut être sélectionné que si « seulement la première répétition » est activée pour éviter de très longues listes.\nNoter que la sélection des jours supplémentaires définit encore si les rendez-vous les plus récents sont listés."
 
-#: ../src/event-list.c:1201
-#, fuzzy
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
-msgstr "enlèvement de %d entrées à l'index %s.\n"
+msgstr "Les écritures du journal sont démarrées le :"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Rechercher"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "Recherche de texte"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Drapeaux"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Titre"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Double clic sur la ligne pour l'éditer.\n"
-"\n"
-"Drapeaux dans l'ordre :\n"
-"\t 1. Alarme : n=pas d'alarme\n"
-"\t\t A=alarme visuelle S=avec alarme sonore\n"
-"\t 2. Périodicité : n=pas de périodicité\n"
-"t\t D=Quotidienne W=Hebdomadaire M=Mensuelle Y=Annuelle\n"
-"\t 3. Type : f=libre B=occupé\t 4. Se trouve dans le fichier :\n"
-"\t\tO=Orage A=Archive F=Externe\n"
-"\t 5. Type de rendez-vous :\n"
-"\t\tE=Événement T=À faire J=Journal"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Choisir la date"
+msgstr "Double-cliquer sur la ligne pour l'éditer.\n\nDrapeaux dans l'ordre :\n\t 1. Alarme : n = pas d'alarme\n\t\t A = Alarme est définie P = Alarme persistante est définie\n\t 2. Répétition : n = pas de répétition\n\t\t H = Horaire D =  Quotidien W = Hebdomadaire M = Mensuel Y  = Annuel\n\t 3. Type : f = Libre B = Occupé\n\t 4. Localisé dans le fichier :\n\t \tO = Orage A = Archive F = Étranger\n\t 5. Type de rendez-vous:\n\t\tE = Évènement T = Todo J = Journal"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tPériodicité terminée, archivage du fichier."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "L'archivage n'est pas activé. Fermeture"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Seuil d'archivage : %d mois"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tArchivage d'évènements plus ancien que : %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "uid d'archivage : %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tVTODO incomplet; non archivé"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tPériodicité. Année de fin : %04d, mois : %02d, jour : %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Archivage terminé\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
-msgstr "Effacement de l'archive."
+msgstr "Démarrage effacement de l'archive."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tPHASE 1 : annuler les rendez-vous périodiques"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tPHASE 2 : restaurer les rendez-vous archivés"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
-msgstr "Archive effacée\n"
+msgstr "Effacement de l'archive terminé.\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Alarme Orage par défaut"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Liste des alarmes créé pour le fichier Orage principal :"
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-"Création d'une liste d'alarmes : %d alarmes ajoutées. %d évènements traités."
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Liste des alarmes créé pour un fichier externe : %s ( %s )"
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\t%d alarmes ajoutées . %d événements traité."
+
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\t%d alarmes trouvées dont %d sont actives. (cherché dans %d alarmes "
-"périodiques.)"
+msgstr "\t%d alarmes trouvées dont %d sont actives. (cherché dans %d alarmes périodiques.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
-msgstr "Préparation du fichier externe en cous"
+msgstr "Préparation de l'import du fichier externe"
 
 #: ../src/ical-expimp.c:158
-#, fuzzy
 msgid "... Patched DCREATED to be CREATED."
-msgstr "_Liste des segments qui vont être créés :"
+msgstr "... DCREATED modifié pour être CREATED."
 
 #: ../src/ical-expimp.c:197
 msgid "... Patched timezone to Orage format."
@@ -1402,622 +1448,689 @@
 msgid "Import file preprocessing done"
 msgstr "Préparation du fichier d'importation terminée"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Trouvé mise à jour externe dans le fichier %s ."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Rafraichissement des alarmes et des calendriers en raison de la mise à jour du fichier externe."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
-msgstr "Fichiers du calendrier"
+msgstr "Fichiers calendrier"
 
 #: ../src/interface.c:631
 msgid "Current foreign files"
-msgstr "Fichiers externes"
+msgstr "Fichiers externes actuels"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
-msgstr "Lecture seulement"
+msgstr "LECTURE SEULE"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
-msgstr "Lecture & Écriture"
+msgstr "LECTURE ÉCRITURE"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Aucun fichier externe *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Ajout des fichiers externes échoué"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage ne peut traiter que 10 fichiers externes. Limite atteinte."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Le nom du fichier est vide."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Le nom est vide."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Le fichier n'existe pas."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Nom de fichier existant déjà dans Orage."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Nom existant déjà dans Orage."
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Importer/exporter"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Importer"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
-msgstr "lire du fichier :"
+msgstr "Lire depuis un fichier :"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Séparer les noms de fichiers avec une virgule(,).\n"
-" NOTE : les virgules ne sont pas tolérées pour les noms de fichiers Orage."
+msgstr "Séparer les noms de fichiers avec une virgule(,).\n NOTE : la virgule n'est pas un caractère valide dans les noms de fichiers pour Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Exporter"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Écrire dans le fichier :"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Sélectionner"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Tous les rendez-vous"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Rendez-vous nommés :"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
+msgstr "Noter que seuls les fichiers principaux rendez-vous sont lus.\nLes évènements archivés et extérieurs ne sont pas exportés."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
+msgstr "Noter que seuls les fichiers principaux rendez-vous sont lus.\nLes évènements extérieurs ne sont pas exportés."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "Vous pouvez les glisser depuis la fenêtre liste des évènements."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
-msgstr "UIDs rendez-vous d'orage séparés par des virgules."
+msgstr "UIDs des rendez-vous d'orage séparés par des virgules."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Archive"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Archiver maintenant (seuil d'archivage : %d mois)"
 
-#: ../src/interface.c:1094
-#, fuzzy
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
-msgstr "Vous pouvez modifier le niveau d'archive dans les paramètres"
+msgstr "Vous pouvez modifier le seuil d'archive dans les paramètres"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
-msgstr "Rétablir l'archiver maintenant"
+msgstr "Rétablir l'archive maintenant"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
+msgstr "Retourner tous les évènements archivés dans le fichier principal d'orage et supprimer le fichier arch.\nCeci est utile par exemple lorsque vous effectuez l'exportation et le déplacement d'un rendez-vous\norage dans un autre système."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Fichiers d'Orage"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Fichier calendrier principal d'Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Fichier actuel"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Nouveau fichier"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Options des actions"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Fichier actuel :"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Nouveau fichier :"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Options d'action :"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Renommer"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
+msgstr "Renommer le fichier Orage interne uniquement.\nNe pas toucher le système de fichiers externe du tout.\nLe nouveau fichier doit exister."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Copier"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr "Le fichier en cours est copié et reste inchangé à son ancienne place."
+msgstr "Le fichier actuel est copié et reste inchangé à son ancienne place."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Déplacer"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
-msgstr "Le fichier actuel est déplacé et disparaît de l'ancienne place."
+msgstr "Le fichier actuel est déplacé et disparait de l'ancienne place."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Fichier archive"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Fichiers externes"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Ajouter un nouveau fichier externe"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Fichier externe :"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Options"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Nom visible :"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
-msgstr "Lecture seulement"
+msgstr "Lecture seule"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Réglez cette option si vous voulez etre sur que ce fichier ne soit jamais "
-"modifié par Orage.\n"
-"Notez que la modification des fichiers étrangers les rend incompatibles avec "
-"l'outil d'origine, d'où ils sont venus!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Permet d'être certain que ce fichier ne soit jamais modifié par Orage.\nNotez que la modification des fichiers externes les rend incompatibles avec l'outil qui a servi à les créer !"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Ce nom interne s'affiche pour l'utilisateur à la place du nom du fichier."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Échange de données - Orage"
 
-#: ../src/main.c:268
-#, fuzzy, c-format
+#: ../src/main.c:275
+#, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tCeci est %s version %s pour Xfce %s.\n"
-"\n"
+msgstr "\tCeci est %s version %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr "\tDistribué sous les termes de la Licence Publique Générale GNU.\n"
+msgstr "\tDistribué sous les termes de la GNU General Public License.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tCompilé avec GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "utilisant GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tUtilisation de DBUS pour l'importation.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
+msgstr "\tDBUS pas utilisé. L'importation ne fonctionne que partiellement.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
-msgstr "\tlibnotify utilisé.\n"
+msgstr "\tUtilisation de libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
-msgstr "\tlibnotify non utilisé.\n"
+msgstr "\tlibnotify  pas utilisé.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
-msgstr "\tArchivage automatique utilisé.\n"
+msgstr "\tUtilisation de l'archivage automatique.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
-msgstr "\tArchivage non utilisé.\n"
+msgstr "\tArchivage pas utilisé.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
-msgstr ""
+msgstr "\tUtilisation du paquet libical fourni par le système d'exploitation\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
+msgstr "\tUtilisation de la version propre à Orage de libical.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Utilisation : orage [options] [fichiers]\n"
-"\n"
+msgstr "Utilisation : orage [options] [fichiers]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Options :\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
-msgstr "--version (v) \t\tafficher la version\n"
+msgstr "--version (v) \t\tafficher la version d'orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tafficher l'aide\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
-msgstr "--préférences (-p) \tafficher les préférences\n"
+msgstr "--preferences (-p) \tafficher les préférences\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
+msgstr "--toggle (-t) \t\trendre orage visible/invisible\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) fichier [RW] [nom] \tajouter un fichier externe\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) fichier \tsupprimer un fichier externe\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--export (-e) file [rendez-vous...] \texporter les rendez-vous d'Orage dans un fichier\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
-msgstr "files=ical fichiers à charger dans Orage\n"
+msgstr "files=fichiers ical à charger dans Orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tdbus n'est pas inclus dans Orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
+msgstr "\tsans [fichiers] dbus et les options fichier externes (-a et-r) peuvent être seulement utilisées lors du démarrage d'orage \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Option inconnue %s\n"
-"\n"
+msgstr "\nOption inconnue %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "É_changer des données"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
-msgstr "_Éditer"
+msgstr "É_dition"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
-msgstr "Voir le _jour choisie"
+msgstr "Voir le _jour choisi"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
-msgstr "Voir la _semaine"
+msgstr "Voir la _semaine choisie"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Choisir _aujourd'hui"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Heure locale"
+msgstr "Afficher l’heure _globale"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Aucun titre défini"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr " Emplacement : %s \n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n Note :\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Jamais"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Titre : %s\n"
-" Début :\t%s\n"
-" Fin :\t%s\n"
-" Note :\n"
-"%s"
+" Done:\t%s%s"
+msgstr "Titre : %s\n%s Début :\t%s\n Échéance :\t%s\n Fait :\t%s%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Titre : %s\n"
-" Début :\t%s\n"
-" Fin :\t%s\n"
-" Note :\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Titre: %s \n%s Début : \t%s\n Fin : \t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>À faire :</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
-msgstr "<b>Événements pour %s :<b>"
+msgstr "<b>Évènements pour %s :<b>"
 
-#: ../src/mainbox.c:593
-#, fuzzy, c-format
+#: ../src/mainbox.c:660
+#, c-format
 msgid "<b>Events for %s - %s:</b>"
-msgstr "<b>Événements pour %s :<b>"
+msgstr "<b>Évènements pour %s - %s :<b>"
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:492
 msgid "Main settings"
-msgstr "Général"
+msgstr "Paramètres principaux"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
-msgstr "Zone horaire"
+msgstr "Fuseau horaire"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "Vous devez toujours définir votre fuseau horaire local."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "Durée à archiver (mois)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = pas d'archivage)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"L'archivage est utilisé pour gagner du temps et de l'espace lors de la "
-"manipulation des événements."
+msgstr "L'archivage est utilisé pour gagner du temps et de l'espace lors de la manipulation des évènements."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Commande pour jouer un son"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr "Cette commande est donné au shell pour faire sonner les alarmes."
+msgstr "Cette commande est exécutée par l’interpréteur de commande pour faire sonner les alarmes."
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Affiché"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Fenêtre principale du calendrier"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Fenêtre calendrier"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Détails visuel du calendrier  "
+
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "Afficher la bordure de fenêtre"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "Afficher la barre de menu"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Montrer le mois et l'année"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
 msgstr "Afficher le nom du jour"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
-msgstr "Afficher le nombre de semaine"
+msgstr "Afficher les numéros de semaine"
+
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Afficher le mois et l'année"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Calendrier des boîtes info"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "Afficher la liste à faire"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
-msgstr ""
+msgstr "Nombre de jours à afficher dans la fenêtre d’évènements"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
-msgstr ""
+msgstr "0 = ne pas afficher la liste des évènements"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Visibilité calendrier "
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
-msgstr ""
+msgstr "Afficher sur tous les bureaux"
 
-#: ../src/parameters.c:683
-#, fuzzy
+#: ../src/parameters.c:696
 msgid "Keep on top"
-msgstr "Afficher toujours en dessus"
+msgstr "Toujours au-dessus"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
-msgstr "Montrer dans la barre des tâches"
+msgstr "Afficher dans la barre des tâches"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
-msgstr "Montrer dans le pager"
+msgstr "Afficher dans le pager"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
-msgstr "Montrer dans la zone de notification"
+msgstr "Afficher dans la zone de notification"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "Affichage du calendrier au lancement"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
-msgstr "Montrer"
+msgstr "Afficher"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
-msgstr "Cacher"
+msgstr "Masquer"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Réduire"
 
-#: ../src/parameters.c:793
-#, fuzzy
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "Lors de l'ouverture de la fenêtre du calendrier"
+
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Sélectionner la date d'aujourd'hui"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Sélectionner la date précédemment sélectionnée"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Affichage lors d'un double-clic sur une journée du calendrier"
+
+#: ../src/parameters.c:828
+msgid "Days view"
+msgstr "Vue des jours"
+
+#: ../src/parameters.c:840
+msgid "Event list"
+msgstr "Liste des évènements"
+
+#: ../src/parameters.c:862
 msgid "Extra settings"
-msgstr "Paramètres avancés"
+msgstr "Paramètres supplémentaires"
 
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Fenêtre principale du calendrier"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "Choisir _aujourd'hui"
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Fenêtre de la liste des évènements"
 
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
+#: ../src/parameters.c:874
+msgid "Number of extra days to show in event list"
+msgstr "Nombre de jours supplémentaires pour montrer dans la liste des évènements"
+
+#: ../src/parameters.c:883
+msgid ""
+"This is just the default value, you can change it in the actual eventlist "
+"window."
+msgstr "Ceci est juste la valeur par défaut, vous pouvez la modifier dans la fenêtre de la liste des évènements actuels."
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Afficher seulement la première répétition de l’évènement"
 
-#: ../src/parameters.c:836
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Premier jour par défaut dans la fenêtre « vue journalière »"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Premier jour de la semaine"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Jour sélectionné"
+
+#: ../src/parameters.c:943
 msgid "Use dynamic tray icon"
-msgstr ""
+msgstr "Utiliser une icône de notification dynamique"
 
-#: ../src/parameters.c:841
+#: ../src/parameters.c:948
 msgid "Use dynamic icon"
 msgstr "Utiliser une icône dynamique"
 
-#: ../src/parameters.c:847
+#: ../src/parameters.c:954
 msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
+msgstr "L’icône dynamique affiche le mois en cours et le jour du mois."
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Afficher lors d'un double clic"
+#: ../src/parameters.c:962 ../src/parameters.c:967
+msgid "Use wakeup timer"
+msgstr "Utiliser la minuterie du réveil"
 
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr "Vue des jours"
+#: ../src/parameters.c:973
+msgid ""
+"Use this timer if Orage has problems waking up properly after suspend or "
+"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "Utiliser cette minuterie si Orage rencontre des problèmes pour s’activer correctement après une mise en veille ou une mise en veille prolongée (par exemple, si l’icône n'est pas mise à jour ou si les alarmes ne s’activent pas)."
 
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr "Liste des événements"
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Fichier externe par défaut de l'alarme visuelle "
 
-#: ../src/parameters.c:890
-#, fuzzy
-msgid "Eventlist window"
-msgstr "Liste des événements"
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Fenêtre Orage "
 
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr ""
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Signaler la notification"
 
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Toujours quitter lorsqu’on demande à fermer"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Toujours quitter"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:1029
 msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Par défaut Orage reste ouvert en arrière-plan lorsqu’on demande à le fermer. Cette option permet de quitter Orage sans le laisser ouvert en arrière-plan."
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Préférences d'Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
-msgstr "Premier démarrage d' Orage. Recherche du fuseau horaire par défaut."
+msgstr "Premier démarrage d’Orage. Recherche du fuseau horaire par défaut."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
-msgstr "Fuseau horaire définit à %s par défaut."
+msgstr "Fuseau horaire par défaut réglé sur %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
-msgstr ""
-"Fuseau horaire par défaut non trouvé, s'il vous plaît, sélectionnez le "
-"manuellement."
+msgstr "Fuseau horaire par défaut non trouvé, veuillez le sélectionner manuellement."
 
 #: ../src/reminder.c:562
 msgid "Reminder "
@@ -2027,40 +2140,35 @@
 msgid "Open"
 msgstr "Ouvrir"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Rappel - Orage"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Reporter"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
+msgstr "Rappelez-moi après le délai spécifié"
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Prochaines alarmes actives :"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d j %02d h %02d min à : %s"
+msgstr "\n%02d j %02d h %02d min à : %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Pas d'alarme trouvée"
+msgstr "\nAucune alarme active trouvée"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2083,1537 +2191,2229 @@
 msgstr "Afrique/Alger"
 
 #: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
+msgid "Africa/Asmara"
 msgstr "Afrique/Asmara"
 
 #: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr "Afrique/Bamako"
-
+msgid "Africa/Asmera"
+msgstr "Afrique/Asmara"
+
 #: ../src/timezone_names.c:43
+msgid "Africa/Bamako"
+msgstr "Afrique/Bamako"
+
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "Afrique/Bangui"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "Afrique/Banjul"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "Afrique/Bissau"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "Afrique/Blantyre"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "Afrique/Brazzaville"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "Afrique/Boujoumboura"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "Afrique/Le_Caire"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "Afrique/Casablanca"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "Afrique/Ceuta"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "Afrique/Conakry"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "Afrique/Dakar"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrique/Dar_es_Salaam"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "Afrique/Djibouti"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "Afrique/Douala"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "Afrique/El_Aaiun"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "Afrique/Freetown"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "Afrique/Gaborone"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "Afrique/Harare"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "Afrique/Juba"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "Afrique/Johannesburg"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "Afrique/Kampala"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "Afrique/Khartoum"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "Afrique/Kigali"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "Afrique/Kinshasa"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "Afrique/Lagos"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "Afrique/Libreville"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "Afrique/Lome"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "Afrique/Luanda"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "Afrique/Lubumbashi"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "Afrique/Lusaka"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "Afrique/Malabo"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "Afrique/Maputo"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "Afrique/Maseru"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "Afrique/Mbabane"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "Afrique/Mogadiscio"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "Afrique/Monrovia"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "Afrique/Nairobi"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "Afrique/Ndjamena"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "Afrique/Niamey"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "Afrique/Nouakchott"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "Afrique/Ouagadougou"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "Afrique/Porto-Novo"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "Afrique/Sao_Tome"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "Afrique/Tombouctou"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "Afrique/Tripoli"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "Afrique/Tunis"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "Afrique/Windhoek"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "Amérique"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "Amérique/Adak"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "Amérique/Anchorage"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "Amérique/Anguilla"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "Amérique/Antigua"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "Amérique/Araguaia"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "Amérique/Argentine/Buenos_Aires"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "Amérique/Argentine/Catamarca"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "Amérique/Argentine/ComodRivadavia"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "Amérique/Argentine/Cordoba"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "Amérique/Argentine/Jujuy"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "Amérique/Argentine/La_Rioja"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "Amérique/Argentine/Mendoza"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "Amérique/Argentine/Rio_Gallegos"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "Amérique/Argentine/Salta"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "Amérique/Argentine/San_Juan"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "Amérique/Argentine/San_Luis"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "Amérique/Argentine/Tucuman"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "Amérique/Argentine/Ushuaia"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "Amérique/Aruba"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "Amérique/Asuncion"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "Amérique/Atikokan"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "Amérique/Atka"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "Amérique/Bahia"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "America/Bahia_Banderas"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "Amérique/Barbade"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "Amérique/Belém"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "Amérique/Belize"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "Amérique/Blanc-Sablon"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "Amérique/Boa_Vista"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "Amérique/Bogota"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "Amérique/Boise"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "Amérique/Buenos_Aires"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "Amérique/Cambridge_Bay"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "Amérique/Campo_Grande"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "Amérique/Cancun"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "Amérique/Caracas"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "Amérique/Catamarca"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "Amérique/Cayenne"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "Amérique/Caïman"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "Amérique/Chicago"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "Amérique/Chihuahua"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "Amérique/Coral_Harbour"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "Amérique/Cordoba"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "Amérique/Costa_Rica"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "Amérique/Creston"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "Amérique/Cuiabà"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "Amérique/Curaçao"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "Amérique/Danmarkshavn"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "Amérique/Dawson"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "Amérique/Dawson_Creek"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "Amérique/Denver"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "Amérique/Detroit"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "Amérique/Dominique"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "Amérique/Edmonton"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "Amérique/Ensenada"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "Amérique/Eirunepé"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "Amérique/San_Salvador"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "Amérique/Fortaleza"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "Amérique/Fort_Wayne"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "Amérique/Glace_Bay"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "Amérique/Godthab"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "Amérique/Goose_Bay"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "Amérique/Grand_Turk"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "Amérique/Grenade"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "Amérique/Guadeloupe"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "Amérique/Guatemala"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "Amérique/Guayaquil"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "Amérique/Guyana"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "Amérique/Halifax"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "Amérique/La_Havane"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "Amérique/Hermosillo"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "Amérique/Indiana/Indianapolis"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "Amérique/Indiana/Knox"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "Amérique/Indiana/Marengo"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "Amérique/Indiana/Pétersbourg"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "Amérique/Indiana/Tell_City"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "Amérique/Indiana/Vevay"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "Amérique/Indiana/Vincennes"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "Amérique/Indiana/Winamac"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "Amérique/Indianapolis"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "Amérique/Inuvik"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "Amérique/Iqaluit"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "Amérique/Jamaïque"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "Amérique/Jujuy"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "Amérique/Juneau"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "Amérique/Kentucky/Louisville"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "Amérique/Kentucky/Monticello"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "Amérique/Knox_IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "Amérique/Kralendijk"
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "Amérique/La_Paz"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "Amérique/Lima"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "Amérique/Los_Angeles"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "Amérique/Louisville"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "America/Lower_Princes"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "Amérique/Maceio"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "Amérique/Managua"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "Amérique/Manaus"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "Amérique/Marigot"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "Amérique/Martinique"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "Amérique/Matamoros"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "Amérique/Mazatlan"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "Amérique/Mendoza"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "Amérique/Menominee"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "Amérique/Mérida"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "Amérique/Metlakatla"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "Amérique/Mexico"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "Amérique/Miquelon"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "Amérique/Moncton"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "Amérique/Monterrey"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "Amérique/Montevideo"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "Amérique/Montréal"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "Amérique/Montserrat"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "Amérique/Nassau"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "Amérique/New_York"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "Amérique/Nipigon"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "Amérique/Nome"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "Amérique/Nord_Dakota/Beulah"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "Amérique/Nord_Dakota/Centre"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "Amérique/Nord_Dakota/New_Salem"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "Amérique/Noronha"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "Amérique/Ojinaga"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "Amérique/Panama"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "Amérique/Pangnirtung"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "Amérique/Paramaribo"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "Amérique/Phoenix"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "Amérique/Port-au-Prince"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "Amérique/Port_of_Spain"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "Amérique/Porto_Acre"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "Amérique/Pôrto_Velho"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "Amérique/Porto_Rico"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "Amérique/Rainy_River"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "Amérique/Rankin_Inlet"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "Amérique/Recife"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "Amérique/Regina"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "Amérique/Resolute"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "Amérique/Rio_Branco"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "Amérique/Rosario"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "Amérique/Santa_Isabel"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "Amérique/Santarem"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "Amérique/Santiago"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "Amérique/Santo_Domingo"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "Amérique/Sao_Paulo"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "Amérique/Scoresbysund"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "Amérique/Shiprock"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "Amérique/Sitka"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "Amérique/St_Barthelemy"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "Amérique/St_Johns"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "Amérique/St_Kitts"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "Amérique/Ste_Lucie"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "Amérique/St_Thomas"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "Amérique/St_Vincent"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "Amérique/Swift_Current"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "Amérique/Tegucigalpa"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "Amérique/Thule"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "Amérique/Thunder_Bay"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "Amérique/Tijuana"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "Amérique/Toronto"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "Amérique/Tortola"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "Amérique/Vancouver"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "Amérique/Virgin"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "Amérique/Whitehorse"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "Amérique/Winnipeg"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "Amérique/Yakutat"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "Amérique/Yellowknife"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Antarctique"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Antarctique/Casey"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Antarctique/Davis"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarctique/Dumont_D'Urville"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Antarctique/Macquarie"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Antarctique/Mawson"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Antarctique/McMurdo"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Antarctique/Palmer"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Antarctique/Rothera"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Antarctique/Pôle_Sud"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "Antarctique/Syowa"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Antarctique/Vostok"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Arctique"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Arctique/Longyearbyen"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Asie"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Asie/Aden"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Asie/Almati"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Asie/Amman"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Asie/Anadyr"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Asie/Aktaou"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Asie/Aktioubinsk"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "Asie/Achkhabad"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Asie/Achkhabad"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "Asie/Baghdad"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Asie/Bahrein"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Asie/Bakou"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Asie/Bangkok"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Asie/Beyrouth"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Asie/Bishkek"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Asie/Brunei"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Asie/Calcutta"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Asie/Tchoibalsan"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "Asie/Chongqing"
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "Asie/Chongqing"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Asie/Colombo"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Asie/Dacca"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "Asie/Damas"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Asie/Dhaka"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Asie/Dili"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Asie/Doubaï"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Asie/Douchanbé"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Asie/Gaza"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Asie/Harbin"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Asie/Hébron"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Asie/Hong_Kong"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Asie/Ho_Chi_Minh"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Asie/Hovd"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Asie/Irkoutsk"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Asie/Istanbul"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Asie/Djakarta"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Asie/Jayapura"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Asie/Jerusalem"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Asie/Kaboul"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Asie/Kamchatka"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Asie/Karachi"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Asie/Kashgar"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Asie/Katmandou"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Asie/Kathmandu"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Asie/Khandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Asie/Kolkata"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Asie/Krasnoyarsk"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asie/Kuala_Lumpur"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Asie/Kuching"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Asie/Kowait"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Asie/Macao"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Asie/Macao"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Asie/Magadan"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Asie/Makassar"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Asie/Manille"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Asie/Muscat"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Asie/Nicosie"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Asie/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Asie/Novosibirsk"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Asie/Omsk"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Asie/Oral"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Asie/Phnom_Penh"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Asie/Pontianak"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Asie/Pyongyang"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Asie/Qatar"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Asie/Qyzylorda"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Asie/Rangoon"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Asie/Riad"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Asie/Riyadh87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Asie/Riyadh88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Asie/Riyadh89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Asie/Saïgon"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Asie/Sakhaline"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Asie/Samarkand"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Asie/Séoul"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Asie/Shanghai"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Asie/Singapour"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Asie/Taipei"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Asie/Tachkent"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Asie/Tbilisi"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Asie/Téhéran"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Asie/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Asie/Thimbu"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Asie/Thimbu"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Asie/Tokyo"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "Asie/Ujung_Pandang"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Asie/Oulan_Bator"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Asie/Ulan_Bator"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Asie/Tihoua"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Asie/Ust-Nera"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Asie/Vientiane"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Asie/Vladivostok"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Asie/Iakoutsk"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Asie/Sverdlovsk"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Asie/Erevan"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Atlantique"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Atlantique/Açores"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Atlantique/Bermudes"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Atlantique/Canaries"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantique/Cap_Vert"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "Atlantique/Faeroe"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlantique/Féroé"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantique/Jan_Mayen"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "Atlantique/Madère"
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantique/Reykjavik"
 
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr "Atlantique/Géorgie-du_Sud"
+#: ../src/timezone_names.c:375
+msgid "Atlantic/South_Georgia"
+msgstr "Atlantique/Géorgie-du_Sud"
+
+#: ../src/timezone_names.c:376
+msgid "Atlantic/St_Helena"
+msgstr "Atlantique/Ste_Hélène"
+
+#: ../src/timezone_names.c:377
+msgid "Atlantic/Stanley"
+msgstr "Atlantique/Stanley"
+
+#: ../src/timezone_names.c:378
+msgid "Australia"
+msgstr "Australie"
+
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Australie/ACT"
+
+#: ../src/timezone_names.c:380
+msgid "Australia/Adelaide"
+msgstr "Australie/Adelaïde"
+
+#: ../src/timezone_names.c:381
+msgid "Australia/Brisbane"
+msgstr "Australie/Brisbane"
+
+#: ../src/timezone_names.c:382
+msgid "Australia/Broken_Hill"
+msgstr "Australie/Broken_Hill"
+
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Australie/Currie"
+
+#: ../src/timezone_names.c:384
+msgid "Australia/Darwin"
+msgstr "Australie/Darwin"
+
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Australie/Eucla"
+
+#: ../src/timezone_names.c:386
+msgid "Australia/Hobart"
+msgstr "Australie/Hobart"
+
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr "Australie/Lindeman"
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr "Australie/Lord_Howe"
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "Australie/Melbourne"
+
+#: ../src/timezone_names.c:390
+msgid "Australia/Perth"
+msgstr "Australie/Perth"
+
+#: ../src/timezone_names.c:391
+msgid "Australia/Sydney"
+msgstr "Australie/Sydney"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brésil"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brésil/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brésil/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brésil/Est"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brésil/Ouest"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Canada"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Canada/Atlantique"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Canada/Central"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Canada/Est-Saskatchewan"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Canada/Est"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Canada/Montagne"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Canada/Terre-Neuve"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Canada/Pacifique"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Canada/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Canada/Yukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Chili"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Chili/Continent"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Chili/Île_de_Pâques"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
 
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr "Atlantique/Ste_Hélène"
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
 
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr "Atlantique/Stanley"
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
 
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr "Australie"
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
 
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr "Australie/Adelaïde"
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
 
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr "Australie/Brisbane"
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
 
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr "Australie/Broken_Hill"
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
 
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr "Australie/Darwin"
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
 
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr "Australie/Hobart"
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
 
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr "Australie/Lindeman"
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
 
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr "Australie/Lord_Howe"
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
 
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr "Australie/Melbourne"
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
 
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr "Australie/Perth"
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
 
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr "Australie/Sydney"
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/GMT"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Universal"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Zulu"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Europe"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "Europe/Amsterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Europe/Andorre"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Europe/Athene"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Europe/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Europe/Belgrade"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Europe/Berlin"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Europe/Bratislava"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Europe/Bruxelles"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Europe/Bucarest"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Europe/Budapest"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Europe/Busingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Europe/Chisinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Europe/Copenhague"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "Europe/Dublin"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Europe/Gibraltar"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Europe/Guernesey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Europe/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Europe/Isle_of_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Europe/Istanbul"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Europe/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Europe/Kaliningrad"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Europe/Kiev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Europe/Lisbonne"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "Europe/Ljubljana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Europe/Londres"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Europe/Luxembourg"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Europe/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Europe/Malte"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Europe/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Europe/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Europe/Monaco"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Europe/Moscou"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "Europe/Nicosie"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Europe/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Europe/Paris"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Europe/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Europe/Prague"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Europe/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Europe/Rome"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Europe/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Europe/San_Marin"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Europe/Sarajevo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "Europe/Simferopol"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "Europe/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Europe/Sofia"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Europe/Stockholm"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Europe/Tallinn"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Europe/Tirana"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Europe/Tiraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "Europe/Oujgorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Europe/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Europe/Vatican"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Europe/Vienne"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "Europe/Vilnius"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Europe/Volgograd"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "Europe/Varsovie"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Europe/Zagreb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "Europe/Zaporijjya"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "Europe/Zurich"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Indien"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "Indien/Antananarive"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "Indien/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "Indien/Christmas"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "Indien/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "Indien/Comores"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "Indien/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "Indien/Mahé"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "Indien/Maldives"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "Indien/Maurice"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "Indien/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "Indien/Réunion"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Mexique"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Mexique/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Mexique/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Mexique/Général"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Moyen-Orient"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Moyen-Orient/Riyadh87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Moyen-Orient/Riyadh88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Moyen-Orient/Riyadh89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Pacifique"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "Pacifique/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Pacifique/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Pacifique/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Pacifique/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "Pacifique/Pâques"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "Pacifique/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "Pacifique/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Pacifique/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "Pacifique/Fidji"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Pacifique/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Pacifique/Galapagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Pacifique/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "Pacifique/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Pacifique/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Pacifique/Honolulu"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Pacifique/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "Pacifique/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "Pacifique/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "Pacifique/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Pacifique/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Pacifique/Marquises"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Pacifique/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Pacifique/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Pacifique/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Pacifique/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "Pacifique/Nouméa"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Pacifique/Pago_Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Pacifique/Palaos"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "Pacifique/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Pacifique/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "Pacifique/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Pacifique/Port_Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Pacifique/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Pacifique/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pacifique/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Pacifique/Tahiti"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Pacifique/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Pacifique/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Pacifique/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Pacifique/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Pacifique/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "Pacifique/Yap"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "États-Unis"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "États-Unis/Alaska"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "États-Unis/Aléoutiennes"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "États-Unis/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "États-Unis/Central"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "États-Unis/Est"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "États-Unis/Est-Indiana"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "États-Unis/Hawaii"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "États-Unis/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "États-Unis/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "États-Unis/Montagne"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "États-Unis/Pacifique"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "États-Unis/Nouveau-Pacifique"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "États-Unis/Samoa"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "Nouveau rendez-vous"
@@ -3623,246 +4423,34 @@
 msgstr "À propos d'Orage"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Orage Panel Clock"
-msgstr "Horloge Orage"
+msgstr "Horloge du tableau de bord Orage"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
 msgid "Show time and date?"
-msgstr "Montrer l'heure et la date ?"
+msgstr "Afficher l'heure et la date ?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Calendrier"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Préférences d'Orage"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Préférences d'Orage"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Paramètres pour l'Application Calendrier de Xfce 4"
+msgstr "Paramètres pour l'Application Calendrier de Xfce 4 (Orage)"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Calendrier du bureau"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Préférences calendrier Orage"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Calendrier"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Calendrier - Orage"
 
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Vous devez saisir les caractères escape etc vous même.\n"
-#~ " Cette chaîne est simplement donnée au shell pour le traitement"
-
-#~ msgid "Orage clock"
-#~ msgstr "Horloge Orage"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Créateur originel, développeur retiré"
-
-#~ msgid "Contributor"
-#~ msgstr "Contributeur"
-
-#~ msgid "Info"
-#~ msgstr "Info"
-
-#~ msgid "Warning"
-#~ msgstr "Attention"
-
-#~ msgid "Error"
-#~ msgstr "Erreur"
-
-#~ msgid "Display"
-#~ msgstr "Affichage"
-
-#~ msgid "Set sticked"
-#~ msgstr "Coller sur tous les bureaux"
-
-#~ msgid "Select always today"
-#~ msgstr "Toujours sélectionner aujourd'hui"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Lorsque le calendrier principal est affiché, mettez le curseur sur le "
-#~ "jour préalablement sélectionné, où toujours sur le jour actuel."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "erreur en terminant le mode batch: %s\n"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Mode d'ajustement de l'heure de départ"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "ajuster pour changer les minutes"
-
-#~ msgid "Vary"
-#~ msgstr "Changeant"
-
-#~ msgid "Select timezone"
-#~ msgstr "Choisir une zone horaire"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Modifier l'horloge"
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "saisir le fuseau horaire de cette horloge,\n"
-#~ "(=toute valeur TZ)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Modifier les préférences"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Entrez fuseau horaire local. (il est utilisé pour montrer si l'heure est "
-#~ "sur précédente (-) ou à la prochaine date (+) en ajoutant un + / - après "
-#~ "l'heure)"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr ""
-#~ "Mettre une zone horaire valide (=TZ) ou en choisir une dans la liste."
-
-#~ msgid "show line _1:"
-#~ msgstr "Montrer la ligne_1 :"
-
-#~ msgid "show line _2:"
-#~ msgstr "Montrer la ligne_2 :"
-
-#~ msgid "show line _3:"
-#~ msgstr "Montrer la ligne_3 :"
-
-#~ msgid "Properties"
-#~ msgstr "Propriétés"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Échec à l'exécution d'orage -p'"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> ajoute la date actuelle au format local.\n"
-#~ "<T> ajoute l'heure et\n"
-#~ "<DT> ajoute l'heure et la date."
-
-#~ msgid "Show event list"
-#~ msgstr "Afficher la liste des événements"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = icône statique)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "L'icone dynamique indique le jour et mois actuel. Elle est visible "
-#~ "uniquement dans le tiroir. Si elle est trop petite pour la taille des "
-#~ "icônes dynamiques, Orage revient automatiquement à l'icône statique."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Paramètres du Calendrier"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Xfce 4 Paramètres du calendrier"
-
-#~ msgid "Monday"
-#~ msgstr "Lundi"
-
-#~ msgid "Tuesday"
-#~ msgstr "Mardi"
-
-#~ msgid "Wednesday"
-#~ msgstr "Mercredi"
-
-#~ msgid "Thursday"
-#~ msgstr "Jeudi"
-
-#~ msgid "Friday"
-#~ msgstr "Vendredi"
-
-#~ msgid "Saturday"
-#~ msgstr "Dimanche"
-
-#~ msgid "Sunday"
-#~ msgstr "Dimanche"
-
-#~ msgid "Ical week start day"
-#~ msgstr "Début de semaine Ical"
-
-#~ msgid "Days"
-#~ msgstr "jours"
-
-#~ msgid "normal"
-#~ msgstr "Infos générales"
-
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%m/%d/%Y"
-
-#~ msgid "Calendar Files"
-#~ msgstr "Fichiers du calendrier"
-
-#~ msgid "Calendar borders"
-#~ msgstr "Bordures du calendrier"
-
-#~ msgid "Hidden"
-#~ msgstr "Caché"
-
-#~ msgid "3 months"
-#~ msgstr "3 mois"
-
-#~ msgid "6 months"
-#~ msgstr "6 mois"
-
-#~ msgid "1 year"
-#~ msgstr "1 an"
-
-#~ msgid "Application"
-#~ msgstr "Application"
-
-#~ msgid "Button Label|Orage"
-#~ msgstr "Orage"
-
-#~ msgid "Core developer"
-#~ msgstr "Développeur principal"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Vous allez effacer toute information \n"
-#~ "associée à cette date."
-
-#~ msgid "Clear"
-#~ msgstr "Effacer"
-
-#~ msgid "uid"
-#~ msgstr "uid"
-
-#~ msgid "This should not happen"
-#~ msgstr "Cela ne devrait pas arriver"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Impossible de créer un canal client MCS"
-
-#~ msgid "Open archive file..."
-#~ msgstr "Ouvrir un fichier archive..."
-
-#~ msgid "Close archive file"
-#~ msgstr "Fermer un fichier archive"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Calendrier du bureau"
diff -Nru orage-4.8.3/po/gl.po orage-4.12.1/po/gl.po
--- orage-4.8.3/po/gl.po	2012-01-03 12:01:04.000000000 +0000
+++ orage-4.12.1/po/gl.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,25 +1,22 @@
-# Galician translation of orage
-# Copyright (C) 2008, 2009, 2010 Leandro Regueiro
-# This file is distributed under the same license as the xfce package.
-#
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2006, 2008, 2009, 2010.
-#
-# Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
-# colaborar connosco, podes atopar máis información en <http://trasno.net>
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Leandro Regueiro <leandro.regueiro@gmail.com>, 2006,2008-2010
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.01\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2010-10-20 09:44+0100\n"
-"Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
-"Language-Team: Galician <proxecto@trasno.net>\n"
+"POT-Creation-Date: 2013-11-18 18:30+0100\n"
+"PO-Revision-Date: 2013-11-19 15:56+0000\n"
+"Last-Translator: Xfce <transifex@xfce.org>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/xfce/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -35,9 +32,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"prema para modificar o reloxo"
+msgstr "%s\nprema para modificar o reloxo"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -111,9 +106,8 @@
 msgstr "pechar a xanela e saír"
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "preferencias de actualización"
+msgstr ""
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -161,9 +155,8 @@
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
-#, fuzzy
 msgid "Foreground (=text) color:"
-msgstr "Cor de primeiro plano do texto"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
@@ -198,9 +191,8 @@
 msgstr "Subraiar a hora do reloxo:"
 
 #: ../globaltime/gt_prefs.c:850
-#, fuzzy
 msgid "Text Default Formatting"
-msgstr "Usar o formato predeterminado"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:863
 msgid "Click to change default background colour for clocks"
@@ -208,8 +200,7 @@
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
-"Marque isto para usar a predefinición do sistema en vez da cor seleccionada"
+msgstr "Marque isto para usar a predefinición do sistema en vez da cor seleccionada"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
@@ -221,9 +212,7 @@
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"Marque isto para usar o tipo de letra predeterminado do sistema en vez do "
-"tipo de letra seleccionado"
+msgstr "Marque isto para usar o tipo de letra predeterminado do sistema en vez do tipo de letra seleccionado"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -244,9 +233,8 @@
 msgstr "preferencias de actualización"
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "Preferencias xerais"
+msgstr ""
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
@@ -340,7 +328,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2771
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Situación"
@@ -401,20 +389,18 @@
 msgid "floating"
 msgstr "flotante"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "Hora local"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "Orage - Calendario"
+msgstr ""
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "Mostrar reloxos de diferentes paises"
 
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr ""
+
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
 msgstr "Aparencia"
@@ -501,9 +487,8 @@
 msgstr ""
 
 #: ../panel-plugin/oc_config.c:457
-#, fuzzy
 msgid "Orage clock Preferences"
-msgstr "Preferencias de Orage"
+msgstr ""
 
 #. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
@@ -514,7 +499,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
@@ -524,29 +509,27 @@
 msgstr "Mantedor"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "Xestionar a hora con Xfce4"
+msgstr ""
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2800
 msgid "End"
 msgstr "Fin"
 
 #: ../src/appointment.c:333
-#, fuzzy
 msgid "Due"
-msgstr "debido"
+msgstr ""
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Seleccione un ficheiro..."
 
@@ -554,226 +537,273 @@
 msgid "Sound Files"
 msgstr "Ficheiros de son"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Modificouse a información da cita."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1282 ../src/event-list.c:921
 msgid "Do you want to continue?"
 msgstr "Desexa continuar?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr ""
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr ""
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "A fin desta cita é antes do seu comezo."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1918
 msgid "Not set"
 msgstr "Non definido"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1220
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1221
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1231
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1232
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1281
 msgid "This appointment will be permanently removed."
 msgstr "Esta cita eliminarase permanentemente."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1283 ../src/event-list.c:922
+msgid "No, cancel the removal"
+msgstr ""
+
+#: ../src/appointment.c:1284
+msgid "Yes, remove it"
+msgstr ""
+
+#: ../src/appointment.c:1373 ../src/appointment.c:1388 ../src/day-view.c:457
+#: ../src/event-list.c:980
+msgid "Pick the date"
+msgstr "Seleccionar a data"
+
+#: ../src/appointment.c:1375 ../src/appointment.c:1390 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:982 ../src/event-list.c:1132
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Hoxe"
+
+#: ../src/appointment.c:1798
 msgid "This appointment does not exist."
 msgstr "Esta cita non existe."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1799
 msgid "It was probably removed, please refresh your screen."
 msgstr "Probablemente se eliminou, actualice a pantalla."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2100
 msgid "Current categories"
 msgstr "Categorías actuais"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2115
 msgid "Add new category with color"
 msgstr "Engadir nova categoría de cor"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2119
 msgid "Category:"
 msgstr "Categoría:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2150
 msgid "Colors of categories - Orage"
 msgstr "Cores das categorías - Orage"
 
-#: ../src/appointment.c:2092
-#, fuzzy
+#: ../src/appointment.c:2196
 msgid " *** COPY ***"
-msgstr "_Copiar"
+msgstr ""
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2461
 msgid "New appointment - Orage"
 msgstr "Cita nova - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2491 ../src/day-view.c:279 ../src/event-list.c:1033
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2497
 msgid "Sav_e and close"
 msgstr "_Gardar e saír"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2510 ../src/event-list.c:1039
 msgid "D_uplicate"
 msgstr "D_uplicar"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2697
 msgid "Save"
 msgstr "Gardar"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2699
 msgid "Save and close"
 msgstr "Gardar e pechar"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2704
 msgid "Revert"
 msgstr "Reverter"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2706 ../src/event-list.c:1123
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2711 ../src/event-list.c:1125
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Free"
 msgstr "Libre"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2733
 msgid "General"
 msgstr "Xeral"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2739
 msgid "Type "
 msgstr "Tipo"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2741 ../src/event-list.c:1176
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2744
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"O evento ocorrerá algunha vez. Por exemplo:\n"
-"Reunión ou aniversario ou programa de TV."
+msgstr "O evento ocorrerá algunha vez. Por exemplo:\nReunión ou aniversario ou programa de TV."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2747 ../src/event-list.c:1196
 msgid "Todo"
 msgstr "Tarefas pendentes"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2750
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Algo que ten que facer nalgún momento. Por exemplo\n"
-"Limpar o coche ou probar a nova versión de Orage."
+msgstr "Algo que ten que facer nalgún momento. Por exemplo\nLimpar o coche ou probar a nova versión de Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2753 ../src/event-list.c:1209
 msgid "Journal"
 msgstr "Diario"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2757
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Crear unha nota indicando que algo ocurriu. Por exemplo:\n"
-"Remarcar que a túa nai chamou ou que nevou por primeira vez."
+msgstr "Crear unha nota indicando que algo ocurriu. Por exemplo:\nRemarcar que a túa nai chamou ou que nevou por primeira vez."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2764
 msgid "Title "
 msgstr "Título"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2779
 msgid "All day event"
 msgstr "Evento de día completo"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2785 ../src/appointment.c:3446 ../src/day-view.c:801
 msgid "Start"
 msgstr "Comezo"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2805
 msgid "Set      "
 msgstr "Definir"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2826
 msgid "Duration"
 msgstr "Duración"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2830 ../src/appointment.c:3020 ../src/reminder.c:758
 msgid "days"
 msgstr "días"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2832 ../src/appointment.c:3022 ../src/reminder.c:760
 msgid "hours"
 msgstr "horas"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2834 ../src/appointment.c:3024 ../src/reminder.c:762
 msgid "mins"
 msgstr "minutos"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2846
 msgid "Availability"
 msgstr "Dispoñibilidade"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2854 ../src/appointment.c:3452
 msgid "Completed"
 msgstr "Completado"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2857
 msgid "Done"
 msgstr "Feito"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2878
 msgid "Categories"
 msgstr "Categorías"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2890
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
 msgstr ""
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2895
 msgid "update colors for categories."
 msgstr "actualizar as cores das categorías."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2901
 msgid "Priority"
 msgstr "Prioridade"
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2911
 msgid "Note"
 msgstr "Nota"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2932
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -782,37 +812,35 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before Start"
 msgstr "Antes do comezo"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before End"
 msgstr "Antes de finalizar"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After Start"
 msgstr "Despois do comezo"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After End"
 msgstr "Despois de finalizar"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3011
 msgid "Alarm"
 msgstr "Alarma"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-#, fuzzy
+#: ../src/appointment.c:3017
 msgid "Alarm time"
-msgstr "Hora da última alarma"
+msgstr ""
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3041
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
@@ -820,93 +848,88 @@
 " 3) after Todo start"
 msgstr ""
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3046
 msgid "Persistent alarm"
 msgstr "Alarma persistente"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3048
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
 msgstr ""
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3057
 msgid "Sound"
 msgstr "Son"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
-#, fuzzy
+#: ../src/appointment.c:3061 ../src/appointment.c:3181
 msgid "Use"
-msgstr "Usar"
+msgstr ""
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3063
 msgid "Select this if you want audible alarm"
 msgstr "Seleccione isto se desexa unha alarma sonora"
 
-#: ../src/appointment.c:2972
-#, fuzzy
+#: ../src/appointment.c:3080
 msgid "Repeat alarm sound"
-msgstr "Son de alarma personalizado"
+msgstr ""
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3096 ../src/appointment.c:3395
 msgid "times"
 msgstr "veces"
 
-#: ../src/appointment.c:3004
-#, fuzzy
+#: ../src/appointment.c:3112
 msgid "sec interval"
-msgstr "Intervalo de gardado automático"
+msgstr ""
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3122
 msgid "Visual"
 msgstr "Visual"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3126
 msgid "Use Orage window"
 msgstr "Usar a xanela de Orage"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3128
 msgid "Select this if you want Orage window alarm"
 msgstr ""
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3140
 msgid "Use notification"
 msgstr "Usar notificación"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3142
 msgid "Select this if you want notification alarm"
 msgstr "Seleccione isto se desexa alarma de notificación"
 
-#: ../src/appointment.c:3040
-#, fuzzy
+#: ../src/appointment.c:3148
 msgid "Set timeout"
-msgstr "Tempo de espera do servidor excedido"
+msgstr ""
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3150
 msgid "Select this if you want notification to expire automatically"
 msgstr ""
 
-#: ../src/appointment.c:3054
-#, fuzzy
+#: ../src/appointment.c:3161
 msgid "0 = system default expiration time"
-msgstr "Cambiar o fuso horario do sistema"
+msgstr ""
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3166
 msgid "seconds"
 msgstr "segundos"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3177
 msgid "Procedure"
 msgstr "Procedemento"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3183
 msgid "Select this if you want procedure or script alarm"
 msgstr ""
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3189
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -918,98 +941,96 @@
 "\t<&ET> appointment end time"
 msgstr ""
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3201
 msgid "Test this alarm by raising it now"
 msgstr ""
 
-#: ../src/appointment.c:3101
-#, fuzzy
+#: ../src/appointment.c:3208
 msgid "<b>Default alarm</b>"
-msgstr "Alarma predeterminada"
+msgstr ""
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3216
 msgid "Store current settings as default alarm"
 msgstr "Gardar a configuración actual coma alarma predeterminada"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3221
 msgid "Set current settings from default alarm"
 msgstr ""
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "None"
 msgstr "Ningún"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Daily"
 msgstr "Diariamente"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Monthly"
 msgstr "Mensualmente"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Yearly"
 msgstr "Anualmente"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Hourly"
 msgstr ""
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Mon"
 msgstr "Lun"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Tue"
 msgstr "Mar"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Wed"
 msgstr "Mér"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Thu"
 msgstr "Xov"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Fri"
 msgstr "Ven"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sat"
 msgstr "Sáb"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sun"
 msgstr "Dom"
 
-#: ../src/appointment.c:3183
-#, fuzzy
+#: ../src/appointment.c:3290
 msgid "Recurrence"
-msgstr "Recorrencia"
+msgstr ""
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3296
 msgid "Complexity"
 msgstr "Complexidade"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3299
 msgid "Basic"
 msgstr "Básico"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3305
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3309
 msgid "Use this if you want regular repeating event"
 msgstr ""
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3311
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
@@ -1017,53 +1038,51 @@
 msgstr ""
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3317
 msgid "Frequency"
 msgstr "Frecuencia"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3323
 msgid "Each"
 msgstr "cada"
 
-#: ../src/appointment.c:3224
-#, fuzzy
+#: ../src/appointment.c:3330
 msgid "occurrence"
-msgstr "Eliminar esta _ocorrencia"
+msgstr ""
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3334
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
 msgstr ""
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3379
 msgid "Limit"
 msgstr "Límite"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3381
 msgid "Repeat forever"
 msgstr "Repetir sempre"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3387
 msgid "Repeat "
 msgstr "Repetir "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3403
 msgid "Repeat until "
 msgstr "Repetir ata "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-#, fuzzy
+#: ../src/appointment.c:3416
 msgid "Weekdays"
-msgstr "Semanalmente"
+msgstr ""
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3428
 msgid "Which day"
 msgstr "Que día"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3436
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1074,179 +1093,184 @@
 msgstr ""
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3443
 msgid "TODO base"
 msgstr ""
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3456
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
 msgstr ""
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3458
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3464
 msgid "Exceptions"
 msgstr "Excepcións"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3477
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
 msgstr ""
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3482
 msgid "Add excluded date (-)"
 msgstr ""
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3484
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr ""
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3490
 msgid "Add included time (+)"
 msgstr ""
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3492
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
 msgstr ""
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
-#, fuzzy
+#: ../src/appointment.c:3509
 msgid "Action dates"
-msgstr "Opcións de configuración:"
+msgstr ""
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1056 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Ver"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1075
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1121
 msgid "New"
 msgstr "Novo"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Atrás"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr ""
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Hoxe"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Adiante"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
+
+#: ../src/day-view.c:395 ../src/event-list.c:1139
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1146 ../src/interface.c:834
 msgid "Close"
 msgstr "Pechar"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr ""
 
-#: ../src/day-view.c:935
-#, fuzzy
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
-msgstr "(Mostrar nunha Visualización diaria)"
+msgstr ""
 
 #. date only appointment
 #: ../src/event-list.c:190
 msgid "All day"
 msgstr "Todos os días"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:583 ../src/event-list.c:1292
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:751
 msgid "No rows have been selected."
 msgstr "Non se seleccionou ningunha fila."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:752
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Prema nunha fila para seleccionala e despois diso poderá copiala."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:920
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
+msgstr "Eliminará de xeito permanente\ntodas as citas seleccionadas."
+
+#: ../src/event-list.c:923
+msgid "Yes, remove them"
 msgstr ""
-"Eliminará de xeito permanente\n"
-"todas as citas seleccionadas."
 
 #: ../src/event-list.c:1130
+msgid "Back"
+msgstr "Atrás"
+
+#: ../src/event-list.c:1134
+msgid "Forward"
+msgstr "Adiante"
+
+#: ../src/event-list.c:1141
 msgid "Find"
 msgstr "Buscar"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1148
 msgid "Dayview"
 msgstr ""
 
-#: ../src/event-list.c:1170
-#, fuzzy
+#: ../src/event-list.c:1181
 msgid "Extra days to show "
-msgstr "A páxina da barra lateral para mostrar"
+msgstr ""
 
-#: ../src/event-list.c:1201
-#, fuzzy
+#: ../src/event-list.c:1212
 msgid "Journal entries starting from:"
-msgstr "Non é posible ler as entradas de cor de '%s'"
+msgstr ""
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1232
 msgid "Search"
 msgstr "Buscar"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1235
 msgid "Search text "
 msgstr "Buscar o texto"
 
-#: ../src/event-list.c:1289
-#, fuzzy
+#: ../src/event-list.c:1300
 msgid "Flags"
-msgstr "Parámetros"
+msgstr ""
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1308
 msgid "Title"
 msgstr "Título"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1334
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
@@ -1254,724 +1278,783 @@
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
 
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Seleccionar a data"
-
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr ""
 
-#: ../src/ical-archive.c:329
-#, fuzzy
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
-msgstr "Non é un directorio compartido co WebDAV"
+msgstr ""
 
-#: ../src/ical-archive.c:347
-#, fuzzy, c-format
+#: ../src/ical-archive.c:349
+#, c-format
 msgid "Archiving threshold: %d month(s)"
-msgstr "dentro de 1 mes"
+msgstr ""
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr ""
 
-#: ../src/ical-archive.c:377
-#, fuzzy, c-format
+#: ../src/ical-archive.c:379
+#, c-format
 msgid "Archiving uid: %s"
-msgstr "UID máximo:"
+msgstr ""
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
-#, fuzzy
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
-msgstr "Completado, mais non é o único"
+msgstr ""
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr ""
 
-#: ../src/ical-archive.c:405
-#, fuzzy
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
-msgstr "%s, feito %02i%%"
+msgstr ""
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Iniciando a eliminación do arquivo."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr ""
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr ""
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Rematouse a eliminación de arquivo\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Alarma predeterminada de Orage"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
+msgid "Created alarm list for foreign file: %s (%s)"
 msgstr ""
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr ""
+
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
 msgstr ""
 
 #: ../src/ical-expimp.c:123
-#, fuzzy
 msgid "Starting import file preprocessing"
-msgstr "Importar marcadores desde un ficheiro"
+msgstr ""
 
 #: ../src/ical-expimp.c:158
-#, fuzzy
 msgid "... Patched DCREATED to be CREATED."
-msgstr "_Listaxe dos segmentos que se van crear:"
+msgstr ""
 
 #: ../src/ical-expimp.c:197
 msgid "... Patched timezone to Orage format."
 msgstr ""
 
 #: ../src/ical-expimp.c:206
-#, fuzzy
 msgid "Import file preprocessing done"
-msgstr "Importar marcadores desde un ficheiro"
+msgstr ""
+
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
 
-#: ../src/interface.c:284
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Ficheiros de calendario"
 
 #: ../src/interface.c:631
-#, fuzzy
 msgid "Current foreign files"
-msgstr "Engadir ficheiros ao actual"
+msgstr ""
 
-#: ../src/interface.c:643
-#, fuzzy
+#: ../src/interface.c:648
 msgid "READ ONLY"
-msgstr "[só de lectura]"
+msgstr ""
 
-#: ../src/interface.c:645
-#, fuzzy
+#: ../src/interface.c:650
 msgid "READ WRITE"
-msgstr "Lectura e escritura"
+msgstr ""
 
-#: ../src/interface.c:663
-#, fuzzy
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
-msgstr "Non se encontrou ningún ficheiro"
+msgstr ""
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr ""
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Importar/exportar"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Ler dende o ficheiro:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
 msgstr ""
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Exportar"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Escribir no ficheiro:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Todas as citas"
 
-#: ../src/interface.c:1050
-#, fuzzy
+#: ../src/interface.c:1041
 msgid "Named appointments: "
-msgstr "Citas activas"
+msgstr ""
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr ""
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr ""
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Arquivo"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr ""
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr ""
 
-#: ../src/interface.c:1101
-#, fuzzy
+#: ../src/interface.c:1092
 msgid "Revert archive now"
-msgstr "_Actualizar o sistema agora"
+msgstr ""
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
 msgstr ""
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Ficheiros de Orage"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Ficheiro de calendario principal de Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Ficheiro actual"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Novo ficheiro"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-#, fuzzy
-msgid "Action options"
-msgstr "Opcións de configuración:"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Renomear"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
 msgstr ""
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr ""
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Mover"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr ""
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Ficheiro de arquivo"
 
-#: ../src/interface.c:1254
-#, fuzzy
+#: ../src/interface.c:1245
 msgid "Foreign files"
-msgstr "Todos os ficheros"
+msgstr ""
 
-#: ../src/interface.c:1261
-#, fuzzy
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
-msgstr "Engade un ficheiro novo baleiro"
+msgstr ""
 
-#: ../src/interface.c:1266
-#, fuzzy
+#: ../src/interface.c:1257
 msgid "Foreign file:"
-msgstr "Xestor de ficheiros"
+msgstr ""
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Opcións"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Só lectura"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr ""
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
 msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Exportar datos - Orage"
 
-#: ../src/main.c:268
-#, fuzzy, c-format
+#: ../src/main.c:275
+#, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
 msgstr ""
-"\tIsto é %s versión %s para Xfce %s\n"
-"\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tPublicado baixo os termos da Licenza pública xeral GNU.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tCompilado con GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "usando GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tUsando DBUS para importar.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr ""
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tUsando libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tNon usa libnotify.\n"
 
-#: ../src/main.c:286
-#, fuzzy, c-format
+#: ../src/main.c:293
+#, c-format
 msgid "\tUsing automatic archiving.\n"
-msgstr "Arquivo (320 kbps)"
+msgstr ""
 
-#: ../src/main.c:288
-#, fuzzy, c-format
+#: ../src/main.c:295
+#, c-format
 msgid "\tNot using archiving.\n"
-msgstr "Arquivo (320 kbps)"
+msgstr ""
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr ""
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr ""
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Uso: orage [opcións] [ficheiros]\n"
-"\n"
+msgstr "Uso: orage [opcións] [ficheiros]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Opcións:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tmostrar a versión de orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tmostra este texto\n"
 
-#: ../src/main.c:310
-#, fuzzy, c-format
+#: ../src/main.c:317
+#, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
-msgstr "Manipulador de acción do formulario"
+msgstr ""
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\tfacer a oraga visible/invisible\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
 msgstr ""
 
-#: ../src/main.c:313
-#, fuzzy, c-format
+#: ../src/main.c:320
+#, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr "CVS: Eliminar ficheiro ou directorio"
+msgstr ""
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
 msgstr ""
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "files=ficheiros ical a cargar en orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tdbus non se incluiu en orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
 msgstr ""
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Opción descoñecida %s\n"
-"\n"
+msgstr "\nOpción descoñecida %s\n\n"
 
-#: ../src/mainbox.c:287
-#, fuzzy
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
-msgstr "Composición de datos"
+msgstr ""
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Ver a _data seleccionada..."
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Ver a _semana seleccionada"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Seleccionar _hoxe"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Hora local"
+msgstr ""
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr ""
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr ""
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr ""
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Nunca"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
-"Título: %s\n"
-" Inicio:\t%s\n"
-" Fin:\t%s\n"
-" Notas:\n"
-"%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
-"Título: %s\n"
-" Inicio:\t%s\n"
-" Fin:\t%s\n"
-" Notas:\n"
-"%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Tarefas pendentes:<b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Eventos de %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>Eventos de %s - %s:</b>"
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:486
 msgid "Main settings"
-msgstr "Opcións principais"
+msgstr ""
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:492
 msgid "Timezone"
 msgstr "Fuso horario"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:507
 msgid "You should always define your local timezone."
 msgstr "Sempre debe definir o seu fuso horario."
 
-#: ../src/parameters.c:552
-#, fuzzy
+#: ../src/parameters.c:515
 msgid "Archive threshold (months)"
-msgstr "Umbral (Por canle)"
+msgstr ""
 
-#: ../src/parameters.c:562
-#, fuzzy
+#: ../src/parameters.c:525
 msgid "(0 = no archiving)"
-msgstr "Ferramentas para arquivar"
+msgstr ""
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:528
 msgid "Archiving is used to save time and space when handling events."
 msgstr "O arquivado úsase para aforrar tempo e espazo ó xestionar os eventos."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:536
 msgid "Sound command"
 msgstr "Orde de son"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:551
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-"Proporciónaselle esta orde ao intérprete de comandos para reproducir os sons "
-"das alarmas."
+msgstr "Proporciónaselle esta orde ao intérprete de comandos para reproducir os sons das alarmas."
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Mostrar"
+#: ../src/parameters.c:590
+msgid "Calendar window"
+msgstr ""
 
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Xanela principal do calendario"
+#: ../src/parameters.c:597
+msgid "Calendar visual details"
+msgstr ""
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:603
 msgid "Show borders"
 msgstr "Mostrar os bordos"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:608
 msgid "Show menu"
 msgstr "Mostrar o menú"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Mostrar mes e ano"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:616
 msgid "Show day names"
 msgstr "Mostrar os nomes dos días"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:621
 msgid "Show week numbers"
 msgstr "Mostrar os números das semanas"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:629
+msgid "Show month and year"
+msgstr "Mostrar mes e ano"
+
+#: ../src/parameters.c:649
+msgid "Calendar info boxes"
+msgstr ""
+
+#: ../src/parameters.c:654
 msgid "Show todo list"
 msgstr "Mostrar a lista de tarefas pendentes"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:661
 msgid "Number of days to show in event window"
 msgstr ""
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:667
 msgid "0 = do not show event list at all"
 msgstr ""
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:680
+msgid "Calendar visibility"
+msgstr ""
+
+#: ../src/parameters.c:685
 msgid "Show on all desktops"
 msgstr ""
 
-#: ../src/parameters.c:683
-#, fuzzy
+#: ../src/parameters.c:690
 msgid "Keep on top"
-msgstr "Poñer enriba"
+msgstr ""
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:698
 msgid "Show in taskbar"
 msgstr "Mostrar na barra de tarefas"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:703
 msgid "Show in pager"
 msgstr "Mostrar no paxinador"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:711
 msgid "Show in systray"
 msgstr "Mostrar na zona de notificación"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:732
 msgid "Calendar start"
 msgstr "Comezo do calendario"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:737
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:749
 msgid "Hide"
 msgstr "Ocultar"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:761
 msgid "Minimized"
 msgstr "Minimizada"
 
-#: ../src/parameters.c:793
-#, fuzzy
-msgid "Extra settings"
-msgstr "Configuracións adicionais"
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Xanela principal do calendario"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "Seleccionar _hoxe"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:781
+msgid "On calendar window open"
 msgstr ""
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
+#: ../src/parameters.c:786
+msgid "Select today's date"
 msgstr ""
 
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "Usar icona dinámica"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
+#: ../src/parameters.c:799
+msgid "Select previously selected date"
 msgstr ""
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
+#: ../src/parameters.c:817
+msgid "Calendar day double click shows"
 msgstr ""
 
-#: ../src/parameters.c:861
-#, fuzzy
+#: ../src/parameters.c:822
 msgid "Days view"
-msgstr "Sen visualización"
+msgstr ""
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:834
 msgid "Event list"
 msgstr "Lista de eventos"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr "Xanela de lista de eventos"
+#: ../src/parameters.c:856
+msgid "Extra settings"
+msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:863
+msgid "Event list window extra days"
+msgstr ""
+
+#: ../src/parameters.c:868
 msgid "Number of extra days to show in event list"
 msgstr ""
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:876
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
 msgstr ""
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:886
+msgid "Day view window default first day"
+msgstr ""
+
+#: ../src/parameters.c:891
+msgid "First day of week"
+msgstr ""
+
+#: ../src/parameters.c:904
+msgid "Selected day"
+msgstr ""
+
+#: ../src/parameters.c:922
+msgid "Use dynamic tray icon"
+msgstr ""
+
+#: ../src/parameters.c:927
+msgid "Use dynamic icon"
+msgstr "Usar icona dinámica"
+
+#: ../src/parameters.c:933
+msgid "Dynamic icon shows current month and day of the month."
+msgstr ""
+
+#: ../src/parameters.c:941 ../src/parameters.c:946
 msgid "Use wakeup timer"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:952
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:961
+msgid "Foreign file default visual alarm"
+msgstr ""
+
+#: ../src/parameters.c:966
+msgid "Orage window"
+msgstr ""
+
+#: ../src/parameters.c:979
+msgid "Notify notification"
+msgstr ""
+
+#: ../src/parameters.c:997
+msgid "Always quit when asked to close"
+msgstr ""
+
+#: ../src/parameters.c:1002
+msgid "Always quit"
+msgstr ""
+
+#: ../src/parameters.c:1008
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr ""
+
+#: ../src/parameters.c:1024
 msgid "Orage Preferences"
 msgstr "Preferencias de Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1136
 msgid "First Orage start. Searching default timezone."
 msgstr "Primeiro inicio de Orage. Buscando o fuso horario predeterminado."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1155
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "O fuso predeterminado é %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1158
 msgid "Default timezone not found, please, set it manually."
 msgstr "Non se atopou o fuso horario predeterminado, defínao a man."
 
@@ -1983,54 +2066,47 @@
 msgid "Open"
 msgstr "Abrir"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Recordatorio - Orage"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
+#: ../src/reminder.c:803
+msgid "Postpone"
 msgstr ""
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
 msgstr ""
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Seguintes alarmas activas:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d d %02d h %02d min para: %s"
+msgstr "\n%02d d %02d h %02d min para: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Non se atoparon alarmas activas"
+msgstr "\nNon se atoparon alarmas activas"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
 msgstr "África"
 
 #: ../src/timezone_names.c:37
-#, fuzzy
 msgid "Africa/Abidjan"
-msgstr "África/Abidjan"
+msgstr ""
 
 #: ../src/timezone_names.c:38
-#, fuzzy
 msgid "Africa/Accra"
-msgstr "África/Accra"
+msgstr ""
 
 #: ../src/timezone_names.c:39
 msgid "Africa/Addis_Ababa"
@@ -2045,37 +2121,32 @@
 msgstr "África/Asmara"
 
 #: ../src/timezone_names.c:42
-#, fuzzy
 msgid "Africa/Bamako"
-msgstr "África/Bamako"
+msgstr ""
 
 #: ../src/timezone_names.c:43
 msgid "Africa/Bangui"
 msgstr "África/Bangui"
 
 #: ../src/timezone_names.c:44
-#, fuzzy
 msgid "Africa/Banjul"
-msgstr "África/Banjul"
+msgstr ""
 
 #: ../src/timezone_names.c:45
 msgid "Africa/Bissau"
 msgstr "África/Bissau"
 
 #: ../src/timezone_names.c:46
-#, fuzzy
 msgid "Africa/Blantyre"
-msgstr "África/Blantyre"
+msgstr ""
 
 #: ../src/timezone_names.c:47
-#, fuzzy
 msgid "Africa/Brazzaville"
-msgstr "África/Brazzaville"
+msgstr ""
 
 #: ../src/timezone_names.c:48
-#, fuzzy
 msgid "Africa/Bujumbura"
-msgstr "África/Bujumbura"
+msgstr ""
 
 #: ../src/timezone_names.c:49
 msgid "Africa/Cairo"
@@ -2094,57 +2165,48 @@
 msgstr "África/Conacri"
 
 #: ../src/timezone_names.c:53
-#, fuzzy
 msgid "Africa/Dakar"
-msgstr "África/Dakar"
+msgstr ""
 
 #: ../src/timezone_names.c:54
-#, fuzzy
 msgid "Africa/Dar_es_Salaam"
-msgstr "África/Dar_es_Salaam"
+msgstr ""
 
 #: ../src/timezone_names.c:55
 msgid "Africa/Djibouti"
 msgstr "África/Xibutí"
 
 #: ../src/timezone_names.c:56
-#, fuzzy
 msgid "Africa/Douala"
-msgstr "África/Douala"
+msgstr ""
 
 #: ../src/timezone_names.c:57
 msgid "Africa/El_Aaiun"
 msgstr "África/O_Aaiún"
 
 #: ../src/timezone_names.c:58
-#, fuzzy
 msgid "Africa/Freetown"
-msgstr "África/Freetown"
+msgstr ""
 
 #: ../src/timezone_names.c:59
-#, fuzzy
 msgid "Africa/Gaborone"
-msgstr "África/Gaborone"
+msgstr ""
 
 #: ../src/timezone_names.c:60
-#, fuzzy
 msgid "Africa/Harare"
-msgstr "África/Harare"
+msgstr ""
 
 #: ../src/timezone_names.c:61
-#, fuzzy
 msgid "Africa/Johannesburg"
-msgstr "África/Johannesburgo"
+msgstr ""
 
 #: ../src/timezone_names.c:62
-#, fuzzy
 msgid "Africa/Kampala"
-msgstr "África/Kampala"
+msgstr ""
 
 #: ../src/timezone_names.c:63
-#, fuzzy
 msgid "Africa/Khartoum"
-msgstr "África/Khartum"
+msgstr ""
 
 #: ../src/timezone_names.c:64
 msgid "Africa/Kigali"
@@ -2207,24 +2269,20 @@
 msgstr "África/Nairobi"
 
 #: ../src/timezone_names.c:79
-#, fuzzy
 msgid "Africa/Ndjamena"
-msgstr "África/Ndjamena"
+msgstr ""
 
 #: ../src/timezone_names.c:80
-#, fuzzy
 msgid "Africa/Niamey"
-msgstr "África/Niamey"
+msgstr ""
 
 #: ../src/timezone_names.c:81
-#, fuzzy
 msgid "Africa/Nouakchott"
-msgstr "África/Nouakchott"
+msgstr ""
 
 #: ../src/timezone_names.c:82
-#, fuzzy
 msgid "Africa/Ouagadougou"
-msgstr "África/Ouagadougou"
+msgstr ""
 
 #: ../src/timezone_names.c:83
 msgid "Africa/Porto-Novo"
@@ -2235,9 +2293,8 @@
 msgstr "África/São_Tomé"
 
 #: ../src/timezone_names.c:85
-#, fuzzy
 msgid "Africa/Timbuktu"
-msgstr "África/Timbuktu"
+msgstr ""
 
 #: ../src/timezone_names.c:86
 msgid "Africa/Tripoli"
@@ -2248,18 +2305,16 @@
 msgstr "África/Tunicia"
 
 #: ../src/timezone_names.c:88
-#, fuzzy
 msgid "Africa/Windhoek"
-msgstr "África/Windhoek"
+msgstr ""
 
 #: ../src/timezone_names.c:89
 msgid "America"
 msgstr "América"
 
 #: ../src/timezone_names.c:90
-#, fuzzy
 msgid "America/Adak"
-msgstr "América/Adak"
+msgstr ""
 
 #: ../src/timezone_names.c:91
 msgid "America/Anchorage"
@@ -2290,9 +2345,8 @@
 msgstr "América/Arxentina/Córdoba"
 
 #: ../src/timezone_names.c:98
-#, fuzzy
 msgid "America/Argentina/Jujuy"
-msgstr "América/Boa_Vista"
+msgstr ""
 
 #: ../src/timezone_names.c:99
 msgid "America/Argentina/Mendoza"
@@ -2335,9 +2389,8 @@
 msgstr "América/Bos_Aires"
 
 #: ../src/timezone_names.c:109
-#, fuzzy
 msgid "America/Cambridge_Bay"
-msgstr "América/Cambridge_Bay"
+msgstr ""
 
 #: ../src/timezone_names.c:110
 msgid "America/Cancun"
@@ -2388,9 +2441,8 @@
 msgstr "América/Dawson"
 
 #: ../src/timezone_names.c:122
-#, fuzzy
 msgid "America/Dawson_Creek"
-msgstr "América/Dawson_Creek"
+msgstr ""
 
 #: ../src/timezone_names.c:123
 msgid "America/Denver"
@@ -2409,38 +2461,32 @@
 msgstr "América/Edmonton"
 
 #: ../src/timezone_names.c:127
-#, fuzzy
 msgid "America/Eirunepe"
-msgstr "América/Eirunepé"
+msgstr ""
 
 #: ../src/timezone_names.c:128
-#, fuzzy
 msgid "America/El_Salvador"
-msgstr "América/El_Salvador"
+msgstr ""
 
 #: ../src/timezone_names.c:129
 msgid "America/Fortaleza"
 msgstr "América/Fortaleza"
 
 #: ../src/timezone_names.c:130
-#, fuzzy
 msgid "America/Glace_Bay"
-msgstr "América/Glace_Bay"
+msgstr ""
 
 #: ../src/timezone_names.c:131
-#, fuzzy
 msgid "America/Godthab"
-msgstr "América/Godthab"
+msgstr ""
 
 #: ../src/timezone_names.c:132
-#, fuzzy
 msgid "America/Goose_Bay"
-msgstr "América/Goose_Bay"
+msgstr ""
 
 #: ../src/timezone_names.c:133
-#, fuzzy
 msgid "America/Grand_Turk"
-msgstr "América/Grand_Turk"
+msgstr ""
 
 #: ../src/timezone_names.c:134
 msgid "America/Grenada"
@@ -2455,9 +2501,8 @@
 msgstr "América/Guatemala"
 
 #: ../src/timezone_names.c:137
-#, fuzzy
 msgid "America/Guayaquil"
-msgstr "América/Guayaquil"
+msgstr ""
 
 #: ../src/timezone_names.c:138
 msgid "America/Guyana"
@@ -2472,9 +2517,8 @@
 msgstr "América/A Habana"
 
 #: ../src/timezone_names.c:141
-#, fuzzy
 msgid "America/Hermosillo"
-msgstr "América/Hermosillo"
+msgstr ""
 
 #: ../src/timezone_names.c:142
 msgid "America/Indiana/Indianapolis"
@@ -2489,18 +2533,16 @@
 msgstr "América/Indiana/Marengo"
 
 #: ../src/timezone_names.c:145
-#, fuzzy
 msgid "America/Indiana/Vevay"
-msgstr "América/Indiana/Vevay"
+msgstr ""
 
 #: ../src/timezone_names.c:146
 msgid "America/Indianapolis"
 msgstr "América/Indianápolis"
 
 #: ../src/timezone_names.c:147
-#, fuzzy
 msgid "America/Inuvik"
-msgstr "América/Inuvik"
+msgstr ""
 
 #: ../src/timezone_names.c:148
 msgid "America/Iqaluit"
@@ -2511,9 +2553,8 @@
 msgstr "América/Xamaica"
 
 #: ../src/timezone_names.c:150
-#, fuzzy
 msgid "America/Jujuy"
-msgstr "América/Jujuy"
+msgstr ""
 
 #: ../src/timezone_names.c:151
 msgid "America/Juneau"
@@ -2568,9 +2609,8 @@
 msgstr "América/Mendoza"
 
 #: ../src/timezone_names.c:164
-#, fuzzy
 msgid "America/Menominee"
-msgstr "América/Menominee"
+msgstr ""
 
 #: ../src/timezone_names.c:165
 msgid "America/Merida"
@@ -2625,9 +2665,8 @@
 msgstr "América/Panamá"
 
 #: ../src/timezone_names.c:178
-#, fuzzy
 msgid "America/Pangnirtung"
-msgstr "América/Pangnirtung"
+msgstr ""
 
 #: ../src/timezone_names.c:179
 msgid "America/Paramaribo"
@@ -2646,23 +2685,20 @@
 msgstr "América/Porto_de_España"
 
 #: ../src/timezone_names.c:183
-#, fuzzy
 msgid "America/Porto_Velho"
-msgstr "América/Pôrto_Velho"
+msgstr ""
 
 #: ../src/timezone_names.c:184
 msgid "America/Puerto_Rico"
 msgstr "América/Porto_Rico"
 
 #: ../src/timezone_names.c:185
-#, fuzzy
 msgid "America/Rainy_River"
-msgstr "América/Rainy_River"
+msgstr ""
 
 #: ../src/timezone_names.c:186
-#, fuzzy
 msgid "America/Rankin_Inlet"
-msgstr "América/Rankin_Inlet"
+msgstr ""
 
 #: ../src/timezone_names.c:187
 msgid "America/Recife"
@@ -2697,19 +2733,16 @@
 msgstr "América/Scoresbysund"
 
 #: ../src/timezone_names.c:195
-#, fuzzy
 msgid "America/Shiprock"
-msgstr "América/Shiprock"
+msgstr ""
 
 #: ../src/timezone_names.c:196
-#, fuzzy
 msgid "America/St_Johns"
-msgstr "América/St_Johns"
+msgstr ""
 
 #: ../src/timezone_names.c:197
-#, fuzzy
 msgid "America/St_Kitts"
-msgstr "América/St_Kitts"
+msgstr ""
 
 #: ../src/timezone_names.c:198
 msgid "America/St_Lucia"
@@ -2724,9 +2757,8 @@
 msgstr "América/San_Vincente"
 
 #: ../src/timezone_names.c:201
-#, fuzzy
 msgid "America/Swift_Current"
-msgstr "América/Swift_Current"
+msgstr ""
 
 #: ../src/timezone_names.c:202
 msgid "America/Tegucigalpa"
@@ -2737,9 +2769,8 @@
 msgstr "América/Thule"
 
 #: ../src/timezone_names.c:204
-#, fuzzy
 msgid "America/Thunder_Bay"
-msgstr "América/Thunder_Bay"
+msgstr ""
 
 #: ../src/timezone_names.c:205
 msgid "America/Tijuana"
@@ -2762,9 +2793,8 @@
 msgstr "América/Winnipeg"
 
 #: ../src/timezone_names.c:210
-#, fuzzy
 msgid "America/Yakutat"
-msgstr "América/Yakutat"
+msgstr ""
 
 #: ../src/timezone_names.c:211
 msgid "America/Yellowknife"
@@ -2803,9 +2833,8 @@
 msgstr "Antártida/Polo_Sur"
 
 #: ../src/timezone_names.c:220
-#, fuzzy
 msgid "Antarctica/Syowa"
-msgstr "Antártida/Syowa"
+msgstr ""
 
 #: ../src/timezone_names.c:221
 msgid "Antarctica/Vostok"
@@ -2816,9 +2845,8 @@
 msgstr "Ártico"
 
 #: ../src/timezone_names.c:223
-#, fuzzy
 msgid "Arctic/Longyearbyen"
-msgstr "Ártico/Longyearbyen"
+msgstr ""
 
 #: ../src/timezone_names.c:224
 msgid "Asia"
@@ -2829,33 +2857,28 @@
 msgstr "Asia/Adén"
 
 #: ../src/timezone_names.c:226
-#, fuzzy
 msgid "Asia/Almaty"
-msgstr "Asia/Almaty"
+msgstr ""
 
 #: ../src/timezone_names.c:227
 msgid "Asia/Amman"
 msgstr "Asia/Amán"
 
 #: ../src/timezone_names.c:228
-#, fuzzy
 msgid "Asia/Anadyr"
-msgstr "Asia/Anadyr"
+msgstr ""
 
 #: ../src/timezone_names.c:229
-#, fuzzy
 msgid "Asia/Aqtau"
-msgstr "Asia/Aqtau"
+msgstr ""
 
 #: ../src/timezone_names.c:230
-#, fuzzy
 msgid "Asia/Aqtobe"
-msgstr "Asia/Aqtobe"
+msgstr ""
 
 #: ../src/timezone_names.c:231
-#, fuzzy
 msgid "Asia/Ashgabat"
-msgstr "Asia/Ashgabat"
+msgstr ""
 
 #: ../src/timezone_names.c:232
 msgid "Asia/Baghdad"
@@ -2878,9 +2901,8 @@
 msgstr "Asia/Beirut"
 
 #: ../src/timezone_names.c:237
-#, fuzzy
 msgid "Asia/Bishkek"
-msgstr "Asia/Bishkek"
+msgstr ""
 
 #: ../src/timezone_names.c:238
 msgid "Asia/Brunei"
@@ -2891,9 +2913,8 @@
 msgstr "Asia/Calcuta"
 
 #: ../src/timezone_names.c:240
-#, fuzzy
 msgid "Asia/Chungking"
-msgstr "Asia/Adén"
+msgstr ""
 
 #: ../src/timezone_names.c:241
 msgid "Asia/Colombo"
@@ -2904,9 +2925,8 @@
 msgstr "Asia/Damasco"
 
 #: ../src/timezone_names.c:243
-#, fuzzy
 msgid "Asia/Dhaka"
-msgstr "Asia/Dhaka"
+msgstr ""
 
 #: ../src/timezone_names.c:244
 msgid "Asia/Dili"
@@ -2917,89 +2937,76 @@
 msgstr "Asia/Dubai"
 
 #: ../src/timezone_names.c:246
-#, fuzzy
 msgid "Asia/Dushanbe"
-msgstr "Asia/Dushanbe"
+msgstr ""
 
 #: ../src/timezone_names.c:247
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
 #: ../src/timezone_names.c:248
-#, fuzzy
 msgid "Asia/Harbin"
-msgstr "Asia/Harbin"
+msgstr ""
 
 #: ../src/timezone_names.c:249
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong_Kong"
 
 #: ../src/timezone_names.c:250
-#, fuzzy
 msgid "Asia/Hovd"
-msgstr "Asia/Hovd"
+msgstr ""
 
 #: ../src/timezone_names.c:251
-#, fuzzy
 msgid "Asia/Irkutsk"
-msgstr "Asia/Irkutsk"
+msgstr ""
 
 #: ../src/timezone_names.c:252
 msgid "Asia/Istanbul"
 msgstr "Asia/Estambul"
 
 #: ../src/timezone_names.c:253
-#, fuzzy
 msgid "Asia/Jakarta"
-msgstr "Asia/Jakarta"
+msgstr ""
 
 #: ../src/timezone_names.c:254
-#, fuzzy
 msgid "Asia/Jayapura"
-msgstr "Asia/Jayapura"
+msgstr ""
 
 #: ../src/timezone_names.c:255
 msgid "Asia/Jerusalem"
 msgstr "Asia/Xerusalén"
 
 #: ../src/timezone_names.c:256
-#, fuzzy
 msgid "Asia/Kabul"
-msgstr "Asia/Kabul"
+msgstr ""
 
 #: ../src/timezone_names.c:257
-#, fuzzy
 msgid "Asia/Kamchatka"
-msgstr "Asia/Kamchatka"
+msgstr ""
 
 #: ../src/timezone_names.c:258
-#, fuzzy
 msgid "Asia/Karachi"
-msgstr "Asia/Karachi"
+msgstr ""
 
 #: ../src/timezone_names.c:259
-#, fuzzy
 msgid "Asia/Kashgar"
-msgstr "Asia/Kashgar"
+msgstr ""
 
 #: ../src/timezone_names.c:260
 msgid "Asia/Katmandu"
 msgstr "Asia/Katmandú"
 
 #: ../src/timezone_names.c:261
-#, fuzzy
 msgid "Asia/Krasnoyarsk"
-msgstr "Asia/Krasnoyarsk"
+msgstr ""
 
 #: ../src/timezone_names.c:262
-#, fuzzy
 msgid "Asia/Kuala_Lumpur"
-msgstr "Asia/Kuala_Lumpur"
+msgstr ""
 
 #: ../src/timezone_names.c:263
-#, fuzzy
 msgid "Asia/Kuching"
-msgstr "Asia/Kuching"
+msgstr ""
 
 #: ../src/timezone_names.c:264
 msgid "Asia/Kuwait"
@@ -3010,46 +3017,40 @@
 msgstr "Asia/Macau"
 
 #: ../src/timezone_names.c:266
-#, fuzzy
 msgid "Asia/Magadan"
-msgstr "Asia/Magadan"
+msgstr ""
 
 #: ../src/timezone_names.c:267
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
 #: ../src/timezone_names.c:268
-#, fuzzy
 msgid "Asia/Muscat"
-msgstr "Asia/Muscat"
+msgstr ""
 
 #: ../src/timezone_names.c:269
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
 #: ../src/timezone_names.c:270
-#, fuzzy
 msgid "Asia/Novosibirsk"
-msgstr "Asia/Novosibirsk"
+msgstr ""
 
 #: ../src/timezone_names.c:271
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
 #: ../src/timezone_names.c:272
-#, fuzzy
 msgid "Asia/Phnom_Penh"
-msgstr "Asia/Phnom_Penh"
+msgstr ""
 
 #: ../src/timezone_names.c:273
-#, fuzzy
 msgid "Asia/Pontianak"
-msgstr "Asia/Pontianak"
+msgstr ""
 
 #: ../src/timezone_names.c:274
-#, fuzzy
 msgid "Asia/Pyongyang"
-msgstr "Asia/Pyongyang"
+msgstr ""
 
 #: ../src/timezone_names.c:275
 msgid "Asia/Qatar"
@@ -3060,9 +3061,8 @@
 msgstr "Asia/Rangún"
 
 #: ../src/timezone_names.c:277
-#, fuzzy
 msgid "Asia/Riyadh"
-msgstr "Asia/Riyadh"
+msgstr ""
 
 #: ../src/timezone_names.c:278
 msgid "Asia/Saigon"
@@ -3089,14 +3089,12 @@
 msgstr "Asia/Taipei"
 
 #: ../src/timezone_names.c:284
-#, fuzzy
 msgid "Asia/Tashkent"
-msgstr "Asia/Tashkent"
+msgstr ""
 
 #: ../src/timezone_names.c:285
-#, fuzzy
 msgid "Asia/Tbilisi"
-msgstr "Asia/Tbilisi"
+msgstr ""
 
 #: ../src/timezone_names.c:286
 msgid "Asia/Tehran"
@@ -3111,19 +3109,16 @@
 msgstr "Asia/Toquio"
 
 #: ../src/timezone_names.c:289
-#, fuzzy
 msgid "Asia/Ujung_Pandang"
-msgstr "Asia/Ujung_Pandang"
+msgstr ""
 
 #: ../src/timezone_names.c:290
-#, fuzzy
 msgid "Asia/Ulaanbaatar"
-msgstr "Asia/Ulaanbaatar"
+msgstr ""
 
 #: ../src/timezone_names.c:291
-#, fuzzy
 msgid "Asia/Urumqi"
-msgstr "Asia/Urumqi"
+msgstr ""
 
 #: ../src/timezone_names.c:292
 msgid "Asia/Vientiane"
@@ -3134,19 +3129,16 @@
 msgstr "Asia/Vladivostok"
 
 #: ../src/timezone_names.c:294
-#, fuzzy
 msgid "Asia/Yakutsk"
-msgstr "Asia/Yakutsk"
+msgstr ""
 
 #: ../src/timezone_names.c:295
-#, fuzzy
 msgid "Asia/Yekaterinburg"
-msgstr "Asia/Yekaterinburg"
+msgstr ""
 
 #: ../src/timezone_names.c:296
-#, fuzzy
 msgid "Asia/Yerevan"
-msgstr "Asia/Yerevan"
+msgstr ""
 
 #: ../src/timezone_names.c:297
 msgid "Atlantic"
@@ -3173,9 +3165,8 @@
 msgstr "Atlántico/Feroe"
 
 #: ../src/timezone_names.c:303
-#, fuzzy
 msgid "Atlantic/Jan_Mayen"
-msgstr "Atlántico/Jan_Mayen"
+msgstr ""
 
 #: ../src/timezone_names.c:304
 msgid "Atlantic/Madeira"
@@ -3210,9 +3201,8 @@
 msgstr "Australia/Brisbane"
 
 #: ../src/timezone_names.c:312
-#, fuzzy
 msgid "Australia/Broken_Hill"
-msgstr "Australia/Broken_Hill"
+msgstr ""
 
 #: ../src/timezone_names.c:313
 msgid "Australia/Darwin"
@@ -3287,14 +3277,12 @@
 msgstr "Europa/Budapest"
 
 #: ../src/timezone_names.c:331
-#, fuzzy
 msgid "Europe/Chisinau"
-msgstr "Europa/Chisinau"
+msgstr ""
 
 #: ../src/timezone_names.c:332
-#, fuzzy
 msgid "Europe/Copenhagen"
-msgstr "Europa/Copenhaguen"
+msgstr ""
 
 #: ../src/timezone_names.c:333
 msgid "Europe/Dublin"
@@ -3345,9 +3333,8 @@
 msgstr "Europa/Malta"
 
 #: ../src/timezone_names.c:345
-#, fuzzy
 msgid "Europe/Minsk"
-msgstr "Europa/Minsk"
+msgstr ""
 
 #: ../src/timezone_names.c:346
 msgid "Europe/Monaco"
@@ -3398,9 +3385,8 @@
 msgstr "Europa/Simferopol"
 
 #: ../src/timezone_names.c:358
-#, fuzzy
 msgid "Europe/Skopje"
-msgstr "Europa/Skopje"
+msgstr ""
 
 #: ../src/timezone_names.c:359
 msgid "Europe/Sofia"
@@ -3419,9 +3405,8 @@
 msgstr "Europa/Tirana"
 
 #: ../src/timezone_names.c:363
-#, fuzzy
 msgid "Europe/Uzhgorod"
-msgstr "Europa/Uzhgorod"
+msgstr ""
 
 #: ../src/timezone_names.c:364
 msgid "Europe/Vaduz"
@@ -3448,9 +3433,8 @@
 msgstr "Europa/Zagreb"
 
 #: ../src/timezone_names.c:370
-#, fuzzy
 msgid "Europe/Zaporozhye"
-msgstr "Europa/Zaporozhye"
+msgstr ""
 
 #: ../src/timezone_names.c:371
 msgid "Europe/Zurich"
@@ -3469,9 +3453,8 @@
 msgstr "Índico/Chagos"
 
 #: ../src/timezone_names.c:375
-#, fuzzy
 msgid "Indian/Christmas"
-msgstr "Índico/Christmas"
+msgstr ""
 
 #: ../src/timezone_names.c:376
 msgid "Indian/Cocos"
@@ -3498,9 +3481,8 @@
 msgstr "Índico/Mauricio"
 
 #: ../src/timezone_names.c:382
-#, fuzzy
 msgid "Indian/Mayotte"
-msgstr "Índico/Mayotte"
+msgstr ""
 
 #: ../src/timezone_names.c:383
 msgid "Indian/Reunion"
@@ -3519,9 +3501,8 @@
 msgstr "Pacífico/Auckland"
 
 #: ../src/timezone_names.c:387
-#, fuzzy
 msgid "Pacific/Chatham"
-msgstr "Pacífico/Chatham"
+msgstr ""
 
 #: ../src/timezone_names.c:388
 msgid "Pacific/Easter"
@@ -3532,14 +3513,12 @@
 msgstr "Pacífico/Efaté"
 
 #: ../src/timezone_names.c:390
-#, fuzzy
 msgid "Pacific/Enderbury"
-msgstr "Pacífico/Enderbury"
+msgstr ""
 
 #: ../src/timezone_names.c:391
-#, fuzzy
 msgid "Pacific/Fakaofo"
-msgstr "Pacífico/Fakaofo"
+msgstr ""
 
 #: ../src/timezone_names.c:392
 msgid "Pacific/Fiji"
@@ -3578,19 +3557,16 @@
 msgstr "Pacífico/Kiritimati"
 
 #: ../src/timezone_names.c:401
-#, fuzzy
 msgid "Pacific/Kosrae"
-msgstr "Pacífico/Kosrae"
+msgstr ""
 
 #: ../src/timezone_names.c:402
-#, fuzzy
 msgid "Pacific/Kwajalein"
-msgstr "Pacífico/Kwajalein"
+msgstr ""
 
 #: ../src/timezone_names.c:403
-#, fuzzy
 msgid "Pacific/Majuro"
-msgstr "Pacífico/Majuro"
+msgstr ""
 
 #: ../src/timezone_names.c:404
 msgid "Pacific/Marquesas"
@@ -3625,18 +3601,16 @@
 msgstr "Pacífico/Palaos"
 
 #: ../src/timezone_names.c:412
-#, fuzzy
 msgid "Pacific/Pitcairn"
-msgstr "Pacífico/Pitcairn"
+msgstr ""
 
 #: ../src/timezone_names.c:413
 msgid "Pacific/Ponape"
 msgstr "Pacífico/Ponapé"
 
 #: ../src/timezone_names.c:414
-#, fuzzy
 msgid "Pacific/Port_Moresby"
-msgstr "Pacífico/Port_Moresby"
+msgstr ""
 
 #: ../src/timezone_names.c:415
 msgid "Pacific/Rarotonga"
@@ -3659,23 +3633,20 @@
 msgstr "Pacífico/Tongatapu"
 
 #: ../src/timezone_names.c:420
-#, fuzzy
 msgid "Pacific/Truk"
-msgstr "Pacífico/Truk"
+msgstr ""
 
 #: ../src/timezone_names.c:421
 msgid "Pacific/Wake"
 msgstr "Pacífico/Wake"
 
 #: ../src/timezone_names.c:422
-#, fuzzy
 msgid "Pacific/Wallis"
-msgstr "Pacífico/Wallis"
+msgstr ""
 
 #: ../src/timezone_names.c:423
-#, fuzzy
 msgid "Pacific/Yap"
-msgstr "Pacífico/Yap"
+msgstr ""
 
 #: ../src/tray_icon.c:469
 msgid "New appointment"
@@ -3686,110 +3657,34 @@
 msgstr "Acerca de Orage"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Orage Panel Clock"
-msgstr "Reloxo Orage"
+msgstr ""
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
 msgid "Show time and date?"
-msgstr "Que hora e que día é?"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Calendario"
+msgid "Orage preferences"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Preferencias de Orage"
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Preferencias de Orage"
+msgid "Orage Calendar Preferences"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Configuración da aplicación de calendario de Xfce 4"
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Calendario"
+
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr ""
 
 #: ../xfcalendar.desktop.in.h:2
 msgid "Desktop calendar"
 msgstr "Calendario para o escritorio"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "Orage - Calendario"
-
-#~ msgid "Orage clock"
-#~ msgstr "Reloxo de Orage"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Creador orixinal, mantedor retirado"
-
-#~ msgid "Contributor"
-#~ msgstr "Contribuínte"
-
-#~ msgid "Info"
-#~ msgstr "Información"
-
-#~ msgid "Warning"
-#~ msgstr "Advertencia"
-
-#~ msgid "Error"
-#~ msgstr "Erro"
-
-#, fuzzy
-#~ msgid "Set sticked"
-#~ msgstr "Establecer preferencias"
-
-#~ msgid "Select always today"
-#~ msgstr "Seleccionar sempre hoxe"
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Rematando o modo de axuste de hora"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Iniciando o modo de axuste de hora"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "axustar para cambiar o minuto"
-
-#~ msgid "Select timezone"
-#~ msgstr "Seleccionar fuso horario"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Modificar o reloxo"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Modificar as preferencias"
-
-#~ msgid "show line _1:"
-#~ msgstr "Mostrar os números de liña"
-
-#~ msgid "show line _2:"
-#~ msgstr "Mostrar os números de liña"
-
-#~ msgid "show line _3:"
-#~ msgstr "Mostrar os números de liña"
-
-#~ msgid "Properties"
-#~ msgstr "Propiedades"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Produciuse un erro ó iniciar 'orage -p'"
-
-#~ msgid "Show event list"
-#~ msgstr "Mostrar a lista de eventos"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "O tamaño da icona que se vai usar."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Configuración do calendario"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Configuración do calendario de Xfce4"
diff -Nru orage-4.8.3/po/gu.po orage-4.12.1/po/gu.po
--- orage-4.8.3/po/gu.po	2012-01-03 12:01:04.000000000 +0000
+++ orage-4.12.1/po/gu.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,3636 +0,0 @@
-# Gujarati translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Ankit Patel <ankit@redhat.com>, 2004, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2005-09-14 01:54+0900\n"
-"Last-Translator: Ankit Patel <ankit@redhat.com>\n"
-"Language-Team: Gujarati <indianoss-gujarati@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gu\n"
-"X-Generator: KBabel 1.9.1\n"
-"Plural-Forms: Plural-Forms: Plural-Forms: nplurals=2; plural=(n!=1);\n"
-
-#: ../globaltime/globaltime.c:100
-msgid "Raising GlobalTime window..."
-msgstr ""
-
-#: ../globaltime/globaltime.c:102
-msgid "GlobalTime window raise failed"
-msgstr ""
-
-#. ********** timezone tooltip **********
-#: ../globaltime/globaltime.c:277
-#, c-format
-msgid ""
-"%s\n"
-"click to modify clock"
-msgstr ""
-
-#: ../globaltime/globaltime.c:386
-msgid "Localtime"
-msgstr ""
-
-#: ../globaltime/globaltime.c:464
-msgid ""
-"button 1 to change preferences \n"
-"button 2 to adjust time of clocks"
-msgstr ""
-
-#: ../globaltime/globaltime.c:480
-msgid "adjust to change hour"
-msgstr ""
-
-#: ../globaltime/globaltime.c:496
-msgid ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
-msgid "NEW"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:289
-msgid "NEW COPY"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:310
-msgid "Not possible to delete the last clock."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:516
-msgid "update this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
-msgid "add new empty clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:526
-msgid "add new clock using this clock as model"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:531
-msgid "delete this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:539
-msgid "move this clock first"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:544
-msgid "move this clock left"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:549
-msgid "move this clock right"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:554
-msgid "move this clock last"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:562
-msgid "set the timezone of this clock to be local timezone"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
-msgid "close window and exit"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:590
-#, fuzzy
-msgid "Globaltime preferences "
-msgstr "પસંદગીઓ"
-
-#. -----------------------HEADING-------------------------------------------
-#: ../globaltime/gt_prefs.c:603
-msgid "Clock Parameters"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:607
-msgid "Name of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:613
-msgid "enter name of clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:616
-msgid "Timezone of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:643
-msgid "Text Formatting"
-msgstr ""
-
-#. ------------------------background-------------------------
-#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
-msgid "Background color:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:656
-msgid "Click to change background colour for clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
-#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
-#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
-#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
-#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
-msgid "Use default"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
-#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
-#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
-msgid "Cross this to use default instead of selected value"
-msgstr ""
-
-#. ------------------------foreground-------------------------
-#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
-msgid "Foreground (=text) color:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:688
-msgid "Click to change foreground colour for clock"
-msgstr ""
-
-#. ------------------------name font-------------------------
-#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
-msgid "Font for name of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:720
-msgid "Click to change font for clock name"
-msgstr ""
-
-#. ------------------------time font-------------------------
-#: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
-msgid "Font for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:753
-msgid "Click to change font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:780
-msgid "Underline name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:810
-msgid "Underline time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:850
-msgid "Text Default Formatting"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:863
-msgid "Click to change default background colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
-msgid "Cross this to use system default instead of selected color"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:896
-msgid "Click to change default text colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:929
-msgid "Click to change default font for clock name"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
-msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:963
-msgid "Click to change default font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:990
-msgid "Underline for name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:1004
-msgid "Underline for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1027
-#, fuzzy
-msgid "update preferences"
-msgstr "પસંદગીઓ"
-
-#: ../globaltime/gt_prefs.c:1062
-#, fuzzy
-msgid "Globaltime Preferences"
-msgstr "પસંદગીઓ"
-
-#. -----------------------HEADING--------------------------------------
-#: ../globaltime/gt_prefs.c:1073
-#, fuzzy
-msgid "General Preferences"
-msgstr "પસંદગીઓ"
-
-#: ../globaltime/gt_prefs.c:1077
-msgid "Decorations:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1078
-#, fuzzy
-msgid "Standard"
-msgstr "કેલેન્ડર"
-
-#: ../globaltime/gt_prefs.c:1083
-msgid "Use normal decorations"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1094
-msgid "Do not show window decorations (borders)"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1100
-msgid "Clock size:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1101
-msgid "Equal"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1106
-msgid "All clocks have same size"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1111
-#, fuzzy
-msgid "Varying"
-msgstr "ચેતવણી"
-
-#: ../globaltime/gt_prefs.c:1116
-msgid "Clock sizes vary"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1122
-msgid "Local timezone:"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:101
-#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
-msgid " Other"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:156
-#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
-#, c-format
-msgid "%d hour %d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:159
-#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, c-format
-msgid "%d hour"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:161
-#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, c-format
-msgid "%d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:167
-#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
-msgid "backward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:170
-#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-msgid "forward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:194
-#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
-msgid "not changed"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:195
-#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
-msgid "not changing"
-msgstr ""
-
-#. location
-#: ../globaltime/timezone_selection.c:247
-#: ../globaltime/timezone_selection.c:252
-#: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
-#: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
-msgid "Location"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:258
-#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
-msgid "GMT Offset"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:264
-#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
-msgid "Previous/Next Change"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:269
-#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
-msgid "Country"
-msgstr ""
-
-#. We are actually setting the g_par parameter. In other words
-#. we are setting the global default timezone for Orage. This is
-#. done very seldom and we do not want to allow "floating" here.
-#. This test is ugly, but it is not worth an extra parameter.
-#. this is normal appointment
-#: ../globaltime/timezone_selection.c:299
-#: ../globaltime/timezone_selection.c:309
-#: ../panel-plugin/timezone_selection.c:300
-#: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
-#: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
-msgid "Pick timezone"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:302
-#: ../globaltime/timezone_selection.c:312
-#: ../panel-plugin/timezone_selection.c:303
-#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
-#: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
-msgid "Change mode"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:303
-#: ../globaltime/timezone_selection.c:313
-#: ../globaltime/timezone_selection.c:352
-#: ../panel-plugin/timezone_selection.c:304
-#: ../panel-plugin/timezone_selection.c:314
-#: ../panel-plugin/timezone_selection.c:353 ../src/timezone_selection.c:320
-#: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
-#: ../src/timezone_selection.c:379
-msgid "UTC"
-msgstr ""
-
-#. NOTE: this exists only if ical timezones are being used
-#: ../globaltime/timezone_selection.c:304
-#: ../globaltime/timezone_selection.c:357
-#: ../panel-plugin/timezone_selection.c:305
-#: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
-#: ../src/timezone_selection.c:384
-msgid "floating"
-msgstr ""
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "પસંદગીઓ"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
-msgid "Orage Globaltime"
-msgstr "કેલેન્ડર"
-
-#: ../globaltime/globaltime.desktop.in.h:3
-msgid "Show clocks from different countries"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:224
-msgid "Appearance"
-msgstr ""
-
-#. show frame
-#: ../panel-plugin/oc_config.c:229
-msgid "Show _frame"
-msgstr ""
-
-#. foreground color
-#: ../panel-plugin/oc_config.c:239
-msgid "set foreground _color:"
-msgstr ""
-
-#. background color
-#: ../panel-plugin/oc_config.c:253
-msgid "set _background color:"
-msgstr ""
-
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
-msgid "set _height:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:277
-msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:282
-msgid "set _width:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:293
-msgid "Note that you can not change the width of vertical panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:316
-msgid "Clock Options"
-msgstr ""
-
-#. timezone
-#: ../panel-plugin/oc_config.c:326
-msgid "set timezone to:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:347
-#, c-format
-msgid "Line %d:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:357
-msgid "Enter any valid strftime function parameter."
-msgstr ""
-
-#. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
-msgid "Tooltip:"
-msgstr ""
-
-#. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
-msgid "fix time after suspend/hibernate"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:415
-msgid ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:432
-msgid ""
-"This program uses strftime function to get time.\n"
-"Use any valid code to get time in the format you prefer.\n"
-"Some common codes are:\n"
-"\t%A = weekday\t\t\t%B = month\n"
-"\t%c = date & time\t\t%R = hour & minute\n"
-"\t%V = week number\t\t%Z = timezone in use\n"
-"\t%H = hours \t\t\t\t%M = minute\n"
-"\t%X = local time\t\t\t%x = local date"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:457
-#, fuzzy
-msgid "Orage clock Preferences"
-msgstr "પસંદગીઓ"
-
-#. no lines yet
-#. TRANSLATORS: Use format characters from strftime(3)
-#. * to get the proper string for your locale.
-#. * I used these:
-#. * %A  : full weekday name
-#. * %d  : day of the month
-#. * %B  : full month name
-#. * %Y  : four digit year
-#. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
-msgid "%A %d %B %Y/%V"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:40
-msgid "Maintainer"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:47
-#, fuzzy
-msgid "Manage your time with Orage"
-msgstr "તમારો સમય Xfce4 સાથે વ્યવસ્થિત કરો"
-
-#. if (gtk_toggle_button_get_active(
-#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
-#. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
-msgid "End"
-msgstr ""
-
-#: ../src/appointment.c:333
-msgid "Due"
-msgstr ""
-
-#: ../src/appointment.c:493 ../src/mainbox.c:783
-msgid "Orage"
-msgstr ""
-
-#. to avoid timing problems when updating entry
-#. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
-msgid "Select a file..."
-msgstr ""
-
-#: ../src/appointment.c:680
-msgid "Sound Files"
-msgstr ""
-
-#: ../src/appointment.c:687 ../src/interface.c:290
-msgid "All Files"
-msgstr ""
-
-#: ../src/appointment.c:739
-#, fuzzy
-msgid "The appointment information has been modified."
-msgstr ""
-"\n"
-"જાણકારી સુધારાઈ ગઈ છે.\n"
-" શું તમે ચાલુ રાખવા માંગો છો ?\n"
-
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
-msgid "Do you want to continue?"
-msgstr ""
-
-#: ../src/appointment.c:767
-msgid "The end of this appointment is earlier than the beginning."
-msgstr ""
-
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-msgid "Not set"
-msgstr ""
-
-#: ../src/appointment.c:1193
-msgid "This appointment will be permanently removed."
-msgstr ""
-
-#: ../src/appointment.c:1692
-msgid "This appointment does not exist."
-msgstr ""
-
-#: ../src/appointment.c:1693
-msgid "It was probably removed, please refresh your screen."
-msgstr ""
-
-#: ../src/appointment.c:1995
-#, fuzzy
-msgid "Current categories"
-msgstr "કેલેન્ડર"
-
-#: ../src/appointment.c:2010
-msgid "Add new category with color"
-msgstr ""
-
-#: ../src/appointment.c:2014
-msgid "Category:"
-msgstr ""
-
-#: ../src/appointment.c:2045
-msgid "Colors of categories - Orage"
-msgstr ""
-
-#: ../src/appointment.c:2092
-msgid " *** COPY ***"
-msgstr ""
-
-#: ../src/appointment.c:2353
-#, fuzzy
-msgid "New appointment - Orage"
-msgstr "મુલાકાત"
-
-#. File menu stuff
-#. ********* File menu *********
-#. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
-msgid "_File"
-msgstr "ફાઈલ (_F)"
-
-#: ../src/appointment.c:2388
-msgid "Sav_e and close"
-msgstr ""
-
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
-msgid "D_uplicate"
-msgstr ""
-
-#: ../src/appointment.c:2589
-msgid "Save"
-msgstr ""
-
-#: ../src/appointment.c:2591
-msgid "Save and close"
-msgstr ""
-
-#: ../src/appointment.c:2596
-msgid "Revert"
-msgstr ""
-
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
-msgid "Duplicate"
-msgstr ""
-
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
-msgid "Delete"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Free"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Busy"
-msgstr ""
-
-#: ../src/appointment.c:2625
-msgid "General"
-msgstr ""
-
-#. type
-#: ../src/appointment.c:2631
-msgid "Type "
-msgstr ""
-
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
-msgid "Event"
-msgstr ""
-
-#: ../src/appointment.c:2636
-msgid ""
-"Event that will happen sometime. For example:\n"
-"Meeting or birthday or TV show."
-msgstr ""
-
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-#, fuzzy
-msgid "Todo"
-msgstr "આજે"
-
-#: ../src/appointment.c:2642
-msgid ""
-"Something that you should do sometime. For example:\n"
-"Wash your car or test new version of Orage."
-msgstr ""
-
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
-msgid "Journal"
-msgstr ""
-
-#: ../src/appointment.c:2649
-msgid ""
-"Make a note that something happened. For example:\n"
-"Remark that your mother called or first snow came."
-msgstr ""
-
-#. title
-#: ../src/appointment.c:2656
-msgid "Title "
-msgstr ""
-
-#: ../src/appointment.c:2671
-msgid "All day event"
-msgstr ""
-
-#. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
-msgid "Start"
-msgstr ""
-
-#: ../src/appointment.c:2697
-msgid "Set      "
-msgstr ""
-
-#: ../src/appointment.c:2718
-msgid "Duration"
-msgstr ""
-
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
-#, fuzzy
-msgid "days"
-msgstr "આજે"
-
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
-msgid "hours"
-msgstr ""
-
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
-msgid "mins"
-msgstr ""
-
-#. Availability (only for EVENT)
-#: ../src/appointment.c:2738
-msgid "Availability"
-msgstr ""
-
-#. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
-msgid "Completed"
-msgstr ""
-
-#: ../src/appointment.c:2749
-msgid "Done"
-msgstr ""
-
-#. categories
-#: ../src/appointment.c:2770
-msgid "Categories"
-msgstr ""
-
-#: ../src/appointment.c:2782
-msgid ""
-"This is special category, which can be used to color this appointment in "
-"list views."
-msgstr ""
-
-#: ../src/appointment.c:2787
-msgid "update colors for categories."
-msgstr ""
-
-#. priority
-#: ../src/appointment.c:2793
-msgid "Priority"
-msgstr ""
-
-#. note
-#: ../src/appointment.c:2803
-msgid "Note"
-msgstr ""
-
-#: ../src/appointment.c:2824
-msgid ""
-"These shorthand commands take effect immediately:\n"
-"    <D> inserts current date in local date format\n"
-"    <T> inserts time and\n"
-"    <DT> inserts date and time.\n"
-"\n"
-"These are converted only later when they are seen:\n"
-"    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before Start"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before End"
-msgstr ""
-
-#: ../src/appointment.c:2896
-msgid "After Start"
-msgstr ""
-
-#: ../src/appointment.c:2896
-msgid "After End"
-msgstr ""
-
-#: ../src/appointment.c:2903
-msgid "Alarm"
-msgstr ""
-
-#. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-msgid "Alarm time"
-msgstr ""
-
-#: ../src/appointment.c:2933
-msgid ""
-"Often you want to get alarm:\n"
-" 1) before Event start\n"
-" 2) before Todo end\n"
-" 3) after Todo start"
-msgstr ""
-
-#: ../src/appointment.c:2938
-msgid "Persistent alarm"
-msgstr ""
-
-#: ../src/appointment.c:2940
-msgid ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
-msgstr ""
-
-#. **** Audio Alarm ****
-#: ../src/appointment.c:2949
-msgid "Sound"
-msgstr ""
-
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
-msgid "Use"
-msgstr ""
-
-#: ../src/appointment.c:2955
-msgid "Select this if you want audible alarm"
-msgstr ""
-
-#: ../src/appointment.c:2972
-msgid "Repeat alarm sound"
-msgstr ""
-
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
-msgid "times"
-msgstr ""
-
-#: ../src/appointment.c:3004
-msgid "sec interval"
-msgstr ""
-
-#. **** Display Alarm ****
-#: ../src/appointment.c:3014
-msgid "Visual"
-msgstr ""
-
-#: ../src/appointment.c:3018
-msgid "Use Orage window"
-msgstr ""
-
-#: ../src/appointment.c:3020
-msgid "Select this if you want Orage window alarm"
-msgstr ""
-
-#: ../src/appointment.c:3032
-msgid "Use notification"
-msgstr ""
-
-#: ../src/appointment.c:3034
-msgid "Select this if you want notification alarm"
-msgstr ""
-
-#: ../src/appointment.c:3040
-msgid "Set timeout"
-msgstr ""
-
-#: ../src/appointment.c:3043
-msgid "Select this if you want notification to expire automatically"
-msgstr ""
-
-#: ../src/appointment.c:3054
-msgid "0 = system default expiration time"
-msgstr ""
-
-#: ../src/appointment.c:3059
-msgid "seconds"
-msgstr ""
-
-#. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
-msgid "Procedure"
-msgstr ""
-
-#: ../src/appointment.c:3076
-msgid "Select this if you want procedure or script alarm"
-msgstr ""
-
-#: ../src/appointment.c:3082
-msgid ""
-"You must enter all escape etc characters yourself.\n"
-"This string is just given to shell to process.\n"
-"The following special commands are replaced at run time:\n"
-"\t<&T>  appointment title\n"
-"\t<&D>  appointment description\n"
-"\t<&AT> alarm time\n"
-"\t<&ST> appointment start time\n"
-"\t<&ET> appointment end time"
-msgstr ""
-
-#: ../src/appointment.c:3094
-msgid "Test this alarm by raising it now"
-msgstr ""
-
-#: ../src/appointment.c:3101
-msgid "<b>Default alarm</b>"
-msgstr ""
-
-#: ../src/appointment.c:3109
-msgid "Store current settings as default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3114
-msgid "Set current settings from default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Daily"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Weekly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Monthly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Yearly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Hourly"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Mon"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Tue"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Wed"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Thu"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Fri"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Sat"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Sun"
-msgstr ""
-
-#: ../src/appointment.c:3183
-msgid "Recurrence"
-msgstr ""
-
-#. complexity
-#: ../src/appointment.c:3189
-msgid "Complexity"
-msgstr ""
-
-#: ../src/appointment.c:3192
-msgid "Basic"
-msgstr ""
-
-#: ../src/appointment.c:3198
-msgid "Advanced"
-msgstr ""
-
-#: ../src/appointment.c:3202
-msgid "Use this if you want regular repeating event"
-msgstr ""
-
-#: ../src/appointment.c:3204
-msgid ""
-"Use this if you need complex times like:\n"
-" Every Saturday and Sunday or \n"
-" First Tuesday every month"
-msgstr ""
-
-#. frequency
-#: ../src/appointment.c:3211
-msgid "Frequency"
-msgstr ""
-
-#: ../src/appointment.c:3217
-msgid "Each"
-msgstr ""
-
-#: ../src/appointment.c:3224
-msgid "occurrence"
-msgstr ""
-
-#: ../src/appointment.c:3228
-msgid ""
-"Limit frequency to certain interval.\n"
-" For example: Every third day:\n"
-" Frequency = Daily and Interval = 3"
-msgstr ""
-
-#: ../src/appointment.c:3274
-msgid "Limit"
-msgstr ""
-
-#: ../src/appointment.c:3276
-msgid "Repeat forever"
-msgstr ""
-
-#: ../src/appointment.c:3282
-msgid "Repeat "
-msgstr ""
-
-#: ../src/appointment.c:3298
-msgid "Repeat until "
-msgstr ""
-
-#. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-#, fuzzy
-msgid "Weekdays"
-msgstr "આજે"
-
-#: ../src/appointment.c:3323
-msgid "Which day"
-msgstr ""
-
-#: ../src/appointment.c:3331
-msgid ""
-"Specify which weekday for monthly and yearly events.\n"
-" For example:\n"
-" Second Wednesday each month:\n"
-"\tFrequency = Monthly,\n"
-"\tWeekdays = check only Wednesday,\n"
-"\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-
-#. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
-msgid "TODO base"
-msgstr ""
-
-#: ../src/appointment.c:3352
-msgid ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
-msgstr ""
-
-#: ../src/appointment.c:3354
-msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-
-#. exceptions
-#: ../src/appointment.c:3361
-msgid "Exceptions"
-msgstr ""
-
-#: ../src/appointment.c:3374
-msgid ""
-"Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
-"Remove by clicking the data."
-msgstr ""
-
-#: ../src/appointment.c:3379
-msgid "Add excluded date (-)"
-msgstr ""
-
-#: ../src/appointment.c:3381
-msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-
-#: ../src/appointment.c:3387
-msgid "Add included time (+)"
-msgstr ""
-
-#: ../src/appointment.c:3389
-msgid ""
-"Included times have same timezone than start time, but they may have "
-"different time"
-msgstr ""
-
-#. calendars showing the action days
-#: ../src/appointment.c:3406
-msgid "Action dates"
-msgstr ""
-
-#. ********* View menu *********
-#. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
-msgid "_View"
-msgstr ""
-
-#. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
-msgid "_Go"
-msgstr ""
-
-#: ../src/day-view.c:319 ../src/event-list.c:1110
-msgid "New"
-msgstr ""
-
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr ""
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "આજે"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr ""
-
-#: ../src/day-view.c:333 ../src/event-list.c:1128
-msgid "Refresh"
-msgstr ""
-
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
-msgid "Close"
-msgstr ""
-
-#: ../src/day-view.c:454
-msgid "Unknown"
-msgstr ""
-
-#: ../src/day-view.c:704
-msgid "       Number of days to show"
-msgstr ""
-
-#: ../src/day-view.c:935
-#, fuzzy
-msgid "Orage - day view"
-msgstr "કેલેન્ડર"
-
-#. date only appointment
-#: ../src/event-list.c:190
-msgid "All day"
-msgstr ""
-
-#: ../src/event-list.c:580 ../src/event-list.c:1281
-msgid "Time"
-msgstr ""
-
-#: ../src/event-list.c:748
-msgid "No rows have been selected."
-msgstr ""
-
-#: ../src/event-list.c:749
-msgid "Click a row to select it and after that you can copy it."
-msgstr ""
-
-#: ../src/event-list.c:918
-msgid ""
-"You will permanently remove all\n"
-"selected appointments."
-msgstr ""
-
-#: ../src/event-list.c:1130
-msgid "Find"
-msgstr ""
-
-#: ../src/event-list.c:1137
-msgid "Dayview"
-msgstr ""
-
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr ""
-
-#: ../src/event-list.c:1201
-msgid "Journal entries starting from:"
-msgstr ""
-
-#: ../src/event-list.c:1221
-msgid "Search"
-msgstr ""
-
-#: ../src/event-list.c:1224
-msgid "Search text "
-msgstr ""
-
-#: ../src/event-list.c:1289
-msgid "Flags"
-msgstr ""
-
-#: ../src/event-list.c:1297
-msgid "Title"
-msgstr ""
-
-#: ../src/event-list.c:1323
-msgid ""
-"Double click line to edit it.\n"
-"\n"
-"Flags in order:\n"
-"\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
-"\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
-"\t 3. Type: f=free B=Busy\n"
-"\t 4. Located in file:\n"
-"\t\tO=Orage A=Archive F=Foreign\n"
-"\t 5. Appointment type:\n"
-"\t\tE=Event T=Todo J=Journal"
-msgstr ""
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr ""
-
-#. remove since it has ended
-#: ../src/ical-archive.c:267
-msgid "\tRecur ended, moving to archive file."
-msgstr ""
-
-#: ../src/ical-archive.c:329
-msgid "Archiving not enabled. Exiting"
-msgstr ""
-
-#: ../src/ical-archive.c:347
-#, c-format
-msgid "Archiving threshold: %d month(s)"
-msgstr ""
-
-#. yy mon day
-#: ../src/ical-archive.c:350
-#, c-format
-msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr ""
-
-#: ../src/ical-archive.c:377
-#, c-format
-msgid "Archiving uid: %s"
-msgstr ""
-
-#. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
-msgid "\tVTODO not complete; not archived"
-msgstr ""
-
-#. it is recurrent event
-#: ../src/ical-archive.c:388
-#, c-format
-msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr ""
-
-#: ../src/ical-archive.c:405
-msgid "Archiving done\n"
-msgstr ""
-
-#. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
-msgid "Starting archive removal."
-msgstr ""
-
-#: ../src/ical-archive.c:422
-msgid "\tPHASE 1: reset recurring appointments"
-msgstr ""
-
-#. PHASE 2: go through archive file and add everything back to base orage.
-#. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
-msgid "\tPHASE 2: return archived appointments"
-msgstr ""
-
-#: ../src/ical-archive.c:470
-msgid "Archive removal done\n"
-msgstr ""
-
-#: ../src/ical-code.c:932
-msgid "Orage default alarm"
-msgstr ""
-
-#: ../src/ical-code.c:3115
-#, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-
-#: ../src/ical-code.c:3117
-#, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-
-#: ../src/ical-expimp.c:123
-msgid "Starting import file preprocessing"
-msgstr ""
-
-#: ../src/ical-expimp.c:158
-msgid "... Patched DCREATED to be CREATED."
-msgstr ""
-
-#: ../src/ical-expimp.c:197
-msgid "... Patched timezone to Orage format."
-msgstr ""
-
-#: ../src/ical-expimp.c:206
-msgid "Import file preprocessing done"
-msgstr ""
-
-#: ../src/interface.c:284
-#, fuzzy
-msgid "Calendar files"
-msgstr "કેલેન્ડર"
-
-#: ../src/interface.c:631
-msgid "Current foreign files"
-msgstr ""
-
-#: ../src/interface.c:643
-msgid "READ ONLY"
-msgstr ""
-
-#: ../src/interface.c:645
-msgid "READ WRITE"
-msgstr ""
-
-#: ../src/interface.c:663
-msgid "***** No foreign files *****"
-msgstr ""
-
-#: ../src/interface.c:974
-msgid "Import/export"
-msgstr ""
-
-#: ../src/interface.c:981
-msgid "Import"
-msgstr ""
-
-#: ../src/interface.c:986
-msgid "Read from file:"
-msgstr ""
-
-#: ../src/interface.c:1003
-msgid ""
-"Separate filenames with comma(,).\n"
-" NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-
-#: ../src/interface.c:1008
-msgid "Export"
-msgstr ""
-
-#: ../src/interface.c:1013
-msgid "Write to file:"
-msgstr ""
-
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
-msgid "Select"
-msgstr "આજનો દિવસ પસંદ કરો (_T)"
-
-#: ../src/interface.c:1037
-#, fuzzy
-msgid "All appointments"
-msgstr "મુલાકાત"
-
-#: ../src/interface.c:1050
-#, fuzzy
-msgid "Named appointments: "
-msgstr "મુલાકાત"
-
-#: ../src/interface.c:1062
-msgid ""
-"Note that only main file appointments are read.\n"
-"Archived and Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1065
-msgid ""
-"Note that only main file appointments are read.\n"
-"Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1068
-msgid "You can easily drag these from event-list window."
-msgstr ""
-
-#: ../src/interface.c:1070
-msgid "Orage appointment UIDs separated by commas."
-msgstr ""
-
-#: ../src/interface.c:1076
-msgid "Archive"
-msgstr ""
-
-#: ../src/interface.c:1084
-#, c-format
-msgid "Archive now (threshold: %d months)"
-msgstr ""
-
-#: ../src/interface.c:1094
-msgid "You can change archive threshold in parameters"
-msgstr ""
-
-#: ../src/interface.c:1101
-msgid "Revert archive now"
-msgstr ""
-
-#: ../src/interface.c:1107
-msgid ""
-"Return all archived events into main orage file and remove arch file.\n"
-"This is useful for example when doing export and moving orage\n"
-"appointments to another system."
-msgstr ""
-
-#: ../src/interface.c:1118
-#, fuzzy
-msgid "Orage files"
-msgstr "પસંદગીઓ"
-
-#: ../src/interface.c:1125
-#, fuzzy
-msgid "Orage main calendar file"
-msgstr "કેલેન્ડર"
-
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "કેલેન્ડર"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr ""
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr ""
-
-#: ../src/interface.c:1156 ../src/interface.c:1222
-msgid "Rename"
-msgstr ""
-
-#: ../src/interface.c:1160
-msgid ""
-"Orage internal file rename only.\n"
-"Does not touch external filesystem at all.\n"
-"New file must exist."
-msgstr ""
-
-#: ../src/interface.c:1164 ../src/interface.c:1227
-msgid "Copy"
-msgstr ""
-
-#: ../src/interface.c:1168
-msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-
-#: ../src/interface.c:1172 ../src/interface.c:1232
-msgid "Move"
-msgstr ""
-
-#: ../src/interface.c:1176
-msgid "Current file is moved and vanishes from the old place."
-msgstr ""
-
-#: ../src/interface.c:1190
-msgid "Archive file"
-msgstr ""
-
-#: ../src/interface.c:1254
-msgid "Foreign files"
-msgstr ""
-
-#: ../src/interface.c:1261
-msgid "Add new foreign file"
-msgstr ""
-
-#: ../src/interface.c:1266
-msgid "Foreign file:"
-msgstr ""
-
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr ""
-
-#: ../src/interface.c:1286
-msgid "Read only"
-msgstr ""
-
-#: ../src/interface.c:1294
-msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-
-#: ../src/interface.c:1308
-msgid "Exchange data - Orage"
-msgstr ""
-
-#: ../src/main.c:268
-#, c-format
-msgid ""
-"\tThis is %s version %s\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:270
-#, c-format
-msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
-
-#: ../src/main.c:271
-#, c-format
-msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
-
-#: ../src/main.c:273
-#, c-format
-msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
-
-#: ../src/main.c:276
-#, c-format
-msgid "\tUsing DBUS for import.\n"
-msgstr ""
-
-#: ../src/main.c:278
-#, c-format
-msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
-
-#: ../src/main.c:281
-#, c-format
-msgid "\tUsing libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:283
-#, c-format
-msgid "\tNot using libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:286
-#, c-format
-msgid "\tUsing automatic archiving.\n"
-msgstr ""
-
-#: ../src/main.c:288
-#, c-format
-msgid "\tNot using archiving.\n"
-msgstr ""
-
-#: ../src/main.c:291
-#, c-format
-msgid "\tUsing operating system package libical.\n"
-msgstr ""
-
-#: ../src/main.c:293
-#, c-format
-msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
-
-#: ../src/main.c:306
-#, c-format
-msgid ""
-"Usage: orage [options] [files]\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:307
-#, c-format
-msgid "Options:\n"
-msgstr ""
-
-#: ../src/main.c:308
-#, c-format
-msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
-
-#: ../src/main.c:309
-#, c-format
-msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
-
-#: ../src/main.c:310
-#, c-format
-msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
-
-#: ../src/main.c:311
-#, c-format
-msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
-
-#: ../src/main.c:312
-#, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:313
-#, c-format
-msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:314
-#, c-format
-msgid ""
-"--export (-e) file [appointment...] \texport appointments from Orage to "
-"file\n"
-msgstr ""
-
-#: ../src/main.c:316
-#, c-format
-msgid "files=ical files to load into orage\n"
-msgstr ""
-
-#: ../src/main.c:318
-#, c-format
-msgid "\tdbus not included in orage. \n"
-msgstr ""
-
-#: ../src/main.c:319
-#, c-format
-msgid ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
-msgstr ""
-
-#: ../src/main.c:511
-#, c-format
-msgid ""
-"\n"
-"Unknown option %s\n"
-"\n"
-msgstr ""
-
-#: ../src/mainbox.c:287
-msgid "_Exchange data"
-msgstr ""
-
-#. Edit menu
-#: ../src/mainbox.c:298
-msgid "_Edit"
-msgstr ""
-
-#: ../src/mainbox.c:308
-msgid "View selected _date"
-msgstr ""
-
-#: ../src/mainbox.c:311
-msgid "View selected _week"
-msgstr ""
-
-#: ../src/mainbox.c:317
-msgid "Select _Today"
-msgstr "આજનો દિવસ પસંદ કરો (_T)"
-
-#: ../src/mainbox.c:323
-#, fuzzy
-msgid "Show _Globaltime"
-msgstr "પસંદગીઓ"
-
-#. Help menu
-#: ../src/mainbox.c:327
-msgid "_Help"
-msgstr "મદદ (_H)"
-
-#: ../src/mainbox.c:448
-msgid "Never"
-msgstr ""
-
-#: ../src/mainbox.c:453
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:460
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:546
-msgid "<b>To do:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:582
-#, c-format
-msgid "<b>Events for %s:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:593
-#, c-format
-msgid "<b>Events for %s - %s:</b>"
-msgstr ""
-
-#: ../src/parameters.c:522
-#, fuzzy
-msgid "Main settings"
-msgstr "કેલેન્ડર સુયોજનો"
-
-#: ../src/parameters.c:528
-msgid "Timezone"
-msgstr ""
-
-#: ../src/parameters.c:543
-msgid "You should always define your local timezone."
-msgstr ""
-
-#: ../src/parameters.c:552
-msgid "Archive threshold (months)"
-msgstr ""
-
-#: ../src/parameters.c:562
-msgid "(0 = no archiving)"
-msgstr ""
-
-#: ../src/parameters.c:565
-msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-
-#: ../src/parameters.c:574
-msgid "Sound command"
-msgstr ""
-
-#: ../src/parameters.c:589
-msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "કેલેન્ડર સુયોજનો"
-
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
-msgstr "વિન્ડો બંધ કરો (_C)"
-
-#: ../src/parameters.c:618
-msgid "Show borders"
-msgstr ""
-
-#: ../src/parameters.c:625
-msgid "Show menu"
-msgstr ""
-
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr ""
-
-#: ../src/parameters.c:639
-msgid "Show day names"
-msgstr ""
-
-#: ../src/parameters.c:646
-msgid "Show week numbers"
-msgstr ""
-
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr ""
-
-#: ../src/parameters.c:660
-msgid "Number of days to show in event window"
-msgstr ""
-
-#: ../src/parameters.c:666
-msgid "0 = do not show event list at all"
-msgstr ""
-
-#: ../src/parameters.c:676
-msgid "Show on all desktops"
-msgstr ""
-
-#: ../src/parameters.c:683
-msgid "Keep on top"
-msgstr ""
-
-#: ../src/parameters.c:690
-msgid "Show in taskbar"
-msgstr ""
-
-#: ../src/parameters.c:697
-msgid "Show in pager"
-msgstr ""
-
-#: ../src/parameters.c:704
-msgid "Show in systray"
-msgstr ""
-
-#: ../src/parameters.c:739
-#, fuzzy
-msgid "Calendar start"
-msgstr "કેલેન્ડર"
-
-#: ../src/parameters.c:744
-msgid "Show"
-msgstr ""
-
-#: ../src/parameters.c:756
-msgid "Hide"
-msgstr ""
-
-#: ../src/parameters.c:768
-msgid "Minimized"
-msgstr ""
-
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr ""
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "વિન્ડો બંધ કરો (_C)"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "આજનો દિવસ પસંદ કરો (_T)"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr ""
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
-
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr ""
-
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr ""
-
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr ""
-
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr ""
-
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
-
-#: ../src/parameters.c:921
-msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-
-#: ../src/parameters.c:938
-#, fuzzy
-msgid "Orage Preferences"
-msgstr "પસંદગીઓ"
-
-#: ../src/parameters.c:1050
-msgid "First Orage start. Searching default timezone."
-msgstr ""
-
-#: ../src/parameters.c:1069
-#, c-format
-msgid "Default timezone set to %s."
-msgstr ""
-
-#: ../src/parameters.c:1072
-msgid "Default timezone not found, please, set it manually."
-msgstr ""
-
-#: ../src/reminder.c:562
-#, fuzzy
-msgid "Reminder "
-msgstr "યાદ અપાવનાર"
-
-#: ../src/reminder.c:591
-msgid "Open"
-msgstr ""
-
-#: ../src/reminder.c:722
-#, fuzzy
-msgid "Reminder - Orage"
-msgstr "યાદ અપાવનાર"
-
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
-
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-
-#: ../src/reminder.c:1099
-msgid "Next active alarms:"
-msgstr ""
-
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
-#, c-format
-msgid ""
-"\n"
-"%02d d %02d h %02d min to: %s"
-msgstr ""
-
-#: ../src/reminder.c:1166
-#, c-format
-msgid ""
-"\n"
-"No active alarms found"
-msgstr ""
-
-#: ../src/timezone_names.c:36
-msgid "Africa"
-msgstr ""
-
-#: ../src/timezone_names.c:37
-msgid "Africa/Abidjan"
-msgstr ""
-
-#: ../src/timezone_names.c:38
-msgid "Africa/Accra"
-msgstr ""
-
-#: ../src/timezone_names.c:39
-msgid "Africa/Addis_Ababa"
-msgstr ""
-
-#: ../src/timezone_names.c:40
-msgid "Africa/Algiers"
-msgstr ""
-
-#: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr ""
-
-#: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr ""
-
-#: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr ""
-
-#: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr ""
-
-#: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr ""
-
-#: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr ""
-
-#: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr ""
-
-#: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr ""
-
-#: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr ""
-
-#: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr ""
-
-#: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr ""
-
-#: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr ""
-
-#: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr ""
-
-#: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr ""
-
-#: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr ""
-
-#: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr ""
-
-#: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr ""
-
-#: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr ""
-
-#: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr ""
-
-#: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr ""
-
-#: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr ""
-
-#: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr ""
-
-#: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr ""
-
-#: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr ""
-
-#: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr ""
-
-#: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr ""
-
-#: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr ""
-
-#: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr ""
-
-#: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr ""
-
-#: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr ""
-
-#: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr ""
-
-#: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr ""
-
-#: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr ""
-
-#: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr ""
-
-#: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr ""
-
-#: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr ""
-
-#: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr ""
-
-#: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr ""
-
-#: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr ""
-
-#: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr ""
-
-#: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr ""
-
-#: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr ""
-
-#: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr ""
-
-#: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr ""
-
-#: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr ""
-
-#: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr ""
-
-#: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr ""
-
-#: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr ""
-
-#: ../src/timezone_names.c:89
-msgid "America"
-msgstr ""
-
-#: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr ""
-
-#: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr ""
-
-#: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr ""
-
-#: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr ""
-
-#: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr ""
-
-#: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:96
-msgid "America/Argentina/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:97
-msgid "America/Argentina/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:98
-msgid "America/Argentina/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:99
-msgid "America/Argentina/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr ""
-
-#: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr ""
-
-#: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr ""
-
-#: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr ""
-
-#: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr ""
-
-#: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr ""
-
-#: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr ""
-
-#: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr ""
-
-#: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr ""
-
-#: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr ""
-
-#: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr ""
-
-#: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr ""
-
-#: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr ""
-
-#: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr ""
-
-#: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr ""
-
-#: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr ""
-
-#: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr ""
-
-#: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr ""
-
-#: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr ""
-
-#: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr ""
-
-#: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr ""
-
-#: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr ""
-
-#: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr ""
-
-#: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr ""
-
-#: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr ""
-
-#: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr ""
-
-#: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr ""
-
-#: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr ""
-
-#: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr ""
-
-#: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr ""
-
-#: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr ""
-
-#: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr ""
-
-#: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr ""
-
-#: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr ""
-
-#: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr ""
-
-#: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr ""
-
-#: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr ""
-
-#: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr ""
-
-#: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr ""
-
-#: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr ""
-
-#: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr ""
-
-#: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr ""
-
-#: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr ""
-
-#: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr ""
-
-#: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr ""
-
-#: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr ""
-
-#: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr ""
-
-#: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr ""
-
-#: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr ""
-
-#: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr ""
-
-#: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr ""
-
-#: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr ""
-
-#: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr ""
-
-#: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr ""
-
-#: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr ""
-
-#: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr ""
-
-#: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr ""
-
-#: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr ""
-
-#: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr ""
-
-#: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr ""
-
-#: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr ""
-
-#: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr ""
-
-#: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr ""
-
-#: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr ""
-
-#: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr ""
-
-#: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr ""
-
-#: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr ""
-
-#: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr ""
-
-#: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr ""
-
-#: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr ""
-
-#: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr ""
-
-#: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr ""
-
-#: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr ""
-
-#: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr ""
-
-#: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr ""
-
-#: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr ""
-
-#: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr ""
-
-#: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr ""
-
-#: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr ""
-
-#: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr ""
-
-#: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr ""
-
-#: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr ""
-
-#: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr ""
-
-#: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr ""
-
-#: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr ""
-
-#: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr ""
-
-#: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr ""
-
-#: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr ""
-
-#: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr ""
-
-#: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr ""
-
-#: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr ""
-
-#: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr ""
-
-#: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr ""
-
-#: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr ""
-
-#: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr ""
-
-#: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr ""
-
-#: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr ""
-
-#: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr ""
-
-#: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr ""
-
-#: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr ""
-
-#: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr ""
-
-#: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr ""
-
-#: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr ""
-
-#: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr ""
-
-#: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr ""
-
-#: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr ""
-
-#: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr ""
-
-#: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr ""
-
-#: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr ""
-
-#: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr ""
-
-#: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr ""
-
-#: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr ""
-
-#: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr ""
-
-#: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr ""
-
-#: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr ""
-
-#: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr ""
-
-#: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr ""
-
-#: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr ""
-
-#: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr ""
-
-#: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr ""
-
-#: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr ""
-
-#: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr ""
-
-#: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr ""
-
-#: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr ""
-
-#: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr ""
-
-#: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr ""
-
-#: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr ""
-
-#: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr ""
-
-#: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr ""
-
-#: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr ""
-
-#: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr ""
-
-#: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr ""
-
-#: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr ""
-
-#: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr ""
-
-#: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr ""
-
-#: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr ""
-
-#: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr ""
-
-#: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr ""
-
-#: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr ""
-
-#: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr ""
-
-#: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr ""
-
-#: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr ""
-
-#: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr ""
-
-#: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr ""
-
-#: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr ""
-
-#: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr ""
-
-#: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr ""
-
-#: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr ""
-
-#: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr ""
-
-#: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr ""
-
-#: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr ""
-
-#: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr ""
-
-#: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr ""
-
-#: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr ""
-
-#: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr ""
-
-#: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr ""
-
-#: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr ""
-
-#: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr ""
-
-#: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr ""
-
-#: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr ""
-
-#: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr ""
-
-#: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr ""
-
-#: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr ""
-
-#: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr ""
-
-#: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr ""
-
-#: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr ""
-
-#: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr ""
-
-#: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr ""
-
-#: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr ""
-
-#: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr ""
-
-#: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr ""
-
-#: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr ""
-
-#: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr ""
-
-#: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr ""
-
-#: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr ""
-
-#: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr ""
-
-#: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr ""
-
-#: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr ""
-
-#: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr ""
-
-#: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr ""
-
-#: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr ""
-
-#: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr ""
-
-#: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr ""
-
-#: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr ""
-
-#: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr ""
-
-#: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr ""
-
-#: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr ""
-
-#: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr ""
-
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr ""
-
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr ""
-
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr ""
-
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr ""
-
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr ""
-
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr ""
-
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr ""
-
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr ""
-
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr ""
-
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr ""
-
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr ""
-
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr ""
-
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr ""
-
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr ""
-
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr ""
-
-#: ../src/timezone_names.c:320
-msgid "Europe"
-msgstr ""
-
-#: ../src/timezone_names.c:321
-msgid "Europe/Amsterdam"
-msgstr ""
-
-#: ../src/timezone_names.c:322
-msgid "Europe/Andorra"
-msgstr ""
-
-#: ../src/timezone_names.c:323
-msgid "Europe/Athens"
-msgstr ""
-
-#: ../src/timezone_names.c:324
-msgid "Europe/Belfast"
-msgstr ""
-
-#: ../src/timezone_names.c:325
-msgid "Europe/Belgrade"
-msgstr ""
-
-#: ../src/timezone_names.c:326
-msgid "Europe/Berlin"
-msgstr ""
-
-#: ../src/timezone_names.c:327
-msgid "Europe/Bratislava"
-msgstr ""
-
-#: ../src/timezone_names.c:328
-msgid "Europe/Brussels"
-msgstr ""
-
-#: ../src/timezone_names.c:329
-msgid "Europe/Bucharest"
-msgstr ""
-
-#: ../src/timezone_names.c:330
-msgid "Europe/Budapest"
-msgstr ""
-
-#: ../src/timezone_names.c:331
-msgid "Europe/Chisinau"
-msgstr ""
-
-#: ../src/timezone_names.c:332
-msgid "Europe/Copenhagen"
-msgstr ""
-
-#: ../src/timezone_names.c:333
-msgid "Europe/Dublin"
-msgstr ""
-
-#: ../src/timezone_names.c:334
-msgid "Europe/Gibraltar"
-msgstr ""
-
-#: ../src/timezone_names.c:335
-msgid "Europe/Helsinki"
-msgstr ""
-
-#: ../src/timezone_names.c:336
-msgid "Europe/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:337
-msgid "Europe/Kaliningrad"
-msgstr ""
-
-#: ../src/timezone_names.c:338
-msgid "Europe/Kiev"
-msgstr ""
-
-#: ../src/timezone_names.c:339
-msgid "Europe/Lisbon"
-msgstr ""
-
-#: ../src/timezone_names.c:340
-msgid "Europe/Ljubljana"
-msgstr ""
-
-#: ../src/timezone_names.c:341
-msgid "Europe/London"
-msgstr ""
-
-#: ../src/timezone_names.c:342
-msgid "Europe/Luxembourg"
-msgstr ""
-
-#: ../src/timezone_names.c:343
-msgid "Europe/Madrid"
-msgstr ""
-
-#: ../src/timezone_names.c:344
-msgid "Europe/Malta"
-msgstr ""
-
-#: ../src/timezone_names.c:345
-msgid "Europe/Minsk"
-msgstr ""
-
-#: ../src/timezone_names.c:346
-msgid "Europe/Monaco"
-msgstr ""
-
-#: ../src/timezone_names.c:347
-msgid "Europe/Moscow"
-msgstr ""
-
-#: ../src/timezone_names.c:348
-msgid "Europe/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:349
-msgid "Europe/Oslo"
-msgstr ""
-
-#: ../src/timezone_names.c:350
-msgid "Europe/Paris"
-msgstr ""
-
-#: ../src/timezone_names.c:351
-msgid "Europe/Prague"
-msgstr ""
-
-#: ../src/timezone_names.c:352
-msgid "Europe/Riga"
-msgstr ""
-
-#: ../src/timezone_names.c:353
-msgid "Europe/Rome"
-msgstr ""
-
-#: ../src/timezone_names.c:354
-msgid "Europe/Samara"
-msgstr ""
-
-#: ../src/timezone_names.c:355
-msgid "Europe/San_Marino"
-msgstr ""
-
-#: ../src/timezone_names.c:356
-msgid "Europe/Sarajevo"
-msgstr ""
-
-#: ../src/timezone_names.c:357
-msgid "Europe/Simferopol"
-msgstr ""
-
-#: ../src/timezone_names.c:358
-msgid "Europe/Skopje"
-msgstr ""
-
-#: ../src/timezone_names.c:359
-msgid "Europe/Sofia"
-msgstr ""
-
-#: ../src/timezone_names.c:360
-msgid "Europe/Stockholm"
-msgstr ""
-
-#: ../src/timezone_names.c:361
-msgid "Europe/Tallinn"
-msgstr ""
-
-#: ../src/timezone_names.c:362
-msgid "Europe/Tirane"
-msgstr ""
-
-#: ../src/timezone_names.c:363
-msgid "Europe/Uzhgorod"
-msgstr ""
-
-#: ../src/timezone_names.c:364
-msgid "Europe/Vaduz"
-msgstr ""
-
-#: ../src/timezone_names.c:365
-msgid "Europe/Vatican"
-msgstr ""
-
-#: ../src/timezone_names.c:366
-msgid "Europe/Vienna"
-msgstr ""
-
-#: ../src/timezone_names.c:367
-msgid "Europe/Vilnius"
-msgstr ""
-
-#: ../src/timezone_names.c:368
-msgid "Europe/Warsaw"
-msgstr ""
-
-#: ../src/timezone_names.c:369
-msgid "Europe/Zagreb"
-msgstr ""
-
-#: ../src/timezone_names.c:370
-msgid "Europe/Zaporozhye"
-msgstr ""
-
-#: ../src/timezone_names.c:371
-msgid "Europe/Zurich"
-msgstr ""
-
-#: ../src/timezone_names.c:372
-msgid "Indian"
-msgstr ""
-
-#: ../src/timezone_names.c:373
-msgid "Indian/Antananarivo"
-msgstr ""
-
-#: ../src/timezone_names.c:374
-msgid "Indian/Chagos"
-msgstr ""
-
-#: ../src/timezone_names.c:375
-msgid "Indian/Christmas"
-msgstr ""
-
-#: ../src/timezone_names.c:376
-msgid "Indian/Cocos"
-msgstr ""
-
-#: ../src/timezone_names.c:377
-msgid "Indian/Comoro"
-msgstr ""
-
-#: ../src/timezone_names.c:378
-msgid "Indian/Kerguelen"
-msgstr ""
-
-#: ../src/timezone_names.c:379
-msgid "Indian/Mahe"
-msgstr ""
-
-#: ../src/timezone_names.c:380
-msgid "Indian/Maldives"
-msgstr ""
-
-#: ../src/timezone_names.c:381
-msgid "Indian/Mauritius"
-msgstr ""
-
-#: ../src/timezone_names.c:382
-msgid "Indian/Mayotte"
-msgstr ""
-
-#: ../src/timezone_names.c:383
-msgid "Indian/Reunion"
-msgstr ""
-
-#: ../src/timezone_names.c:384
-msgid "Pacific"
-msgstr ""
-
-#: ../src/timezone_names.c:385
-msgid "Pacific/Apia"
-msgstr ""
-
-#: ../src/timezone_names.c:386
-msgid "Pacific/Auckland"
-msgstr ""
-
-#: ../src/timezone_names.c:387
-msgid "Pacific/Chatham"
-msgstr ""
-
-#: ../src/timezone_names.c:388
-msgid "Pacific/Easter"
-msgstr ""
-
-#: ../src/timezone_names.c:389
-msgid "Pacific/Efate"
-msgstr ""
-
-#: ../src/timezone_names.c:390
-msgid "Pacific/Enderbury"
-msgstr ""
-
-#: ../src/timezone_names.c:391
-msgid "Pacific/Fakaofo"
-msgstr ""
-
-#: ../src/timezone_names.c:392
-msgid "Pacific/Fiji"
-msgstr ""
-
-#: ../src/timezone_names.c:393
-msgid "Pacific/Funafuti"
-msgstr ""
-
-#: ../src/timezone_names.c:394
-msgid "Pacific/Galapagos"
-msgstr ""
-
-#: ../src/timezone_names.c:395
-msgid "Pacific/Gambier"
-msgstr ""
-
-#: ../src/timezone_names.c:396
-msgid "Pacific/Guadalcanal"
-msgstr ""
-
-#: ../src/timezone_names.c:397
-msgid "Pacific/Guam"
-msgstr ""
-
-#: ../src/timezone_names.c:398
-msgid "Pacific/Honolulu"
-msgstr ""
-
-#: ../src/timezone_names.c:399
-msgid "Pacific/Johnston"
-msgstr ""
-
-#: ../src/timezone_names.c:400
-msgid "Pacific/Kiritimati"
-msgstr ""
-
-#: ../src/timezone_names.c:401
-msgid "Pacific/Kosrae"
-msgstr ""
-
-#: ../src/timezone_names.c:402
-msgid "Pacific/Kwajalein"
-msgstr ""
-
-#: ../src/timezone_names.c:403
-msgid "Pacific/Majuro"
-msgstr ""
-
-#: ../src/timezone_names.c:404
-msgid "Pacific/Marquesas"
-msgstr ""
-
-#: ../src/timezone_names.c:405
-msgid "Pacific/Midway"
-msgstr ""
-
-#: ../src/timezone_names.c:406
-msgid "Pacific/Nauru"
-msgstr ""
-
-#: ../src/timezone_names.c:407
-msgid "Pacific/Niue"
-msgstr ""
-
-#: ../src/timezone_names.c:408
-msgid "Pacific/Norfolk"
-msgstr ""
-
-#: ../src/timezone_names.c:409
-msgid "Pacific/Noumea"
-msgstr ""
-
-#: ../src/timezone_names.c:410
-msgid "Pacific/Pago_Pago"
-msgstr ""
-
-#: ../src/timezone_names.c:411
-msgid "Pacific/Palau"
-msgstr ""
-
-#: ../src/timezone_names.c:412
-msgid "Pacific/Pitcairn"
-msgstr ""
-
-#: ../src/timezone_names.c:413
-msgid "Pacific/Ponape"
-msgstr ""
-
-#: ../src/timezone_names.c:414
-msgid "Pacific/Port_Moresby"
-msgstr ""
-
-#: ../src/timezone_names.c:415
-msgid "Pacific/Rarotonga"
-msgstr ""
-
-#: ../src/timezone_names.c:416
-msgid "Pacific/Saipan"
-msgstr ""
-
-#: ../src/timezone_names.c:417
-msgid "Pacific/Tahiti"
-msgstr ""
-
-#: ../src/timezone_names.c:418
-msgid "Pacific/Tarawa"
-msgstr ""
-
-#: ../src/timezone_names.c:419
-msgid "Pacific/Tongatapu"
-msgstr ""
-
-#: ../src/timezone_names.c:420
-msgid "Pacific/Truk"
-msgstr ""
-
-#: ../src/timezone_names.c:421
-msgid "Pacific/Wake"
-msgstr ""
-
-#: ../src/timezone_names.c:422
-msgid "Pacific/Wallis"
-msgstr ""
-
-#: ../src/timezone_names.c:423
-msgid "Pacific/Yap"
-msgstr ""
-
-#: ../src/tray_icon.c:469
-#, fuzzy
-msgid "New appointment"
-msgstr "મુલાકાત"
-
-#: ../src/tray_icon.c:485
-msgid "About Orage"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-msgid "Orage Panel Clock"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-msgid "Show time and date?"
-msgstr ""
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "કેલેન્ડર"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "પસંદગીઓ"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "પસંદગીઓ"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Xfce 4 કેલેન્ડર કાર્યક્રમ માટેના સુયોજનો"
-
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "ડેસ્કટોપ કેલેન્ડર"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "કેલેન્ડર"
-
-#~ msgid "Contributor"
-#~ msgstr "ફાળો આપનાર"
-
-#~ msgid "Warning"
-#~ msgstr "ચેતવણી"
-
-#, fuzzy
-#~ msgid "Select always today"
-#~ msgstr "આજનો દિવસ પસંદ કરો (_T)"
-
-#, fuzzy
-#~ msgid "Modify Preferences"
-#~ msgstr "પસંદગીઓ"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Xfce 4 કેલેન્ડર સુયોજનો"
-
-#, fuzzy
-#~ msgid "Monday"
-#~ msgstr "આજે"
-
-#, fuzzy
-#~ msgid "Tuesday"
-#~ msgstr "આજે"
-
-#, fuzzy
-#~ msgid "Wednesday"
-#~ msgstr "આજે"
-
-#, fuzzy
-#~ msgid "Thursday"
-#~ msgstr "આજે"
-
-#, fuzzy
-#~ msgid "Friday"
-#~ msgstr "આજે"
-
-#, fuzzy
-#~ msgid "Sunday"
-#~ msgstr "આજે"
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "આજે"
-
-#, fuzzy
-#~ msgid "Calendar Files"
-#~ msgstr "કેલેન્ડર"
-
-#, fuzzy
-#~ msgid "Calendar borders"
-#~ msgstr "કેલેન્ડર"
-
-#~ msgid "Core developer"
-#~ msgstr "મુખ્ય વિકાસકાર"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "આ તારીખ સાથે સંકળાયેલ બધી જાણકારી \n"
-#~ "તમે દૂર કરી શકો છો."
-
-#, fuzzy
-#~ msgid "Clear"
-#~ msgstr "કેલેન્ડર"
-
-#~ msgid "This should not happen"
-#~ msgstr "આ બનવું જોઈએ નહિં"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "MCS ક્લાઈન્ટ ચેનલ બનાવી શકતા નથી"
diff -Nru orage-4.8.3/po/he.po orage-4.12.1/po/he.po
--- orage-4.8.3/po/he.po	2012-01-03 12:01:04.000000000 +0000
+++ orage-4.12.1/po/he.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,25 +1,24 @@
-# translation of he.po to Hebrew
-# Hebrew translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-#
-#
-# Dotan Kamber <kamberd@yahoo.com>, 2004, 2006.
-# Jonatan Perry <Jonatan443@walla.co.il>, 2004.
-# Yuval Tanny <tanai@int.gov.il>, 2004, 2006.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Dotan Kamber <kamberd@yahoo.com>, 2004,2006
+# Jonatan Perry <Jonatan443@walla.co.il>, 2004
+# Yuval Tanny <tanai@int.gov.il>, 2004,2006
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2006-05-05 22:37+0300\n"
-"Last-Translator: Yuval Tanny <tanai@int.gov.il>\n"
-"Language-Team: Hebrew\n"
+"POT-Creation-Date: 2013-11-18 18:30+0100\n"
+"PO-Revision-Date: 2013-11-19 15:56+0000\n"
+"Last-Translator: Xfce <transifex@xfce.org>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/xfce/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Generator: KBabel 1.11.2\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -38,9 +37,8 @@
 msgstr ""
 
 #: ../globaltime/globaltime.c:386
-#, fuzzy
 msgid "Localtime"
-msgstr "מיקום"
+msgstr ""
 
 #: ../globaltime/globaltime.c:464
 msgid ""
@@ -110,9 +108,8 @@
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "העדפות Orage"
+msgstr ""
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -124,9 +121,8 @@
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:613
-#, fuzzy
 msgid "enter name of clock"
-msgstr "שעון Orage"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
@@ -138,9 +134,8 @@
 
 #. ------------------------background-------------------------
 #: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
-#, fuzzy
 msgid "Background color:"
-msgstr "קבע צבע _רקע:"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:656
 msgid "Click to change background colour for clock"
@@ -151,9 +146,8 @@
 #: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
 #: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
 #: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
-#, fuzzy
 msgid "Use default"
-msgstr "התראת ברירת המחדל של Orage"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
@@ -163,9 +157,8 @@
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
-#, fuzzy
 msgid "Foreground (=text) color:"
-msgstr "קבע צבע _חזית:"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
@@ -238,30 +231,25 @@
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:1027
-#, fuzzy
 msgid "update preferences"
-msgstr "העדפות Orage"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "העדפות Orage"
+msgstr ""
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
-#, fuzzy
 msgid "General Preferences"
-msgstr "העדפות Orage"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1077
-#, fuzzy
 msgid "Decorations:"
-msgstr "משך"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1078
-#, fuzzy
 msgid "Standard"
-msgstr "לוח שנה"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1083
 msgid "Use normal decorations"
@@ -272,9 +260,8 @@
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:1100
-#, fuzzy
 msgid "Clock size:"
-msgstr "סגור"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1101
 msgid "Equal"
@@ -285,18 +272,16 @@
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:1111
-#, fuzzy
 msgid "Varying"
-msgstr "אזהרה"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1116
 msgid "Clock sizes vary"
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:1122
-#, fuzzy
 msgid "Local timezone:"
-msgstr "בחר אזור-זמן מקומי"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:101
 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
@@ -311,15 +296,15 @@
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
-msgstr "שעות"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "%d mins"
-msgstr "דקות"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
@@ -328,9 +313,8 @@
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-#, fuzzy
 msgid "forward"
-msgstr "קדימה"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
@@ -346,7 +330,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2771
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "מיקום"
@@ -407,20 +391,18 @@
 msgid "floating"
 msgstr "צף"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "מיקום"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "לוח שנה"
+msgstr ""
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr ""
 
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr ""
+
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
 msgstr "מראה"
@@ -504,19 +486,11 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"תכנית זו משתמשת בפונקציית strftime בשביל לקבל את השעה.\n"
-"אפשר להשתמש בכל קוד תקין בשביל לקבוע את תבנית התאריך והשעה המועדפת.\n"
-"מספר קודים נפוצים: \t%A = יום בשבוע\t\t\t%B = חודש\n"
-"\t%c = תאריך ושעה\t\t%R = שעה ודקה\n"
-"\t%V = מספר השבוע\t\t%Z = אזור זמן בשימוש\n"
-"\t%H = שעות \t\t\t\t%M = דקות\n"
-"\t%X = שעה מקומית\t\t\t%x = תאריך מקומי"
+msgstr "תכנית זו משתמשת בפונקציית strftime בשביל לקבל את השעה.\nאפשר להשתמש בכל קוד תקין בשביל לקבוע את תבנית התאריך והשעה המועדפת.\nמספר קודים נפוצים: \t%A = יום בשבוע\t\t\t%B = חודש\n\t%c = תאריך ושעה\t\t%R = שעה ודקה\n\t%V = מספר השבוע\t\t%Z = אזור זמן בשימוש\n\t%H = שעות \t\t\t\t%M = דקות\n\t%X = שעה מקומית\t\t\t%x = תאריך מקומי"
 
 #: ../panel-plugin/oc_config.c:457
-#, fuzzy
 msgid "Orage clock Preferences"
-msgstr "העדפות Orage"
+msgstr ""
 
 #. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
@@ -527,7 +501,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
@@ -537,14 +511,13 @@
 msgstr ""
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "ארגן את זמנך עם Xfce4"
+msgstr ""
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2800
 msgid "End"
 msgstr "סיום"
 
@@ -552,13 +525,13 @@
 msgid "Due"
 msgstr ""
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "בחר קובץ..."
 
@@ -566,224 +539,273 @@
 msgid "Sound Files"
 msgstr "קבצי קול"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "כל הקבצים"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "המידע אודות הפגישה שונה."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1282 ../src/event-list.c:921
 msgid "Do you want to continue?"
 msgstr "האם ברצונך להמשיך?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr ""
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr ""
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "סוף פגישה זו מוקדם מתחילתה."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-#, fuzzy
+#: ../src/appointment.c:1035 ../src/appointment.c:1918
 msgid "Not set"
-msgstr "תזכורת"
+msgstr ""
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1220
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1221
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1231
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1232
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1281
 msgid "This appointment will be permanently removed."
 msgstr "הפגישה תוסר לצמיתות."
 
-#: ../src/appointment.c:1692
-#, fuzzy
+#: ../src/appointment.c:1283 ../src/event-list.c:922
+msgid "No, cancel the removal"
+msgstr ""
+
+#: ../src/appointment.c:1284
+msgid "Yes, remove it"
+msgstr ""
+
+#: ../src/appointment.c:1373 ../src/appointment.c:1388 ../src/day-view.c:457
+#: ../src/event-list.c:980
+msgid "Pick the date"
+msgstr "בחר תאריך"
+
+#: ../src/appointment.c:1375 ../src/appointment.c:1390 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:982 ../src/event-list.c:1132
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "היום"
+
+#: ../src/appointment.c:1798
 msgid "This appointment does not exist."
-msgstr "הפגישה תוסר לצמיתות."
+msgstr ""
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1799
 msgid "It was probably removed, please refresh your screen."
 msgstr ""
 
-#: ../src/appointment.c:1995
-#, fuzzy
+#: ../src/appointment.c:2100
 msgid "Current categories"
-msgstr "קובץ ארכיב"
+msgstr ""
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2115
 msgid "Add new category with color"
 msgstr ""
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2119
 msgid "Category:"
 msgstr ""
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2150
 msgid "Colors of categories - Orage"
 msgstr ""
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2196
 msgid " *** COPY ***"
 msgstr ""
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2461
 msgid "New appointment - Orage"
 msgstr "פגישה חדשה - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2491 ../src/day-view.c:279 ../src/event-list.c:1033
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_קובץ"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2497
 msgid "Sav_e and close"
 msgstr "_שמור וסגור"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2510 ../src/event-list.c:1039
 msgid "D_uplicate"
 msgstr "ש_כפל"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2697
 msgid "Save"
 msgstr "שמור"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2699
 msgid "Save and close"
 msgstr "שמור וסגור"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2704
 msgid "Revert"
 msgstr "בטל"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2706 ../src/event-list.c:1123
 msgid "Duplicate"
 msgstr "שכפל"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2711 ../src/event-list.c:1125
 msgid "Delete"
 msgstr "מחק"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Free"
 msgstr "פנוי"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Busy"
 msgstr "עסוק"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2733
 msgid "General"
 msgstr "כללי"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2739
 msgid "Type "
 msgstr ""
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2741 ../src/event-list.c:1176
 msgid "Event"
 msgstr ""
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2744
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
 msgstr ""
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-#, fuzzy
+#: ../src/appointment.c:2747 ../src/event-list.c:1196
 msgid "Todo"
-msgstr "היום"
+msgstr ""
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2750
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
 msgstr ""
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2753 ../src/event-list.c:1209
 msgid "Journal"
 msgstr ""
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2757
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
 msgstr ""
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2764
 msgid "Title "
 msgstr "כותרת"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2779
 msgid "All day event"
 msgstr "אירוע במשך יום שלם"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2785 ../src/appointment.c:3446 ../src/day-view.c:801
 msgid "Start"
 msgstr "התחלה"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2805
 msgid "Set      "
 msgstr ""
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2826
 msgid "Duration"
 msgstr "משך"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2830 ../src/appointment.c:3020 ../src/reminder.c:758
 msgid "days"
 msgstr "ימים"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2832 ../src/appointment.c:3022 ../src/reminder.c:760
 msgid "hours"
 msgstr "שעות"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2834 ../src/appointment.c:3024 ../src/reminder.c:762
 msgid "mins"
 msgstr "דקות"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2846
 msgid "Availability"
 msgstr "זמינות"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2854 ../src/appointment.c:3452
 msgid "Completed"
 msgstr ""
 
-#: ../src/appointment.c:2749
-#, fuzzy
+#: ../src/appointment.c:2857
 msgid "Done"
-msgstr "כלום"
+msgstr ""
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2878
 msgid "Categories"
 msgstr ""
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2890
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
 msgstr ""
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2895
 msgid "update colors for categories."
 msgstr ""
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2901
 msgid "Priority"
 msgstr ""
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2911
 msgid "Note"
 msgstr "תזכורת"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2932
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -792,38 +814,35 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before Start"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before End"
 msgstr ""
 
-#: ../src/appointment.c:2896
-#, fuzzy
+#: ../src/appointment.c:3004
 msgid "After Start"
-msgstr "התחלה"
+msgstr ""
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After End"
 msgstr ""
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3011
 msgid "Alarm"
 msgstr "התראה"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-#, fuzzy
+#: ../src/appointment.c:3017
 msgid "Alarm time"
-msgstr "התראה"
+msgstr ""
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3041
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
@@ -831,91 +850,88 @@
 " 3) after Todo start"
 msgstr ""
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3046
 msgid "Persistent alarm"
 msgstr ""
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3048
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
 msgstr ""
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3057
 msgid "Sound"
 msgstr "צליל"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3061 ../src/appointment.c:3181
 msgid "Use"
 msgstr ""
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3063
 msgid "Select this if you want audible alarm"
 msgstr ""
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3080
 msgid "Repeat alarm sound"
 msgstr "חזור על צליל ההתראה"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3096 ../src/appointment.c:3395
 msgid "times"
 msgstr "זמנים"
 
-#: ../src/appointment.c:3004
-#, fuzzy
+#: ../src/appointment.c:3112
 msgid "sec interval"
-msgstr "כללי"
+msgstr ""
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3122
 msgid "Visual"
 msgstr ""
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3126
 msgid "Use Orage window"
 msgstr ""
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3128
 msgid "Select this if you want Orage window alarm"
 msgstr ""
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3140
 msgid "Use notification"
 msgstr ""
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3142
 msgid "Select this if you want notification alarm"
 msgstr ""
 
-#: ../src/appointment.c:3040
-#, fuzzy
+#: ../src/appointment.c:3148
 msgid "Set timeout"
-msgstr "בחר אזור-זמן"
+msgstr ""
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3150
 msgid "Select this if you want notification to expire automatically"
 msgstr ""
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3161
 msgid "0 = system default expiration time"
 msgstr ""
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3166
 msgid "seconds"
 msgstr ""
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
-#, fuzzy
+#: ../src/appointment.c:3177
 msgid "Procedure"
-msgstr "מאפיינים"
+msgstr ""
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3183
 msgid "Select this if you want procedure or script alarm"
 msgstr ""
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3189
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -927,101 +943,96 @@
 "\t<&ET> appointment end time"
 msgstr ""
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3201
 msgid "Test this alarm by raising it now"
 msgstr ""
 
-#: ../src/appointment.c:3101
-#, fuzzy
+#: ../src/appointment.c:3208
 msgid "<b>Default alarm</b>"
-msgstr "התראת ברירת המחדל של Orage"
+msgstr ""
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3216
 msgid "Store current settings as default alarm"
 msgstr ""
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3221
 msgid "Set current settings from default alarm"
 msgstr ""
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "None"
 msgstr "כלום"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Daily"
 msgstr "יומי"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Weekly"
 msgstr "שבועי"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Monthly"
 msgstr "חודשי"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Yearly"
 msgstr "שנתי"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Hourly"
 msgstr ""
 
-#: ../src/appointment.c:3178
-#, fuzzy
+#: ../src/appointment.c:3285
 msgid "Mon"
-msgstr "חודשי"
+msgstr ""
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Tue"
 msgstr ""
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Wed"
 msgstr ""
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Thu"
 msgstr ""
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Fri"
 msgstr ""
 
-#: ../src/appointment.c:3178
-#, fuzzy
+#: ../src/appointment.c:3285
 msgid "Sat"
-msgstr "התחלה"
+msgstr ""
 
-#: ../src/appointment.c:3178
-#, fuzzy
+#: ../src/appointment.c:3285
 msgid "Sun"
-msgstr "צליל"
+msgstr ""
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3290
 msgid "Recurrence"
 msgstr "מופע חוזר"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3296
 msgid "Complexity"
 msgstr ""
 
-#: ../src/appointment.c:3192
-#, fuzzy
+#: ../src/appointment.c:3299
 msgid "Basic"
-msgstr "לאחור"
+msgstr ""
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3305
 msgid "Advanced"
 msgstr ""
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3309
 msgid "Use this if you want regular repeating event"
 msgstr ""
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3311
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
@@ -1029,54 +1040,51 @@
 msgstr ""
 
 #. frequency
-#: ../src/appointment.c:3211
-#, fuzzy
+#: ../src/appointment.c:3317
 msgid "Frequency"
-msgstr "פנוי"
+msgstr ""
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3323
 msgid "Each"
 msgstr ""
 
-#: ../src/appointment.c:3224
-#, fuzzy
+#: ../src/appointment.c:3330
 msgid "occurrence"
-msgstr "מופע חוזר"
+msgstr ""
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3334
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
 msgstr ""
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3379
 msgid "Limit"
 msgstr ""
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3381
 msgid "Repeat forever"
 msgstr "חזור לעולם"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3387
 msgid "Repeat "
 msgstr "חזור "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3403
 msgid "Repeat until "
 msgstr "חזור עד "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-#, fuzzy
+#: ../src/appointment.c:3416
 msgid "Weekdays"
-msgstr "שבועי"
+msgstr ""
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3428
 msgid "Which day"
 msgstr ""
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3436
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1087,266 +1095,269 @@
 msgstr ""
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3443
 msgid "TODO base"
 msgstr ""
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3456
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
 msgstr ""
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3458
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 
 #. exceptions
-#: ../src/appointment.c:3361
-#, fuzzy
+#: ../src/appointment.c:3464
 msgid "Exceptions"
-msgstr "אפשרויות שעון"
+msgstr ""
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3477
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
 msgstr ""
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3482
 msgid "Add excluded date (-)"
 msgstr ""
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3484
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr ""
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3490
 msgid "Add included time (+)"
 msgstr ""
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3492
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
 msgstr ""
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3509
 msgid "Action dates"
 msgstr ""
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1056 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_הצג"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1075
 msgid "_Go"
 msgstr "_עבור"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1121
 msgid "New"
 msgstr "חדש"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "לאחור"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr ""
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "היום"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "קדימה"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1139
 msgid "Refresh"
 msgstr "רענן"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1146 ../src/interface.c:834
 msgid "Close"
 msgstr "סגור"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr ""
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr ""
 
-#: ../src/day-view.c:935
-#, fuzzy
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
-msgstr "לוח שנה"
+msgstr ""
 
 #. date only appointment
 #: ../src/event-list.c:190
 msgid "All day"
 msgstr "כל היום"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:583 ../src/event-list.c:1292
 msgid "Time"
 msgstr "זמן"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:751
 msgid "No rows have been selected."
 msgstr ""
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:752
 msgid "Click a row to select it and after that you can copy it."
 msgstr ""
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:920
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
 msgstr ""
 
+#: ../src/event-list.c:923
+msgid "Yes, remove them"
+msgstr ""
+
 #: ../src/event-list.c:1130
+msgid "Back"
+msgstr "לאחור"
+
+#: ../src/event-list.c:1134
+msgid "Forward"
+msgstr "קדימה"
+
+#: ../src/event-list.c:1141
 msgid "Find"
 msgstr ""
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1148
 msgid "Dayview"
 msgstr ""
 
-#: ../src/event-list.c:1170
+#: ../src/event-list.c:1181
 msgid "Extra days to show "
 msgstr ""
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1212
 msgid "Journal entries starting from:"
 msgstr ""
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1232
 msgid "Search"
 msgstr ""
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1235
 msgid "Search text "
 msgstr ""
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1300
 msgid "Flags"
 msgstr "דגלים"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1308
 msgid "Title"
 msgstr "כותרת"
 
-#: ../src/event-list.c:1323
-#, fuzzy
+#: ../src/event-list.c:1334
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
-"לחץ לחיצה כפולה על השורה בשביל לערוך אותה\n"
-"\n"
-"דגלים לפי סדר:\n"
-"\t 1. התראה: n=ללא התראה\n"
-"\t\tA=התראה ויזואלית S=גם התראה קולית\n"
-"\t 2. Recurrence: n=ללא חזרות\n"
-"\t\t D=יומית W=שבועית M=חודשית Y=שנתית\n"
-"\t 3. סוג: f=פנוי B=עסוק"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "בחר תאריך"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr ""
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr ""
 
-#: ../src/ical-archive.c:347
-#, fuzzy, c-format
+#: ../src/ical-archive.c:349
+#, c-format
 msgid "Archiving threshold: %d month(s)"
-msgstr "סף הארכיב"
+msgstr ""
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr ""
 
-#: ../src/ical-archive.c:377
-#, fuzzy, c-format
+#: ../src/ical-archive.c:379
+#, c-format
 msgid "Archiving uid: %s"
-msgstr "ארכיבים"
+msgstr ""
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr ""
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr ""
 
-#: ../src/ical-archive.c:405
-#, fuzzy
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
-msgstr "ארכיבים"
+msgstr ""
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
-#, fuzzy
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
-msgstr "סף הארכיב"
+msgstr ""
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr ""
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr ""
 
-#: ../src/ical-archive.c:470
-#, fuzzy
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
-msgstr "סף הארכיב"
+msgstr ""
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "התראת ברירת המחדל של Orage"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr ""
+
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
+msgid "\tAdded %d alarms. Processed %d events."
 msgstr ""
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
@@ -1368,7 +1379,16 @@
 msgid "Import file preprocessing done"
 msgstr ""
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "קבצי לוח שנה"
 
@@ -1376,323 +1396,345 @@
 msgid "Current foreign files"
 msgstr ""
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr ""
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr ""
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr ""
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr ""
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr ""
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr ""
 
-#: ../src/interface.c:986
-#, fuzzy
+#: ../src/interface.c:977
 msgid "Read from file:"
-msgstr "קובץ ארכיב"
+msgstr ""
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
 msgstr ""
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr ""
 
-#: ../src/interface.c:1013
-#, fuzzy
+#: ../src/interface.c:1004
 msgid "Write to file:"
-msgstr "קובץ ארכיב"
+msgstr ""
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
-msgstr "מחק"
+msgstr ""
 
-#: ../src/interface.c:1037
-#, fuzzy
+#: ../src/interface.c:1028
 msgid "All appointments"
-msgstr "פגישה חדשה"
+msgstr ""
 
-#: ../src/interface.c:1050
-#, fuzzy
+#: ../src/interface.c:1041
 msgid "Named appointments: "
-msgstr "פגישה חדשה"
+msgstr ""
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr ""
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr ""
 
-#: ../src/interface.c:1076
-#, fuzzy
+#: ../src/interface.c:1067
 msgid "Archive"
-msgstr "ארכיבים"
+msgstr ""
 
-#: ../src/interface.c:1084
-#, fuzzy, c-format
+#: ../src/interface.c:1075
+#, c-format
 msgid "Archive now (threshold: %d months)"
-msgstr "סף הארכיב"
+msgstr ""
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr ""
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr ""
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
 msgstr ""
 
-#: ../src/interface.c:1118
-#, fuzzy
+#: ../src/interface.c:1109
 msgid "Orage files"
-msgstr "העדפות Orage"
+msgstr ""
 
-#: ../src/interface.c:1125
-#, fuzzy
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
-msgstr "לוח שנה"
+msgstr ""
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "קובץ ארכיב"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
 
-#: ../src/interface.c:1137 ../src/interface.c:1202
-#, fuzzy
-msgid "New file"
-msgstr "קובץ ארכיב"
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
 
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
 msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr ""
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
 msgstr ""
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr ""
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr ""
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr ""
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr ""
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "קובץ ארכיב"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr ""
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr ""
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr ""
 
-#: ../src/interface.c:1284
-#, fuzzy
-msgid "Options"
-msgstr "אפשרויות שעון"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr ""
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr ""
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
 msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr ""
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
 msgstr ""
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr ""
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr ""
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr ""
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr ""
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr ""
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr ""
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr ""
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr ""
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr ""
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr ""
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr ""
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
 msgstr ""
 
-#: ../src/main.c:307
-#, fuzzy, c-format
+#: ../src/main.c:314
+#, c-format
 msgid "Options:\n"
-msgstr "אפשרויות שעון"
+msgstr ""
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr ""
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr ""
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr ""
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr ""
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
 msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr ""
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
 msgstr ""
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr ""
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr ""
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
 msgstr ""
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
@@ -1700,279 +1742,321 @@
 "\n"
 msgstr ""
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr ""
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "ע_ריכה"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "הצג _תאריך נבחר"
 
-#: ../src/mainbox.c:311
-#, fuzzy
+#: ../src/mainbox.c:329
 msgid "View selected _week"
-msgstr "הצג _תאריך נבחר"
+msgstr ""
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "_בחר את היום"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "מיקום"
+msgstr ""
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_עזרה"
 
-#: ../src/mainbox.c:448
-#, fuzzy
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr ""
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr ""
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr ""
+
+#: ../src/mainbox.c:489
 msgid "Never"
-msgstr "אף פעם"
+msgstr ""
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:495
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr ""
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr ""
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr ""
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:486
 msgid "Main settings"
-msgstr "הגדרות לוח השנה"
+msgstr ""
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:492
 msgid "Timezone"
 msgstr "אזור-זמן"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:507
 msgid "You should always define your local timezone."
 msgstr ""
 
-#: ../src/parameters.c:552
-#, fuzzy
+#: ../src/parameters.c:515
 msgid "Archive threshold (months)"
-msgstr "סף הארכיב"
+msgstr ""
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:525
 msgid "(0 = no archiving)"
 msgstr ""
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:528
 msgid "Archiving is used to save time and space when handling events."
 msgstr ""
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:536
 msgid "Sound command"
 msgstr ""
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:551
 msgid "This command is given to shell to make sound in alarms."
 msgstr ""
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "מוצג"
-
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
-msgstr "חלון לוח השנה"
+#: ../src/parameters.c:590
+msgid "Calendar window"
+msgstr ""
+
+#: ../src/parameters.c:597
+msgid "Calendar visual details"
+msgstr ""
 
-#: ../src/parameters.c:618
-#, fuzzy
+#: ../src/parameters.c:603
 msgid "Show borders"
-msgstr "הצג _מסגרת"
+msgstr ""
 
-#: ../src/parameters.c:625
-#, fuzzy
+#: ../src/parameters.c:608
 msgid "Show menu"
-msgstr "הצג _מסגרת"
-
-#: ../src/parameters.c:632
-#, fuzzy
-msgid "Show month and year"
-msgstr "הצג במחליף סביבות העבודה"
+msgstr ""
 
-#: ../src/parameters.c:639
-#, fuzzy
+#: ../src/parameters.c:616
 msgid "Show day names"
-msgstr "הצג _מסגרת"
+msgstr ""
 
-#: ../src/parameters.c:646
-#, fuzzy
+#: ../src/parameters.c:621
 msgid "Show week numbers"
-msgstr "הצג _מסגרת"
+msgstr ""
+
+#: ../src/parameters.c:629
+msgid "Show month and year"
+msgstr ""
 
-#: ../src/parameters.c:653
-#, fuzzy
+#: ../src/parameters.c:649
+msgid "Calendar info boxes"
+msgstr ""
+
+#: ../src/parameters.c:654
 msgid "Show todo list"
-msgstr "הצג _מסגרת"
+msgstr ""
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:661
 msgid "Number of days to show in event window"
 msgstr ""
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:667
 msgid "0 = do not show event list at all"
 msgstr ""
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:680
+msgid "Calendar visibility"
+msgstr ""
+
+#: ../src/parameters.c:685
 msgid "Show on all desktops"
 msgstr ""
 
-#: ../src/parameters.c:683
-#, fuzzy
+#: ../src/parameters.c:690
 msgid "Keep on top"
-msgstr "קבע אזור-זמן:"
+msgstr ""
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:698
 msgid "Show in taskbar"
 msgstr "הצג בסרגל המשימות"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:703
 msgid "Show in pager"
 msgstr "הצג במחליף סביבות העבודה"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:711
 msgid "Show in systray"
 msgstr "הצג במגש המערכת"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:732
 msgid "Calendar start"
 msgstr "תחילת לוח השנה"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:737
 msgid "Show"
 msgstr "הצג"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:749
 msgid "Hide"
 msgstr "הסתר"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:761
 msgid "Minimized"
 msgstr "ממוזער"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
+#: ../src/parameters.c:781
+msgid "On calendar window open"
 msgstr ""
 
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "חלון לוח השנה"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "_בחר את היום"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:786
+msgid "Select today's date"
 msgstr ""
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
+#: ../src/parameters.c:799
+msgid "Select previously selected date"
 msgstr ""
 
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
+#: ../src/parameters.c:817
+msgid "Calendar day double click shows"
 msgstr ""
 
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
-
-#: ../src/parameters.c:861
+#: ../src/parameters.c:822
 msgid "Days view"
 msgstr ""
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:834
 msgid "Event list"
 msgstr ""
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
+#: ../src/parameters.c:856
+msgid "Extra settings"
+msgstr ""
+
+#: ../src/parameters.c:863
+msgid "Event list window extra days"
 msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:868
 msgid "Number of extra days to show in event list"
 msgstr ""
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:876
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
 msgstr ""
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:886
+msgid "Day view window default first day"
+msgstr ""
+
+#: ../src/parameters.c:891
+msgid "First day of week"
+msgstr ""
+
+#: ../src/parameters.c:904
+msgid "Selected day"
+msgstr ""
+
+#: ../src/parameters.c:922
+msgid "Use dynamic tray icon"
+msgstr ""
+
+#: ../src/parameters.c:927
+msgid "Use dynamic icon"
+msgstr ""
+
+#: ../src/parameters.c:933
+msgid "Dynamic icon shows current month and day of the month."
+msgstr ""
+
+#: ../src/parameters.c:941 ../src/parameters.c:946
 msgid "Use wakeup timer"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:952
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:961
+msgid "Foreign file default visual alarm"
+msgstr ""
+
+#: ../src/parameters.c:966
+msgid "Orage window"
+msgstr ""
+
+#: ../src/parameters.c:979
+msgid "Notify notification"
+msgstr ""
+
+#: ../src/parameters.c:997
+msgid "Always quit when asked to close"
+msgstr ""
+
+#: ../src/parameters.c:1002
+msgid "Always quit"
+msgstr ""
+
+#: ../src/parameters.c:1008
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr ""
+
+#: ../src/parameters.c:1024
 msgid "Orage Preferences"
 msgstr "העדפות Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1136
 msgid "First Orage start. Searching default timezone."
 msgstr ""
 
-#: ../src/parameters.c:1069
-#, fuzzy, c-format
+#: ../src/parameters.c:1155
+#, c-format
 msgid "Default timezone set to %s."
-msgstr "קבע אזור-זמן:"
+msgstr ""
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1158
 msgid "Default timezone not found, please, set it manually."
 msgstr ""
 
@@ -1984,37 +2068,35 @@
 msgid "Open"
 msgstr ""
 
-#: ../src/reminder.c:722
-#, fuzzy
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
-msgstr "תזכורת "
+msgstr ""
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
+#: ../src/reminder.c:803
+msgid "Postpone"
 msgstr ""
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
 msgstr ""
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr ""
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
 msgstr ""
 
-#: ../src/reminder.c:1166
-#, fuzzy, c-format
+#: ../src/reminder.c:1154
+#, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr "חזור על צליל ההתראה"
+msgstr ""
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2253,29 +2335,24 @@
 msgstr "אמריקה/אראגואינה"
 
 #: ../src/timezone_names.c:95
-#, fuzzy
 msgid "America/Argentina/Buenos_Aires"
-msgstr "אמריקה/בואנוס איירס"
+msgstr ""
 
 #: ../src/timezone_names.c:96
-#, fuzzy
 msgid "America/Argentina/Catamarca"
-msgstr "אמריקה/קטמרקה"
+msgstr ""
 
 #: ../src/timezone_names.c:97
-#, fuzzy
 msgid "America/Argentina/Cordoba"
-msgstr "אמריקה/קורדובה"
+msgstr ""
 
 #: ../src/timezone_names.c:98
-#, fuzzy
 msgid "America/Argentina/Jujuy"
-msgstr "אמריקה/חוחוי"
+msgstr ""
 
 #: ../src/timezone_names.c:99
-#, fuzzy
 msgid "America/Argentina/Mendoza"
-msgstr "אמריקה/מנדוסה"
+msgstr ""
 
 #: ../src/timezone_names.c:100
 msgid "America/Aruba"
@@ -3403,7 +3480,7 @@
 
 #: ../src/timezone_names.c:381
 msgid "Indian/Mauritius"
-msgstr "האוקיינוס ההודי/מאוריצ'יוס"
+msgstr "האוקיינוס ההודי/מאוריציוס"
 
 #: ../src/timezone_names.c:382
 msgid "Indian/Mayotte"
@@ -3582,177 +3659,34 @@
 msgstr "אודות Orage"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Orage Panel Clock"
-msgstr "שעון Orage"
+msgstr ""
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
 msgid "Show time and date?"
-msgstr "באיזה תאריך ושעה זה?"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "לוח שנה"
+msgid "Orage preferences"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "העדפות Orage"
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "העדפות Orage"
+msgid "Orage Calendar Preferences"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "הגדרות לוח שנה"
-
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "לוח שנה לשולחן העבודה"
-
 #: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
+msgid "Calendar"
 msgstr "לוח שנה"
 
-#~ msgid "Orage clock"
-#~ msgstr "שעון Orage"
-
-#~ msgid "Contributor"
-#~ msgstr "תורמים"
-
-#~ msgid "Warning"
-#~ msgstr "אזהרה"
-
-#~ msgid "Display"
-#~ msgstr "תצוגה"
-
-#, fuzzy
-#~ msgid "Select always today"
-#~ msgstr "_בחר את היום"
-
-#, fuzzy
-#~ msgid "Vary"
-#~ msgstr "שנתי"
-
-#~ msgid "Select timezone"
-#~ msgstr "בחר אזור-זמן"
-
-#, fuzzy
-#~ msgid "Modify Preferences"
-#~ msgstr "העדפות Orage"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr "הכנס ערך אזור זמן תקין (=TZ) או שתבחר אחד מהרשימה."
-
-#~ msgid "show line _1:"
-#~ msgstr "הצג שורה _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "הצג שורה _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "הצג שורה _3:"
-
-#~ msgid "Properties"
-#~ msgstr "מאפיינים"
-
-#, fuzzy
-#~ msgid "Show event list"
-#~ msgstr "הצג במגש המערכת"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "הגדרות לוח שנה Xfce 4"
-
-#, fuzzy
-#~ msgid "Monday"
-#~ msgstr "היום"
-
-#, fuzzy
-#~ msgid "Tuesday"
-#~ msgstr "היום"
-
-#, fuzzy
-#~ msgid "Wednesday"
-#~ msgstr "שבועי"
-
-#, fuzzy
-#~ msgid "Thursday"
-#~ msgstr "היום"
-
-#, fuzzy
-#~ msgid "Friday"
-#~ msgstr "ימים"
-
-#, fuzzy
-#~ msgid "Sunday"
-#~ msgstr "צליל"
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "ימים"
-
-#, fuzzy
-#~ msgid "normal"
-#~ msgstr "כללי"
-
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%m/%d/%Y"
-
-#, fuzzy
-#~ msgid "Calendar Files"
-#~ msgstr "קבצי לוח שנה"
-
-#~ msgid "Calendar borders"
-#~ msgstr "גבולות לוח השנה"
-
-#~ msgid "Hidden"
-#~ msgstr "מוסתר"
-
-#~ msgid "3 months"
-#~ msgstr "3 חודשים"
-
-#~ msgid "6 months"
-#~ msgstr "6 חודשים"
-
-#~ msgid "1 year"
-#~ msgstr "1 שנה"
-
-#~ msgid "Application"
-#~ msgstr "יישום"
-
-#~ msgid "Button Label|Orage"
-#~ msgstr "Orage"
-
-#~ msgid "Core developer"
-#~ msgstr "מפתח עיקרי"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "אתה תסיר את כל המידע \n"
-#~ "השייך לתאריך זה."
-
-#~ msgid "Clear"
-#~ msgstr "נקה"
-
-#~ msgid "uid"
-#~ msgstr "uid"
-
-#~ msgid "This should not happen"
-#~ msgstr "זה לא צריך לקרות"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "אין אפשרות ליצור ערוץ לקוח MCS"
-
-#~ msgid "Open archive file..."
-#~ msgstr "פתח קובץ ארכיב..."
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr ""
 
-#~ msgid "Close archive file"
-#~ msgstr "סגור קובץ ארכיב..."
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "לוח שנה לשולחן העבודה"
diff -Nru orage-4.8.3/po/hi.po orage-4.12.1/po/hi.po
--- orage-4.8.3/po/hi.po	2012-01-03 12:01:04.000000000 +0000
+++ orage-4.12.1/po/hi.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,3662 +0,0 @@
-# Hindi translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Ravishankar Shrivastava <raviratlami@yahoo.com>, 2003.
-# Anurag Garg <ang.astronomy@gmail.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2011-06-19 21:02+0530\n"
-"Last-Translator: Anurag Garg <ang.astronomy@gmail.com>\n"
-"Language-Team: Hindi <indlinux-group@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.6.1\n"
-
-#: ../globaltime/globaltime.c:100
-msgid "Raising GlobalTime window..."
-msgstr "GlobalTime खिड़की की स्थापना हो रही है..."
-
-#: ../globaltime/globaltime.c:102
-msgid "GlobalTime window raise failed"
-msgstr "GlobalTime खिड़की स्थापना नाकाम..."
-
-#. ********** timezone tooltip **********
-#: ../globaltime/globaltime.c:277
-#, c-format
-msgid ""
-"%s\n"
-"click to modify clock"
-msgstr ""
-"%s \n"
-"घड़ी को संशोधित करने के लिए क्लिक करें"
-
-#: ../globaltime/globaltime.c:386
-msgid "Localtime"
-msgstr "स्थानीय समय"
-
-#: ../globaltime/globaltime.c:464
-msgid ""
-"button 1 to change preferences \n"
-"button 2 to adjust time of clocks"
-msgstr ""
-"वरीयताओं को बदलने के लिए बटन 1\n"
-"घड़ियों के समय को समायोजित करने कि लिए बटन 2"
-
-#: ../globaltime/globaltime.c:480
-msgid "adjust to change hour"
-msgstr "घंटे को परिवर्तित करने कि लिए समायोजित करें"
-
-#: ../globaltime/globaltime.c:496
-msgid ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"मिनट को परिवर्तित करने के लिए समायोजित करें। केवल 1 मिनट का परिवर्तन करने कि लिए बटन "
-"2 को तीर के साथ क्लिक करें।"
-
-#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
-msgid "NEW"
-msgstr "नया"
-
-#: ../globaltime/gt_prefs.c:289
-msgid "NEW COPY"
-msgstr "नई प्रतिलिपि"
-
-#: ../globaltime/gt_prefs.c:310
-msgid "Not possible to delete the last clock."
-msgstr "अंतिम घड़ी को हटाना संभव नहीं।"
-
-#: ../globaltime/gt_prefs.c:516
-msgid "update this clock"
-msgstr "इस घड़ी का अद्यतन करें"
-
-#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
-msgid "add new empty clock"
-msgstr "नई खाली घड़ी जोड़े"
-
-#: ../globaltime/gt_prefs.c:526
-msgid "add new clock using this clock as model"
-msgstr "इस घड़ी का मॉडल के रूप में उपयोग कर नई खाली घड़ी जोड़े"
-
-#: ../globaltime/gt_prefs.c:531
-msgid "delete this clock"
-msgstr "इस घड़ी को हटाऐं"
-
-#: ../globaltime/gt_prefs.c:539
-msgid "move this clock first"
-msgstr "पहले इस घड़ी को खिसकाए"
-
-#: ../globaltime/gt_prefs.c:544
-msgid "move this clock left"
-msgstr "इस घड़ी को बाएं और खिसकाए"
-
-#: ../globaltime/gt_prefs.c:549
-msgid "move this clock right"
-msgstr "इस घड़ी को दाएं और खिसकाए"
-
-#: ../globaltime/gt_prefs.c:554
-msgid "move this clock last"
-msgstr "इस घड़ी को सबसे पिछे खिसकाए"
-
-#: ../globaltime/gt_prefs.c:562
-msgid "set the timezone of this clock to be local timezone"
-msgstr "इस घड़ी के समय क्षेत्र को स्थानीय समयक्षेत्र पर निर्धारित करें"
-
-#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
-msgid "close window and exit"
-msgstr "खिड़की बंद करें और बाहर निकलें"
-
-#: ../globaltime/gt_prefs.c:590
-msgid "Globaltime preferences "
-msgstr "Globaltime प्राथमिकताएं"
-
-#. -----------------------HEADING-------------------------------------------
-#: ../globaltime/gt_prefs.c:603
-msgid "Clock Parameters"
-msgstr "घड़ी के मापदण्ड"
-
-#: ../globaltime/gt_prefs.c:607
-msgid "Name of the clock:"
-msgstr "घड़ी का नाम:"
-
-#: ../globaltime/gt_prefs.c:613
-msgid "enter name of clock"
-msgstr "घड़ी का नाम डाले"
-
-#: ../globaltime/gt_prefs.c:616
-msgid "Timezone of the clock:"
-msgstr "घड़ी का समय क्षेत्र:"
-
-#: ../globaltime/gt_prefs.c:643
-msgid "Text Formatting"
-msgstr "पाठ स्वरूपण"
-
-#. ------------------------background-------------------------
-#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
-msgid "Background color:"
-msgstr "पृष्ठभूमि का रंग:"
-
-#: ../globaltime/gt_prefs.c:656
-msgid "Click to change background colour for clock"
-msgstr "घड़ी की पृष्ठभूमि के रंग को बदलने के लिए क्लिक करें"
-
-#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
-#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
-#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
-#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
-#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
-msgid "Use default"
-msgstr "मूलभूत का उपयोग करें"
-
-#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
-#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
-#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
-msgid "Cross this to use default instead of selected value"
-msgstr "चयनित मान के बजाय मूलभूत का उपयोग करने के लिए इसे क्रॉस करें"
-
-#. ------------------------foreground-------------------------
-#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
-msgid "Foreground (=text) color:"
-msgstr "अग्रभूमि (= पाठ) रंग:"
-
-#: ../globaltime/gt_prefs.c:688
-msgid "Click to change foreground colour for clock"
-msgstr "घड़ी के अग्रभूमि के रंग को बदलने के लिए क्लिक करें"
-
-#. ------------------------name font-------------------------
-#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
-msgid "Font for name of clock:"
-msgstr "घड़ी का नाम के लिए फॉन्ट:"
-
-#: ../globaltime/gt_prefs.c:720
-msgid "Click to change font for clock name"
-msgstr "घड़ी के नाम के लिए फ़ॉन्ट को बदलने के लिए क्लिक करें"
-
-#. ------------------------time font-------------------------
-#: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
-msgid "Font for time of clock:"
-msgstr "घड़ी के समय के लिए फॉन्ट:"
-
-#: ../globaltime/gt_prefs.c:753
-msgid "Click to change font for clock time"
-msgstr "घड़ी के समय के लिए फ़ॉन्ट को बदलने के लिए क्लिक करें"
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:780
-msgid "Underline name of clock:"
-msgstr "घड़ी के नाम को रेखांकित करें:"
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:810
-msgid "Underline time of clock:"
-msgstr "घड़ी के समय को रेखांकित करें:"
-
-#: ../globaltime/gt_prefs.c:850
-msgid "Text Default Formatting"
-msgstr "पाठ का मूलभूत स्वरूपण"
-
-#: ../globaltime/gt_prefs.c:863
-msgid "Click to change default background colour for clocks"
-msgstr "घड़ी की मूलभूत पृष्ठभूमि के रंग को बदलने के लिए क्लिक करें"
-
-#: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
-msgid "Cross this to use system default instead of selected color"
-msgstr "चयनित रंग के बजाय मूलभूत का उपयोग करने के लिए इसे क्रॉस करें"
-
-#: ../globaltime/gt_prefs.c:896
-msgid "Click to change default text colour for clocks"
-msgstr "घड़ी की मूलभूत पाठ के रंग को बदलने के लिए क्लिक करें"
-
-#: ../globaltime/gt_prefs.c:929
-msgid "Click to change default font for clock name"
-msgstr "घड़ी के नाम के लिए मूलभूत फ़ॉन्ट को बदलने के लिए क्लिक करें"
-
-#: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
-msgid "Cross this to use system default font instead of selected font"
-msgstr "चयनित फ़ॉन्ट के बजाय मूलभूत फ़ॉन्ट का उपयोग करने के लिए इसे क्रॉस करें"
-
-#: ../globaltime/gt_prefs.c:963
-msgid "Click to change default font for clock time"
-msgstr "घड़ी के समय के लिए मूलभूत फ़ॉन्ट को बदलने के लिए क्लिक करें"
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:990
-msgid "Underline for name of clock:"
-msgstr "घड़ी के नाम के लिए रेखांकित:"
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:1004
-msgid "Underline for time of clock:"
-msgstr "घड़ी के समय के लिए रेखांकित:"
-
-#: ../globaltime/gt_prefs.c:1027
-msgid "update preferences"
-msgstr "अद्यतन वरीयताएँ"
-
-#: ../globaltime/gt_prefs.c:1062
-msgid "Globaltime Preferences"
-msgstr "Globaltime वरीयताएँ"
-
-#. -----------------------HEADING--------------------------------------
-#: ../globaltime/gt_prefs.c:1073
-msgid "General Preferences"
-msgstr "सामान्य वरीयताएँ"
-
-#: ../globaltime/gt_prefs.c:1077
-msgid "Decorations:"
-msgstr "सजावट:"
-
-#: ../globaltime/gt_prefs.c:1078
-msgid "Standard"
-msgstr "मानक"
-
-#: ../globaltime/gt_prefs.c:1083
-msgid "Use normal decorations"
-msgstr "मानक सजावट का प्रयोग करें"
-
-#: ../globaltime/gt_prefs.c:1094
-msgid "Do not show window decorations (borders)"
-msgstr "विंडो सजावट (किनारी) मत दिखाओ"
-
-#: ../globaltime/gt_prefs.c:1100
-msgid "Clock size:"
-msgstr "घड़ी का आकार:"
-
-#: ../globaltime/gt_prefs.c:1101
-msgid "Equal"
-msgstr "समान"
-
-#: ../globaltime/gt_prefs.c:1106
-msgid "All clocks have same size"
-msgstr "सभी घड़ियों का आकार समान है"
-
-# #-#-#-#-#  libgnomeui.gnome-2-4.hi.po (libgnomeui-2.0.hi)  #-#-#-#-#
-# libgnomeui/gnome-messagebox.c:115
-#: ../globaltime/gt_prefs.c:1111
-msgid "Varying"
-msgstr "घटता-बढ़ता"
-
-#: ../globaltime/gt_prefs.c:1116
-msgid "Clock sizes vary"
-msgstr "घड़ियों के आकार बड़े-छोटे है"
-
-#: ../globaltime/gt_prefs.c:1122
-msgid "Local timezone:"
-msgstr "स्थानीय समयक्षेत्र:"
-
-#: ../globaltime/timezone_selection.c:101
-#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
-msgid " Other"
-msgstr "अन्य"
-
-#: ../globaltime/timezone_selection.c:156
-#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
-#, c-format
-msgid "%d hour %d mins"
-msgstr "%d घंटा %d मिनट"
-
-#: ../globaltime/timezone_selection.c:159
-#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, c-format
-msgid "%d hour"
-msgstr "%d घंटा"
-
-#: ../globaltime/timezone_selection.c:161
-#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, c-format
-msgid "%d mins"
-msgstr "%d मिनट"
-
-#: ../globaltime/timezone_selection.c:167
-#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
-msgid "backward"
-msgstr "पीछे की ओर"
-
-#: ../globaltime/timezone_selection.c:170
-#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-msgid "forward"
-msgstr "आगे"
-
-#: ../globaltime/timezone_selection.c:194
-#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
-msgid "not changed"
-msgstr "नहीं बदला"
-
-#: ../globaltime/timezone_selection.c:195
-#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
-msgid "not changing"
-msgstr "नहीं बदल रहा है"
-
-#. location
-#: ../globaltime/timezone_selection.c:247
-#: ../globaltime/timezone_selection.c:252
-#: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
-#: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
-msgid "Location"
-msgstr "स्थान"
-
-#: ../globaltime/timezone_selection.c:258
-#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
-msgid "GMT Offset"
-msgstr "GMT के प्रति संतुलित करना"
-
-#: ../globaltime/timezone_selection.c:264
-#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
-msgid "Previous/Next Change"
-msgstr "पिछला/अगला बदलें"
-
-#: ../globaltime/timezone_selection.c:269
-#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
-msgid "Country"
-msgstr "देश"
-
-#. We are actually setting the g_par parameter. In other words
-#. we are setting the global default timezone for Orage. This is
-#. done very seldom and we do not want to allow "floating" here.
-#. This test is ugly, but it is not worth an extra parameter.
-#. this is normal appointment
-#: ../globaltime/timezone_selection.c:299
-#: ../globaltime/timezone_selection.c:309
-#: ../panel-plugin/timezone_selection.c:300
-#: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
-#: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
-msgid "Pick timezone"
-msgstr "चुनें समयक्षेत्र"
-
-#: ../globaltime/timezone_selection.c:302
-#: ../globaltime/timezone_selection.c:312
-#: ../panel-plugin/timezone_selection.c:303
-#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
-#: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
-msgid "Change mode"
-msgstr "मोड बदलें"
-
-#: ../globaltime/timezone_selection.c:303
-#: ../globaltime/timezone_selection.c:313
-#: ../globaltime/timezone_selection.c:352
-#: ../panel-plugin/timezone_selection.c:304
-#: ../panel-plugin/timezone_selection.c:314
-#: ../panel-plugin/timezone_selection.c:353 ../src/timezone_selection.c:320
-#: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
-#: ../src/timezone_selection.c:379
-msgid "UTC"
-msgstr "UTC"
-
-#. NOTE: this exists only if ical timezones are being used
-#: ../globaltime/timezone_selection.c:304
-#: ../globaltime/timezone_selection.c:357
-#: ../panel-plugin/timezone_selection.c:305
-#: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
-#: ../src/timezone_selection.c:384
-msgid "floating"
-msgstr "अस्थिर"
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Globaltime"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-msgid "Orage Globaltime"
-msgstr "औरेज़ Globaltime"
-
-#: ../globaltime/globaltime.desktop.in.h:3
-msgid "Show clocks from different countries"
-msgstr "भिन्न देशों की घड़ियाँ दिखाएँ"
-
-#: ../panel-plugin/oc_config.c:224
-msgid "Appearance"
-msgstr "दिखावट"
-
-#. show frame
-#: ../panel-plugin/oc_config.c:229
-msgid "Show _frame"
-msgstr "फ्रेम दिखाए"
-
-#. foreground color
-#: ../panel-plugin/oc_config.c:239
-msgid "set foreground _color:"
-msgstr "अग्रभूमि रंग निर्धारित करें:"
-
-#. background color
-#: ../panel-plugin/oc_config.c:253
-msgid "set _background color:"
-msgstr "पृष्ठभूमि रंग निर्धारित करें:"
-
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
-msgid "set _height:"
-msgstr "ऊंचाई निर्धारित करें:"
-
-#: ../panel-plugin/oc_config.c:277
-msgid "Note that you can not change the height of horizontal panels"
-msgstr "ध्यान दें कि आप क्षैतिज पैनलों की ऊंचाई को नहीं बदल सकते"
-
-#: ../panel-plugin/oc_config.c:282
-msgid "set _width:"
-msgstr "चौड़ाई निर्धारित करें:"
-
-#: ../panel-plugin/oc_config.c:293
-msgid "Note that you can not change the width of vertical panels"
-msgstr "ध्यान दें कि आप क्षैतिज पैनलों की चौड़ाई को नहीं बदल सकते"
-
-#: ../panel-plugin/oc_config.c:316
-msgid "Clock Options"
-msgstr "घड़ी के विकल्प"
-
-#. timezone
-#: ../panel-plugin/oc_config.c:326
-msgid "set timezone to:"
-msgstr "समयक्षेत्र को निर्धारित करे:"
-
-#: ../panel-plugin/oc_config.c:347
-#, c-format
-msgid "Line %d:"
-msgstr "पंक्ति %d:"
-
-#: ../panel-plugin/oc_config.c:357
-msgid "Enter any valid strftime function parameter."
-msgstr "किसी भी मान्य strftime function पैरामीटर को दर्ज करें"
-
-#. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
-msgid "Tooltip:"
-msgstr "टूलटिप:"
-
-#. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
-msgid "fix time after suspend/hibernate"
-msgstr "निलंबित या शीतनिद्रा में होने के बाद समय तय करें"
-
-#: ../panel-plugin/oc_config.c:415
-msgid ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
-msgstr ""
-"आप को इसकी जरूरत तब है अगर आप निलंबित या शीतनिद्रा केवल अल्पावधि के लिए करना (5 घंटे "
-"से कम समय) चाहते है और अपके दृश्यमान समय मे सेकंड शामिल नहीं है। इन परिस्थितियों में यह संभव "
-"है कि अगर आपने इसका चुनाव नहीं किया है तो औरेज़clock गलत समय बता सकती है। (इसका चयन "
-"करने से सीपीयू काम नहीं करता और सहेज़ने की सुविधा को रोकता है।)"
-
-#: ../panel-plugin/oc_config.c:432
-msgid ""
-"This program uses strftime function to get time.\n"
-"Use any valid code to get time in the format you prefer.\n"
-"Some common codes are:\n"
-"\t%A = weekday\t\t\t%B = month\n"
-"\t%c = date & time\t\t%R = hour & minute\n"
-"\t%V = week number\t\t%Z = timezone in use\n"
-"\t%H = hours \t\t\t\t%M = minute\n"
-"\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"यह प्रोग्रैम strftime function का उपयोग कर समय मिलता है।\n"
-"आप समय को मन चाहे प्रारूप मे प्रदर्शित करने के लिए किसी भी मान्य कोड का प्रयोग कर सकते "
-"है।\n"
-"कुछ आम कोड हैं:\n"
-"%A = काम करने के दिन\t%B = माह \n"
-"%c = दिनांक एवं समय\t\t%R = मिनट और घंटे\n"
-"%V = सप्ताह के नंबर\t\t%Z = उपयोक्त समयक्षेत्र\n"
-"%H = घंटे\t\t\t%M = मिनट\n"
-"%X = स्थानीय समय\t\t%x = स्थानीय तारीख"
-
-#: ../panel-plugin/oc_config.c:457
-msgid "Orage clock Preferences"
-msgstr "औरेज़ घड़ी की प्राथमिकताएं"
-
-#. no lines yet
-#. TRANSLATORS: Use format characters from strftime(3)
-#. * to get the proper string for your locale.
-#. * I used these:
-#. * %A  : full weekday name
-#. * %d  : day of the month
-#. * %B  : full month name
-#. * %Y  : four digit year
-#. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
-msgid "%A %d %B %Y/%V"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:40
-msgid "Maintainer"
-msgstr "अनुरक्षक"
-
-#: ../src/about-xfcalendar.c:47
-msgid "Manage your time with Orage"
-msgstr "औरेज़ के साथ अपने समय का प्रबंधन करें"
-
-#. if (gtk_toggle_button_get_active(
-#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
-#. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
-msgid "End"
-msgstr "समाप्त"
-
-#: ../src/appointment.c:333
-msgid "Due"
-msgstr "देय"
-
-#: ../src/appointment.c:493 ../src/mainbox.c:783
-msgid "Orage"
-msgstr "औरेज़"
-
-#. to avoid timing problems when updating entry
-#. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
-msgid "Select a file..."
-msgstr "एक फ़ाइल चुनें ..."
-
-#: ../src/appointment.c:680
-msgid "Sound Files"
-msgstr "ध्वनिफ़ाइलें"
-
-#: ../src/appointment.c:687 ../src/interface.c:290
-msgid "All Files"
-msgstr "सभी फ़ाइलें"
-
-#: ../src/appointment.c:739
-msgid "The appointment information has been modified."
-msgstr "नियुक्ति जानकारी संशोधित की गई है।"
-
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
-msgid "Do you want to continue?"
-msgstr "क्या आप जारी रखना चाहते हैं?"
-
-#: ../src/appointment.c:767
-msgid "The end of this appointment is earlier than the beginning."
-msgstr "इस नियुक्ति का अंत इसकी मूल शुरूआत से पहले है।"
-
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-msgid "Not set"
-msgstr "निर्धारित नहीं है।"
-
-#: ../src/appointment.c:1193
-msgid "This appointment will be permanently removed."
-msgstr "यह नियुक्ति स्थायी रूप से हटाई जा चुकी है।"
-
-#: ../src/appointment.c:1692
-msgid "This appointment does not exist."
-msgstr "इस नियुक्ति मौजूद नहीं है।"
-
-#: ../src/appointment.c:1693
-msgid "It was probably removed, please refresh your screen."
-msgstr "इसे शायद हटा दिया गया है, कृपया अपनी स्क्रीन ताज़ा करें।"
-
-#: ../src/appointment.c:1995
-msgid "Current categories"
-msgstr "वर्तमान श्रेणियां"
-
-#: ../src/appointment.c:2010
-msgid "Add new category with color"
-msgstr "रंग के साथ नई श्रेणी जोड़ें"
-
-#: ../src/appointment.c:2014
-msgid "Category:"
-msgstr "श्रेणी:"
-
-#: ../src/appointment.c:2045
-msgid "Colors of categories - Orage"
-msgstr "श्रेणियों की रंग - औरेज़"
-
-#: ../src/appointment.c:2092
-msgid " *** COPY ***"
-msgstr "*** नक़ल करें ***"
-
-#: ../src/appointment.c:2353
-msgid "New appointment - Orage"
-msgstr "नई नियुक्ति - औरेज़"
-
-#. File menu stuff
-#. ********* File menu *********
-#. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
-msgid "_File"
-msgstr "फाइल (_F)"
-
-#: ../src/appointment.c:2388
-msgid "Sav_e and close"
-msgstr "सहेजें और बंद करें (_e)"
-
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
-msgid "D_uplicate"
-msgstr "प्रतिलिपि (_u)"
-
-#: ../src/appointment.c:2589
-msgid "Save"
-msgstr "सहेजें"
-
-#: ../src/appointment.c:2591
-msgid "Save and close"
-msgstr "सहेजें और बंद करें"
-
-#: ../src/appointment.c:2596
-msgid "Revert"
-msgstr "वापस लाए"
-
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
-msgid "Duplicate"
-msgstr "प्रतिलिपि"
-
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
-msgid "Delete"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Free"
-msgstr "मुफ्त"
-
-#: ../src/appointment.c:2621
-msgid "Busy"
-msgstr "व्यस्त"
-
-#: ../src/appointment.c:2625
-msgid "General"
-msgstr "सामान्य"
-
-#. type
-#: ../src/appointment.c:2631
-msgid "Type "
-msgstr "टाइप"
-
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
-msgid "Event"
-msgstr "कार्यक्रम"
-
-#: ../src/appointment.c:2636
-msgid ""
-"Event that will happen sometime. For example:\n"
-"Meeting or birthday or TV show."
-msgstr ""
-"कार्यक्रम जो कभी-कभी होगा। उदाहरण के लिए:\n"
-"बैठक, जन्मदिन या टीवी का शो।"
-
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-msgid "Todo"
-msgstr "करने वाले कार्य"
-
-#: ../src/appointment.c:2642
-msgid ""
-"Something that you should do sometime. For example:\n"
-"Wash your car or test new version of Orage."
-msgstr ""
-"कुछ कार्य जो कि आप कभी-कभी ही करते है। उदाहरण के लिए:\n"
-"आपकी कार की सफाई या औरेज़ के नए संस्करण का परीक्षण।"
-
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
-msgid "Journal"
-msgstr "दैनिकी"
-
-#: ../src/appointment.c:2649
-msgid ""
-"Make a note that something happened. For example:\n"
-"Remark that your mother called or first snow came."
-msgstr ""
-"किसी हो चुकि गतिविधि का एक लेख बनाए। उदाहरण के लिए:\n"
-"टिप्पणी कि आपकी माँ ने कॉल किया या पहली बर्फ गिर पड़ी।"
-
-#. title
-#: ../src/appointment.c:2656
-msgid "Title "
-msgstr "शीर्षक"
-
-#: ../src/appointment.c:2671
-msgid "All day event"
-msgstr "पूरे दिन का कार्यक्रम"
-
-#. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
-msgid "Start"
-msgstr "शुरूआत"
-
-#: ../src/appointment.c:2697
-msgid "Set      "
-msgstr "निर्धारित करें"
-
-#: ../src/appointment.c:2718
-msgid "Duration"
-msgstr "अवधि"
-
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
-msgid "days"
-msgstr "दिन"
-
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
-msgid "hours"
-msgstr "घंटे"
-
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
-msgid "mins"
-msgstr "मिनट"
-
-#. Availability (only for EVENT)
-#: ../src/appointment.c:2738
-msgid "Availability"
-msgstr "उपलब्धता"
-
-#. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
-msgid "Completed"
-msgstr "संपन्न"
-
-#: ../src/appointment.c:2749
-msgid "Done"
-msgstr "किया जा चुका"
-
-#. categories
-#: ../src/appointment.c:2770
-msgid "Categories"
-msgstr "श्रेणियाँ:"
-
-#: ../src/appointment.c:2782
-msgid ""
-"This is special category, which can be used to color this appointment in "
-"list views."
-msgstr ""
-"यह विशेष श्रेणी हैं, जिसे सूची दृश्य में इस नियुक्ति को रंगने मे इस्तेमाल किया जा सकता है।."
-
-#: ../src/appointment.c:2787
-msgid "update colors for categories."
-msgstr "श्रेणियों के लिए रंग अद्यतन"
-
-#. priority
-#: ../src/appointment.c:2793
-msgid "Priority"
-msgstr "प्राथमिकता"
-
-#. note
-#: ../src/appointment.c:2803
-msgid "Note"
-msgstr "नोट"
-
-#: ../src/appointment.c:2824
-msgid ""
-"These shorthand commands take effect immediately:\n"
-"    <D> inserts current date in local date format\n"
-"    <T> inserts time and\n"
-"    <DT> inserts date and time.\n"
-"\n"
-"These are converted only later when they are seen:\n"
-"    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"ये आशुलिपि कमॉण्ड तुरंत प्रभावी होती है:\n"
-"     <D> स्थानीय दिनांक स्वरूप में वर्तमान दिनांक सम्मिलित करता है\n"
-"     <T> समय सम्मिलित करता है और\n"
-"     <DT> दिनांक और समय सम्मिलित करता है।\n"
-"\n"
-"ये केवल बाद में परिवर्तित होते हैं जब इन्हें देखा जाता है:\n"
-"     <&Ynnnn> है चालू वर्ष घटाव nnnn मे अनुवादित होता है।\n"
-"(यह उदाहरण के लिए जन्मदिन अनुस्मारक में इस्तेमाल किया जा सकता है ताकी यह बताया जा सके "
-"की वह व्यक्ति कितने साल का हो जायेगा।)"
-
-#: ../src/appointment.c:2895
-msgid "Before Start"
-msgstr "प्रारंभ होने से पहले"
-
-#: ../src/appointment.c:2895
-msgid "Before End"
-msgstr "अंत होने से पहले"
-
-#: ../src/appointment.c:2896
-msgid "After Start"
-msgstr "शुरू होने के बाद"
-
-#: ../src/appointment.c:2896
-msgid "After End"
-msgstr "अंत होने के बाद"
-
-#: ../src/appointment.c:2903
-msgid "Alarm"
-msgstr "अलार्म"
-
-#. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-msgid "Alarm time"
-msgstr "अलार्म का समय"
-
-#: ../src/appointment.c:2933
-msgid ""
-"Often you want to get alarm:\n"
-" 1) before Event start\n"
-" 2) before Todo end\n"
-" 3) after Todo start"
-msgstr ""
-"अक्सर आप आलार्म प्राप्त करना चाहेंगे:\n"
-"  1) कार्यक्रम के शुरू होने से पहले\n"
-"  2) करने वाले कार्य के अंत से पहले\n"
-"  3) करने वाले कार्य के शुरुआत के बाद"
-
-#: ../src/appointment.c:2938
-msgid "Persistent alarm"
-msgstr "लगातार बजने वाला अलार्म"
-
-#: ../src/appointment.c:2940
-msgid ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
-msgstr ""
-"यदि आप चाहते हैं कि औरेज़ आपको याद दिलाए भले ही वह सक्रिय नहीं हो तो जब अलार्म बजें तो "
-"इसका चयन करें।"
-
-#. **** Audio Alarm ****
-#: ../src/appointment.c:2949
-msgid "Sound"
-msgstr "ध्वनि"
-
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
-msgid "Use"
-msgstr "इस्तेमाल करें"
-
-#: ../src/appointment.c:2955
-msgid "Select this if you want audible alarm"
-msgstr "अगर आप श्रव्य अलार्म चाहते हैं तो इसका चयन करें"
-
-#: ../src/appointment.c:2972
-msgid "Repeat alarm sound"
-msgstr "अलार्म ध्वनि को दोहराएँ"
-
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
-msgid "times"
-msgstr "टाइम्ज़"
-
-#: ../src/appointment.c:3004
-msgid "sec interval"
-msgstr "सेकंड के अंतराल में"
-
-#. **** Display Alarm ****
-#: ../src/appointment.c:3014
-msgid "Visual"
-msgstr "विश़ूअल"
-
-#: ../src/appointment.c:3018
-msgid "Use Orage window"
-msgstr "औरेज़ विंडो का उपयोग करें"
-
-#: ../src/appointment.c:3020
-msgid "Select this if you want Orage window alarm"
-msgstr "अगर आप विंडो अलार्म चाहते हैं तो इसका चयन करें"
-
-#: ../src/appointment.c:3032
-msgid "Use notification"
-msgstr "अधिसूचना का प्रयोग करें"
-
-#: ../src/appointment.c:3034
-msgid "Select this if you want notification alarm"
-msgstr "अगर आप अधिसूचना अलार्म चाहते हैं तो इसका चयन करें"
-
-#: ../src/appointment.c:3040
-msgid "Set timeout"
-msgstr "मध्यांतर सेट करें"
-
-#: ../src/appointment.c:3043
-msgid "Select this if you want notification to expire automatically"
-msgstr "इसका चयन करें यदि आप अलार्म स्वतः समाप्त करने चाहते हैं"
-
-#: ../src/appointment.c:3054
-msgid "0 = system default expiration time"
-msgstr "0 = प्रणाली मूलभूत समाप्ति समय"
-
-#: ../src/appointment.c:3059
-msgid "seconds"
-msgstr "सेकण्डस"
-
-#. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
-msgid "Procedure"
-msgstr "प्रक्रिया"
-
-#: ../src/appointment.c:3076
-msgid "Select this if you want procedure or script alarm"
-msgstr "यह चयन करें यदि आप प्रक्रिया या स्क्रिप्ट अलार्म चाहते हैं"
-
-#: ../src/appointment.c:3082
-msgid ""
-"You must enter all escape etc characters yourself.\n"
-"This string is just given to shell to process.\n"
-"The following special commands are replaced at run time:\n"
-"\t<&T>  appointment title\n"
-"\t<&D>  appointment description\n"
-"\t<&AT> alarm time\n"
-"\t<&ST> appointment start time\n"
-"\t<&ET> appointment end time"
-msgstr ""
-
-#: ../src/appointment.c:3094
-msgid "Test this alarm by raising it now"
-msgstr "इस अलार्म को जाग्रत कर टेस्ट करें"
-
-#: ../src/appointment.c:3101
-msgid "<b>Default alarm</b>"
-msgstr "<b>मूलभूत अलार्म</b>"
-
-#: ../src/appointment.c:3109
-msgid "Store current settings as default alarm"
-msgstr "मूलभूत अलार्म के रूप में वर्तमान सेटिंग्स सहेज़े"
-
-#: ../src/appointment.c:3114
-msgid "Set current settings from default alarm"
-msgstr "मूलभूत अलार्म से वर्तमान सेटिंग्स सेट करें"
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "बिल्कुल भी नहीं"
-
-#: ../src/appointment.c:3176
-msgid "Daily"
-msgstr "रोज"
-
-#: ../src/appointment.c:3176
-msgid "Weekly"
-msgstr "साप्ताहिक"
-
-#: ../src/appointment.c:3176
-#, fuzzy
-msgid "Monthly"
-msgstr "मासिक"
-
-#: ../src/appointment.c:3176
-msgid "Yearly"
-msgstr "वार्षिक"
-
-#: ../src/appointment.c:3176
-msgid "Hourly"
-msgstr ""
-
-#: ../src/appointment.c:3178
-#, fuzzy
-msgid "Mon"
-msgstr "सोम"
-
-#: ../src/appointment.c:3178
-msgid "Tue"
-msgstr "मंगल"
-
-#: ../src/appointment.c:3178
-msgid "Wed"
-msgstr "बुध"
-
-#: ../src/appointment.c:3178
-msgid "Thu"
-msgstr "वीर"
-
-#: ../src/appointment.c:3178
-msgid "Fri"
-msgstr "शूक्र"
-
-#: ../src/appointment.c:3178
-msgid "Sat"
-msgstr "शनि"
-
-#: ../src/appointment.c:3178
-msgid "Sun"
-msgstr "रवि"
-
-#: ../src/appointment.c:3183
-msgid "Recurrence"
-msgstr "पुनरावृत्ति"
-
-#. complexity
-#: ../src/appointment.c:3189
-msgid "Complexity"
-msgstr "जटिलता"
-
-#: ../src/appointment.c:3192
-msgid "Basic"
-msgstr "मूलतत्त्व"
-
-#: ../src/appointment.c:3198
-msgid "Advanced"
-msgstr "विकसित"
-
-#: ../src/appointment.c:3202
-msgid "Use this if you want regular repeating event"
-msgstr "अगर आप नियमित रूप से दोहराई जाने वाली घटना चाहते हैं तो इस का प्रयोग करें"
-
-#: ../src/appointment.c:3204
-msgid ""
-"Use this if you need complex times like:\n"
-" Every Saturday and Sunday or \n"
-" First Tuesday every month"
-msgstr ""
-"इस का प्रयोग करें अगर आप इस तरह की जटिल समय-सारिणी की जरूरत है:\n"
-"  हर शनिवार और रविवार या\n"
-"  हर महीने पहले मंगलवार"
-
-#. frequency
-#: ../src/appointment.c:3211
-msgid "Frequency"
-msgstr "आवृत्ति"
-
-#: ../src/appointment.c:3217
-msgid "Each"
-msgstr "हरेक"
-
-#: ../src/appointment.c:3224
-msgid "occurrence"
-msgstr "घटना"
-
-#: ../src/appointment.c:3228
-msgid ""
-"Limit frequency to certain interval.\n"
-" For example: Every third day:\n"
-" Frequency = Daily and Interval = 3"
-msgstr ""
-"आवृत्ति को कुछ अंतराल के लिए सीमित करना।\n"
-"  उदाहरण के लिए: हर तीसरे दिन:\n"
-"  आवृत्ति = दैनिक और अंतराल = 3"
-
-#: ../src/appointment.c:3274
-msgid "Limit"
-msgstr "सीमा (सीमित)"
-
-#: ../src/appointment.c:3276
-msgid "Repeat forever"
-msgstr "हमेशा के लिए दोहराएँ"
-
-#: ../src/appointment.c:3282
-msgid "Repeat "
-msgstr "दोहराएँ"
-
-#: ../src/appointment.c:3298
-msgid "Repeat until "
-msgstr "तब तक दोहराएँ"
-
-#. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-#, fuzzy
-msgid "Weekdays"
-msgstr "कार्य दिवस"
-
-#: ../src/appointment.c:3323
-msgid "Which day"
-msgstr "किस दिन"
-
-#: ../src/appointment.c:3331
-msgid ""
-"Specify which weekday for monthly and yearly events.\n"
-" For example:\n"
-" Second Wednesday each month:\n"
-"\tFrequency = Monthly,\n"
-"\tWeekdays = check only Wednesday,\n"
-"\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-
-#. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
-msgid "TODO base"
-msgstr ""
-
-#: ../src/appointment.c:3352
-msgid ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
-msgstr ""
-
-#: ../src/appointment.c:3354
-msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-
-#. exceptions
-#: ../src/appointment.c:3361
-msgid "Exceptions"
-msgstr ""
-
-#: ../src/appointment.c:3374
-msgid ""
-"Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
-"Remove by clicking the data."
-msgstr ""
-
-#: ../src/appointment.c:3379
-msgid "Add excluded date (-)"
-msgstr ""
-
-#: ../src/appointment.c:3381
-msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-
-#: ../src/appointment.c:3387
-msgid "Add included time (+)"
-msgstr ""
-
-#: ../src/appointment.c:3389
-msgid ""
-"Included times have same timezone than start time, but they may have "
-"different time"
-msgstr ""
-
-#. calendars showing the action days
-#: ../src/appointment.c:3406
-msgid "Action dates"
-msgstr ""
-
-#. ********* View menu *********
-#. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
-msgid "_View"
-msgstr ""
-
-#. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
-msgid "_Go"
-msgstr ""
-
-#: ../src/day-view.c:319 ../src/event-list.c:1110
-msgid "New"
-msgstr ""
-
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr ""
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "आज"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr ""
-
-#: ../src/day-view.c:333 ../src/event-list.c:1128
-msgid "Refresh"
-msgstr ""
-
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
-msgid "Close"
-msgstr "बंद करें"
-
-#: ../src/day-view.c:454
-msgid "Unknown"
-msgstr ""
-
-#: ../src/day-view.c:704
-msgid "       Number of days to show"
-msgstr ""
-
-#: ../src/day-view.c:935
-#, fuzzy
-msgid "Orage - day view"
-msgstr "एक्सएफ पंचांग (कैलेंडर)"
-
-#. date only appointment
-#: ../src/event-list.c:190
-msgid "All day"
-msgstr ""
-
-#: ../src/event-list.c:580 ../src/event-list.c:1281
-msgid "Time"
-msgstr ""
-
-#: ../src/event-list.c:748
-msgid "No rows have been selected."
-msgstr ""
-
-#: ../src/event-list.c:749
-msgid "Click a row to select it and after that you can copy it."
-msgstr ""
-
-#: ../src/event-list.c:918
-msgid ""
-"You will permanently remove all\n"
-"selected appointments."
-msgstr ""
-
-#: ../src/event-list.c:1130
-msgid "Find"
-msgstr ""
-
-#: ../src/event-list.c:1137
-msgid "Dayview"
-msgstr ""
-
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr ""
-
-#: ../src/event-list.c:1201
-msgid "Journal entries starting from:"
-msgstr ""
-
-#: ../src/event-list.c:1221
-msgid "Search"
-msgstr ""
-
-#: ../src/event-list.c:1224
-msgid "Search text "
-msgstr ""
-
-#: ../src/event-list.c:1289
-msgid "Flags"
-msgstr ""
-
-#: ../src/event-list.c:1297
-msgid "Title"
-msgstr ""
-
-#: ../src/event-list.c:1323
-msgid ""
-"Double click line to edit it.\n"
-"\n"
-"Flags in order:\n"
-"\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
-"\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
-"\t 3. Type: f=free B=Busy\n"
-"\t 4. Located in file:\n"
-"\t\tO=Orage A=Archive F=Foreign\n"
-"\t 5. Appointment type:\n"
-"\t\tE=Event T=Todo J=Journal"
-msgstr ""
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr ""
-
-#. remove since it has ended
-#: ../src/ical-archive.c:267
-msgid "\tRecur ended, moving to archive file."
-msgstr ""
-
-#: ../src/ical-archive.c:329
-msgid "Archiving not enabled. Exiting"
-msgstr ""
-
-#: ../src/ical-archive.c:347
-#, c-format
-msgid "Archiving threshold: %d month(s)"
-msgstr ""
-
-#. yy mon day
-#: ../src/ical-archive.c:350
-#, c-format
-msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr ""
-
-#: ../src/ical-archive.c:377
-#, c-format
-msgid "Archiving uid: %s"
-msgstr ""
-
-#. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
-msgid "\tVTODO not complete; not archived"
-msgstr ""
-
-#. it is recurrent event
-#: ../src/ical-archive.c:388
-#, c-format
-msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr ""
-
-#: ../src/ical-archive.c:405
-msgid "Archiving done\n"
-msgstr ""
-
-#. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
-msgid "Starting archive removal."
-msgstr ""
-
-#: ../src/ical-archive.c:422
-msgid "\tPHASE 1: reset recurring appointments"
-msgstr ""
-
-#. PHASE 2: go through archive file and add everything back to base orage.
-#. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
-msgid "\tPHASE 2: return archived appointments"
-msgstr ""
-
-#: ../src/ical-archive.c:470
-msgid "Archive removal done\n"
-msgstr ""
-
-#: ../src/ical-code.c:932
-msgid "Orage default alarm"
-msgstr ""
-
-#: ../src/ical-code.c:3115
-#, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-
-#: ../src/ical-code.c:3117
-#, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-
-#: ../src/ical-expimp.c:123
-msgid "Starting import file preprocessing"
-msgstr ""
-
-#: ../src/ical-expimp.c:158
-msgid "... Patched DCREATED to be CREATED."
-msgstr ""
-
-#: ../src/ical-expimp.c:197
-msgid "... Patched timezone to Orage format."
-msgstr ""
-
-#: ../src/ical-expimp.c:206
-msgid "Import file preprocessing done"
-msgstr ""
-
-#: ../src/interface.c:284
-#, fuzzy
-msgid "Calendar files"
-msgstr "एक्सएफ पंचांग (कैलेंडर)"
-
-#: ../src/interface.c:631
-msgid "Current foreign files"
-msgstr ""
-
-#: ../src/interface.c:643
-msgid "READ ONLY"
-msgstr ""
-
-#: ../src/interface.c:645
-msgid "READ WRITE"
-msgstr ""
-
-#: ../src/interface.c:663
-msgid "***** No foreign files *****"
-msgstr ""
-
-#: ../src/interface.c:974
-msgid "Import/export"
-msgstr ""
-
-#: ../src/interface.c:981
-msgid "Import"
-msgstr ""
-
-#: ../src/interface.c:986
-msgid "Read from file:"
-msgstr ""
-
-#: ../src/interface.c:1003
-msgid ""
-"Separate filenames with comma(,).\n"
-" NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-
-#: ../src/interface.c:1008
-msgid "Export"
-msgstr ""
-
-#: ../src/interface.c:1013
-msgid "Write to file:"
-msgstr ""
-
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
-msgid "Select"
-msgstr "अगला दिन"
-
-#: ../src/interface.c:1037
-#, fuzzy
-msgid "All appointments"
-msgstr "नियुक्ति"
-
-#: ../src/interface.c:1050
-#, fuzzy
-msgid "Named appointments: "
-msgstr "नियुक्ति"
-
-#: ../src/interface.c:1062
-msgid ""
-"Note that only main file appointments are read.\n"
-"Archived and Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1065
-msgid ""
-"Note that only main file appointments are read.\n"
-"Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1068
-msgid "You can easily drag these from event-list window."
-msgstr ""
-
-#: ../src/interface.c:1070
-msgid "Orage appointment UIDs separated by commas."
-msgstr ""
-
-#: ../src/interface.c:1076
-msgid "Archive"
-msgstr ""
-
-#: ../src/interface.c:1084
-#, c-format
-msgid "Archive now (threshold: %d months)"
-msgstr ""
-
-#: ../src/interface.c:1094
-msgid "You can change archive threshold in parameters"
-msgstr ""
-
-#: ../src/interface.c:1101
-msgid "Revert archive now"
-msgstr ""
-
-#: ../src/interface.c:1107
-msgid ""
-"Return all archived events into main orage file and remove arch file.\n"
-"This is useful for example when doing export and moving orage\n"
-"appointments to another system."
-msgstr ""
-
-#: ../src/interface.c:1118
-#, fuzzy
-msgid "Orage files"
-msgstr "एक्सएफ पंचांग (कैलेंडर)"
-
-#: ../src/interface.c:1125
-#, fuzzy
-msgid "Orage main calendar file"
-msgstr "एक्सएफ पंचांग (कैलेंडर)"
-
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "एक्सएफ पंचांग (कैलेंडर)"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr ""
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr ""
-
-#: ../src/interface.c:1156 ../src/interface.c:1222
-msgid "Rename"
-msgstr ""
-
-#: ../src/interface.c:1160
-msgid ""
-"Orage internal file rename only.\n"
-"Does not touch external filesystem at all.\n"
-"New file must exist."
-msgstr ""
-
-#: ../src/interface.c:1164 ../src/interface.c:1227
-msgid "Copy"
-msgstr ""
-
-#: ../src/interface.c:1168
-msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-
-#: ../src/interface.c:1172 ../src/interface.c:1232
-msgid "Move"
-msgstr ""
-
-#: ../src/interface.c:1176
-msgid "Current file is moved and vanishes from the old place."
-msgstr ""
-
-#: ../src/interface.c:1190
-msgid "Archive file"
-msgstr ""
-
-#: ../src/interface.c:1254
-msgid "Foreign files"
-msgstr ""
-
-#: ../src/interface.c:1261
-msgid "Add new foreign file"
-msgstr ""
-
-#: ../src/interface.c:1266
-msgid "Foreign file:"
-msgstr ""
-
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr ""
-
-#: ../src/interface.c:1286
-msgid "Read only"
-msgstr ""
-
-#: ../src/interface.c:1294
-msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-
-#: ../src/interface.c:1308
-msgid "Exchange data - Orage"
-msgstr ""
-
-#: ../src/main.c:268
-#, c-format
-msgid ""
-"\tThis is %s version %s\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:270
-#, c-format
-msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
-
-#: ../src/main.c:271
-#, c-format
-msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
-
-#: ../src/main.c:273
-#, c-format
-msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
-
-#: ../src/main.c:276
-#, c-format
-msgid "\tUsing DBUS for import.\n"
-msgstr ""
-
-#: ../src/main.c:278
-#, c-format
-msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
-
-#: ../src/main.c:281
-#, c-format
-msgid "\tUsing libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:283
-#, c-format
-msgid "\tNot using libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:286
-#, c-format
-msgid "\tUsing automatic archiving.\n"
-msgstr ""
-
-#: ../src/main.c:288
-#, c-format
-msgid "\tNot using archiving.\n"
-msgstr ""
-
-#: ../src/main.c:291
-#, c-format
-msgid "\tUsing operating system package libical.\n"
-msgstr ""
-
-#: ../src/main.c:293
-#, c-format
-msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
-
-#: ../src/main.c:306
-#, c-format
-msgid ""
-"Usage: orage [options] [files]\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:307
-#, c-format
-msgid "Options:\n"
-msgstr ""
-
-#: ../src/main.c:308
-#, c-format
-msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
-
-#: ../src/main.c:309
-#, c-format
-msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
-
-#: ../src/main.c:310
-#, c-format
-msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
-
-#: ../src/main.c:311
-#, c-format
-msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
-
-#: ../src/main.c:312
-#, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:313
-#, c-format
-msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:314
-#, c-format
-msgid ""
-"--export (-e) file [appointment...] \texport appointments from Orage to "
-"file\n"
-msgstr ""
-
-#: ../src/main.c:316
-#, c-format
-msgid "files=ical files to load into orage\n"
-msgstr ""
-
-#: ../src/main.c:318
-#, c-format
-msgid "\tdbus not included in orage. \n"
-msgstr ""
-
-#: ../src/main.c:319
-#, c-format
-msgid ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
-msgstr ""
-
-#: ../src/main.c:511
-#, c-format
-msgid ""
-"\n"
-"Unknown option %s\n"
-"\n"
-msgstr ""
-
-#: ../src/mainbox.c:287
-msgid "_Exchange data"
-msgstr ""
-
-#. Edit menu
-#: ../src/mainbox.c:298
-msgid "_Edit"
-msgstr ""
-
-#: ../src/mainbox.c:308
-msgid "View selected _date"
-msgstr ""
-
-#: ../src/mainbox.c:311
-msgid "View selected _week"
-msgstr ""
-
-#: ../src/mainbox.c:317
-#, fuzzy
-msgid "Select _Today"
-msgstr "अगला दिन"
-
-#: ../src/mainbox.c:323
-#, fuzzy
-msgid "Show _Globaltime"
-msgstr "एक्सएफ पंचांग (कैलेंडर)"
-
-#. Help menu
-#: ../src/mainbox.c:327
-msgid "_Help"
-msgstr "सहायता (_H)"
-
-#: ../src/mainbox.c:448
-msgid "Never"
-msgstr ""
-
-#: ../src/mainbox.c:453
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:460
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:546
-msgid "<b>To do:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:582
-#, c-format
-msgid "<b>Events for %s:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:593
-#, c-format
-msgid "<b>Events for %s - %s:</b>"
-msgstr ""
-
-#: ../src/parameters.c:522
-msgid "Main settings"
-msgstr ""
-
-#: ../src/parameters.c:528
-msgid "Timezone"
-msgstr ""
-
-#: ../src/parameters.c:543
-msgid "You should always define your local timezone."
-msgstr ""
-
-#: ../src/parameters.c:552
-msgid "Archive threshold (months)"
-msgstr ""
-
-#: ../src/parameters.c:562
-msgid "(0 = no archiving)"
-msgstr ""
-
-#: ../src/parameters.c:565
-msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-
-#: ../src/parameters.c:574
-msgid "Sound command"
-msgstr ""
-
-#: ../src/parameters.c:589
-msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr ""
-
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
-msgstr "एक्सएफ पंचांग (कैलेंडर)"
-
-#: ../src/parameters.c:618
-msgid "Show borders"
-msgstr ""
-
-#: ../src/parameters.c:625
-msgid "Show menu"
-msgstr ""
-
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr ""
-
-#: ../src/parameters.c:639
-msgid "Show day names"
-msgstr ""
-
-#: ../src/parameters.c:646
-msgid "Show week numbers"
-msgstr ""
-
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr ""
-
-#: ../src/parameters.c:660
-msgid "Number of days to show in event window"
-msgstr ""
-
-#: ../src/parameters.c:666
-msgid "0 = do not show event list at all"
-msgstr ""
-
-#: ../src/parameters.c:676
-msgid "Show on all desktops"
-msgstr ""
-
-#: ../src/parameters.c:683
-msgid "Keep on top"
-msgstr ""
-
-#: ../src/parameters.c:690
-msgid "Show in taskbar"
-msgstr ""
-
-#: ../src/parameters.c:697
-msgid "Show in pager"
-msgstr ""
-
-#: ../src/parameters.c:704
-msgid "Show in systray"
-msgstr ""
-
-#: ../src/parameters.c:739
-#, fuzzy
-msgid "Calendar start"
-msgstr "एक्सएफ पंचांग (कैलेंडर)"
-
-#: ../src/parameters.c:744
-msgid "Show"
-msgstr ""
-
-#: ../src/parameters.c:756
-msgid "Hide"
-msgstr ""
-
-#: ../src/parameters.c:768
-msgid "Minimized"
-msgstr ""
-
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr ""
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "एक्सएफ पंचांग (कैलेंडर)"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "अगला दिन"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr ""
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
-
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr ""
-
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr ""
-
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr ""
-
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr ""
-
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
-
-#: ../src/parameters.c:921
-msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-
-#: ../src/parameters.c:938
-#, fuzzy
-msgid "Orage Preferences"
-msgstr "एक्सएफ पंचांग (कैलेंडर)"
-
-#: ../src/parameters.c:1050
-msgid "First Orage start. Searching default timezone."
-msgstr ""
-
-#: ../src/parameters.c:1069
-#, c-format
-msgid "Default timezone set to %s."
-msgstr ""
-
-#: ../src/parameters.c:1072
-msgid "Default timezone not found, please, set it manually."
-msgstr ""
-
-#: ../src/reminder.c:562
-#, fuzzy
-msgid "Reminder "
-msgstr "स्मरण"
-
-#: ../src/reminder.c:591
-msgid "Open"
-msgstr ""
-
-#: ../src/reminder.c:722
-#, fuzzy
-msgid "Reminder - Orage"
-msgstr "स्मरण"
-
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
-
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-
-#: ../src/reminder.c:1099
-msgid "Next active alarms:"
-msgstr ""
-
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
-#, c-format
-msgid ""
-"\n"
-"%02d d %02d h %02d min to: %s"
-msgstr ""
-
-#: ../src/reminder.c:1166
-#, c-format
-msgid ""
-"\n"
-"No active alarms found"
-msgstr ""
-
-#: ../src/timezone_names.c:36
-msgid "Africa"
-msgstr ""
-
-#: ../src/timezone_names.c:37
-msgid "Africa/Abidjan"
-msgstr ""
-
-#: ../src/timezone_names.c:38
-msgid "Africa/Accra"
-msgstr ""
-
-#: ../src/timezone_names.c:39
-msgid "Africa/Addis_Ababa"
-msgstr ""
-
-#: ../src/timezone_names.c:40
-msgid "Africa/Algiers"
-msgstr ""
-
-#: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr ""
-
-#: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr ""
-
-#: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr ""
-
-#: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr ""
-
-#: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr ""
-
-#: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr ""
-
-#: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr ""
-
-#: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr ""
-
-#: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr ""
-
-#: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr ""
-
-#: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr ""
-
-#: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr ""
-
-#: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr ""
-
-#: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr ""
-
-#: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr ""
-
-#: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr ""
-
-#: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr ""
-
-#: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr ""
-
-#: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr ""
-
-#: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr ""
-
-#: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr ""
-
-#: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr ""
-
-#: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr ""
-
-#: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr ""
-
-#: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr ""
-
-#: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr ""
-
-#: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr ""
-
-#: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr ""
-
-#: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr ""
-
-#: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr ""
-
-#: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr ""
-
-#: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr ""
-
-#: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr ""
-
-#: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr ""
-
-#: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr ""
-
-#: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr ""
-
-#: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr ""
-
-#: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr ""
-
-#: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr ""
-
-#: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr ""
-
-#: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr ""
-
-#: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr ""
-
-#: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr ""
-
-#: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr ""
-
-#: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr ""
-
-#: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr ""
-
-#: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr ""
-
-#: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr ""
-
-#: ../src/timezone_names.c:89
-msgid "America"
-msgstr ""
-
-#: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr ""
-
-#: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr ""
-
-#: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr ""
-
-#: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr ""
-
-#: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr ""
-
-#: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:96
-msgid "America/Argentina/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:97
-msgid "America/Argentina/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:98
-msgid "America/Argentina/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:99
-msgid "America/Argentina/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr ""
-
-#: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr ""
-
-#: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr ""
-
-#: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr ""
-
-#: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr ""
-
-#: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr ""
-
-#: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr ""
-
-#: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr ""
-
-#: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr ""
-
-#: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr ""
-
-#: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr ""
-
-#: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr ""
-
-#: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr ""
-
-#: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr ""
-
-#: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr ""
-
-#: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr ""
-
-#: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr ""
-
-#: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr ""
-
-#: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr ""
-
-#: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr ""
-
-#: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr ""
-
-#: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr ""
-
-#: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr ""
-
-#: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr ""
-
-#: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr ""
-
-#: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr ""
-
-#: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr ""
-
-#: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr ""
-
-#: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr ""
-
-#: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr ""
-
-#: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr ""
-
-#: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr ""
-
-#: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr ""
-
-#: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr ""
-
-#: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr ""
-
-#: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr ""
-
-#: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr ""
-
-#: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr ""
-
-#: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr ""
-
-#: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr ""
-
-#: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr ""
-
-#: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr ""
-
-#: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr ""
-
-#: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr ""
-
-#: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr ""
-
-#: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr ""
-
-#: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr ""
-
-#: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr ""
-
-#: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr ""
-
-#: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr ""
-
-#: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr ""
-
-#: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr ""
-
-#: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr ""
-
-#: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr ""
-
-#: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr ""
-
-#: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr ""
-
-#: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr ""
-
-#: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr ""
-
-#: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr ""
-
-#: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr ""
-
-#: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr ""
-
-#: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr ""
-
-#: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr ""
-
-#: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr ""
-
-#: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr ""
-
-#: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr ""
-
-#: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr ""
-
-#: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr ""
-
-#: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr ""
-
-#: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr ""
-
-#: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr ""
-
-#: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr ""
-
-#: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr ""
-
-#: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr ""
-
-#: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr ""
-
-#: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr ""
-
-#: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr ""
-
-#: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr ""
-
-#: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr ""
-
-#: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr ""
-
-#: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr ""
-
-#: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr ""
-
-#: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr ""
-
-#: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr ""
-
-#: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr ""
-
-#: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr ""
-
-#: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr ""
-
-#: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr ""
-
-#: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr ""
-
-#: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr ""
-
-#: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr ""
-
-#: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr ""
-
-#: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr ""
-
-#: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr ""
-
-#: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr ""
-
-#: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr ""
-
-#: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr ""
-
-#: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr ""
-
-#: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr ""
-
-#: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr ""
-
-#: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr ""
-
-#: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr ""
-
-#: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr ""
-
-#: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr ""
-
-#: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr ""
-
-#: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr ""
-
-#: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr ""
-
-#: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr ""
-
-#: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr ""
-
-#: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr ""
-
-#: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr ""
-
-#: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr ""
-
-#: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr ""
-
-#: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr ""
-
-#: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr ""
-
-#: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr ""
-
-#: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr ""
-
-#: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr ""
-
-#: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr ""
-
-#: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr ""
-
-#: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr ""
-
-#: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr ""
-
-#: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr ""
-
-#: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr ""
-
-#: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr ""
-
-#: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr ""
-
-#: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr ""
-
-#: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr ""
-
-#: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr ""
-
-#: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr ""
-
-#: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr ""
-
-#: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr ""
-
-#: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr ""
-
-#: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr ""
-
-#: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr ""
-
-#: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr ""
-
-#: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr ""
-
-#: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr ""
-
-#: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr ""
-
-#: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr ""
-
-#: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr ""
-
-#: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr ""
-
-#: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr ""
-
-#: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr ""
-
-#: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr ""
-
-#: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr ""
-
-#: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr ""
-
-#: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr ""
-
-#: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr ""
-
-#: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr ""
-
-#: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr ""
-
-#: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr ""
-
-#: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr ""
-
-#: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr ""
-
-#: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr ""
-
-#: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr ""
-
-#: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr ""
-
-#: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr ""
-
-#: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr ""
-
-#: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr ""
-
-#: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr ""
-
-#: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr ""
-
-#: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr ""
-
-#: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr ""
-
-#: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr ""
-
-#: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr ""
-
-#: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr ""
-
-#: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr ""
-
-#: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr ""
-
-#: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr ""
-
-#: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr ""
-
-#: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr ""
-
-#: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr ""
-
-#: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr ""
-
-#: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr ""
-
-#: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr ""
-
-#: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr ""
-
-#: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr ""
-
-#: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr ""
-
-#: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr ""
-
-#: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr ""
-
-#: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr ""
-
-#: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr ""
-
-#: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr ""
-
-#: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr ""
-
-#: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr ""
-
-#: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr ""
-
-#: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr ""
-
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr ""
-
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr ""
-
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr ""
-
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr ""
-
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr ""
-
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr ""
-
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr ""
-
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr ""
-
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr ""
-
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr ""
-
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr ""
-
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr ""
-
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr ""
-
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr ""
-
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr ""
-
-#: ../src/timezone_names.c:320
-msgid "Europe"
-msgstr ""
-
-#: ../src/timezone_names.c:321
-msgid "Europe/Amsterdam"
-msgstr ""
-
-#: ../src/timezone_names.c:322
-msgid "Europe/Andorra"
-msgstr ""
-
-#: ../src/timezone_names.c:323
-msgid "Europe/Athens"
-msgstr ""
-
-#: ../src/timezone_names.c:324
-msgid "Europe/Belfast"
-msgstr ""
-
-#: ../src/timezone_names.c:325
-msgid "Europe/Belgrade"
-msgstr ""
-
-#: ../src/timezone_names.c:326
-msgid "Europe/Berlin"
-msgstr ""
-
-#: ../src/timezone_names.c:327
-msgid "Europe/Bratislava"
-msgstr ""
-
-#: ../src/timezone_names.c:328
-msgid "Europe/Brussels"
-msgstr ""
-
-#: ../src/timezone_names.c:329
-msgid "Europe/Bucharest"
-msgstr ""
-
-#: ../src/timezone_names.c:330
-msgid "Europe/Budapest"
-msgstr ""
-
-#: ../src/timezone_names.c:331
-msgid "Europe/Chisinau"
-msgstr ""
-
-#: ../src/timezone_names.c:332
-msgid "Europe/Copenhagen"
-msgstr ""
-
-#: ../src/timezone_names.c:333
-msgid "Europe/Dublin"
-msgstr ""
-
-#: ../src/timezone_names.c:334
-msgid "Europe/Gibraltar"
-msgstr ""
-
-#: ../src/timezone_names.c:335
-msgid "Europe/Helsinki"
-msgstr ""
-
-#: ../src/timezone_names.c:336
-msgid "Europe/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:337
-msgid "Europe/Kaliningrad"
-msgstr ""
-
-#: ../src/timezone_names.c:338
-msgid "Europe/Kiev"
-msgstr ""
-
-#: ../src/timezone_names.c:339
-msgid "Europe/Lisbon"
-msgstr ""
-
-#: ../src/timezone_names.c:340
-msgid "Europe/Ljubljana"
-msgstr ""
-
-#: ../src/timezone_names.c:341
-msgid "Europe/London"
-msgstr ""
-
-#: ../src/timezone_names.c:342
-msgid "Europe/Luxembourg"
-msgstr ""
-
-#: ../src/timezone_names.c:343
-msgid "Europe/Madrid"
-msgstr ""
-
-#: ../src/timezone_names.c:344
-msgid "Europe/Malta"
-msgstr ""
-
-#: ../src/timezone_names.c:345
-msgid "Europe/Minsk"
-msgstr ""
-
-#: ../src/timezone_names.c:346
-msgid "Europe/Monaco"
-msgstr ""
-
-#: ../src/timezone_names.c:347
-msgid "Europe/Moscow"
-msgstr ""
-
-#: ../src/timezone_names.c:348
-msgid "Europe/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:349
-msgid "Europe/Oslo"
-msgstr ""
-
-#: ../src/timezone_names.c:350
-msgid "Europe/Paris"
-msgstr ""
-
-#: ../src/timezone_names.c:351
-msgid "Europe/Prague"
-msgstr ""
-
-#: ../src/timezone_names.c:352
-msgid "Europe/Riga"
-msgstr ""
-
-#: ../src/timezone_names.c:353
-msgid "Europe/Rome"
-msgstr ""
-
-#: ../src/timezone_names.c:354
-msgid "Europe/Samara"
-msgstr ""
-
-#: ../src/timezone_names.c:355
-msgid "Europe/San_Marino"
-msgstr ""
-
-#: ../src/timezone_names.c:356
-msgid "Europe/Sarajevo"
-msgstr ""
-
-#: ../src/timezone_names.c:357
-msgid "Europe/Simferopol"
-msgstr ""
-
-#: ../src/timezone_names.c:358
-msgid "Europe/Skopje"
-msgstr ""
-
-#: ../src/timezone_names.c:359
-msgid "Europe/Sofia"
-msgstr ""
-
-#: ../src/timezone_names.c:360
-msgid "Europe/Stockholm"
-msgstr ""
-
-#: ../src/timezone_names.c:361
-msgid "Europe/Tallinn"
-msgstr ""
-
-#: ../src/timezone_names.c:362
-msgid "Europe/Tirane"
-msgstr ""
-
-#: ../src/timezone_names.c:363
-msgid "Europe/Uzhgorod"
-msgstr ""
-
-#: ../src/timezone_names.c:364
-msgid "Europe/Vaduz"
-msgstr ""
-
-#: ../src/timezone_names.c:365
-msgid "Europe/Vatican"
-msgstr ""
-
-#: ../src/timezone_names.c:366
-msgid "Europe/Vienna"
-msgstr ""
-
-#: ../src/timezone_names.c:367
-msgid "Europe/Vilnius"
-msgstr ""
-
-#: ../src/timezone_names.c:368
-msgid "Europe/Warsaw"
-msgstr ""
-
-#: ../src/timezone_names.c:369
-msgid "Europe/Zagreb"
-msgstr ""
-
-#: ../src/timezone_names.c:370
-msgid "Europe/Zaporozhye"
-msgstr ""
-
-#: ../src/timezone_names.c:371
-msgid "Europe/Zurich"
-msgstr ""
-
-#: ../src/timezone_names.c:372
-msgid "Indian"
-msgstr ""
-
-#: ../src/timezone_names.c:373
-msgid "Indian/Antananarivo"
-msgstr ""
-
-#: ../src/timezone_names.c:374
-msgid "Indian/Chagos"
-msgstr ""
-
-#: ../src/timezone_names.c:375
-msgid "Indian/Christmas"
-msgstr ""
-
-#: ../src/timezone_names.c:376
-msgid "Indian/Cocos"
-msgstr ""
-
-#: ../src/timezone_names.c:377
-msgid "Indian/Comoro"
-msgstr ""
-
-#: ../src/timezone_names.c:378
-msgid "Indian/Kerguelen"
-msgstr ""
-
-#: ../src/timezone_names.c:379
-msgid "Indian/Mahe"
-msgstr ""
-
-#: ../src/timezone_names.c:380
-msgid "Indian/Maldives"
-msgstr ""
-
-#: ../src/timezone_names.c:381
-msgid "Indian/Mauritius"
-msgstr ""
-
-#: ../src/timezone_names.c:382
-msgid "Indian/Mayotte"
-msgstr ""
-
-#: ../src/timezone_names.c:383
-msgid "Indian/Reunion"
-msgstr ""
-
-#: ../src/timezone_names.c:384
-msgid "Pacific"
-msgstr ""
-
-#: ../src/timezone_names.c:385
-msgid "Pacific/Apia"
-msgstr ""
-
-#: ../src/timezone_names.c:386
-msgid "Pacific/Auckland"
-msgstr ""
-
-#: ../src/timezone_names.c:387
-msgid "Pacific/Chatham"
-msgstr ""
-
-#: ../src/timezone_names.c:388
-msgid "Pacific/Easter"
-msgstr ""
-
-#: ../src/timezone_names.c:389
-msgid "Pacific/Efate"
-msgstr ""
-
-#: ../src/timezone_names.c:390
-msgid "Pacific/Enderbury"
-msgstr ""
-
-#: ../src/timezone_names.c:391
-msgid "Pacific/Fakaofo"
-msgstr ""
-
-#: ../src/timezone_names.c:392
-msgid "Pacific/Fiji"
-msgstr ""
-
-#: ../src/timezone_names.c:393
-msgid "Pacific/Funafuti"
-msgstr ""
-
-#: ../src/timezone_names.c:394
-msgid "Pacific/Galapagos"
-msgstr ""
-
-#: ../src/timezone_names.c:395
-msgid "Pacific/Gambier"
-msgstr ""
-
-#: ../src/timezone_names.c:396
-msgid "Pacific/Guadalcanal"
-msgstr ""
-
-#: ../src/timezone_names.c:397
-msgid "Pacific/Guam"
-msgstr ""
-
-#: ../src/timezone_names.c:398
-msgid "Pacific/Honolulu"
-msgstr ""
-
-#: ../src/timezone_names.c:399
-msgid "Pacific/Johnston"
-msgstr ""
-
-#: ../src/timezone_names.c:400
-msgid "Pacific/Kiritimati"
-msgstr ""
-
-#: ../src/timezone_names.c:401
-msgid "Pacific/Kosrae"
-msgstr ""
-
-#: ../src/timezone_names.c:402
-msgid "Pacific/Kwajalein"
-msgstr ""
-
-#: ../src/timezone_names.c:403
-msgid "Pacific/Majuro"
-msgstr ""
-
-#: ../src/timezone_names.c:404
-msgid "Pacific/Marquesas"
-msgstr ""
-
-#: ../src/timezone_names.c:405
-msgid "Pacific/Midway"
-msgstr ""
-
-#: ../src/timezone_names.c:406
-msgid "Pacific/Nauru"
-msgstr ""
-
-#: ../src/timezone_names.c:407
-msgid "Pacific/Niue"
-msgstr ""
-
-#: ../src/timezone_names.c:408
-msgid "Pacific/Norfolk"
-msgstr ""
-
-#: ../src/timezone_names.c:409
-msgid "Pacific/Noumea"
-msgstr ""
-
-#: ../src/timezone_names.c:410
-msgid "Pacific/Pago_Pago"
-msgstr ""
-
-#: ../src/timezone_names.c:411
-msgid "Pacific/Palau"
-msgstr ""
-
-#: ../src/timezone_names.c:412
-msgid "Pacific/Pitcairn"
-msgstr ""
-
-#: ../src/timezone_names.c:413
-msgid "Pacific/Ponape"
-msgstr ""
-
-#: ../src/timezone_names.c:414
-msgid "Pacific/Port_Moresby"
-msgstr ""
-
-#: ../src/timezone_names.c:415
-msgid "Pacific/Rarotonga"
-msgstr ""
-
-#: ../src/timezone_names.c:416
-msgid "Pacific/Saipan"
-msgstr ""
-
-#: ../src/timezone_names.c:417
-msgid "Pacific/Tahiti"
-msgstr ""
-
-#: ../src/timezone_names.c:418
-msgid "Pacific/Tarawa"
-msgstr ""
-
-#: ../src/timezone_names.c:419
-msgid "Pacific/Tongatapu"
-msgstr ""
-
-#: ../src/timezone_names.c:420
-msgid "Pacific/Truk"
-msgstr ""
-
-#: ../src/timezone_names.c:421
-msgid "Pacific/Wake"
-msgstr ""
-
-#: ../src/timezone_names.c:422
-msgid "Pacific/Wallis"
-msgstr ""
-
-#: ../src/timezone_names.c:423
-msgid "Pacific/Yap"
-msgstr ""
-
-#: ../src/tray_icon.c:469
-#, fuzzy
-msgid "New appointment"
-msgstr "नियुक्ति"
-
-#: ../src/tray_icon.c:485
-msgid "About Orage"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-msgid "Orage Panel Clock"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-msgid "Show time and date?"
-msgstr ""
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-#, fuzzy
-msgid "Calendar"
-msgstr "एक्सएफ पंचांग (कैलेंडर)"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "एक्सएफ पंचांग (कैलेंडर)"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "एक्सएफ पंचांग (कैलेंडर)"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr ""
-
-#: ../xfcalendar.desktop.in.h:2
-#, fuzzy
-msgid "Desktop calendar"
-msgstr "एक्सएफ पंचांग (कैलेण्डर) के बारे में "
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "एक्सएफ पंचांग (कैलेंडर)"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "आपको सब पलायन आदि अक्षर अपने आप दर्ज करने होंगे।\n"
-#~ "यह स्ट्रिंग बस शेल को दी जाती है प्रक्रम करने के लिए।"
-
-# #-#-#-#-#  libgnomeui.gnome-2-4.hi.po (libgnomeui-2.0.hi)  #-#-#-#-#
-# libgnomeui/gnome-messagebox.c:115
-#~ msgid "Warning"
-#~ msgstr "चेतावनी"
-
-#, fuzzy
-#~ msgid "Select always today"
-#~ msgstr "अगला दिन"
-
-#, fuzzy
-#~ msgid "Modify Preferences"
-#~ msgstr "एक्सएफ पंचांग (कैलेंडर)"
-
-#, fuzzy
-#~ msgid "Monday"
-#~ msgstr "आज"
-
-#, fuzzy
-#~ msgid "Tuesday"
-#~ msgstr "आज"
-
-#, fuzzy
-#~ msgid "Wednesday"
-#~ msgstr "आज"
-
-#, fuzzy
-#~ msgid "Thursday"
-#~ msgstr "आज"
-
-#, fuzzy
-#~ msgid "Friday"
-#~ msgstr "आज"
-
-#, fuzzy
-#~ msgid "Sunday"
-#~ msgstr "आज"
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "आज"
-
-#, fuzzy
-#~ msgid "Calendar Files"
-#~ msgstr "एक्सएफ पंचांग (कैलेंडर)"
-
-#, fuzzy
-#~ msgid "Calendar borders"
-#~ msgstr "एक्सएफ पंचांग (कैलेंडर)"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "आपको सभी जानकारी मिटाना होंगी \n"
-#~ "जो इस दिनांक से सम्बद्ध हैं."
-
-#~ msgid "Clear"
-#~ msgstr "साफ"
diff -Nru orage-4.8.3/po/hr.po orage-4.12.1/po/hr.po
--- orage-4.8.3/po/hr.po	2012-01-03 12:01:04.000000000 +0000
+++ orage-4.12.1/po/hr.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,25 +1,46 @@
-# Croatian translations for orage package.
-# Copyright (C) 2010 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-#  Ivica Kolić<ikoli@yahoo.com>, 2010.
-#  Ivica Kolić<ikoli@yahoo.com> <>, 2010.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Edin Veskovic <edin.veskovic@openmailbox.org>, 2014
+# Edin Veskovic <edin.veskovic@openmailbox.org>, 2014
+# Ivica  Kolić <ikoli@yahoo.com>, 2010
+# Ivica  Kolić <ikoli@yahoo.com>, 2010
+# Ivica  Kolić <ikoli@yahoo.com>, 2013-2014
 msgid ""
 msgstr ""
-"Project-Id-Version: orage\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2010-06-05 09:26+0200\n"
-"Last-Translator: Ivica Kolić<ikoli@yahoo.com> <>\n"
-"Language-Team: Croatian <>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2014-10-19 06:55+0000\n"
+"Last-Translator: Ivica  Kolić <ikoli@yahoo.com>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/xfce-apps/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "nepodcrtano"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "jednostruko"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "dvostruko"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "nisko"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr "Podizanje prozora globalnoga vremena"
+msgstr "Podizanje prozora globalnoga vremena..."
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
@@ -31,9 +52,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"klik za izmjenu sata"
+msgstr "%s\nklik za izmjenu sata"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -43,9 +62,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"dugme 1 za promjenu osobitosti\n"
-"dugme 2 za usklađivanje satova"
+msgstr "dugme 1 za promjenu osobitosti\ndugme 2 za usklađivanje satova"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -54,9 +71,11 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"Prilagodii promjeni minute. Kliknite na strelice sa dugmetom 2 za promjenu "
-"samo 1 minute."
+msgstr "prilagodii promjeni minute. Kliknite na strelice sa dugmetom 2 za promjenu samo 1 minute."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Globalno vrijeme"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -68,7 +87,7 @@
 
 #: ../globaltime/gt_prefs.c:310
 msgid "Not possible to delete the last clock."
-msgstr "Nije moguće izbrisati zadnji sat"
+msgstr "Nije moguće izbrisati zadnji sat."
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
@@ -156,7 +175,7 @@
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
 #: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
 msgid "Cross this to use default instead of selected value"
-msgstr ""
+msgstr "Izaberite ovo za korištenje zadane umjesto odabrane vrijednosti"
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
@@ -165,12 +184,12 @@
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
-msgstr ""
+msgstr "Klikni za promjenu prednje boje sata"
 
 #. ------------------------name font-------------------------
 #: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
 msgid "Font for name of clock:"
-msgstr "Font za ime sata"
+msgstr "Font za ime sata:"
 
 #: ../globaltime/gt_prefs.c:720
 msgid "Click to change font for clock name"
@@ -179,7 +198,7 @@
 #. ------------------------time font-------------------------
 #: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
 msgid "Font for time of clock:"
-msgstr "Font za vrijeme sata"
+msgstr "Font za vrijeme sata:"
 
 #: ../globaltime/gt_prefs.c:753
 msgid "Click to change font for clock time"
@@ -188,12 +207,12 @@
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:780
 msgid "Underline name of clock:"
-msgstr "Podcrtaj ime sata"
+msgstr "Podcrtaj ime sata:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:810
 msgid "Underline time of clock:"
-msgstr "Podcrtaj vrijeme sata"
+msgstr "Podcrtaj vrijeme sata:"
 
 #: ../globaltime/gt_prefs.c:850
 msgid "Text Default Formatting"
@@ -205,7 +224,7 @@
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
+msgstr "Izaberite ovo za korištenje sistemske umjesto odabrane boje"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
@@ -217,7 +236,7 @@
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
+msgstr "Izaberite ovo za korištenje sistemskog fonta umjesto odabranog"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -258,6 +277,10 @@
 msgid "Use normal decorations"
 msgstr "Koristi normalno ukrašavanje"
 
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "NIjedan"
+
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
 msgstr "Ne pokazuj ukrašavanje prozora (rubovi)"
@@ -295,7 +318,7 @@
 #: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
 #, c-format
 msgid "%d hour %d mins"
-msgstr ""
+msgstr "%d sat %d minuta"
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
@@ -307,7 +330,7 @@
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
 #, c-format
 msgid "%d mins"
-msgstr ""
+msgstr "%d minuta"
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
@@ -333,7 +356,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Lokacija"
@@ -341,7 +364,7 @@
 #: ../globaltime/timezone_selection.c:258
 #: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
 msgid "GMT Offset"
-msgstr ""
+msgstr "GMT odmak"
 
 #: ../globaltime/timezone_selection.c:264
 #: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
@@ -394,92 +417,108 @@
 msgid "floating"
 msgstr "plutajuće"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Globalno vrijeme"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Orage Globalno vrijeme"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "Pokaži satove različitih zemalja"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Globalno vrijeme"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Bez rotacije"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Rotiraj lijevo"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Rotiraj desno"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "Izgled"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
-msgstr ""
+msgstr "Pokaži _okvir"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
 msgstr "Postavi boju _prvoga plana:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
 msgstr "postavi _pozadinsku boju:"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
 msgstr "postavi _visinu"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
 msgstr "Ne možete mijenjati visinu vodoravnih ploča"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
 msgstr "postavi _dužinu"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
 msgstr "Ne možete mijenjati dužinu okomitih ploča"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Pokazuj retke _vertikalno"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "Opcije sata"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
 msgstr "postavi vremensku zonu na:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "Redak %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
-msgstr ""
+msgstr "Upišite bilo koji valjanji strftime parametar."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
-msgstr ""
+msgstr "Oblačić:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
 msgstr "popravi vrijeme nakon suspenzije/hibernacije"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
+msgstr "Ova opcija vam je potrebna samo ako radite kratke suspenzije ili hibernaciju sustava (kraće od 5 sati) i ako prikazano vrijeme ne uključuje sekunde. Pod tim uvjetima moguće je da Orageclock netočno pokaže vrijeme. (Uključivanjem ove opcije spriječavaju se funkcije procesora i prekida za očuvanje energije.)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -489,13 +528,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
+msgstr "Ovaj program koristi strftime funkcije za dobivanje vremena.\nKoristite bilo koji pravilan kod za dobivanje vremena u željenom formatu.\nNeki česti kodovi su:\n\t%A = dan u tjednu\t\t\t%B = mjesec\n\t%c = datum i vrijeme\t\t%R = sat i minute\n\t%V = broj tjedna\t\t%Z = vremenska zona u upotrebi\n\t%H = sati \t\t\t\t%M = minute\n\t%X = lokalno vrijeme\t\t\t%x = lokalni datum"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
 msgstr "Osobitosti Orage sata"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -504,10 +542,9 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
-msgstr ""
+msgstr "%A %d %B %Y/%V"
 
 #: ../src/about-xfcalendar.c:40
 msgid "Maintainer"
@@ -520,21 +557,21 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Kraj"
 
 #: ../src/appointment.c:333
 msgid "Due"
-msgstr ""
+msgstr "Do"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Odaberi datoteku..."
 
@@ -542,223 +579,281 @@
 msgid "Sound Files"
 msgstr "Zvučne datoteke"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Sve datoteke"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Informacija o sastanku je promijenjena"
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "Želite li nastaviti?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Ne, ne odlazi"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Da, ignoriraj promijene i otiđi"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
-msgstr ""
+msgstr "Kraj ovog termina je prije njegovog početka."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "Nije postavljeno"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Dodaj novi termin ovoj datoteci."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Orage zadana datoteka"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Neuspjelo dodavanje termina."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Dogodila se greška pri dodavanju termina. Više detalja možete naći u datoteci prijave."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Neuspjelo ažuriranje termina."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Više detalja možete naći u datoteci prijave. (Možda je datoteka ažurirana izvana?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
 msgstr "Ovaj će sastanak biti trajno uklonjen."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Ne, poništi uklanjanje"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Da, ukloni"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Odaberite datum"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Danas"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "Sastanak ne postoji."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
 msgstr "Vjerojatno je uklonjen,osvježite vaš zaslon."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Trenutne kategorije"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Dodaj novu kategoriju sa bojom"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Kategorija:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Boje kategorija -  Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr " *** KOPIJA ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
-msgstr ""
+msgstr "Novi sastanak - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "Sprem_i i zatvori"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "U_dvostruči"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Spremi"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Spremi i zatvori"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Obrnuto"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Udvostruči"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Slobodno"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Zauzeto"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Osnovno"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Tip"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Događaj"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Događaj koji će se dogoditi.N primjer:\n"
-"susret ili rođendan ili TV show."
+msgstr "Događaj koji će se dogoditi.N primjer:\nsusret ili rođendan ili TV show."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
-msgstr ""
+msgstr "Obaveza"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Nešto što treba ponekad učiniti.Na primjer:\n"
-"oprati automobil ili testirati novu Orage verziju."
+msgstr "Nešto što treba ponekad učiniti.Na primjer:\noprati automobil ili testirati novu Orage verziju."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
-msgstr ""
+msgstr "Dnevnik"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
+msgstr "Napravite bilješku da se nešto dogodilo. Na primjer:\nBilješka da je zvala vaša majka ili da je došao prvi snijeg."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Naslov"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "Cjelodnevni događaj"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Počni"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Postavi"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Trajanje"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "dana"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "sati"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "minuta"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Dostupnost"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Dovršeno"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "Učinjeno"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Kategorije"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
+msgstr "Ovo je specijalna kategorija koja se može koristiti za bojanje termina na listi."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "ažurirajte boje kategorija."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "Prioritet"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Ako postavite na 8 ili veće, termin NIJE pokazan na listi.\nMožete koristiti ovu opciju kako bi rasčistili listu, ali će biti teže naći termin.\n(Alarmi će se pokretati normalno.)\n(Postoji nedokumentirani parametar tako da možete mijenjati zadani limit od 8.)"
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Bilješka"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -767,125 +862,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Ove skraćene naredbe odmah stupaju na snagu:\n<D> umeće trenutni datum u formatu lokalnog vremena\n<T> umeće vrijeme i\n<DT> umeće datum i vrijeme.\n\nOve naredbe se pretvaraju tek kasnije kada se pokažu:\n<&Ynnnn> se prevodi u trenutnu godinu minus nnnn.\n(Može se primjerice koristi kod rođendanskih podsjetnika tako da pokazuje koliko će godina osoba imati.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "Prije početka"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "Prije kraja"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "Nakon početka"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "Nakon kraja"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Alarm"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Vrijeme alarma"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
+msgstr "Često želite alarm:\n1) prije starta događaja\n2) prije završetka obaveze\n3) nakon starta obaveze"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
-msgstr ""
+msgstr "Trajni alarm"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
+msgstr "Odaberite ovo ako želite da vas Orage podsjeti iako nije bio aktivan kada je alarm počeo."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "Koristi"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
 msgstr "Odaberite ovo ako želite čujan alarm"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "Ponovi zvuk alarma"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
-msgstr ""
+msgstr "puta"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
-msgstr ""
+msgstr "sekunde intervali"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "Vizualno"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Koristi Orage prozor"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
-msgstr ""
+msgstr "Izaberite ako želite Orage prozor za alarm "
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Koristite obavijest"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
 msgstr "Odaberite ovu opciju ako želite alarm obavijesti"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
-msgstr ""
+msgstr "Postavite istek"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
 msgstr "Odaberite ovu opciju ako želite da obavijest istekne automatski"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 = "
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "sekude"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Procedura"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
-msgstr ""
+msgstr "Odaberite ako želite izvršiti neku proceduru ili skriptu kao alarm"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -895,156 +989,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
+msgstr "Sami morate upisati sve znakove.\nString je samo dan ljusci za procesuiranje.\nSlijedeće specijalne naredbe se zamijenjuju pri pokretanju:\n\t<&T>  naslov termina\n\t<&D>  opis termina\n\t<&AT> vrijeme alarma\n\t<&ST> početak termina\n\t<&ET> kraj termina"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
-msgstr ""
+msgstr "Testirajte alarm sada"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "<b>Zadani alarm</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
 msgstr "Pohrani trenutne postavke kao zadani alarm"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
 msgstr "Postavi trenutne postavke sa zadanog alarma"
 
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "NIjedan"
-
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Dnevno"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Tjedno"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Mjesečno"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Godišnje"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
-msgstr ""
+msgstr "Svakog sata"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Pon"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Uto"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Srij"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Čet"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Pet"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "Sub"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "Ned"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
-msgstr ""
+msgstr "Ponavljanje"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Složenost"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Osnovno"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Napredno"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "Koristite ovo ako želite obični ponavljajući događaj"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Koristite ovo ako vam trebaju kompleksna vremena poput:\n"
-"Svaku subotu i nedjelju ili \n"
-"prvi utorak svakog mjeseca"
+msgstr "Koristite ovo ako vam trebaju kompleksna vremena poput:\nSvaku subotu i nedjelju ili \nprvi utorak svakog mjeseca"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Učestalost"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Svaki"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "okolnost"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Ograniči učestalost na neki interval.\n"
-"Na primjer: svaki treći dan:\n"
-"Učestalost = dnevna i interval = 3"
+msgstr "Ograniči učestalost na neki interval.\nNa primjer: svaki treći dan:\nUčestalost = dnevna i interval = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Ograničenje"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Ponavljaj zauvijek"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Ponavljaj"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Ponavljaj do"
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Dani u tjednu"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "Koji dan"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1052,290 +1136,324 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Odredi dan u tjednu za mjesečne i godišnje događaje.\n"
-"Na primijer:\n"
-"Druga srijeda svakog mjececa:\n"
-"\tUčestalost = mjesečna,\n"
-"\tDani u tjednu = označi samo srijede,\n"
-"\tKoji dan = odaberite 2 ispod srijede"
+msgstr "Odredi dan u tjednu za mjesečne i godišnje događaje.\nNa primijer:\nDruga srijeda svakog mjececa:\n\tUčestalost = mjesečna,\n\tDani u tjednu = označi samo srijede,\n\tKoji dan = odaberite 2 ispod srijede"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
-msgstr ""
+msgstr "TODO baza"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
+msgstr "TODO se pojavljuje redovito krečući od startnog vremena i ponavljajući se nakon svakog intervala bez obzira kad je zadnji put završen"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "TODO pojavljivanje je bazirano na vremenu svršetka te se ponavlja prema intervalu zadnjeg svršetka.\n(Uočite da ne možete reći ništa o povijesti TODO-a budući da se baza pojavljivanja mijenja svakim svršetkom.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "Izuzeci"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"Dodajte više datuma izuzetaka klikom na dane kalendara ispod.\n"
-"Izuzetak je ili isključujući(-) ili uključujući(+) ovisno o odabiru.\n"
-"Ukloni klikom na podatak."
+msgstr "Dodajte više datuma izuzetaka klikom na dane kalendara ispod.\nIzuzetak je ili isključujući(-) ili uključujući(+) ovisno o odabiru.\nUkloni klikom na podatak."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr "Dodaj isključujući datum (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr "Isključujući dani su puni dani kada se ovaj sastanak neće dogoditi"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
 msgstr "Dodaj uključujući datum (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"Uključujuća vremena  su u istoj vremenskoj zoni ka o i početno vrijeme ali "
-"mogu imati drugačije vrijeme"
+msgstr "Uključujuća vremena  su u istoj vremenskoj zoni ka o i početno vrijeme ali mogu imati drugačije vrijeme"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
-msgstr ""
+msgstr "Datumi akcije"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Pogled"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "_Idi"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Novo"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Nazad"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Danas"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "NAprijed"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Jedan tjedan nazad"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Jedan dan nazad"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Jedan dan naprijed"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Jedan tjedan naprijed"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Osviježi"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "       Broj dana za pokazati"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
-msgstr ""
+msgstr "Orage - pregled dana"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Cijeli dan"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Vrijeme"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "NIjedan red nije odabran"
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Klik na red za odabir i nakon toga možete ga kopirati."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"Trajno ćete ukloniti sve\n"
-"odabrane sastanke."
+msgstr "Trajno ćete ukloniti sve\nodabrane sastanke."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Da, ukloni ih"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Nazad"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "NAprijed"
+
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Nađi"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
-msgstr ""
+msgstr "Pregled dana"
+
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Dodatni dani za pokazati:"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Dodatni dani za pokazati"
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "samo prvi ponavljajući"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Izaberite ako želite da se pokazuje prvi ponavljajući događaj. Obično se pokazuju svi.\nUočite da se pokazuju i sve hitnoće.\nUoćite da se ponavljajući događaji na listi mogu pokazati ranije s obzirom da se pokazuje samo prvo pojavljivanje."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "također staro"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Izaberite ako želite vidjeti i stare događaje. Ova opcija je dostupna samo kada je izabrana i 'samo prvi ponavljajući' kako bi se izbjegle duge liste.\nUočite da odabir dodatnih dana još uvijek određuje izlistavaju li se noviji termini."
+
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
-msgstr ""
+msgstr "Unosi u dnevnik počevši s:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Traži"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "Traži tekst"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Zastave"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Naslov"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Odaberite datum"
+msgstr "Dvoklik za uređivanje.\n\nOznake redom:\n\t 1. Alarm: n=bez alarma\n\t\t A=Alarm je postavljen P=Postavljen je ustrajni alarm\n\t 2. Ponavljanje: n=bez ponavljanja\n\t\t H=Svaki sat D=Dnevno W=Tjedno M=Mjesečno Y=Godišnje\n\t 3. Tip: f=slobodan B=Zauzet\n\t 4. Lociran u datoteci:\n\t\tO=Orage A=Arhiva F=Strani\n\t 5. Vrsta termina:\n\t\tE=Događaj T=Obaveza J=Dnevnik"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
-msgstr ""
+msgstr "\tPonavljanje završilo, premještanje u arhivu."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Arhiviranje nije omogućeno.Izlazim"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
-msgstr ""
+msgstr "Granica arhiviranja: %d mjesec(i)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr ""
+msgstr "\tArhiviranje događaja starijih od: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
-msgstr ""
+msgstr "Uid arhiviranja: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
-msgstr ""
+msgstr "\tVTODO nije svršen; nije arhiviran"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr ""
+msgstr "\tPonavljanje. Godina kraja: %04d, mjesec: %02d, dan: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
-msgstr ""
+msgstr "Arhiviranje završeno\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
-msgstr ""
+msgstr "Započinje uklanjanje arhive."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
-msgstr ""
+msgstr "\tFAZA 1: resetiraj ponavljajuće termine"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
-msgstr ""
+msgstr "\tFAZA 2: vrati arhivirane termine"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
-msgstr ""
+msgstr "Uklanjanje arhive završeno\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Orage zadani alarm"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Stvorena je lista alarma za glavnu Orage datoteku:"
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Kreirana lista alarma za vanjsku datoteku: %s (%s)"
+
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\tDodano %d alarma. Obrađeno %d događaja."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
+msgstr "\tNađeno %d alarma od kojih je %d aktivno. (Pretraženo %d ponavljajućih alarma.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
-msgstr ""
+msgstr "Pokrećem predobradu datoteke za unos"
 
 #: ../src/ical-expimp.c:158
 msgid "... Patched DCREATED to be CREATED."
-msgstr ""
+msgstr "... Zakrpao DCREATED da bude CREATED."
 
 #: ../src/ical-expimp.c:197
 msgid "... Patched timezone to Orage format."
-msgstr ""
+msgstr "... Zakrpao vremensku zonu da odgovara Orage formatu."
 
 #: ../src/ical-expimp.c:206
 msgid "Import file preprocessing done"
-msgstr ""
+msgstr "Predobrada datoteke za unos završena"
+
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Nađeno vanjsko ažuriranje na datoteci %s."
 
-#: ../src/interface.c:284
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Osvježavanje alarma i kalendara zbog vanjskog ažuriranja datoteke."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Datoteke kalendara"
 
@@ -1343,581 +1461,670 @@
 msgid "Current foreign files"
 msgstr "Trenutne strane datoteke"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "SAMO ČITAJ"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "ČITAJ PIŠI"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Nema stranih datoteka *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Neuspjelo dodavanje vanjske datoteke"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage može rukovati sa 10 vanjskih datoteka. Dosegnut je limit."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Ime datoteke je prazno."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Ime je prazno."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Datoteka ne postoji."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "U Orageu već postoji isto ime datoteke."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "U Orageu već postoji isto ime."
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Uvezi/izvezi"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Uvezi"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Čitaj iz datoteke:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
+msgstr "Odvoji imena datoteka sa zarezom (,).\nBilješka: zarez nije valjan znak u imenu datoteke za Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Izvezi"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Piši na datoteku"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Odaberi"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Svi sastanci"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Imenovani sastanci: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
+msgstr "Uočite da se čitaju samo termini glavne datoteke.\nArhivirani i vanjski događaji nisu izvezeni."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
+msgstr "Uočite da se čitaju samo termini glavne datoteke.\nVanjski događaji nisu izvezeni."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
-msgstr ""
+msgstr "Lako ih možete povući s prozora s listom događaja."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
-msgstr ""
+msgstr "UID-i Orage termina odvojeni zarezima."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Arhiviraj"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
-msgstr ""
+msgstr "Arhiviraj sada (granica: %d mjeseci)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
-msgstr ""
+msgstr "Granicu arhiviranja možete promijeniti u parametrima"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Obrnuto arhiviranje sada"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
+msgstr "Vrati sve arhivirane događaje u glavnu Orage datoteku i ukloni arhivu.\nOvo je primjerice korisno kada izvozite događaje i premještate Orage\ntermine na drugi sistem. "
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Orage datoteke"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Orage glavna datoteka kalendara"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "trenutna datoteka"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Nova datoteka"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr ""
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Trenutna datoteka:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Nova datoteka:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Opcije radnji:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
+msgstr "Preimenovanje samo Orage internalne datoteke.\nNe dira vanjski sistem datoteka.\nMora postojati nova datoteka."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr "trenutna datoteka je kopirana i ostaje neizmjenjena na starome mjestu"
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Pomakni"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
-msgstr ""
+msgstr "Trenutna datoteka je premještena i nestala je sa staroga mjesta.."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Datoteka arhive"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Strane datoteke"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Dodaj novu stranu datoteku"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Strana datoteka:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Opcije"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Vidljivo ime:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Samo čitaj"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Ovo postavite ako želite biti sigurni da Orage ne modificira datoteku ikada.\nUočite da datoteke, ukoliko ih modificirate, mogu postati nekompatibilne s orginalnim alatom koji ih je stvorio."
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Korsniku se pokazuje ovo ime umjesto imena datoteke."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
-msgstr ""
+msgstr "Razmjena podataka - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tOvo je%s verzija %s\n"
-"\n"
+msgstr "\tOvo je%s verzija %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
+msgstr "\tObjavljeno pod uvjetima GNU General Public License.\n\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
+msgstr "\tKompajlirano uz GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
+msgstr "koristeći GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
-msgstr ""
+msgstr "\tKoristi DBUS za uvoz.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
+msgstr "\tNe koristi DBUS. Uvoz radi samo djelomično.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
-msgstr ""
+msgstr "\tKoristi libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
-msgstr ""
+msgstr "\tNe koristi libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tKoristi automatsko arhiviranje.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tNe koristi arhiviranje.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
-msgstr ""
+msgstr "\tKoristi libical paket operativnog sustava.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
+msgstr "\tKoristi libical lokanu Orage verziju.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
+msgstr "Korištenje: orage [mogućnosti] [datoteke]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Options:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tpokaži orage verziju\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\\ispis ovoga teksta\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
+msgstr "--preferences (-p) \tpokaži formu osobitosti\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
+msgstr "--toggle (-t) \t\tnapravi orage vidljivim/nevidljivim\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) datoteka [RW] [ime] \tdodaj vanjsku datoteku\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
+msgstr "--remove-foreign (-r) datoteka \tukloni vanjsku datoteku\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--export (-e) datoteka [termin...] \tizvezi termin iz Oraga u datoteku\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
-msgstr ""
+msgstr "datoteke=ical datoteke za učitavanje u Orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
-msgstr ""
+msgstr "\tdbus nije uključen u Orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
+msgstr "\tbez dbus [datoteke] i opcija za vanjske datoteke(-a & -r) se može koristiti samo pri pokretanju Oragea\n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Nepoznata opcija  %s\n"
-"\n"
+msgstr "\nNepoznata opcija  %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
-msgstr ""
+msgstr "_Razmjena podataka"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Pogledaj odabrani _datum"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Pogledaj odabrani _tjedan"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Odaberi _danas"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
 msgstr "Pokaži _globalno vrijeme"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Naslov nije definiran"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr "Lokacija: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\nBilješka:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Nikada"
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:495
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
+" Done:\t%s%s"
+msgstr "Naslov: %s\n%s Start:\t%s\n Za:\t%s\n Gotovo:\t%s%s"
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Naslov: %s\n%s Start:\t%s\nKraj:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
-msgstr ""
+msgstr "<b>Obaveza:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Događaji za %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>Događaji za %s - %s:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "Glavne postavke"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Vremenska zona"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "Uvijek možete definirati vašu lokalnu vremensku zonu."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
-msgstr ""
+msgstr "Granica arhiviranja (mjeseci)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = ne arhiviraj)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
+msgstr "Arhiviranje se koristi za uštedu vremena i mjesta kada se upravlja događajima."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Zvučna naredba"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
+msgstr "Ova naredba se prosljeđuje ljusci radi pretvaranja zvuka u alarm."
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "Prikaži postavke"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Glavni prozor kalendara"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Prozor kalendara"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Vizualni detalji kalendara"
+
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "Pokaži rubove"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "Pokaži izbornik"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Pokaži mjesec i godinu"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
 msgstr "Pokaži imena dana"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
 msgstr "Pokaži broj tjedana"
 
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr ""
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Pokaži mjesec i godinu"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Info okviri kalendara"
 
 #: ../src/parameters.c:660
+msgid "Show todo list"
+msgstr "Pokaži listu obaveza"
+
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
-msgstr ""
+msgstr "Broj dana za pokazivanje u prozoru događaja"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
-msgstr ""
+msgstr "0 = uopće ne prikazuj listu događaja"
+
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Vidljivost kalendara"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
 msgstr "Prikaži sve radne površine"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
 msgstr "Postavi na vrh"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
-msgstr ""
+msgstr "Pokaži u traci zadataka"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
-msgstr ""
+msgstr "Pokaži u dojavljivaču"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "Pokaži u traci sustava"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "Pokreni kalendar"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Pokaži"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Sakrij"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Minimizirano"
 
-#: ../src/parameters.c:793
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "Na otvaranju prozora kalendara"
+
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Odaberi današnji datum"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Odaberi prethodno odabrani datum"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Dvoklik na dan u kalendaru pokazuje"
+
+#: ../src/parameters.c:828
+msgid "Days view"
+msgstr "Pregled dana"
+
+#: ../src/parameters.c:840
+msgid "Event list"
+msgstr "Lista događaja"
+
+#: ../src/parameters.c:862
 msgid "Extra settings"
 msgstr "Dodatne postavke"
 
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr ""
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Prozor liste događaja"
 
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "Odaberi  današnji datum"
+#: ../src/parameters.c:874
+msgid "Number of extra days to show in event list"
+msgstr "Broj dodatnih dana za pokazivanje u listi događaja"
 
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
+#: ../src/parameters.c:883
+msgid ""
+"This is just the default value, you can change it in the actual eventlist "
+"window."
+msgstr "Ovo je samo zadana vrijednost, možete ju promijeniti u prozoru s listom događaja."
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Pokazuj samo prvi ponavljajući događaj"
 
-#: ../src/parameters.c:836
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Zadani prvi dan prozora s pregledom dana"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Prvi dan u tjednu"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Odabrani dan"
+
+#: ../src/parameters.c:943
 msgid "Use dynamic tray icon"
-msgstr ""
+msgstr "Koristi dinamičnu ikonu u traci"
 
-#: ../src/parameters.c:841
+#: ../src/parameters.c:948
 msgid "Use dynamic icon"
-msgstr ""
+msgstr "Koristi dinamičnu ikonu"
 
-#: ../src/parameters.c:847
+#: ../src/parameters.c:954
 msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
+msgstr "Dinamična ikona pokazuje trenutni mjesec i dan u mjesecu."
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
+#: ../src/parameters.c:962 ../src/parameters.c:967
+msgid "Use wakeup timer"
+msgstr "Koristi brojač za buđenje"
 
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr ""
+#: ../src/parameters.c:973
+msgid ""
+"Use this timer if Orage has problems waking up properly after suspend or "
+"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "Koristite ovaj vremenski brojač ako Orage ima problema prilikom buđenja sustava nakon suspenzije ili hibernacije. (Primjerice kada se ikona ne osvježi ili alarm ne pokrene.)"
 
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr "Lista događaja"
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Zadani vizualni alarm vanjske datoteke"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr "Prozor liste događaja"
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Orage prozor"
 
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr ""
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Notify obavijest"
 
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Uvijek ugasi kada se pita za zatvaranje"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Uvijek ugasi"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:1029
 msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Orage ostaje otvoren u pozadini kada ga se zatvori. Ovom opcijom možete ga natjerati da se ugasi kada odaberete zatvaranje."
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Orage osobitosti"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
 msgstr "Prvo Orage pokretanje.Traženje zadane vremenske zone."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Zadana vremenska zona postavljena na %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
 msgstr "Zadana vremenska zona nije nađena,postavite je ručno."
 
@@ -1929,36 +2136,35 @@
 msgid "Open"
 msgstr "Otvori"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Podsjetnik"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Odgodi"
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "Podsjeti me ponovno nakon određenog vremena"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
-msgstr ""
+msgstr "Slijedeći aktivni alarm:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
+msgstr "\n%02d d %02d h %02d min do: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
+msgstr "\nNije nađen aktivni alarm"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -1981,1537 +2187,2229 @@
 msgstr "Afrika/Algiers"
 
 #: ../src/timezone_names.c:41
+msgid "Africa/Asmara"
+msgstr "Afrika/Asmara"
+
+#: ../src/timezone_names.c:42
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
-#: ../src/timezone_names.c:42
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "Afrika/Banjul"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "Afrika/Cairo"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "Afrika/Conakry"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_Salaam"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "Afrika/Djibouti"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "Afrika/Douala"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Aaiun"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "Afrika/Freetown"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaborone"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "Afrika/Juba"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johannesburg"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "Afrika/Khartoum"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinshasa"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "Afrika/Libreville"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbashi"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "Afrika/Mogadishu"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovia"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndjamena"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamey"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nouakchott"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ouagadougou"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripoli"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "Afrika/Windhoek"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "Amerika"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "Amerika/Anchorage"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "Amerika/Anguilla"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "Amerika/Antigua"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "Amerika/Araguaina"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "Amerika/Argentina/Buenos_Aires"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "Amerika/Argentina/Catamarca"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "Amerika/Argentina/ComodRivadavia"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "Amerika/Argentina/Cordoba"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "Amerika/Argentina/Jujuy"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "Amerika/Argentina/La_Rioja"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "Amerika/Argentina/Mendoza"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "Amerika/Argentina/Rio_Gallegos"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "Amerika/Argentina/Salta"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "Amerika/Argentina/San_Juan"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "America/Argentina/San_Luis"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "Amerika/Argentina/Tucuman"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "America/Argentina/Ushuaia"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "Amerika/Asuncion"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "Amerika/Atikokan"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "America/Atka"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "Amerika/Bahia"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "America/Bahia_Banderas"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "Amerika/Blanc-Sablon"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "Amerika/Boise"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Cambridge_Bay"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "America/Campo_Grande"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "Amerika/Cancun"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "Amerika/Caracas"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "Amerika/Catamarca"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "Amerika/Cayenne"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "Amerika/Cayman"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "Amerika/Chicago"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "Amerika/Chihuahua"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "America/Coral_Harbour"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "Amerika/Cordoba"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "Amerika/Costa_Rica"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "Amerika/Creston"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "Amerika/Cuiaba"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "Amerika/Curacao"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "America/Danmarkshavn"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "Amerika/Dawson"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Dawson_Creek"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "Amerika/Dominica"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "Amerika/Ensenada"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "Amerika/Eirunepe"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "Amerika/Fort_Wayne"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glace_Bay"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "Amerika/Godthab"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "Amerika/Goose_Bay"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grand_Turk"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "Amerika/Guadeloupe"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "Amerika/Guatemala"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "Amerika/Guayaquil"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "Amerika/Guyana"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "Amerika/Halifax"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosillo"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indiana/Indianapolis"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indiana/Knox"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indiana/Marengo"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "Amerika/Indiana/Petersburg"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "Amerika/Indiana/Tell_City"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indiana/Vevay"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "Amerika/Indiana/Vincennes"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "Amerika/Indiana/Winamac"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "Amerika/Indianapolis"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "Amerika/Iqaluit"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "Amerika/Jamaica"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "Amerika/Jujuy"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "Amerika/Juneau"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentucky/Louisville"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentucky/Monticello"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "Amerika/Knox_IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "Amerika/Kralendijk"
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "Amerika/La_Paz"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Angeles"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "Amerika/Louisville"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "Amerika/Lower_Princes"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "Amerika/Maceio"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "Amerika/Managua"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "Amerika/Marigot"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "Amerika/Martinique"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "Amerika/Matamoros"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "Amerika/Mazatlan"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "Amerika/Menominee"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "Amerika/Metlakatla"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "Amerika/Mexico_City"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "Amerika/Miquelon"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "Amerika/Moncton"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "Amerika/Monterrey"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "Amerika/Montserrat"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "Amerika/Nome"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "Amerika/Sjeverna_Dakota/Beulah"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "Ameria/Sjeverna_Dakota/Center"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "America/North_Dakota/New_Salem"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "Amerika/Noronha"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "Amerika/Ojinaga"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "Amerika/Phoenix"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Port-au-Prince"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_of_Spain"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "America/Porto_Acre"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "Amerika/Porto_Velho"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Puerto_Rico"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "Amerika/Rainy_River"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Rankin_Inlet"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "Amerika/Recife"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "Amerika/Resolute"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branco"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "Amerika/Rosario"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "Amerika/Santa_Isabel"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "Amerika/Santarem"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "Amerika/Santiago"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo_Domingo"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao_Paulo"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "Amerika/Scoresbysund"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "Amerika/Shiprock"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "Amerika/Sitka"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "Amerika/St_Barthelemy"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "Amerika/St_Johns"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "Amerika/St_Kitts"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "Amerika/St_Lucia"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "Amerika/St_Thomas"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "Amerika/St_Vincent"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "Amerika/Swift_Current"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegucigalpa"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "Amerika/Thule"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Thunder_Bay"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "Amerika/Tijuana"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "Amerika/Toronto"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "Amerika/Vancouver"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "Amerika/Virgin"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "Amerika/Whitehorse"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "Amerika/Winnipeg"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "Amerika/Yakutat"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "Amerika/Yellowknife"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Antarktik"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Antarktik/Casey"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Antarktik/Davis"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktik/DumontDurville"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Antarktik/Macquarie"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Antarktik/Mawson"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Antarktik/McMurdo"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Antarktik/Palmer"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Antarktik/Rothera"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Antarktik/South_Pole"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "Antarktik/Syowa"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Antarktik/Vostok"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Arktik"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Arktik/Longyearbyen"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Azija"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Azija/Aden"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Azija/Almaty"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Azija/Amman"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Azija/Anadyr"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Azija/Aqtau"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Azija/Aqtobe"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "Azija/Ashgabat"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Azija/Ashkhabad"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "Azija/Bagdad"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Azija/Bahrain"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Azija/Baku"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Azija/Bangkok"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Azija/Beirut"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Azija/Bishkek"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Azija/Brunei"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Azija/Calcutta"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Azija/Choibalsan"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "/Chongqing"
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "Azija/Chungking"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Azija/Colombo"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "/Dacca"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "Azija/Damask"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Azija/Dhaka"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Azija/Dili"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Azija/Dubai"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Azija/Dushanbe"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Azija/Gaza"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Azija/Harbin"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "/Hebron"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Azija/Hong_Kong"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Azija/Ho_Ši_Min"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Azija/Hovd"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Azija/Irkutsk"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Azija/Istanbul"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Azija/Jakarta"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Azija/Jayapura"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Azija/Jeruzalem"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Azija/Kabul"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Azija/Kamčatka"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Azija/Karachi"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Azija/Kashgar"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Azija/Kathmandu"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Azija/Katmandu"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Azija/Khandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Azija/Kolkata"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Azija/Krasnoyarsk"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Azija/Kuala_Lumpur"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Azija/Kuching"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Azija/Kuwait"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Azija/Macao"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Azija/Macau"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Azija/Magadan"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Azija/Makassar"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Azija/Manila"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Azija/Muscat"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Azija/Nicosia"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Azija/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Azija/Novosibirsk"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Azija/Omsk"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Azija/Oral"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Azija/Phnom_Penh"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Azija/Pontianak"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Azija/Pyongyang"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Azija/Qatar"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Azija/Qyzylorda"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Azija/Rangoon"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Azija/Riyadh"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "/Riyadh87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "/Riyadh88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Azija/Riyadh89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Azija/saigon"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Azija/Sahalin"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Azija/Samarkand"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Azija/Seoul"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Azija/Šangaj"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Azija/Singapur"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Azija/Taipei"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Azija/Tashkent"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Azija/Tbilisi"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Azija/Teheran"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "/Thimbu"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Azija/Thimphu"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Azija/Tokio"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "Azija/Ujung_Pandang"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Azija/Ulaanbaatar"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "/Ulan_Bator"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Azija/Urumqi"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "/Ust-Nera"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Azija/Vientiane"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Azija/Vladivostok"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Azija/Yakutsk"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Azija/Yekaterinburg"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Azija/Yerevan"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Atlantik"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azori"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermuda"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Atlantik/Canary"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Cape_Verde"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "Atlantik/Faeroe"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlantik/Faroe"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantik/Jan_Mayen"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "Atlantik/Madeira"
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantik/Reykjavik"
 
-#: ../src/timezone_names.c:306
+#: ../src/timezone_names.c:375
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantik/South_Georgia"
 
-#: ../src/timezone_names.c:307
+#: ../src/timezone_names.c:376
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/St_Helena"
 
-#: ../src/timezone_names.c:308
+#: ../src/timezone_names.c:377
 msgid "Atlantic/Stanley"
 msgstr "Atlantik/Stanley"
 
-#: ../src/timezone_names.c:309
+#: ../src/timezone_names.c:378
 msgid "Australia"
 msgstr "Australija"
 
-#: ../src/timezone_names.c:310
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Australia/ACT"
+
+#: ../src/timezone_names.c:380
 msgid "Australia/Adelaide"
 msgstr "Australija/Adelaide"
 
-#: ../src/timezone_names.c:311
+#: ../src/timezone_names.c:381
 msgid "Australia/Brisbane"
 msgstr "Australija/Brisbane"
 
-#: ../src/timezone_names.c:312
+#: ../src/timezone_names.c:382
 msgid "Australia/Broken_Hill"
 msgstr "Australija/Broken_Hill"
 
-#: ../src/timezone_names.c:313
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Australia/Currie"
+
+#: ../src/timezone_names.c:384
 msgid "Australia/Darwin"
 msgstr "Australija/Darwin"
 
-#: ../src/timezone_names.c:314
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Australia/Eucla"
+
+#: ../src/timezone_names.c:386
 msgid "Australia/Hobart"
 msgstr "Australija/Hobart"
 
-#: ../src/timezone_names.c:315
+#: ../src/timezone_names.c:387
 msgid "Australia/Lindeman"
 msgstr "Australija/Lindeman"
 
-#: ../src/timezone_names.c:316
+#: ../src/timezone_names.c:388
 msgid "Australia/Lord_Howe"
 msgstr "Australija/Lord_Howe"
 
-#: ../src/timezone_names.c:317
+#: ../src/timezone_names.c:389
 msgid "Australia/Melbourne"
 msgstr "Australija/Melbourne"
 
-#: ../src/timezone_names.c:318
+#: ../src/timezone_names.c:390
 msgid "Australia/Perth"
 msgstr "Australija/Perth"
 
-#: ../src/timezone_names.c:319
+#: ../src/timezone_names.c:391
 msgid "Australia/Sydney"
 msgstr "Australija/Sydney"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brazil"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brazil/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brazil/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brazil/Istok"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brazil/Zapad"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Kanada/Atlantik"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Kanada/Centralna"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Kanada/Istok-Saskatchewan"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Kanada/istočna"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Kanada/Planine"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Kanada/Newfoundland"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Kanada/Pacifik"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Kanada/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Kanada/Yukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Čile"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Čile/Continentalni"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Čile/Uskršnji otok"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Univerzalno"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Zulu"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Europa"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Europa/Atena"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Europa/Beograd"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Europa/Berlin"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Europa/Brussels"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Europ/Bukurešt"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Europa/Budimpešta"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Europa/Busingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Europa/Copenhagen"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Europa/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Europa/Isle_of_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Europa/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Europa/Kijev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisabon"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Europa/London"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxembourg"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Europa/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Europa/Moskva"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Europa/Pariz"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Europa/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Europa/Prag"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Europa/Rim"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Europa/Sofija"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Europa/Stockholm"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Europaa/Tiraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Europa/Vatikan"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Europa/Beč"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Europa/Volgograd"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "Europa/Warsaw"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "Europa/Zurich"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Indijski ocean"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "Indijski ocean/Antananarivo"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "Indijski ocean/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "Indijski ocean/Christmas"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "Indijski ocean/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "Indijski ocean/Comoro"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "Indijski ocean/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "Indijski ocean/Mahe"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "Indijski ocean/Maldivi"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "Indijski ocean/Mauricijus"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "Indijski ocean/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "Indijski ocean/Reunion"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Meksiko"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Meksiko/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Meksiko/Općenito"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Mideast"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Bliski Istok/Riyadh87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Bliski Istok/Riyadh88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Mideast/Riyadh89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Pacifik"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "Pacifik/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Pacifik/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Pacifik/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Pacifik/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "Pacifik/Easter"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "Pacifik/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "Pacifik/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Pacifik/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "Pacifik/Fiji"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Pacifik/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Pacifik/Galapagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Pacifik/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "Pacifik/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Pacifik/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Pacifik/Honolulu"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Pacifik/Johnson"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "Pacifik/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "Pacifik/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "Pacifik/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Pacifik/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Pacifik/Marquesas"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Pacifik/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Pacifik/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Pacifik/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Pacifik/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "Pacifik/Noumea"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Pacifik/Pago_Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Pacifik/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "Pacifik/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Pacific/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "Pacifik/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Pacifik/Port_Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Pacifik/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Pacifik/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pacifik/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Pacifik/Tahiti"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Pacifik/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Pacifik/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Pacifik/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Pacifik/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Pacifik/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "Pacifik/Yap"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "US"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "US/Aljaska"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "US/Aleuti"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "US/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "US/Centralno"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "US/Istočno"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "US/East-Indiana"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "US/Havaji"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "US/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "US/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "US/Mountain"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "US/Pacifik"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "US/Pacifik-novo"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "US/Samoa"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "Novi sastanak"
@@ -3529,38 +4427,26 @@
 msgstr "Pokaži datum i vrijeme?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Kalendar"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Osobitosti Orage kalendara"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Orage osobitosti"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Postavke za  Xfce 4 kalendarski program (Orage)"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Kalendar radne površine"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Osobitosti Orage kalendara"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Kalendar"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Orage kalendar"
 
-#~ msgid "Info"
-#~ msgstr "Info"
-
-#~ msgid "Warning"
-#~ msgstr "Upozorenje"
-
-#~ msgid "Error"
-#~ msgstr "Greška"
-
-#~ msgid "Select always today"
-#~ msgstr "Odaberi uvijek danas"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Kalendar radne površine"
diff -Nru orage-4.8.3/po/hu.po orage-4.12.1/po/hu.po
--- orage-4.8.3/po/hu.po	2012-01-03 12:01:05.000000000 +0000
+++ orage-4.12.1/po/hu.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,24 +1,25 @@
-# Hungarian translation of orage
-# Copyright 2003-2009. Free Software Foundation, Inc.
-# This file is distributed under the same license as the orage package.
-#
-# SZERVÁC Attila <sas at 321 dot hu>, 2006.
-# András Mohari <mayday at mailpoint dot hu>, 2006.
-# Gabor Kelemen <kelemeng at gnome dot hu>, 2009, 2010.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# András Mohari <mayday at mailpoint dot hu>, 2006
+# Nucleo <nucleo@indamail.hu>, 2013
+# Gabor Kelemen <kelemeng at gnome dot hu>, 2009-2010
+# SZERVÁC Attila <sas at 321 dot hu>, 2006
 msgid ""
 msgstr ""
-"Project-Id-Version: orage\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2010-11-27 01:57+0100\n"
-"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
-"Language-Team: Hungarian <gnome at fsf dot hu>\n"
+"POT-Creation-Date: 2013-11-29 12:30+0100\n"
+"PO-Revision-Date: 2013-12-02 00:44+0000\n"
+"Last-Translator: Nucleo <nucleo@indamail.hu>\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/xfce/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -34,9 +35,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"kattintson az óra módosításához"
+msgstr "%s\nkattintson az óra módosításához"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -46,9 +45,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"1. gomb a beállítások módosításához\n"
-"2. gomb az órák idejének módosításához"
+msgstr "1. gomb a beállítások módosításához\n2. gomb az órák idejének módosításához"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -57,9 +54,7 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"A perc megváltoztatása. Kattintson a nyilakra a jobb gombbal az 1 percre "
-"váltáshoz."
+msgstr "A perc megváltoztatása. Kattintson a nyilakra a jobb gombbal az 1 percre váltáshoz."
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -220,8 +215,7 @@
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"A rendszer alapértelmezett betűkészletének használata a kiválasztott helyett"
+msgstr "A rendszer alapértelmezett betűkészletének használata a kiválasztott helyett"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -337,7 +331,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Hely"
@@ -398,18 +392,18 @@
 msgid "floating"
 msgstr "Lebegő"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Globális idő"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Orage globális idő"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "Különböző országok óráinak megjelenítése"
 
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Globális idő"
+
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
 msgstr "Megjelenés"
@@ -481,12 +475,7 @@
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Erre csak akkor van szükség, ha rövid idejű (5 óránál rövidebb) "
-"felfüggesztést vagy hibernálást végez és a látható idő nem tartalmazza a "
-"másodperceket. Ebben az esetben előfordulhat, hogy az Orage óra az időt "
-"helytelenül jeleníti meg, ha ez nincs kiválasztva. Ez a beállítás "
-"megakadályozza a processzor- és megszakításmentési szolgáltatások működését."
+msgstr "Erre csak akkor van szükség, ha rövid idejű (5 óránál rövidebb) felfüggesztést vagy hibernálást végez és a látható idő nem tartalmazza a másodperceket. Ebben az esetben előfordulhat, hogy az Orage óra az időt helytelenül jeleníti meg, ha ez nincs kiválasztva. Ez a beállítás megakadályozza a processzor- és megszakításmentési szolgáltatások működését."
 
 #: ../panel-plugin/oc_config.c:432
 msgid ""
@@ -498,16 +487,7 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Ez a program az strftime függvényt használja az idő lekérésére.\n"
-"Tetszőleges érvényes kód használható, az idő kívánt formátumban való "
-"megjelenítéséhez.\n"
-"Néhány gyakori kód:\n"
-"\t%A = hétköznap\t\t\t%B = hónap\n"
-"\t%c = dátum és idő\t\t\t%R = óra és perc\n"
-"\t%V = hét száma\t\t%Z = használt időzóna\n"
-"\t%H = órák \t\t\t\t%M = perc\n"
-"\t%X = helyi idő\t\t\t%x = helyi dátum"
+msgstr "Ez a program az strftime függvényt használja az idő lekérésére.\nTetszőleges érvényes kód használható, az idő kívánt formátumban való megjelenítéséhez.\nNéhány gyakori kód:\n\t%A = hétköznap\t\t\t%B = hónap\n\t%c = dátum és idő\t\t\t%R = óra és perc\n\t%V = hét száma\t\t%Z = használt időzóna\n\t%H = órák \t\t\t\t%M = perc\n\t%X = helyi idő\t\t\t%x = helyi dátum"
 
 #: ../panel-plugin/oc_config.c:457
 msgid "Orage clock Preferences"
@@ -522,7 +502,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr "%Y/%V, %B %d., %A"
@@ -538,7 +518,7 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Befejezés"
 
@@ -546,13 +526,13 @@
 msgid "Due"
 msgstr "Esedékes"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Válasszon fájlt…"
 
@@ -560,227 +540,281 @@
 msgid "Sound Files"
 msgstr "Hangfájlok"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Minden fájl"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Az értekezlet információi megváltoztak."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "Folytatni akarja?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Nem, ne lépjen ki"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Igen, módosítások elvetése és kilépés"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "Az értekezlet vége megelőzi a kezdetét."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "Nincs beállítva"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
 msgstr "Ez az értekezlet véglegesen el lesz távolítva."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Nem, mégse távolítsa el"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Igen, távolítsa el"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Válasszon dátumot"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Ma"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "Ez az értekezlet nem létezik."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
 msgstr "Valószínűleg eltávolították, frissítse a képernyőt."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Meglévő kategóriák"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Új kategória hozzáadása színnel"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Kategória:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Kategóriák színei – Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr " *** MÁSOLAT ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "Új értekezlet – Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Fájl"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "_Mentés és bezárás"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "Kettő_zés"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Mentés"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Mentés és bezárás"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Visszaállítás"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Kettőzés"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Törlés"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Szabad"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Elfoglalt"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Általános"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Típus"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Esemény"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Adott időpontban bekövetkező esemény. Például:\n"
-"Találkozó vagy születésnap vagy TV-műsor."
+msgstr "Adott időpontban bekövetkező esemény. Például:\nTalálkozó vagy születésnap vagy TV-műsor."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "Teendő"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Adott időpontban elvégzendő tevékenység. Például:\n"
-"A kocsi lemosása, vagy az Orage új verziójának tesztelése."
+msgstr "Adott időpontban elvégzendő tevékenység. Például:\nA kocsi lemosása, vagy az Orage új verziójának tesztelése."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Napló"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Feljegyzés esemény bekövetkezéséről. Például:\n"
-"Valaki felhívta vagy leesett az első hó."
+msgstr "Feljegyzés esemény bekövetkezéséről. Például:\nValaki felhívta vagy leesett az első hó."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Cím"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "Egész napos esemény"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Kezdés"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Beállítva"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Időtartam"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "nap"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "óra"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "perc"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Elérhetőség"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Befejezve"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "Kész"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Kategóriák"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Ez egy speciális kategória, az értekezlet színezésére használható a "
-"listanézetekben."
+msgstr "Ez egy speciális kategória, az értekezlet színezésére használható a listanézetekben."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "Kategóriák színeinek frissítése."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "Prioritás"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr ""
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Megjegyzés"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -789,140 +823,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"Ezek a rövid parancsok azonnal életbe lépnek:\n"
-"    <D> jelenlegi dátum beszúrása helyi dátumformátumban\n"
-"    <T> idő beszúrása\n"
-"    <DT> dátum és idő beszúrása.\n"
-"\n"
-"Ezek csak később, megjelenítésükkor kerülnek átalakításra:\n"
-"    <&Ynnnn> a jelenlegi év mínusz nnnn.\n"
-"(Ez például születésnap-emlékeztetőkben használható az adott személy "
-"életkorának meghatározására.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Ezek a rövid parancsok azonnal életbe lépnek:\n    <D> jelenlegi dátum beszúrása helyi dátumformátumban\n    <T> idő beszúrása\n    <DT> dátum és idő beszúrása.\n\nEzek csak később, megjelenítésükkor kerülnek átalakításra:\n    <&Ynnnn> a jelenlegi év mínusz nnnn.\n(Ez például születésnap-emlékeztetőkben használható az adott személy életkorának meghatározására.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "Kezdés előtt"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "Befejezés előtt"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "Kezdés után"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "Befejezés után"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Figyelmeztetés"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Figyelmeztetés ideje"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Gyakran szükség lehet figyelmeztetésre:\n"
-"– az esemény kezdete előtt\n"
-"– teendő befejezése előtt\n"
-"– teendő kezdete után"
+msgstr "Gyakran szükség lehet figyelmeztetésre:\n– az esemény kezdete előtt\n– teendő befejezése előtt\n– teendő kezdete után"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr "Folyamatos figyelmeztetés"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Az Orage akkor is emlékeztessen, ha nem volt aktív a figyelmeztetés "
-"bekövetkeztekor."
+msgstr "Az Orage akkor is emlékeztessen, ha nem volt aktív a figyelmeztetés bekövetkeztekor."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Hang"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "Használandó:"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
 msgstr "Hallható hang bekapcsolása"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "Figyelmeztető hang ismétlése"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "alkalommal"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "mp időközzel"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "Vizuális"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Orage ablak használata"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
 msgstr "Az Orage ablak használata figyelmeztetésre"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Értesítés használata"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
 msgstr "Értesítés ablak használata a figyelmeztetésre"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "Időtúllépés beállítása"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
 msgstr "Az értesítés automatikusan járjon le"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 = a rendszer alapértelmezett lejárati ideje"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "másodperc"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Eljárás"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
 msgstr "Eljárás vagy figyelmeztető parancsfájl használata"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -932,164 +950,150 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
-"Minden escape stb. karaktert magának kell megadnia.\n"
-"Ez a karakterlánc átadásra kerül feldolgozásra a parancsértelmezőnek.\n"
-"A következő speciális parancsok helyettesítésre kerülnek futás közben:\n"
-"\t<&T>  találkozó címe\n"
-"\t<&D>  találkozó leírása\n"
-"\t<&AT> értesítés ideje\n"
-"\t<&ST> találkozó kezdési ideje\n"
-"\t<&ET> találkozó befejezési ideje"
+msgstr "Minden escape stb. karaktert magának kell megadnia.\nEz a karakterlánc átadásra kerül feldolgozásra a parancsértelmezőnek.\nA következő speciális parancsok helyettesítésre kerülnek futás közben:\n\t<&T>  találkozó címe\n\t<&D>  találkozó leírása\n\t<&AT> értesítés ideje\n\t<&ST> találkozó kezdési ideje\n\t<&ET> találkozó befejezési ideje"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
 msgstr "Figyelmeztetés tesztelése az azonnali aktiválásával"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "<b>Alapértelmezett figyelmeztetés</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
 msgstr "Aktuális beállítások mentése alapértelmezett figyelmeztetésként"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
 msgstr "Aktuális beállítások betöltése az alapértelmezett figyelmeztetésből"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "None"
 msgstr "Nincs"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Naponta"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Hetente"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Havonta"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Évente"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
 msgstr "Óránként"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Hé"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Ke"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Sze"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Csü"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Pé"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "Szo"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "Vas"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Ismétlődés"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Összetettség"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Alap"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Speciális"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "Egyszerű ismétlődő esemény"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Összetett időpontok, például:\n"
-" Minden szombat és vasárnap\n"
-" Minden hónap első keddje"
+msgstr "Összetett időpontok, például:\n Minden szombat és vasárnap\n Minden hónap első keddje"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Gyakoriság"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Minden"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "alkalommal"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Gyakoriság korlátozása bizonyos időközre.\n"
-" Például: minden harmadik nap:\n"
-" Gyakoriság = naponta, intervallum = 3"
+msgstr "Gyakoriság korlátozása bizonyos időközre.\n Például: minden harmadik nap:\n Gyakoriság = naponta, intervallum = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Korlátozás"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Ismétlés végtelenségig"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Ismétlés "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Ismétlés eddig: "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Hét napjai"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "Mely napon"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1097,295 +1101,297 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Adja meg a hét napjait havi és éves eseményekhez.\n"
-" Például:\n"
-" Minden hónap második szerdája:\n"
-"\tGyakoriság = Havonta\n"
-"\tHét napjai = csak Sze\n"
-"\tMely napon = A Sze alatti mezőben adja meg a 2 értéket"
+msgstr "Adja meg a hét napjait havi és éves eseményekhez.\n Például:\n Minden hónap második szerdája:\n\tGyakoriság = Havonta\n\tHét napjai = csak Sze\n\tMely napon = A Sze alatti mezőben adja meg a 2 értéket"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr "Teendő alapja"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"A teendő rendszeresen ismétlődik a kezdési idővel kezdődően, és minden "
-"időköz után ismétlődik az utolsó befejezés idejétől függetlenül"
+msgstr "A teendő rendszeresen ismétlődik a kezdési idővel kezdődően, és minden időköz után ismétlődik az utolsó befejezés idejétől függetlenül"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"A teendő ismétlődése a befejezési időn alapul, és az utolsó befejezési "
-"időtől számított időköz eltelte után ismétlődik.\n"
-"(A teendő előzményeiről semmit nem lehet tudni, mivel az ismétlődés alapja "
-"minden befejezés után változik.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "A teendő ismétlődése a befejezési időn alapul, és az utolsó befejezési időtől számított időköz eltelte után ismétlődik.\n(A teendő előzményeiről semmit nem lehet tudni, mivel az ismétlődés alapja minden befejezés után változik.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "Kivételek"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"A lenti naptári napok kiválasztásával kivételdátumokat vehet fel.\n"
-"A kivétel kizárás(-) vagy felvétel(+) lehet, a választásától függően.\n"
-"Az adatokra kattintva eltávolíthatja azokat."
+msgstr "A lenti naptári napok kiválasztásával kivételdátumokat vehet fel.\nA kivétel kizárás(-) vagy felvétel(+) lehet, a választásától függően.\nAz adatokra kattintva eltávolíthatja azokat."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr "Kizárt dátum hozzáadása(-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-"A kizárt napok azok a teljes napok, amelyeken ez a találkozó nem jön létre"
+msgstr "A kizárt napok azok a teljes napok, amelyeken ez a találkozó nem jön létre"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
 msgstr "Felvett idő hozzáadása(+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"A felvett idők a kezdési idővel azonos időzónában lévő, de attól eltérő "
-"időpontok"
+msgstr "A felvett idők a kezdési idővel azonos időzónában lévő, de attól eltérő időpontok"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
 msgstr "Művelet dátumai"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Nézet"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "_Ugrás"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Új"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Vissza"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Ma"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Előre"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Vissza egy hetet"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Vissza egy napot"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Előre egy napot"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Előre egy hetet"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Frissítés"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Bezárás"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "Megjelenítendő napok száma"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage – napi nézet"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Egész nap"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Idő"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "Nincsenek kiválasztva sorok."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Kattintson egy sorra annak kiválasztásához, ami után másolhatja azt."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"Minden kijelölt értekezletet\n"
-"véglegesen törölni fog."
+msgstr "Minden kijelölt értekezletet\nvéglegesen törölni fog."
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Igen, távolítsa el"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Vissza"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Előre"
+
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Keresés"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "Napi nézet"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "További megjelenítendő napok "
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr ""
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr ""
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr ""
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr ""
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr ""
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "Naplóbejegyzések ettől:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Keresés"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "Keresendő szöveg:"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Jelzők"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Cím"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
-"Kattintson duplán a sorra a szerkesztéséhez.\n"
-"\n"
-"Jelzők sorrendben:\n"
-"\t 1. Figyelmeztetés: n=nincs figyelmeztetés\n"
-"\t\t A=látható figyelmeztetés S=hangos figyelmeztetés is\n"
-"\t 2. Ismétlődés: n=nincs ismétlődés\n"
-"\t\t D=napi W=heti M=havi Y=évi\n"
-"\t 3. Típus: f=szabad B=elfoglalt\n"
-"\t 4. Előfordulás fájlban:\n"
-"\t\tO=Orage A=archívum F=külső\n"
-"\t 5. Bejegyzés típusa:\n"
-"\t\tE=esemény T=teendő J=napló"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Válasszon dátumot"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tIsmétlődés befejeződött, áthelyezés archívumfájlba."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Az archiválás nem engedélyezett, kilépés."
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Archiválási küszöb: %d hónap"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tEsemények archiválása, amelyek régebbiek mint: %04d. %02d. %02d."
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Archiválási felhasználóazonosító: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tA VTODO nincs kész, nem kerül archiválásra"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tIsmétlődő. Befejezési év, hónap, nap: %04d. %02d. %02d."
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Archiválás kész\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Archívum eltávolításának megkezdése."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\t1. fázis: ismétlődő értekezletek visszaállítása"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\t2. fázis: archivált értekezletek visszaadása"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Archívumok eltávolítása kész\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Orage alapértelmezett figyelmeztetés"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
+msgid "Created alarm list for foreign file: %s (%s)"
 msgstr ""
-"Figyelmeztetéslista építése: %d figyelmeztetés felvéve. %d esemény "
-"feldolgozva."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr ""
+
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\t%d figyelmeztetés található, amiből %d aktív. (%d ismétlődő figyelmeztetés "
-"keresése kész.)"
+msgstr "\t%d figyelmeztetés található, amiből %d aktív. (%d ismétlődő figyelmeztetés keresése kész.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1403,7 +1409,16 @@
 msgid "Import file preprocessing done"
 msgstr "Importálási fájl előfeldolgozása kész"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Naptárfájlok"
 
@@ -1411,615 +1426,671 @@
 msgid "Current foreign files"
 msgstr "Aktuális külső fájlok"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "CSAK OLVASHATÓ"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "OLVASÁS-ÍRÁS"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Nincsenek külső fájlok *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr ""
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Importálás/exportálás"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Importálás"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Olvasás fájlból:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"A fájlneveket vesszővel (,) válassza el.\n"
-" MEGJEGYZÉS: az Orage számára a vessző nem érvényes karakter a fájlnevekben."
+msgstr "A fájlneveket vesszővel (,) válassza el.\n MEGJEGYZÉS: az Orage számára a vessző nem érvényes karakter a fájlnevekben."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Exportálás"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Írás fájlba:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Kijelölés"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Minden értekezlet"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Megadott értekezletek: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Csak az elsődleges fájl értekezletei lesznek beolvasva.\n"
-"Az archivált és külső események nem lesznek exportálva."
+msgstr "Csak az elsődleges fájl értekezletei lesznek beolvasva.\nAz archivált és külső események nem lesznek exportálva."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Csak az elsődleges fájl értekezletei lesznek beolvasva.\n"
-"A külső események nem lesznek exportálva."
+msgstr "Csak az elsődleges fájl értekezletei lesznek beolvasva.\nA külső események nem lesznek exportálva."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "Ezeket egyszerűen áthúzhatja az eseménylista ablakból."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "Orage értekezletek vesszőkkel elválasztott UID-jai."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Archiválás"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Archiválás most (küszöb: %d hónap)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "A beállítások közt, módosítható az archiválási küszöb"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Archívum visszaállítása most"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Az archivált események visszaállítása az elsődleges Orage fájlba és az "
-"archívumfájl eltávolítása. Ez például exportáláskor és az Orage találkozók "
-"másik rendszerre mozgatásakor hasznos."
+msgstr "Az archivált események visszaállítása az elsődleges Orage fájlba és az archívumfájl eltávolítása. Ez például exportáláskor és az Orage találkozók másik rendszerre mozgatásakor hasznos."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Orage fájlok"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Orage elsődleges naptárfájl"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Aktuális fájl"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Új fájl"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Művelet beállításai"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Csak az Orage belső fájljának átnevezése.\n"
-"Egyáltalán nem érinti a külső fájlrendszereket.\n"
-"Az új fájlnak léteznie kell."
+msgstr "Csak az Orage belső fájljának átnevezése.\nEgyáltalán nem érinti a külső fájlrendszereket.\nAz új fájlnak léteznie kell."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Másolás"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr "Aktuális fájl átmásolása és megtartása változatlanul a régi helyen."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Áthelyezés"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "Az aktuális fájl áthelyezése és törlése a régi helyről."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Fájl archiválása"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Külső fájlok"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Új külső fájl hozzáadása"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Külső fájlok:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Beállítások"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Csak olvasható"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Az Orage soha ne módosíthassa a fájlt.\n"
-"Ne feledje, hogy a külső fájlok módosítása inkompatibilissé teheti azokat az "
-"eredeti eszközzel, ahonnan származnak."
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Az Orage soha ne módosíthassa a fájlt.\nNe feledje, hogy a külső fájlok módosítása inkompatibilissé teheti azokat az eredeti eszközzel, ahonnan származnak."
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Adatcsere – Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tEz az %s %s verziója\n"
-"\n"
+msgstr "\tEz az %s %s verziója\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tKiadva a GNU General Public License feltételei szerint.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tÖsszeállítva a GTK+-%d.%d.%d használatával,"
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "fut a GTK+-%d.%d.%d használatával.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tD-Bus használatban az importáláshoz.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tA D-Bus nincs használatban. Az importálás csak részben működik.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tA libnotify használatban.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tA libnotify nincs használatban.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tAutomatikus archiválás használatban.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tAz archiválás nincs használatban.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tA libical operációs rendszerbeli verziójának használata.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tA libical Orage-beli helyi verziójának használata.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Használat: orage [kapcsolók] [fájlok]\n"
-"\n"
+msgstr "Használat: orage [kapcsolók] [fájlok]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Kapcsolók:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tAz orage verziójának megjelenítése\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tEzen súgó kiírása\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \tA beállítások ablak megjelenítése\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\tAz Orage megjelenítése/elrejtése\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) fájl [RW] \tKülső fájl hozzáadása\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) fájl \tKülső fájl eltávolítása\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
-"--export (-e) fájl [találkozó…] \ta találkozók exportálása az Orage-ből a "
-"fájlba\n"
+msgstr "--export (-e) fájl [találkozó…] \ta találkozók exportálása az Orage-ből a fájlba\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "fájlok = Az Orage-be betöltendő ical fájlok\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tAz Orage nem tartalmazza a D-Bus támogatást.\n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tA D-Bus nélkül a [fájlok] és külső fájl kapcsolók (-a és -r) csak az Orage "
-"indításakor használhatók.\n"
+msgstr "\tA D-Bus nélkül a [fájlok] és külső fájl kapcsolók (-a és -r) csak az Orage indításakor használhatók.\n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Ismeretlen kapcsoló: %s\n"
-"\n"
+msgstr "\nIsmeretlen kapcsoló: %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "A_datcsere"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Kijelölt _dátum megjelenítése"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Kijelölt _hét megjelenítése"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "_Mai nap kijelölése"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
 msgstr "Gl_obális idő megjelenítése"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Súgó"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Nincs cím megadva"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr "Hely: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\nMegjegyzés:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Soha"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
-"Cím: %s\n"
-" Kezdés:\t%s\n"
-" Kész:\t%s\n"
-"Megjegyzés:\n"
-"%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
-"Cím: %s\n"
-" Kezdés:\t%s\n"
-" Kész:\t%s\n"
-"Megjegyzés:\n"
-"%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Teendő:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>%s eseményei:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>%s eseményei – %s:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "Elsődleges beállítások"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Időzóna"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "Mindig meg kell adnia a helyi időzónáját."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "Archiválási küszöb (hónap)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = nincs archiválás)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Az archiválás célja az események kezelésekor történő idő- és helyspórolás."
+msgstr "Az archiválás célja az események kezelésekor történő idő- és helyspórolás."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Hang parancs"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-"Ezen parancs futtatása a figyelmeztetések hangjának megszólaltatásához."
+msgstr "Ezen parancs futtatása a figyelmeztetések hangjának megszólaltatásához."
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "Megjelenítési beállítások"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Naptár ablak"
 
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Naptár főablaka"
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Naptár vizuális részletek"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "Szegélyek megjelenítése"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "Menü megjelenítése"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Hónap és év megjelenítése"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
 msgstr "Napnevek megjelenítése"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
 msgstr "Hétszámok megjelenítése"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Hónap és év megjelenítése"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Naptár információs dobozok"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "Teendőlista megjelenítése"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
 msgstr "Az eseményablakban megjelenítendő napok száma"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
 msgstr "0 = ne jelenjen meg az eseménylista"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Naptár láthatóság"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
 msgstr "Megjelenítés minden asztalon"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
 msgstr "Mindig felül tartás"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "Megjelenítés a feladatsávon"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "Megjelenítés a lapozóban"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "Megjelenítés az értesítési területen"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "Naptár indítása"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Megjelenítés"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Elrejtés"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Minimalizálás"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr "További beállítások"
-
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
 msgstr "Naptár főablakának megnyitásakor"
 
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "Mai dátum kijelölése"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr "Korábban kijelölt dátum kijelölése"
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "Dinamikus értesítőikon használata"
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "Dinamikus ikon használata"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "A dinamikus ikon a hónapot és a napot jeleníti meg."
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Az elsődleges naptárra dupla kattintáskor megjelenik"
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Mai dátum kiválasztása"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Előzőleg kiválasztott dátum kiválasztása"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "A naptári napra dupla kattintáskor megjelenik"
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
 msgstr "Napi nézet"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
 msgstr "Eseménylista"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr "Eseménylista ablak"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "További beállítások"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
 msgstr "Az eseménylistában megjelenítendő további napok száma"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
+msgstr "Ez csak az alapértelmezett érték, az eseménylista ablakban módosítható."
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
 msgstr ""
-"Ez csak az alapértelmezett érték, az eseménylista ablakban módosítható."
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Napi nézet ablak alapértelmezett első napja"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Hét első napja"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Kiválasztott nap"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Dinamikus értesítőikon használata"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Dinamikus ikon használata"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "A dinamikus ikon a hónapot és a napot jeleníti meg."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
-msgstr ""
+msgstr "Ébredési időzítő használata"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "Használja ezt az időzítőt, ha az Orage nem ébred fel megfelelően felfüggesztés vagy hibernálás után. (Például a tálcaikon nem frissül, vagy az értesítések nem jelennek meg időben.)"
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr ""
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Orage ablak"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr ""
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Bezáráskor mindig lépjen ki"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Mindig lépjen ki"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Orage beállításai"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
 msgstr "Az Orage első indítása. Alapértelmezett időzóna keresése."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Az alapértelmezett időzóna beállítva: %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
 msgstr "Nem található alapértelmezett időzóna, állítsa be saját kezűleg."
 
@@ -2031,42 +2102,35 @@
 msgid "Open"
 msgstr "Megnyitás"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Emlékeztető – Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Elhalasztás"
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "Emlékeztessen a megadott idő után"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-"Nyomja meg a <Végrehajtás> gombot a megadott idő utáni ismételt "
-"emlékeztetéshez:"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Következő aktív figyelmeztetések:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d n %02d ó %02d perc eddig: %s"
+msgstr "\n%02d n %02d ó %02d perc eddig: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Nem találhatók aktív figyelmeztetések"
+msgstr "\nNem találhatók aktív figyelmeztetések"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2089,1537 +2153,2221 @@
 msgstr "Afrika/Algír"
 
 #: ../src/timezone_names.c:41
+msgid "Africa/Asmara"
+msgstr ""
+
+#: ../src/timezone_names.c:42
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
-#: ../src/timezone_names.c:42
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "Afrika/Banjul"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "Afrika/Kairó"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "Afrika/Conakry"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_Salaam"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "Afrika/Dzsibuti"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "Afrika/Douala"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Aaiun"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "Afrika/Freetown"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaborone"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr ""
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johannesburg"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "Afrika/Kartúm"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinshasa"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "Afrika/Libreville"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbashi"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "Afrika/Mogadishu"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovia"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndjamena"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamey"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nouakchott"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ouagadougou"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripoli"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "Afrika/Windhoek"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "Amerika"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "Amerika/Anchorage"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "Amerika/Anguilla"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "Amerika/Antigua"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "Amerika/Araguaina"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "Amerika/Argentína/Buenos_Aires"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "Amerika/Argentína/Catamarca"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr ""
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "Amerika/Argentína/Cordoba"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "Amerika/Argentína/Jujuy"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Tioja"
+msgstr ""
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "Amerika/Argentína/Mendoza"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr ""
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr ""
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr ""
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Lois"
+msgstr ""
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr ""
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr ""
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "Amerika/Asuncion"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr ""
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr ""
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr ""
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr ""
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr ""
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "Amerika/Boise"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Cambridge_Bay"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr ""
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "Amerika/Cancun"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "Amerika/Caracas"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "Amerika/Catamarca"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "Amerika/Cayenne"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "Amerika/Cayman"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "Amerika/Chicago"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "Amerika/Chihuahua"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr ""
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "Amerika/Cordoba"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "Amerika/Costa_Rica"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr ""
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "Amerika/Cuiaba"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "Amerika/Curacao"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "Amerika/Dawson"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Dawson_Creek"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "Amerika/Dominika"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr ""
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "Amerika/Eirunepe"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr ""
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glace_Bay"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "Amerika/Godthab"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "Amerika/Goose_Bay"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grand_Turk"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "Amerika/Guadeloupe"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "Amerika/Guatemala"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "Amerika/Guayaquil"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "Amerika/Guyana"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "Amerika/Halifax"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "Amerika/Havanna"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosillo"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indiana/Indianapolis"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indiana/Knox"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indiana/Marengo"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr ""
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr ""
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indiana/Vevay"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr ""
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr ""
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "Amerika/Indianapolis"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "Amerika/Iqaluit"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "Amerika/Jamaica"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "Amerika/Jujuy"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "Amerika/Juneau"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentucky/Louisville"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentucky/Monticello"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr ""
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr ""
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "Amerika/La_Paz"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Angeles"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "Amerika/Louisville"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr ""
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "Amerika/Maceio"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "Amerika/Managua"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr ""
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "Amerika/Martinique"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr ""
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "Amerika/Mazatlan"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "Amerika/Menominee"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr ""
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "Amerika/Mexikóváros"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "Amerika/Miquelon"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr ""
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "Amerika/Monterrey"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "Amerika/Montserrat"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "Amerika/Nome"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr ""
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr ""
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "Amerika/Noronha"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr ""
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "Amerika/Phoenix"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Port-au-Prince"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_of_Spain"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr ""
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "Amerika/Porto_Velho"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Puerto_Rico"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "Amerika/Rainy_River"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Rankin_Inlet"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "Amerika/Recife"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr ""
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branco"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "Amerika/Rosario"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr ""
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr ""
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "Amerika/Santiago"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo_Domingo"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao_Paulo"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "Amerika/Scoresbysund"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "Amerika/Shiprock"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr ""
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr ""
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "Amerika/St_Johns"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "Amerika/St_Kitts"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "Amerika/St_Lucia"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "Amerika/St_Thomas"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "Amerika/St_Vincent"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "Amerika/Swift_Current"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegucigalpa"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "Amerika/Thule"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Thunder_Bay"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "Amerika/Tijuana"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr ""
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "Amerika/Vancouver"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr ""
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "Amerika/Whitehorse"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "Amerika/Winnipeg"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "Amerika/Yakutat"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "Amerika/Yellowknife"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Antarktisz"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Antarktisz/Casey"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Antarktisz/Davis"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktisz/DumontDUrville"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr ""
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Antarktisz/Mawson"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Antarktisz/McMurdo"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Antarktisz/Palmer"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr ""
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Antarktisz/Déli_sark"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "Antarktisz/Syowa"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Antarktisz/Vosztok"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Sarkvidék"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Sarkvidék/Longyearbyen"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Ázsia"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Ázsia/Aden"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Ázsia/Almaty"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Ázsia/Amman"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Ázsia/Anadyr"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Ázsia/Aqtau"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Ázsia/Aqtobe"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "Ázsia/Ashgabat"
 
-#: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr ""
+
+#: ../src/timezone_names.c:279
+msgid "Asia/Baghdad"
 msgstr "Ázsia/Bagdad"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Ázsia/Bahrain"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Ázsia/Baku"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Ázsia/Bangkok"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Ázsia/Bejrút"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Ázsia/Bishkek"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Ázsia/Brunei"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Ázsia/Calcutta"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr ""
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr ""
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "Ázsia/Csunking"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Ázsia/Colombo"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr ""
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "Ázsia/Damaszkusz"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Ázsia/Dhaka"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Ázsia/Dili"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Ázsia/Dubai"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Ázsia/Dusanbe"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Ázsia/Gáza"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Ázsia/Harbin"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr ""
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Ázsia/Hong_Kong"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr ""
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Ázsia/Hovd"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Ázsia/Irkutszk"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Ázsia/Isztambul"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Ázsia/Jakarta"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Ázsia/Jayapura"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Ázsia/Jeruzsálem"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Ázsia/Kabul"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Ázsia/Kamcsatka"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Ázsia/Karachi"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Ázsia/Kashgar"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr ""
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Ázsia/Katmandu"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr ""
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr ""
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Ázsia/Krasznojarszk"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Ázsia/Kuala_Lumpur"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Ázsia/Kuching"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Ázsia/Kuvait"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Ázsia/Macao"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr ""
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Ázsia/Magadan"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr ""
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Ázsia/Manila"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Ázsia/Muscat"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Ázsia/Nicosia"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr ""
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Ázsia/Novoszibirszk"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Ázsia/Omszk"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr ""
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Ázsia/Phnom_Penh"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Ázsia/Pontianak"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Ázsia/Pyongyang"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Ázsia/Katar"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Ázsia/Rangoon"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Ázsia/Rijád"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr ""
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr ""
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr ""
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Ázsia/Saigon"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Ázsia/Szamarkand"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Ázsia/Szöul"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Ázsia/Sanghaj"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Ázsia/Szingapúr"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Ázsia/Taipei"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Ázsia/Taskent"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Ázsia/Tbiliszi"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Ázsia/Teherán"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr ""
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr ""
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Ázsia/Thimphu"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Ázsia/Tokió"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "Ázsia/Ujung_Pandang"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Ázsia/Ulánbátor"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr ""
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Ázsia/Urumcsi"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr ""
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Ázsia/Vientiane"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Ázsia/Vlagyivosztok"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Ázsia/Jakutszk"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Ázsia/Jekatyerinburg"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Ázsia/Jereván"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Atlanti-óceán"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Atlanti-óceán/Azori-szigetek"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Atlanti-óceán/Bermuda-szigetek"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Atlanti-óceán/Kanári-szigetek"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlanti-óceán/Zöldfoki-_szigetek"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "Atlanti-óceán/Faeroe"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr ""
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlanti-óceán/Jan_Mayen"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "Atlanti-óceán/Madeira"
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
 msgstr "Atlanti-óceán/Reykjavik"
 
-#: ../src/timezone_names.c:306
+#: ../src/timezone_names.c:375
 msgid "Atlantic/South_Georgia"
 msgstr "Atlanti-óceán/South_Georgia"
 
-#: ../src/timezone_names.c:307
+#: ../src/timezone_names.c:376
 msgid "Atlantic/St_Helena"
 msgstr "Atlanti-óceán/Szent _Ilona"
 
-#: ../src/timezone_names.c:308
+#: ../src/timezone_names.c:377
 msgid "Atlantic/Stanley"
 msgstr "Atlanti-óceán/Stanley"
 
-#: ../src/timezone_names.c:309
+#: ../src/timezone_names.c:378
 msgid "Australia"
 msgstr "Ausztrália"
 
-#: ../src/timezone_names.c:310
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr ""
+
+#: ../src/timezone_names.c:380
 msgid "Australia/Adelaide"
 msgstr "Ausztrália/Adelaide"
 
-#: ../src/timezone_names.c:311
+#: ../src/timezone_names.c:381
 msgid "Australia/Brisbane"
 msgstr "Ausztrália/Brisbane"
 
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr "Ausztrália/Broken_Hill"
+#: ../src/timezone_names.c:382
+msgid "Australia/Broken_Hill"
+msgstr "Ausztrália/Broken_Hill"
+
+#: ../src/timezone_names.c:383
+msgid "Australia/Darwin"
+msgstr "Ausztrália/Darwin"
+
+#: ../src/timezone_names.c:384
+msgid "Australia/Hobart"
+msgstr "Ausztrália/Hobart"
+
+#: ../src/timezone_names.c:385
+msgid "Australia/Lindeman"
+msgstr "Ausztrália/Lindeman"
+
+#: ../src/timezone_names.c:386
+msgid "Australia/Lord_Howe"
+msgstr "Ausztrália/Lord_Howe"
+
+#: ../src/timezone_names.c:387
+msgid "Australia/Melbourne"
+msgstr "Ausztrália/Melbourne"
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Perth"
+msgstr "Ausztrália/Perth"
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Sydney"
+msgstr "Ausztrália/Sydney"
+
+#: ../src/timezone_names.c:390
+msgid "Brazil"
+msgstr ""
+
+#: ../src/timezone_names.c:391
+msgid "Brazil/Acre"
+msgstr ""
+
+#: ../src/timezone_names.c:392
+msgid "Brazil/DeNoronha"
+msgstr ""
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/East"
+msgstr ""
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/West"
+msgstr ""
+
+#: ../src/timezone_names.c:395
+msgid "Canada"
+msgstr ""
+
+#: ../src/timezone_names.c:396
+msgid "Canada/Atlantic"
+msgstr ""
+
+#: ../src/timezone_names.c:397
+msgid "Canada/Central"
+msgstr ""
+
+#: ../src/timezone_names.c:398
+msgid "Canada/East-Saskatchewan"
+msgstr ""
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Eastern"
+msgstr ""
+
+#: ../src/timezone_names.c:400
+msgid "Canada/Mountain"
+msgstr ""
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Newfoundland"
+msgstr ""
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Pacific"
+msgstr ""
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Saskatchewan"
+msgstr ""
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Yukon"
+msgstr ""
+
+#: ../src/timezone_names.c:405
+msgid "Chile"
+msgstr ""
+
+#: ../src/timezone_names.c:406
+msgid "Chile/Continental"
+msgstr ""
+
+#: ../src/timezone_names.c:407
+msgid "Chile/EasterIsland"
+msgstr ""
+
+#: ../src/timezone_names.c:408
+msgid "Etc"
+msgstr ""
+
+#: ../src/timezone_names.c:409
+msgid "Etc/GMT"
+msgstr ""
+
+#: ../src/timezone_names.c:410
+msgid "Etc/GMT+0"
+msgstr ""
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT+1"
+msgstr ""
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+10"
+msgstr ""
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+11"
+msgstr ""
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+12"
+msgstr ""
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+2"
+msgstr ""
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+3"
+msgstr ""
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+4"
+msgstr ""
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+5"
+msgstr ""
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+6"
+msgstr ""
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+7"
+msgstr ""
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+8"
+msgstr ""
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+9"
+msgstr ""
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT-0"
+msgstr ""
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT-1"
+msgstr ""
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-10"
+msgstr ""
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-11"
+msgstr ""
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-12"
+msgstr ""
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-13"
+msgstr ""
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-14"
+msgstr ""
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-2"
+msgstr ""
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-3"
+msgstr ""
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-4"
+msgstr ""
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-5"
+msgstr ""
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-6"
+msgstr ""
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-7"
+msgstr ""
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-8"
+msgstr ""
 
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr "Ausztrália/Darwin"
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-9"
+msgstr ""
 
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr "Ausztrália/Hobart"
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT0"
+msgstr ""
 
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr "Ausztrália/Lindeman"
+#: ../src/timezone_names.c:439
+msgid "Etc/Greenwich"
+msgstr ""
 
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr "Ausztrália/Lord_Howe"
+#: ../src/timezone_names.c:440
+msgid "Etc/UCT"
+msgstr ""
 
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr "Ausztrália/Melbourne"
+#: ../src/timezone_names.c:441
+msgid "Etc/UTC"
+msgstr ""
 
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr "Ausztrália/Perth"
+#: ../src/timezone_names.c:442
+msgid "Etc/Universal"
+msgstr ""
 
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr "Ausztrália/Sydney"
+#: ../src/timezone_names.c:443
+msgid "Etc/Zulu"
+msgstr ""
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:444
 msgid "Europe"
 msgstr "Európa"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:445
 msgid "Europe/Amsterdam"
 msgstr "Európa/Amszterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:446
 msgid "Europe/Andorra"
 msgstr "Európa/Andorra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:447
 msgid "Europe/Athens"
 msgstr "Európa/Athén"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:448
 msgid "Europe/Belfast"
 msgstr "Európa/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:449
 msgid "Europe/Belgrade"
 msgstr "Európa/Belgrád"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:450
 msgid "Europe/Berlin"
 msgstr "Európa/Berlin"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:451
 msgid "Europe/Bratislava"
 msgstr "Európa/Pozsony"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:452
 msgid "Europe/Brussels"
 msgstr "Európa/Brüsszel"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:453
 msgid "Europe/Bucharest"
 msgstr "Európa/Bukarest"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:454
 msgid "Europe/Budapest"
 msgstr "Európa/Budapest"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:455
+msgid "Europe/Busingen"
+msgstr ""
+
+#: ../src/timezone_names.c:456
 msgid "Europe/Chisinau"
 msgstr "Európa/Chisinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:457
 msgid "Europe/Copenhagen"
 msgstr "Európa/Koppenhága"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:458
 msgid "Europe/Dublin"
 msgstr "Európa/Dublin"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:459
 msgid "Europe/Gibraltar"
 msgstr "Európa/Gibraltár"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:460
+msgid "Europe/Guernsey"
+msgstr ""
+
+#: ../src/timezone_names.c:461
 msgid "Europe/Helsinki"
 msgstr "Európa/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:462
+msgid "Europe/Isle_of_Man"
+msgstr ""
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Istanbul"
 msgstr "Európa/Isztambul"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:464
+msgid "Europe/Jersey"
+msgstr ""
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Kaliningrad"
 msgstr "Európa/Kalinyingrád"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:466
 msgid "Europe/Kiev"
 msgstr "Európa/Kijev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:467
 msgid "Europe/Lisbon"
 msgstr "Európa/Lisszabon"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:468
 msgid "Europe/Ljubljana"
 msgstr "Európa/Ljubljana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:469
 msgid "Europe/London"
 msgstr "Európa/London"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:470
 msgid "Europe/Luxembourg"
 msgstr "Európa/Luxemburg"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:471
 msgid "Europe/Madrid"
 msgstr "Európa/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:472
 msgid "Europe/Malta"
 msgstr "Európa/Málta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:473
+msgid "Europe/Mariehamn"
+msgstr ""
+
+#: ../src/timezone_names.c:474
 msgid "Europe/Minsk"
 msgstr "Európa/Minszk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:475
 msgid "Europe/Monaco"
 msgstr "Európa/Monaco"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:476
 msgid "Europe/Moscow"
 msgstr "Európa/Moszkva"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:477
 msgid "Europe/Nicosia"
 msgstr "Európa/Nicosia"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:478
 msgid "Europe/Oslo"
 msgstr "Európa/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:479
 msgid "Europe/Paris"
 msgstr "Európa/Párizs"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:480
+msgid "Europe/Podgorica"
+msgstr ""
+
+#: ../src/timezone_names.c:481
 msgid "Europe/Prague"
 msgstr "Európa/Prága"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:482
 msgid "Europe/Riga"
 msgstr "Európa/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:483
 msgid "Europe/Rome"
 msgstr "Európa/Róma"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:484
 msgid "Europe/Samara"
 msgstr "Európa/Szamara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:485
 msgid "Europe/San_Marino"
 msgstr "Európa/San_Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:486
 msgid "Europe/Sarajevo"
 msgstr "Európa/Szarajevó"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:487
 msgid "Europe/Simferopol"
 msgstr "Európa/Szimferopol"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:488
 msgid "Europe/Skopje"
 msgstr "Európa/Szkopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:489
 msgid "Europe/Sofia"
 msgstr "Európa/Szófia"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:490
 msgid "Europe/Stockholm"
 msgstr "Európa/Stockholm"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:491
 msgid "Europe/Tallinn"
 msgstr "Európa/Tallinn"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:492
 msgid "Europe/Tirane"
 msgstr "Európa/Tirana"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:493
+msgid "Europe/Tiraspol"
+msgstr ""
+
+#: ../src/timezone_names.c:494
 msgid "Europe/Uzhgorod"
 msgstr "Európa/Ungvár"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:495
 msgid "Europe/Vaduz"
 msgstr "Európa/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:496
 msgid "Europe/Vatican"
 msgstr "Európa/Vatikán"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:497
 msgid "Europe/Vienna"
 msgstr "Európa/Bécs"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:498
 msgid "Europe/Vilnius"
 msgstr "Európa/Vilnius"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:499
+msgid "Europe/Volgograd"
+msgstr ""
+
+#: ../src/timezone_names.c:500
 msgid "Europe/Warsaw"
 msgstr "Európa/Varsó"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:501
 msgid "Europe/Zagreb"
 msgstr "Európa/Zágráb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:502
 msgid "Europe/Zaporozhye"
 msgstr "Európa/Zaporozsje"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:503
 msgid "Europe/Zurich"
 msgstr "Európa/Zürich"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:504
 msgid "Indian"
 msgstr "Indiai-óceán"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:505
 msgid "Indian/Antananarivo"
 msgstr "Indiai-óceán/Antananarivo"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:506
 msgid "Indian/Chagos"
 msgstr "Indiai-óceán/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:507
 msgid "Indian/Christmas"
 msgstr "Indiai-óceán/Karácsony-szigetek"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:508
 msgid "Indian/Cocos"
 msgstr "Indiai-óceán/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:509
 msgid "Indian/Comoro"
 msgstr "Indiai-óceán/Comoro"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:510
 msgid "Indian/Kerguelen"
 msgstr "Indiai-óceán/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:511
 msgid "Indian/Mahe"
 msgstr "Indiai-óceán/Mahe"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:512
 msgid "Indian/Maldives"
 msgstr "Indiai-óceán/Maldív-szigetek"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:513
 msgid "Indian/Mauritius"
 msgstr "Indiai-óceán/Mauritius"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:514
 msgid "Indian/Mayotte"
 msgstr "Indiai-óceán/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:515
 msgid "Indian/Reunion"
 msgstr "Indiai-óceán/Reunion"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:516
+msgid "Mexico"
+msgstr ""
+
+#: ../src/timezone_names.c:517
+msgid "Mexico/BajaNorte"
+msgstr ""
+
+#: ../src/timezone_names.c:518
+msgid "Mexico/BajaSur"
+msgstr ""
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/General"
+msgstr ""
+
+#: ../src/timezone_names.c:520
+msgid "Mideast"
+msgstr ""
+
+#: ../src/timezone_names.c:521
+msgid "Mideast/Riyadh87"
+msgstr ""
+
+#: ../src/timezone_names.c:522
+msgid "Mideast/Riyadh88"
+msgstr ""
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh89"
+msgstr ""
+
+#: ../src/timezone_names.c:524
 msgid "Pacific"
 msgstr "Csendes-óceán"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:525
 msgid "Pacific/Apia"
 msgstr "Csendes-óceán/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:526
 msgid "Pacific/Auckland"
 msgstr "Csendes-óceán/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:527
 msgid "Pacific/Chatham"
 msgstr "Csendes-óceán/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:528
+msgid "Pacific/Chuuk"
+msgstr ""
+
+#: ../src/timezone_names.c:529
 msgid "Pacific/Easter"
 msgstr "Csendes-óceán/Húsvét-szigetek"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:530
 msgid "Pacific/Efate"
 msgstr "Csendes-óceán/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:531
 msgid "Pacific/Enderbury"
 msgstr "Csendes-óceán/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:532
 msgid "Pacific/Fakaofo"
 msgstr "Csendes-óceán/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:533
 msgid "Pacific/Fiji"
 msgstr "Csendes-óceán/Fidzsi-szigetek"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:534
 msgid "Pacific/Funafuti"
 msgstr "Csendes-óceán/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:535
 msgid "Pacific/Galapagos"
 msgstr "Csendes-óceán/Galapagos-szigetek"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:536
 msgid "Pacific/Gambier"
 msgstr "Csendes-óceán/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:537
 msgid "Pacific/Guadalcanal"
 msgstr "Csendes-óceán/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:538
 msgid "Pacific/Guam"
 msgstr "Csendes-óceán/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:539
 msgid "Pacific/Honolulu"
 msgstr "Csendes-óceán/Honolulu"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:540
 msgid "Pacific/Johnston"
 msgstr "Csendes-óceán/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:541
 msgid "Pacific/Kiritimati"
 msgstr "Csendes-óceán/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:542
 msgid "Pacific/Kosrae"
 msgstr "Csendes-óceán/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kwajalein"
 msgstr "Csendes-óceán/Kwajelein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:544
 msgid "Pacific/Majuro"
 msgstr "Csendes-óceán/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:545
 msgid "Pacific/Marquesas"
 msgstr "Csendes-óceán/Marquesas"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:546
 msgid "Pacific/Midway"
 msgstr "Csendes-óceán/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:547
 msgid "Pacific/Nauru"
 msgstr "Csendes-óceán/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:548
 msgid "Pacific/Niue"
 msgstr "Csendes-óceán/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:549
 msgid "Pacific/Norfolk"
 msgstr "Csendes-óceán/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:550
 msgid "Pacific/Noumea"
 msgstr "Csendes-óceán/Noumea"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:551
 msgid "Pacific/Pago_Pago"
 msgstr "Csendes-óceán/Pago_Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:552
 msgid "Pacific/Palau"
 msgstr "Csendes-óceán/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pitcairn"
 msgstr "Csendes-óceán/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:554
+msgid "Pacific/Pohnpei"
+msgstr ""
+
+#: ../src/timezone_names.c:555
 msgid "Pacific/Ponape"
 msgstr "Csendes-óceán/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:556
 msgid "Pacific/Port_Moresby"
 msgstr "Csendes-óceán/Port_Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:557
 msgid "Pacific/Rarotonga"
 msgstr "Csendes-óceán/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:558
 msgid "Pacific/Saipan"
 msgstr "Csendes-óceán/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:559
+msgid "Pacific/Samoa"
+msgstr ""
+
+#: ../src/timezone_names.c:560
 msgid "Pacific/Tahiti"
 msgstr "Csendes-óceán/Tahiti"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:561
 msgid "Pacific/Tarawa"
 msgstr "Csendes-óceán/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tongatapu"
 msgstr "Csendes-óceán/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:563
 msgid "Pacific/Truk"
 msgstr "Csendes-óceán/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:564
 msgid "Pacific/Wake"
 msgstr "Csendes-óceán/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:565
 msgid "Pacific/Wallis"
 msgstr "Csendes-óceán/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:566
 msgid "Pacific/Yap"
 msgstr "Csendes-óceán/Yap"
 
+#: ../src/timezone_names.c:567
+msgid "SystemV"
+msgstr ""
+
+#: ../src/timezone_names.c:568
+msgid "SystemV/AST4"
+msgstr ""
+
+#: ../src/timezone_names.c:569
+msgid "SystemV/AST4ADT"
+msgstr ""
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/CST6"
+msgstr ""
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/CST6CDT"
+msgstr ""
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/EST5"
+msgstr ""
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/EST5/EDT"
+msgstr ""
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/HST10"
+msgstr ""
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/MST7"
+msgstr ""
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/MST7/MNT"
+msgstr ""
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/PST8"
+msgstr ""
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/PST8/PDT"
+msgstr ""
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/YST9"
+msgstr ""
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/YST9/YDT"
+msgstr ""
+
+#: ../src/timezone_names.c:581
+msgid "US"
+msgstr ""
+
+#: ../src/timezone_names.c:582
+msgid "US/Alaska"
+msgstr ""
+
+#: ../src/timezone_names.c:583
+msgid "US/Aleutian"
+msgstr ""
+
+#: ../src/timezone_names.c:584
+msgid "US/Arizona"
+msgstr ""
+
+#: ../src/timezone_names.c:585
+msgid "US/Central"
+msgstr ""
+
+#: ../src/timezone_names.c:586
+msgid "US/Eastern"
+msgstr ""
+
+#: ../src/timezone_names.c:587
+msgid "US/East-Indiana"
+msgstr ""
+
+#: ../src/timezone_names.c:588
+msgid "US/Hawaii"
+msgstr ""
+
+#: ../src/timezone_names.c:589
+msgid "US/Indiana-Starke"
+msgstr ""
+
+#: ../src/timezone_names.c:590
+msgid "US/Michigan"
+msgstr ""
+
+#: ../src/timezone_names.c:591
+msgid "US/Mountain"
+msgstr ""
+
+#: ../src/timezone_names.c:592
+msgid "US/Pacific"
+msgstr ""
+
+#: ../src/timezone_names.c:593
+msgid "US/Pacific-New"
+msgstr ""
+
+#: ../src/timezone_names.c:594
+msgid "US/Samoa"
+msgstr ""
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "Új értekezlet"
@@ -3637,79 +4385,26 @@
 msgstr "Idő és dátum megjelenítése"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Naptár"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Orage naptár beállításai"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Orage beállításai"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Az Xfce 4 naptáralkalmazás (Orage) beállításai"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Asztali naptár"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Orage naptár beállításai"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Naptár"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Orage naptár"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Cím: %s\n"
-#~ " Kezdés:\t%s\n"
-#~ " Esedékes:\t%s\n"
-#~ " Kész:\t%s\n"
-#~ "Megjegyzés:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Minden escape stb. karaktert Önnek kell megadnia.\n"
-#~ "Ez a karakterlánc átadásra kerül feldolgozásra a parancsértelmezőnek."
-
-#~ msgid "Orage clock"
-#~ msgstr "Orage óra"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Eredeti készítő, visszavonult karbantartó"
-
-#~ msgid "Contributor"
-#~ msgstr "Hozzájáruló"
-
-#~ msgid "Info"
-#~ msgstr "Információk"
-
-#~ msgid "Warning"
-#~ msgstr "Figyelmeztetés"
-
-#~ msgid "Error"
-#~ msgstr "Hiba"
-
-#~ msgid "Set sticked"
-#~ msgstr "Mindig látható beállítása"
-
-#~ msgid "Select always today"
-#~ msgstr "Mindig a mai nap megjelenítése"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Az elsődleges naptár megjelenítésekor a mutató beállítása a korábban "
-#~ "kiválasztott vagy a mai napra."
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Asztali naptár"
diff -Nru orage-4.8.3/po/hy.po orage-4.12.1/po/hy.po
--- orage-4.8.3/po/hy.po	2012-01-03 12:01:05.000000000 +0000
+++ orage-4.12.1/po/hy.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,3645 +0,0 @@
-# Armenian translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Norayr Chilingaryan <norik@oric.org>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2005-09-14 01:01+0900\n"
-"Last-Translator: Norayr Chilingaryan <norik@oric.org>\n"
-"Language-Team: Armenian <en@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hy\n"
-"X-Generator: KBabel 1.9.1\n"
-
-#: ../globaltime/globaltime.c:100
-msgid "Raising GlobalTime window..."
-msgstr ""
-
-#: ../globaltime/globaltime.c:102
-msgid "GlobalTime window raise failed"
-msgstr ""
-
-#. ********** timezone tooltip **********
-#: ../globaltime/globaltime.c:277
-#, c-format
-msgid ""
-"%s\n"
-"click to modify clock"
-msgstr ""
-
-#: ../globaltime/globaltime.c:386
-msgid "Localtime"
-msgstr ""
-
-#: ../globaltime/globaltime.c:464
-msgid ""
-"button 1 to change preferences \n"
-"button 2 to adjust time of clocks"
-msgstr ""
-
-#: ../globaltime/globaltime.c:480
-msgid "adjust to change hour"
-msgstr ""
-
-#: ../globaltime/globaltime.c:496
-msgid ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
-msgid "NEW"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:289
-msgid "NEW COPY"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:310
-msgid "Not possible to delete the last clock."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:516
-msgid "update this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
-msgid "add new empty clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:526
-msgid "add new clock using this clock as model"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:531
-msgid "delete this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:539
-msgid "move this clock first"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:544
-msgid "move this clock left"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:549
-msgid "move this clock right"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:554
-msgid "move this clock last"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:562
-msgid "set the timezone of this clock to be local timezone"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
-msgid "close window and exit"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:590
-#, fuzzy
-msgid "Globaltime preferences "
-msgstr "Նախընտրանքներ"
-
-#. -----------------------HEADING-------------------------------------------
-#: ../globaltime/gt_prefs.c:603
-msgid "Clock Parameters"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:607
-msgid "Name of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:613
-msgid "enter name of clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:616
-msgid "Timezone of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:643
-msgid "Text Formatting"
-msgstr ""
-
-#. ------------------------background-------------------------
-#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
-msgid "Background color:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:656
-msgid "Click to change background colour for clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
-#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
-#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
-#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
-#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
-msgid "Use default"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
-#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
-#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
-msgid "Cross this to use default instead of selected value"
-msgstr ""
-
-#. ------------------------foreground-------------------------
-#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
-msgid "Foreground (=text) color:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:688
-msgid "Click to change foreground colour for clock"
-msgstr ""
-
-#. ------------------------name font-------------------------
-#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
-msgid "Font for name of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:720
-msgid "Click to change font for clock name"
-msgstr ""
-
-#. ------------------------time font-------------------------
-#: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
-msgid "Font for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:753
-msgid "Click to change font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:780
-msgid "Underline name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:810
-msgid "Underline time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:850
-msgid "Text Default Formatting"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:863
-msgid "Click to change default background colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
-msgid "Cross this to use system default instead of selected color"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:896
-msgid "Click to change default text colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:929
-msgid "Click to change default font for clock name"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
-msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:963
-msgid "Click to change default font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:990
-msgid "Underline for name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:1004
-msgid "Underline for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1027
-#, fuzzy
-msgid "update preferences"
-msgstr "Նախընտրանքներ"
-
-#: ../globaltime/gt_prefs.c:1062
-#, fuzzy
-msgid "Globaltime Preferences"
-msgstr "Նախընտրանքներ"
-
-#. -----------------------HEADING--------------------------------------
-#: ../globaltime/gt_prefs.c:1073
-#, fuzzy
-msgid "General Preferences"
-msgstr "Նախընտրանքներ"
-
-#: ../globaltime/gt_prefs.c:1077
-msgid "Decorations:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1078
-#, fuzzy
-msgid "Standard"
-msgstr "Xfօրացույց"
-
-#: ../globaltime/gt_prefs.c:1083
-msgid "Use normal decorations"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1094
-msgid "Do not show window decorations (borders)"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1100
-msgid "Clock size:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1101
-msgid "Equal"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1106
-msgid "All clocks have same size"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1111
-#, fuzzy
-msgid "Varying"
-msgstr "Նախազգուշացում"
-
-#: ../globaltime/gt_prefs.c:1116
-msgid "Clock sizes vary"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1122
-msgid "Local timezone:"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:101
-#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
-msgid " Other"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:156
-#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
-#, c-format
-msgid "%d hour %d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:159
-#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, c-format
-msgid "%d hour"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:161
-#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, c-format
-msgid "%d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:167
-#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
-msgid "backward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:170
-#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-msgid "forward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:194
-#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
-msgid "not changed"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:195
-#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
-msgid "not changing"
-msgstr ""
-
-#. location
-#: ../globaltime/timezone_selection.c:247
-#: ../globaltime/timezone_selection.c:252
-#: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
-#: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
-msgid "Location"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:258
-#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
-msgid "GMT Offset"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:264
-#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
-msgid "Previous/Next Change"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:269
-#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
-msgid "Country"
-msgstr ""
-
-#. We are actually setting the g_par parameter. In other words
-#. we are setting the global default timezone for Orage. This is
-#. done very seldom and we do not want to allow "floating" here.
-#. This test is ugly, but it is not worth an extra parameter.
-#. this is normal appointment
-#: ../globaltime/timezone_selection.c:299
-#: ../globaltime/timezone_selection.c:309
-#: ../panel-plugin/timezone_selection.c:300
-#: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
-#: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
-msgid "Pick timezone"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:302
-#: ../globaltime/timezone_selection.c:312
-#: ../panel-plugin/timezone_selection.c:303
-#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
-#: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
-msgid "Change mode"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:303
-#: ../globaltime/timezone_selection.c:313
-#: ../globaltime/timezone_selection.c:352
-#: ../panel-plugin/timezone_selection.c:304
-#: ../panel-plugin/timezone_selection.c:314
-#: ../panel-plugin/timezone_selection.c:353 ../src/timezone_selection.c:320
-#: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
-#: ../src/timezone_selection.c:379
-msgid "UTC"
-msgstr ""
-
-#. NOTE: this exists only if ical timezones are being used
-#: ../globaltime/timezone_selection.c:304
-#: ../globaltime/timezone_selection.c:357
-#: ../panel-plugin/timezone_selection.c:305
-#: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
-#: ../src/timezone_selection.c:384
-msgid "floating"
-msgstr ""
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "Նախընտրանքներ"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
-msgid "Orage Globaltime"
-msgstr "Xfօրացույց"
-
-#: ../globaltime/globaltime.desktop.in.h:3
-msgid "Show clocks from different countries"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:224
-msgid "Appearance"
-msgstr ""
-
-#. show frame
-#: ../panel-plugin/oc_config.c:229
-msgid "Show _frame"
-msgstr ""
-
-#. foreground color
-#: ../panel-plugin/oc_config.c:239
-msgid "set foreground _color:"
-msgstr ""
-
-#. background color
-#: ../panel-plugin/oc_config.c:253
-msgid "set _background color:"
-msgstr ""
-
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
-msgid "set _height:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:277
-msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:282
-msgid "set _width:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:293
-msgid "Note that you can not change the width of vertical panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:316
-msgid "Clock Options"
-msgstr ""
-
-#. timezone
-#: ../panel-plugin/oc_config.c:326
-msgid "set timezone to:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:347
-#, c-format
-msgid "Line %d:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:357
-msgid "Enter any valid strftime function parameter."
-msgstr ""
-
-#. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
-msgid "Tooltip:"
-msgstr ""
-
-#. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
-msgid "fix time after suspend/hibernate"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:415
-msgid ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:432
-msgid ""
-"This program uses strftime function to get time.\n"
-"Use any valid code to get time in the format you prefer.\n"
-"Some common codes are:\n"
-"\t%A = weekday\t\t\t%B = month\n"
-"\t%c = date & time\t\t%R = hour & minute\n"
-"\t%V = week number\t\t%Z = timezone in use\n"
-"\t%H = hours \t\t\t\t%M = minute\n"
-"\t%X = local time\t\t\t%x = local date"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:457
-#, fuzzy
-msgid "Orage clock Preferences"
-msgstr "Նախընտրանքներ"
-
-#. no lines yet
-#. TRANSLATORS: Use format characters from strftime(3)
-#. * to get the proper string for your locale.
-#. * I used these:
-#. * %A  : full weekday name
-#. * %d  : day of the month
-#. * %B  : full month name
-#. * %Y  : four digit year
-#. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
-msgid "%A %d %B %Y/%V"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:40
-msgid "Maintainer"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:47
-#, fuzzy
-msgid "Manage your time with Orage"
-msgstr "Կառավարեք Ձեր ժամանակը Xfce4 միջավայրի օգնությամբ"
-
-#. if (gtk_toggle_button_get_active(
-#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
-#. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
-msgid "End"
-msgstr ""
-
-#: ../src/appointment.c:333
-msgid "Due"
-msgstr ""
-
-#: ../src/appointment.c:493 ../src/mainbox.c:783
-msgid "Orage"
-msgstr ""
-
-#. to avoid timing problems when updating entry
-#. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
-msgid "Select a file..."
-msgstr ""
-
-#: ../src/appointment.c:680
-msgid "Sound Files"
-msgstr ""
-
-#: ../src/appointment.c:687 ../src/interface.c:290
-msgid "All Files"
-msgstr ""
-
-#: ../src/appointment.c:739
-#, fuzzy
-msgid "The appointment information has been modified."
-msgstr ""
-"\n"
-"Տեղեկությունները փոփոխվել են։\n"
-" Ցանկանու՞մ եք շարունակել\n"
-
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
-msgid "Do you want to continue?"
-msgstr ""
-
-#: ../src/appointment.c:767
-msgid "The end of this appointment is earlier than the beginning."
-msgstr ""
-
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-msgid "Not set"
-msgstr ""
-
-#: ../src/appointment.c:1193
-msgid "This appointment will be permanently removed."
-msgstr ""
-
-#: ../src/appointment.c:1692
-msgid "This appointment does not exist."
-msgstr ""
-
-#: ../src/appointment.c:1693
-msgid "It was probably removed, please refresh your screen."
-msgstr ""
-
-#: ../src/appointment.c:1995
-#, fuzzy
-msgid "Current categories"
-msgstr "Xfօրացույց"
-
-#: ../src/appointment.c:2010
-msgid "Add new category with color"
-msgstr ""
-
-#: ../src/appointment.c:2014
-msgid "Category:"
-msgstr ""
-
-#: ../src/appointment.c:2045
-msgid "Colors of categories - Orage"
-msgstr ""
-
-#: ../src/appointment.c:2092
-msgid " *** COPY ***"
-msgstr ""
-
-#: ../src/appointment.c:2353
-#, fuzzy
-msgid "New appointment - Orage"
-msgstr "Տեսաքցություն"
-
-#. File menu stuff
-#. ********* File menu *********
-#. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
-msgid "_File"
-msgstr "_Ֆայլ"
-
-#: ../src/appointment.c:2388
-msgid "Sav_e and close"
-msgstr ""
-
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
-msgid "D_uplicate"
-msgstr ""
-
-#: ../src/appointment.c:2589
-msgid "Save"
-msgstr ""
-
-#: ../src/appointment.c:2591
-msgid "Save and close"
-msgstr ""
-
-#: ../src/appointment.c:2596
-msgid "Revert"
-msgstr ""
-
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
-msgid "Duplicate"
-msgstr ""
-
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
-msgid "Delete"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Free"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Busy"
-msgstr ""
-
-#: ../src/appointment.c:2625
-msgid "General"
-msgstr ""
-
-#. type
-#: ../src/appointment.c:2631
-msgid "Type "
-msgstr ""
-
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
-msgid "Event"
-msgstr ""
-
-#: ../src/appointment.c:2636
-msgid ""
-"Event that will happen sometime. For example:\n"
-"Meeting or birthday or TV show."
-msgstr ""
-
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-#, fuzzy
-msgid "Todo"
-msgstr "Այսոր"
-
-#: ../src/appointment.c:2642
-msgid ""
-"Something that you should do sometime. For example:\n"
-"Wash your car or test new version of Orage."
-msgstr ""
-
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
-msgid "Journal"
-msgstr ""
-
-#: ../src/appointment.c:2649
-msgid ""
-"Make a note that something happened. For example:\n"
-"Remark that your mother called or first snow came."
-msgstr ""
-
-#. title
-#: ../src/appointment.c:2656
-msgid "Title "
-msgstr ""
-
-#: ../src/appointment.c:2671
-msgid "All day event"
-msgstr ""
-
-#. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
-msgid "Start"
-msgstr ""
-
-#: ../src/appointment.c:2697
-msgid "Set      "
-msgstr ""
-
-#: ../src/appointment.c:2718
-msgid "Duration"
-msgstr ""
-
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
-#, fuzzy
-msgid "days"
-msgstr "Այսոր"
-
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
-msgid "hours"
-msgstr ""
-
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
-msgid "mins"
-msgstr ""
-
-#. Availability (only for EVENT)
-#: ../src/appointment.c:2738
-msgid "Availability"
-msgstr ""
-
-#. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
-msgid "Completed"
-msgstr ""
-
-#: ../src/appointment.c:2749
-msgid "Done"
-msgstr ""
-
-#. categories
-#: ../src/appointment.c:2770
-msgid "Categories"
-msgstr ""
-
-#: ../src/appointment.c:2782
-msgid ""
-"This is special category, which can be used to color this appointment in "
-"list views."
-msgstr ""
-
-#: ../src/appointment.c:2787
-msgid "update colors for categories."
-msgstr ""
-
-#. priority
-#: ../src/appointment.c:2793
-msgid "Priority"
-msgstr ""
-
-#. note
-#: ../src/appointment.c:2803
-msgid "Note"
-msgstr ""
-
-#: ../src/appointment.c:2824
-msgid ""
-"These shorthand commands take effect immediately:\n"
-"    <D> inserts current date in local date format\n"
-"    <T> inserts time and\n"
-"    <DT> inserts date and time.\n"
-"\n"
-"These are converted only later when they are seen:\n"
-"    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before Start"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before End"
-msgstr ""
-
-#: ../src/appointment.c:2896
-msgid "After Start"
-msgstr ""
-
-#: ../src/appointment.c:2896
-msgid "After End"
-msgstr ""
-
-#: ../src/appointment.c:2903
-msgid "Alarm"
-msgstr ""
-
-#. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-msgid "Alarm time"
-msgstr ""
-
-#: ../src/appointment.c:2933
-msgid ""
-"Often you want to get alarm:\n"
-" 1) before Event start\n"
-" 2) before Todo end\n"
-" 3) after Todo start"
-msgstr ""
-
-#: ../src/appointment.c:2938
-msgid "Persistent alarm"
-msgstr ""
-
-#: ../src/appointment.c:2940
-msgid ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
-msgstr ""
-
-#. **** Audio Alarm ****
-#: ../src/appointment.c:2949
-msgid "Sound"
-msgstr ""
-
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
-msgid "Use"
-msgstr ""
-
-#: ../src/appointment.c:2955
-msgid "Select this if you want audible alarm"
-msgstr ""
-
-#: ../src/appointment.c:2972
-msgid "Repeat alarm sound"
-msgstr ""
-
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
-msgid "times"
-msgstr ""
-
-#: ../src/appointment.c:3004
-msgid "sec interval"
-msgstr ""
-
-#. **** Display Alarm ****
-#: ../src/appointment.c:3014
-msgid "Visual"
-msgstr ""
-
-#: ../src/appointment.c:3018
-msgid "Use Orage window"
-msgstr ""
-
-#: ../src/appointment.c:3020
-msgid "Select this if you want Orage window alarm"
-msgstr ""
-
-#: ../src/appointment.c:3032
-msgid "Use notification"
-msgstr ""
-
-#: ../src/appointment.c:3034
-msgid "Select this if you want notification alarm"
-msgstr ""
-
-#: ../src/appointment.c:3040
-msgid "Set timeout"
-msgstr ""
-
-#: ../src/appointment.c:3043
-msgid "Select this if you want notification to expire automatically"
-msgstr ""
-
-#: ../src/appointment.c:3054
-msgid "0 = system default expiration time"
-msgstr ""
-
-#: ../src/appointment.c:3059
-msgid "seconds"
-msgstr ""
-
-#. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
-msgid "Procedure"
-msgstr ""
-
-#: ../src/appointment.c:3076
-msgid "Select this if you want procedure or script alarm"
-msgstr ""
-
-#: ../src/appointment.c:3082
-msgid ""
-"You must enter all escape etc characters yourself.\n"
-"This string is just given to shell to process.\n"
-"The following special commands are replaced at run time:\n"
-"\t<&T>  appointment title\n"
-"\t<&D>  appointment description\n"
-"\t<&AT> alarm time\n"
-"\t<&ST> appointment start time\n"
-"\t<&ET> appointment end time"
-msgstr ""
-
-#: ../src/appointment.c:3094
-msgid "Test this alarm by raising it now"
-msgstr ""
-
-#: ../src/appointment.c:3101
-msgid "<b>Default alarm</b>"
-msgstr ""
-
-#: ../src/appointment.c:3109
-msgid "Store current settings as default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3114
-msgid "Set current settings from default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Daily"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Weekly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Monthly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Yearly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Hourly"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Mon"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Tue"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Wed"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Thu"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Fri"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Sat"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Sun"
-msgstr ""
-
-#: ../src/appointment.c:3183
-msgid "Recurrence"
-msgstr ""
-
-#. complexity
-#: ../src/appointment.c:3189
-msgid "Complexity"
-msgstr ""
-
-#: ../src/appointment.c:3192
-msgid "Basic"
-msgstr ""
-
-#: ../src/appointment.c:3198
-msgid "Advanced"
-msgstr ""
-
-#: ../src/appointment.c:3202
-msgid "Use this if you want regular repeating event"
-msgstr ""
-
-#: ../src/appointment.c:3204
-msgid ""
-"Use this if you need complex times like:\n"
-" Every Saturday and Sunday or \n"
-" First Tuesday every month"
-msgstr ""
-
-#. frequency
-#: ../src/appointment.c:3211
-msgid "Frequency"
-msgstr ""
-
-#: ../src/appointment.c:3217
-msgid "Each"
-msgstr ""
-
-#: ../src/appointment.c:3224
-msgid "occurrence"
-msgstr ""
-
-#: ../src/appointment.c:3228
-msgid ""
-"Limit frequency to certain interval.\n"
-" For example: Every third day:\n"
-" Frequency = Daily and Interval = 3"
-msgstr ""
-
-#: ../src/appointment.c:3274
-msgid "Limit"
-msgstr ""
-
-#: ../src/appointment.c:3276
-msgid "Repeat forever"
-msgstr ""
-
-#: ../src/appointment.c:3282
-msgid "Repeat "
-msgstr ""
-
-#: ../src/appointment.c:3298
-msgid "Repeat until "
-msgstr ""
-
-#. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-#, fuzzy
-msgid "Weekdays"
-msgstr "Այսոր"
-
-#: ../src/appointment.c:3323
-msgid "Which day"
-msgstr ""
-
-#: ../src/appointment.c:3331
-msgid ""
-"Specify which weekday for monthly and yearly events.\n"
-" For example:\n"
-" Second Wednesday each month:\n"
-"\tFrequency = Monthly,\n"
-"\tWeekdays = check only Wednesday,\n"
-"\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-
-#. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
-msgid "TODO base"
-msgstr ""
-
-#: ../src/appointment.c:3352
-msgid ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
-msgstr ""
-
-#: ../src/appointment.c:3354
-msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-
-#. exceptions
-#: ../src/appointment.c:3361
-msgid "Exceptions"
-msgstr ""
-
-#: ../src/appointment.c:3374
-msgid ""
-"Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
-"Remove by clicking the data."
-msgstr ""
-
-#: ../src/appointment.c:3379
-msgid "Add excluded date (-)"
-msgstr ""
-
-#: ../src/appointment.c:3381
-msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-
-#: ../src/appointment.c:3387
-msgid "Add included time (+)"
-msgstr ""
-
-#: ../src/appointment.c:3389
-msgid ""
-"Included times have same timezone than start time, but they may have "
-"different time"
-msgstr ""
-
-#. calendars showing the action days
-#: ../src/appointment.c:3406
-msgid "Action dates"
-msgstr ""
-
-#. ********* View menu *********
-#. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
-msgid "_View"
-msgstr ""
-
-#. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
-msgid "_Go"
-msgstr ""
-
-#: ../src/day-view.c:319 ../src/event-list.c:1110
-msgid "New"
-msgstr ""
-
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr ""
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Այսոր"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr ""
-
-#: ../src/day-view.c:333 ../src/event-list.c:1128
-msgid "Refresh"
-msgstr ""
-
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
-msgid "Close"
-msgstr ""
-
-#: ../src/day-view.c:454
-msgid "Unknown"
-msgstr ""
-
-#: ../src/day-view.c:704
-msgid "       Number of days to show"
-msgstr ""
-
-#: ../src/day-view.c:935
-#, fuzzy
-msgid "Orage - day view"
-msgstr "Xfօրացույց"
-
-#. date only appointment
-#: ../src/event-list.c:190
-msgid "All day"
-msgstr ""
-
-#: ../src/event-list.c:580 ../src/event-list.c:1281
-msgid "Time"
-msgstr ""
-
-#: ../src/event-list.c:748
-msgid "No rows have been selected."
-msgstr ""
-
-#: ../src/event-list.c:749
-msgid "Click a row to select it and after that you can copy it."
-msgstr ""
-
-#: ../src/event-list.c:918
-msgid ""
-"You will permanently remove all\n"
-"selected appointments."
-msgstr ""
-
-#: ../src/event-list.c:1130
-msgid "Find"
-msgstr ""
-
-#: ../src/event-list.c:1137
-msgid "Dayview"
-msgstr ""
-
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr ""
-
-#: ../src/event-list.c:1201
-msgid "Journal entries starting from:"
-msgstr ""
-
-#: ../src/event-list.c:1221
-msgid "Search"
-msgstr ""
-
-#: ../src/event-list.c:1224
-msgid "Search text "
-msgstr ""
-
-#: ../src/event-list.c:1289
-msgid "Flags"
-msgstr ""
-
-#: ../src/event-list.c:1297
-msgid "Title"
-msgstr ""
-
-#: ../src/event-list.c:1323
-msgid ""
-"Double click line to edit it.\n"
-"\n"
-"Flags in order:\n"
-"\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
-"\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
-"\t 3. Type: f=free B=Busy\n"
-"\t 4. Located in file:\n"
-"\t\tO=Orage A=Archive F=Foreign\n"
-"\t 5. Appointment type:\n"
-"\t\tE=Event T=Todo J=Journal"
-msgstr ""
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr ""
-
-#. remove since it has ended
-#: ../src/ical-archive.c:267
-msgid "\tRecur ended, moving to archive file."
-msgstr ""
-
-#: ../src/ical-archive.c:329
-msgid "Archiving not enabled. Exiting"
-msgstr ""
-
-#: ../src/ical-archive.c:347
-#, c-format
-msgid "Archiving threshold: %d month(s)"
-msgstr ""
-
-#. yy mon day
-#: ../src/ical-archive.c:350
-#, c-format
-msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr ""
-
-#: ../src/ical-archive.c:377
-#, c-format
-msgid "Archiving uid: %s"
-msgstr ""
-
-#. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
-msgid "\tVTODO not complete; not archived"
-msgstr ""
-
-#. it is recurrent event
-#: ../src/ical-archive.c:388
-#, c-format
-msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr ""
-
-#: ../src/ical-archive.c:405
-msgid "Archiving done\n"
-msgstr ""
-
-#. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
-msgid "Starting archive removal."
-msgstr ""
-
-#: ../src/ical-archive.c:422
-msgid "\tPHASE 1: reset recurring appointments"
-msgstr ""
-
-#. PHASE 2: go through archive file and add everything back to base orage.
-#. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
-msgid "\tPHASE 2: return archived appointments"
-msgstr ""
-
-#: ../src/ical-archive.c:470
-msgid "Archive removal done\n"
-msgstr ""
-
-#: ../src/ical-code.c:932
-msgid "Orage default alarm"
-msgstr ""
-
-#: ../src/ical-code.c:3115
-#, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-
-#: ../src/ical-code.c:3117
-#, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-
-#: ../src/ical-expimp.c:123
-msgid "Starting import file preprocessing"
-msgstr ""
-
-#: ../src/ical-expimp.c:158
-msgid "... Patched DCREATED to be CREATED."
-msgstr ""
-
-#: ../src/ical-expimp.c:197
-msgid "... Patched timezone to Orage format."
-msgstr ""
-
-#: ../src/ical-expimp.c:206
-msgid "Import file preprocessing done"
-msgstr ""
-
-#: ../src/interface.c:284
-#, fuzzy
-msgid "Calendar files"
-msgstr "Xfօրացույց"
-
-#: ../src/interface.c:631
-msgid "Current foreign files"
-msgstr ""
-
-#: ../src/interface.c:643
-msgid "READ ONLY"
-msgstr ""
-
-#: ../src/interface.c:645
-msgid "READ WRITE"
-msgstr ""
-
-#: ../src/interface.c:663
-msgid "***** No foreign files *****"
-msgstr ""
-
-#: ../src/interface.c:974
-msgid "Import/export"
-msgstr ""
-
-#: ../src/interface.c:981
-msgid "Import"
-msgstr ""
-
-#: ../src/interface.c:986
-msgid "Read from file:"
-msgstr ""
-
-#: ../src/interface.c:1003
-msgid ""
-"Separate filenames with comma(,).\n"
-" NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-
-#: ../src/interface.c:1008
-msgid "Export"
-msgstr ""
-
-#: ../src/interface.c:1013
-msgid "Write to file:"
-msgstr ""
-
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
-msgid "Select"
-msgstr "Ընտրել _Այսոր"
-
-#: ../src/interface.c:1037
-#, fuzzy
-msgid "All appointments"
-msgstr "Տեսաքցություն"
-
-#: ../src/interface.c:1050
-#, fuzzy
-msgid "Named appointments: "
-msgstr "Տեսաքցություն"
-
-#: ../src/interface.c:1062
-msgid ""
-"Note that only main file appointments are read.\n"
-"Archived and Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1065
-msgid ""
-"Note that only main file appointments are read.\n"
-"Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1068
-msgid "You can easily drag these from event-list window."
-msgstr ""
-
-#: ../src/interface.c:1070
-msgid "Orage appointment UIDs separated by commas."
-msgstr ""
-
-#: ../src/interface.c:1076
-msgid "Archive"
-msgstr ""
-
-#: ../src/interface.c:1084
-#, c-format
-msgid "Archive now (threshold: %d months)"
-msgstr ""
-
-#: ../src/interface.c:1094
-msgid "You can change archive threshold in parameters"
-msgstr ""
-
-#: ../src/interface.c:1101
-msgid "Revert archive now"
-msgstr ""
-
-#: ../src/interface.c:1107
-msgid ""
-"Return all archived events into main orage file and remove arch file.\n"
-"This is useful for example when doing export and moving orage\n"
-"appointments to another system."
-msgstr ""
-
-#: ../src/interface.c:1118
-#, fuzzy
-msgid "Orage files"
-msgstr "Նախընտրանքներ"
-
-#: ../src/interface.c:1125
-#, fuzzy
-msgid "Orage main calendar file"
-msgstr "Xfօրացույց"
-
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "Xfօրացույց"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr ""
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr ""
-
-#: ../src/interface.c:1156 ../src/interface.c:1222
-msgid "Rename"
-msgstr ""
-
-#: ../src/interface.c:1160
-msgid ""
-"Orage internal file rename only.\n"
-"Does not touch external filesystem at all.\n"
-"New file must exist."
-msgstr ""
-
-#: ../src/interface.c:1164 ../src/interface.c:1227
-msgid "Copy"
-msgstr ""
-
-#: ../src/interface.c:1168
-msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-
-#: ../src/interface.c:1172 ../src/interface.c:1232
-msgid "Move"
-msgstr ""
-
-#: ../src/interface.c:1176
-msgid "Current file is moved and vanishes from the old place."
-msgstr ""
-
-#: ../src/interface.c:1190
-msgid "Archive file"
-msgstr ""
-
-#: ../src/interface.c:1254
-msgid "Foreign files"
-msgstr ""
-
-#: ../src/interface.c:1261
-msgid "Add new foreign file"
-msgstr ""
-
-#: ../src/interface.c:1266
-msgid "Foreign file:"
-msgstr ""
-
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr ""
-
-#: ../src/interface.c:1286
-msgid "Read only"
-msgstr ""
-
-#: ../src/interface.c:1294
-msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-
-#: ../src/interface.c:1308
-msgid "Exchange data - Orage"
-msgstr ""
-
-#: ../src/main.c:268
-#, c-format
-msgid ""
-"\tThis is %s version %s\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:270
-#, c-format
-msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
-
-#: ../src/main.c:271
-#, c-format
-msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
-
-#: ../src/main.c:273
-#, c-format
-msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
-
-#: ../src/main.c:276
-#, c-format
-msgid "\tUsing DBUS for import.\n"
-msgstr ""
-
-#: ../src/main.c:278
-#, c-format
-msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
-
-#: ../src/main.c:281
-#, c-format
-msgid "\tUsing libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:283
-#, c-format
-msgid "\tNot using libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:286
-#, c-format
-msgid "\tUsing automatic archiving.\n"
-msgstr ""
-
-#: ../src/main.c:288
-#, c-format
-msgid "\tNot using archiving.\n"
-msgstr ""
-
-#: ../src/main.c:291
-#, c-format
-msgid "\tUsing operating system package libical.\n"
-msgstr ""
-
-#: ../src/main.c:293
-#, c-format
-msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
-
-#: ../src/main.c:306
-#, c-format
-msgid ""
-"Usage: orage [options] [files]\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:307
-#, c-format
-msgid "Options:\n"
-msgstr ""
-
-#: ../src/main.c:308
-#, c-format
-msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
-
-#: ../src/main.c:309
-#, c-format
-msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
-
-#: ../src/main.c:310
-#, c-format
-msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
-
-#: ../src/main.c:311
-#, c-format
-msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
-
-#: ../src/main.c:312
-#, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:313
-#, c-format
-msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:314
-#, c-format
-msgid ""
-"--export (-e) file [appointment...] \texport appointments from Orage to "
-"file\n"
-msgstr ""
-
-#: ../src/main.c:316
-#, c-format
-msgid "files=ical files to load into orage\n"
-msgstr ""
-
-#: ../src/main.c:318
-#, c-format
-msgid "\tdbus not included in orage. \n"
-msgstr ""
-
-#: ../src/main.c:319
-#, c-format
-msgid ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
-msgstr ""
-
-#: ../src/main.c:511
-#, c-format
-msgid ""
-"\n"
-"Unknown option %s\n"
-"\n"
-msgstr ""
-
-#: ../src/mainbox.c:287
-msgid "_Exchange data"
-msgstr ""
-
-#. Edit menu
-#: ../src/mainbox.c:298
-msgid "_Edit"
-msgstr ""
-
-#: ../src/mainbox.c:308
-msgid "View selected _date"
-msgstr ""
-
-#: ../src/mainbox.c:311
-msgid "View selected _week"
-msgstr ""
-
-#: ../src/mainbox.c:317
-msgid "Select _Today"
-msgstr "Ընտրել _Այսոր"
-
-#: ../src/mainbox.c:323
-#, fuzzy
-msgid "Show _Globaltime"
-msgstr "Նախընտրանքներ"
-
-#. Help menu
-#: ../src/mainbox.c:327
-msgid "_Help"
-msgstr "_Ձեռնարկ"
-
-#: ../src/mainbox.c:448
-msgid "Never"
-msgstr ""
-
-#: ../src/mainbox.c:453
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:460
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:546
-msgid "<b>To do:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:582
-#, c-format
-msgid "<b>Events for %s:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:593
-#, c-format
-msgid "<b>Events for %s - %s:</b>"
-msgstr ""
-
-#: ../src/parameters.c:522
-#, fuzzy
-msgid "Main settings"
-msgstr "_Կարգավորումներ"
-
-#: ../src/parameters.c:528
-msgid "Timezone"
-msgstr ""
-
-#: ../src/parameters.c:543
-msgid "You should always define your local timezone."
-msgstr ""
-
-#: ../src/parameters.c:552
-msgid "Archive threshold (months)"
-msgstr ""
-
-#: ../src/parameters.c:562
-msgid "(0 = no archiving)"
-msgstr ""
-
-#: ../src/parameters.c:565
-msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-
-#: ../src/parameters.c:574
-msgid "Sound command"
-msgstr ""
-
-#: ../src/parameters.c:589
-msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "_Կարգավորումներ"
-
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
-msgstr "_Փակել պատուհանը"
-
-#: ../src/parameters.c:618
-msgid "Show borders"
-msgstr ""
-
-#: ../src/parameters.c:625
-#, fuzzy
-msgid "Show menu"
-msgstr "Ցուցադրել"
-
-#: ../src/parameters.c:632
-#, fuzzy
-msgid "Show month and year"
-msgstr "Ցուցադրել"
-
-#: ../src/parameters.c:639
-#, fuzzy
-msgid "Show day names"
-msgstr "Ցուցադրել"
-
-#: ../src/parameters.c:646
-#, fuzzy
-msgid "Show week numbers"
-msgstr "Ցուցադրել"
-
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr ""
-
-#: ../src/parameters.c:660
-msgid "Number of days to show in event window"
-msgstr ""
-
-#: ../src/parameters.c:666
-msgid "0 = do not show event list at all"
-msgstr ""
-
-#: ../src/parameters.c:676
-msgid "Show on all desktops"
-msgstr ""
-
-#: ../src/parameters.c:683
-msgid "Keep on top"
-msgstr ""
-
-#: ../src/parameters.c:690
-#, fuzzy
-msgid "Show in taskbar"
-msgstr "Ցուցադրել"
-
-#: ../src/parameters.c:697
-#, fuzzy
-msgid "Show in pager"
-msgstr "Ցուցադրել"
-
-#: ../src/parameters.c:704
-#, fuzzy
-msgid "Show in systray"
-msgstr "Ցուցադրել"
-
-#: ../src/parameters.c:739
-#, fuzzy
-msgid "Calendar start"
-msgstr "Xfօրացույց"
-
-#: ../src/parameters.c:744
-msgid "Show"
-msgstr "Ցուցադրել"
-
-#: ../src/parameters.c:756
-msgid "Hide"
-msgstr "Թաքցնել"
-
-#: ../src/parameters.c:768
-msgid "Minimized"
-msgstr ""
-
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr ""
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "_Փակել պատուհանը"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "Ընտրել _Այսոր"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr ""
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
-
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr ""
-
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr ""
-
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr ""
-
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr ""
-
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
-
-#: ../src/parameters.c:921
-msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-
-#: ../src/parameters.c:938
-#, fuzzy
-msgid "Orage Preferences"
-msgstr "Նախընտրանքներ"
-
-#: ../src/parameters.c:1050
-msgid "First Orage start. Searching default timezone."
-msgstr ""
-
-#: ../src/parameters.c:1069
-#, c-format
-msgid "Default timezone set to %s."
-msgstr ""
-
-#: ../src/parameters.c:1072
-msgid "Default timezone not found, please, set it manually."
-msgstr ""
-
-#: ../src/reminder.c:562
-#, fuzzy
-msgid "Reminder "
-msgstr "Հուշիչ"
-
-#: ../src/reminder.c:591
-msgid "Open"
-msgstr ""
-
-#: ../src/reminder.c:722
-#, fuzzy
-msgid "Reminder - Orage"
-msgstr "Հուշիչ"
-
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
-
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-
-#: ../src/reminder.c:1099
-msgid "Next active alarms:"
-msgstr ""
-
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
-#, c-format
-msgid ""
-"\n"
-"%02d d %02d h %02d min to: %s"
-msgstr ""
-
-#: ../src/reminder.c:1166
-#, c-format
-msgid ""
-"\n"
-"No active alarms found"
-msgstr ""
-
-#: ../src/timezone_names.c:36
-msgid "Africa"
-msgstr ""
-
-#: ../src/timezone_names.c:37
-msgid "Africa/Abidjan"
-msgstr ""
-
-#: ../src/timezone_names.c:38
-msgid "Africa/Accra"
-msgstr ""
-
-#: ../src/timezone_names.c:39
-msgid "Africa/Addis_Ababa"
-msgstr ""
-
-#: ../src/timezone_names.c:40
-msgid "Africa/Algiers"
-msgstr ""
-
-#: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr ""
-
-#: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr ""
-
-#: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr ""
-
-#: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr ""
-
-#: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr ""
-
-#: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr ""
-
-#: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr ""
-
-#: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr ""
-
-#: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr ""
-
-#: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr ""
-
-#: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr ""
-
-#: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr ""
-
-#: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr ""
-
-#: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr ""
-
-#: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr ""
-
-#: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr ""
-
-#: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr ""
-
-#: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr ""
-
-#: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr ""
-
-#: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr ""
-
-#: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr ""
-
-#: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr ""
-
-#: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr ""
-
-#: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr ""
-
-#: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr ""
-
-#: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr ""
-
-#: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr ""
-
-#: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr ""
-
-#: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr ""
-
-#: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr ""
-
-#: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr ""
-
-#: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr ""
-
-#: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr ""
-
-#: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr ""
-
-#: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr ""
-
-#: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr ""
-
-#: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr ""
-
-#: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr ""
-
-#: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr ""
-
-#: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr ""
-
-#: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr ""
-
-#: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr ""
-
-#: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr ""
-
-#: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr ""
-
-#: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr ""
-
-#: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr ""
-
-#: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr ""
-
-#: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr ""
-
-#: ../src/timezone_names.c:89
-msgid "America"
-msgstr ""
-
-#: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr ""
-
-#: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr ""
-
-#: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr ""
-
-#: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr ""
-
-#: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr ""
-
-#: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:96
-msgid "America/Argentina/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:97
-msgid "America/Argentina/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:98
-msgid "America/Argentina/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:99
-msgid "America/Argentina/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr ""
-
-#: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr ""
-
-#: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr ""
-
-#: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr ""
-
-#: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr ""
-
-#: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr ""
-
-#: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr ""
-
-#: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr ""
-
-#: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr ""
-
-#: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr ""
-
-#: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr ""
-
-#: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr ""
-
-#: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr ""
-
-#: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr ""
-
-#: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr ""
-
-#: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr ""
-
-#: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr ""
-
-#: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr ""
-
-#: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr ""
-
-#: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr ""
-
-#: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr ""
-
-#: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr ""
-
-#: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr ""
-
-#: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr ""
-
-#: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr ""
-
-#: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr ""
-
-#: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr ""
-
-#: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr ""
-
-#: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr ""
-
-#: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr ""
-
-#: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr ""
-
-#: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr ""
-
-#: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr ""
-
-#: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr ""
-
-#: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr ""
-
-#: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr ""
-
-#: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr ""
-
-#: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr ""
-
-#: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr ""
-
-#: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr ""
-
-#: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr ""
-
-#: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr ""
-
-#: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr ""
-
-#: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr ""
-
-#: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr ""
-
-#: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr ""
-
-#: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr ""
-
-#: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr ""
-
-#: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr ""
-
-#: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr ""
-
-#: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr ""
-
-#: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr ""
-
-#: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr ""
-
-#: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr ""
-
-#: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr ""
-
-#: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr ""
-
-#: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr ""
-
-#: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr ""
-
-#: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr ""
-
-#: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr ""
-
-#: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr ""
-
-#: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr ""
-
-#: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr ""
-
-#: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr ""
-
-#: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr ""
-
-#: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr ""
-
-#: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr ""
-
-#: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr ""
-
-#: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr ""
-
-#: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr ""
-
-#: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr ""
-
-#: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr ""
-
-#: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr ""
-
-#: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr ""
-
-#: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr ""
-
-#: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr ""
-
-#: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr ""
-
-#: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr ""
-
-#: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr ""
-
-#: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr ""
-
-#: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr ""
-
-#: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr ""
-
-#: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr ""
-
-#: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr ""
-
-#: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr ""
-
-#: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr ""
-
-#: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr ""
-
-#: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr ""
-
-#: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr ""
-
-#: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr ""
-
-#: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr ""
-
-#: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr ""
-
-#: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr ""
-
-#: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr ""
-
-#: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr ""
-
-#: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr ""
-
-#: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr ""
-
-#: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr ""
-
-#: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr ""
-
-#: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr ""
-
-#: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr ""
-
-#: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr ""
-
-#: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr ""
-
-#: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr ""
-
-#: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr ""
-
-#: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr ""
-
-#: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr ""
-
-#: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr ""
-
-#: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr ""
-
-#: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr ""
-
-#: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr ""
-
-#: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr ""
-
-#: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr ""
-
-#: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr ""
-
-#: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr ""
-
-#: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr ""
-
-#: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr ""
-
-#: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr ""
-
-#: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr ""
-
-#: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr ""
-
-#: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr ""
-
-#: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr ""
-
-#: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr ""
-
-#: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr ""
-
-#: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr ""
-
-#: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr ""
-
-#: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr ""
-
-#: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr ""
-
-#: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr ""
-
-#: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr ""
-
-#: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr ""
-
-#: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr ""
-
-#: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr ""
-
-#: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr ""
-
-#: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr ""
-
-#: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr ""
-
-#: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr ""
-
-#: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr ""
-
-#: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr ""
-
-#: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr ""
-
-#: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr ""
-
-#: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr ""
-
-#: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr ""
-
-#: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr ""
-
-#: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr ""
-
-#: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr ""
-
-#: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr ""
-
-#: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr ""
-
-#: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr ""
-
-#: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr ""
-
-#: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr ""
-
-#: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr ""
-
-#: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr ""
-
-#: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr ""
-
-#: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr ""
-
-#: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr ""
-
-#: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr ""
-
-#: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr ""
-
-#: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr ""
-
-#: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr ""
-
-#: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr ""
-
-#: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr ""
-
-#: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr ""
-
-#: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr ""
-
-#: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr ""
-
-#: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr ""
-
-#: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr ""
-
-#: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr ""
-
-#: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr ""
-
-#: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr ""
-
-#: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr ""
-
-#: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr ""
-
-#: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr ""
-
-#: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr ""
-
-#: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr ""
-
-#: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr ""
-
-#: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr ""
-
-#: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr ""
-
-#: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr ""
-
-#: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr ""
-
-#: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr ""
-
-#: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr ""
-
-#: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr ""
-
-#: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr ""
-
-#: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr ""
-
-#: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr ""
-
-#: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr ""
-
-#: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr ""
-
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr ""
-
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr ""
-
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr ""
-
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr ""
-
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr ""
-
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr ""
-
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr ""
-
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr ""
-
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr ""
-
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr ""
-
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr ""
-
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr ""
-
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr ""
-
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr ""
-
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr ""
-
-#: ../src/timezone_names.c:320
-msgid "Europe"
-msgstr ""
-
-#: ../src/timezone_names.c:321
-msgid "Europe/Amsterdam"
-msgstr ""
-
-#: ../src/timezone_names.c:322
-msgid "Europe/Andorra"
-msgstr ""
-
-#: ../src/timezone_names.c:323
-msgid "Europe/Athens"
-msgstr ""
-
-#: ../src/timezone_names.c:324
-msgid "Europe/Belfast"
-msgstr ""
-
-#: ../src/timezone_names.c:325
-msgid "Europe/Belgrade"
-msgstr ""
-
-#: ../src/timezone_names.c:326
-msgid "Europe/Berlin"
-msgstr ""
-
-#: ../src/timezone_names.c:327
-msgid "Europe/Bratislava"
-msgstr ""
-
-#: ../src/timezone_names.c:328
-msgid "Europe/Brussels"
-msgstr ""
-
-#: ../src/timezone_names.c:329
-msgid "Europe/Bucharest"
-msgstr ""
-
-#: ../src/timezone_names.c:330
-msgid "Europe/Budapest"
-msgstr ""
-
-#: ../src/timezone_names.c:331
-msgid "Europe/Chisinau"
-msgstr ""
-
-#: ../src/timezone_names.c:332
-msgid "Europe/Copenhagen"
-msgstr ""
-
-#: ../src/timezone_names.c:333
-msgid "Europe/Dublin"
-msgstr ""
-
-#: ../src/timezone_names.c:334
-msgid "Europe/Gibraltar"
-msgstr ""
-
-#: ../src/timezone_names.c:335
-msgid "Europe/Helsinki"
-msgstr ""
-
-#: ../src/timezone_names.c:336
-msgid "Europe/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:337
-msgid "Europe/Kaliningrad"
-msgstr ""
-
-#: ../src/timezone_names.c:338
-msgid "Europe/Kiev"
-msgstr ""
-
-#: ../src/timezone_names.c:339
-msgid "Europe/Lisbon"
-msgstr ""
-
-#: ../src/timezone_names.c:340
-msgid "Europe/Ljubljana"
-msgstr ""
-
-#: ../src/timezone_names.c:341
-msgid "Europe/London"
-msgstr ""
-
-#: ../src/timezone_names.c:342
-msgid "Europe/Luxembourg"
-msgstr ""
-
-#: ../src/timezone_names.c:343
-msgid "Europe/Madrid"
-msgstr ""
-
-#: ../src/timezone_names.c:344
-msgid "Europe/Malta"
-msgstr ""
-
-#: ../src/timezone_names.c:345
-msgid "Europe/Minsk"
-msgstr ""
-
-#: ../src/timezone_names.c:346
-msgid "Europe/Monaco"
-msgstr ""
-
-#: ../src/timezone_names.c:347
-msgid "Europe/Moscow"
-msgstr ""
-
-#: ../src/timezone_names.c:348
-msgid "Europe/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:349
-msgid "Europe/Oslo"
-msgstr ""
-
-#: ../src/timezone_names.c:350
-msgid "Europe/Paris"
-msgstr ""
-
-#: ../src/timezone_names.c:351
-msgid "Europe/Prague"
-msgstr ""
-
-#: ../src/timezone_names.c:352
-msgid "Europe/Riga"
-msgstr ""
-
-#: ../src/timezone_names.c:353
-msgid "Europe/Rome"
-msgstr ""
-
-#: ../src/timezone_names.c:354
-msgid "Europe/Samara"
-msgstr ""
-
-#: ../src/timezone_names.c:355
-msgid "Europe/San_Marino"
-msgstr ""
-
-#: ../src/timezone_names.c:356
-msgid "Europe/Sarajevo"
-msgstr ""
-
-#: ../src/timezone_names.c:357
-msgid "Europe/Simferopol"
-msgstr ""
-
-#: ../src/timezone_names.c:358
-msgid "Europe/Skopje"
-msgstr ""
-
-#: ../src/timezone_names.c:359
-msgid "Europe/Sofia"
-msgstr ""
-
-#: ../src/timezone_names.c:360
-msgid "Europe/Stockholm"
-msgstr ""
-
-#: ../src/timezone_names.c:361
-msgid "Europe/Tallinn"
-msgstr ""
-
-#: ../src/timezone_names.c:362
-msgid "Europe/Tirane"
-msgstr ""
-
-#: ../src/timezone_names.c:363
-msgid "Europe/Uzhgorod"
-msgstr ""
-
-#: ../src/timezone_names.c:364
-msgid "Europe/Vaduz"
-msgstr ""
-
-#: ../src/timezone_names.c:365
-msgid "Europe/Vatican"
-msgstr ""
-
-#: ../src/timezone_names.c:366
-msgid "Europe/Vienna"
-msgstr ""
-
-#: ../src/timezone_names.c:367
-msgid "Europe/Vilnius"
-msgstr ""
-
-#: ../src/timezone_names.c:368
-msgid "Europe/Warsaw"
-msgstr ""
-
-#: ../src/timezone_names.c:369
-msgid "Europe/Zagreb"
-msgstr ""
-
-#: ../src/timezone_names.c:370
-msgid "Europe/Zaporozhye"
-msgstr ""
-
-#: ../src/timezone_names.c:371
-msgid "Europe/Zurich"
-msgstr ""
-
-#: ../src/timezone_names.c:372
-msgid "Indian"
-msgstr ""
-
-#: ../src/timezone_names.c:373
-msgid "Indian/Antananarivo"
-msgstr ""
-
-#: ../src/timezone_names.c:374
-msgid "Indian/Chagos"
-msgstr ""
-
-#: ../src/timezone_names.c:375
-msgid "Indian/Christmas"
-msgstr ""
-
-#: ../src/timezone_names.c:376
-msgid "Indian/Cocos"
-msgstr ""
-
-#: ../src/timezone_names.c:377
-msgid "Indian/Comoro"
-msgstr ""
-
-#: ../src/timezone_names.c:378
-msgid "Indian/Kerguelen"
-msgstr ""
-
-#: ../src/timezone_names.c:379
-msgid "Indian/Mahe"
-msgstr ""
-
-#: ../src/timezone_names.c:380
-msgid "Indian/Maldives"
-msgstr ""
-
-#: ../src/timezone_names.c:381
-msgid "Indian/Mauritius"
-msgstr ""
-
-#: ../src/timezone_names.c:382
-msgid "Indian/Mayotte"
-msgstr ""
-
-#: ../src/timezone_names.c:383
-msgid "Indian/Reunion"
-msgstr ""
-
-#: ../src/timezone_names.c:384
-msgid "Pacific"
-msgstr ""
-
-#: ../src/timezone_names.c:385
-msgid "Pacific/Apia"
-msgstr ""
-
-#: ../src/timezone_names.c:386
-msgid "Pacific/Auckland"
-msgstr ""
-
-#: ../src/timezone_names.c:387
-msgid "Pacific/Chatham"
-msgstr ""
-
-#: ../src/timezone_names.c:388
-msgid "Pacific/Easter"
-msgstr ""
-
-#: ../src/timezone_names.c:389
-msgid "Pacific/Efate"
-msgstr ""
-
-#: ../src/timezone_names.c:390
-msgid "Pacific/Enderbury"
-msgstr ""
-
-#: ../src/timezone_names.c:391
-msgid "Pacific/Fakaofo"
-msgstr ""
-
-#: ../src/timezone_names.c:392
-msgid "Pacific/Fiji"
-msgstr ""
-
-#: ../src/timezone_names.c:393
-msgid "Pacific/Funafuti"
-msgstr ""
-
-#: ../src/timezone_names.c:394
-msgid "Pacific/Galapagos"
-msgstr ""
-
-#: ../src/timezone_names.c:395
-msgid "Pacific/Gambier"
-msgstr ""
-
-#: ../src/timezone_names.c:396
-msgid "Pacific/Guadalcanal"
-msgstr ""
-
-#: ../src/timezone_names.c:397
-msgid "Pacific/Guam"
-msgstr ""
-
-#: ../src/timezone_names.c:398
-msgid "Pacific/Honolulu"
-msgstr ""
-
-#: ../src/timezone_names.c:399
-msgid "Pacific/Johnston"
-msgstr ""
-
-#: ../src/timezone_names.c:400
-msgid "Pacific/Kiritimati"
-msgstr ""
-
-#: ../src/timezone_names.c:401
-msgid "Pacific/Kosrae"
-msgstr ""
-
-#: ../src/timezone_names.c:402
-msgid "Pacific/Kwajalein"
-msgstr ""
-
-#: ../src/timezone_names.c:403
-msgid "Pacific/Majuro"
-msgstr ""
-
-#: ../src/timezone_names.c:404
-msgid "Pacific/Marquesas"
-msgstr ""
-
-#: ../src/timezone_names.c:405
-msgid "Pacific/Midway"
-msgstr ""
-
-#: ../src/timezone_names.c:406
-msgid "Pacific/Nauru"
-msgstr ""
-
-#: ../src/timezone_names.c:407
-msgid "Pacific/Niue"
-msgstr ""
-
-#: ../src/timezone_names.c:408
-msgid "Pacific/Norfolk"
-msgstr ""
-
-#: ../src/timezone_names.c:409
-msgid "Pacific/Noumea"
-msgstr ""
-
-#: ../src/timezone_names.c:410
-msgid "Pacific/Pago_Pago"
-msgstr ""
-
-#: ../src/timezone_names.c:411
-msgid "Pacific/Palau"
-msgstr ""
-
-#: ../src/timezone_names.c:412
-msgid "Pacific/Pitcairn"
-msgstr ""
-
-#: ../src/timezone_names.c:413
-msgid "Pacific/Ponape"
-msgstr ""
-
-#: ../src/timezone_names.c:414
-msgid "Pacific/Port_Moresby"
-msgstr ""
-
-#: ../src/timezone_names.c:415
-msgid "Pacific/Rarotonga"
-msgstr ""
-
-#: ../src/timezone_names.c:416
-msgid "Pacific/Saipan"
-msgstr ""
-
-#: ../src/timezone_names.c:417
-msgid "Pacific/Tahiti"
-msgstr ""
-
-#: ../src/timezone_names.c:418
-msgid "Pacific/Tarawa"
-msgstr ""
-
-#: ../src/timezone_names.c:419
-msgid "Pacific/Tongatapu"
-msgstr ""
-
-#: ../src/timezone_names.c:420
-msgid "Pacific/Truk"
-msgstr ""
-
-#: ../src/timezone_names.c:421
-msgid "Pacific/Wake"
-msgstr ""
-
-#: ../src/timezone_names.c:422
-msgid "Pacific/Wallis"
-msgstr ""
-
-#: ../src/timezone_names.c:423
-msgid "Pacific/Yap"
-msgstr ""
-
-#: ../src/tray_icon.c:469
-#, fuzzy
-msgid "New appointment"
-msgstr "Տեսաքցություն"
-
-#: ../src/tray_icon.c:485
-msgid "About Orage"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-msgid "Orage Panel Clock"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
-msgid "Show time and date?"
-msgstr "Ցուցադրել"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-#, fuzzy
-msgid "Calendar"
-msgstr "Xfօրացույց"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Նախընտրանքներ"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Նախընտրանքներ"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr ""
-
-#: ../xfcalendar.desktop.in.h:2
-#, fuzzy
-msgid "Desktop calendar"
-msgstr "Xfcalendar Ծրագրի մասին"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "Xfօրացույց"
-
-#~ msgid "Contributor"
-#~ msgstr "Աջակցող"
-
-#~ msgid "Warning"
-#~ msgstr "Նախազգուշացում"
-
-#, fuzzy
-#~ msgid "Select always today"
-#~ msgstr "Ընտրել _Այսոր"
-
-#, fuzzy
-#~ msgid "Modify Preferences"
-#~ msgstr "Նախընտրանքներ"
-
-#, fuzzy
-#~ msgid "Show event list"
-#~ msgstr "Ցուցադրել"
-
-#, fuzzy
-#~ msgid "Monday"
-#~ msgstr "Այսոր"
-
-#, fuzzy
-#~ msgid "Tuesday"
-#~ msgstr "Այսոր"
-
-#, fuzzy
-#~ msgid "Wednesday"
-#~ msgstr "Այսոր"
-
-#, fuzzy
-#~ msgid "Thursday"
-#~ msgstr "Այսոր"
-
-#, fuzzy
-#~ msgid "Friday"
-#~ msgstr "Այսոր"
-
-#, fuzzy
-#~ msgid "Sunday"
-#~ msgstr "Այսոր"
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "Այսոր"
-
-#, fuzzy
-#~ msgid "Calendar Files"
-#~ msgstr "Xfօրացույց"
-
-#, fuzzy
-#~ msgid "Calendar borders"
-#~ msgstr "Xfօրացույց"
-
-#, fuzzy
-#~ msgid "Hidden"
-#~ msgstr "Թաքցնել"
-
-#~ msgid "Core developer"
-#~ msgstr "Հիմնական մշակող"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Դուք հեռացնելու եք այս  ամսաթվի հետ \n"
-#~ "կապված բոլոր տեղեկությունները։"
-
-#~ msgid "This should not happen"
-#~ msgstr "Դա պետք է չվիճակվի"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Հնարավոր չէ ստեղծել MCS հաճախորդ ուղի"
diff -Nru orage-4.8.3/po/id.po orage-4.12.1/po/id.po
--- orage-4.8.3/po/id.po	2012-01-03 12:01:05.000000000 +0000
+++ orage-4.12.1/po/id.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,30 +1,32 @@
-# Indonesian translation of the orage package.
-# Copyright (C) 2003-2007 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Andhika Padmawan <andhika.padmawan@gmail.com>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# padmawan <andhika.padmawan@gmail.com>, 2010,2014
+# Ardjuna <Asyura.x@gmail.com>, 2013
+# Mohamad Hasan Al Banna, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Orage 4.5.9.6-svn\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2010-05-31 23:02+0700\n"
-"Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
-"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2013-12-02 18:30+0100\n"
+"PO-Revision-Date: 2014-01-25 09:46+0000\n"
+"Last-Translator: padmawan <andhika.padmawan@gmail.com>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/xfce/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 1.0\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr "Naikkan jendela WaktuGlobal..."
+msgstr "Munculkan jendela Waktu Global..."
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
-msgstr "Penaikan jendela WaktuGlobal gagal"
+msgstr "Gagal menaikan jendela Waktu Global"
 
 #. ********** timezone tooltip **********
 #: ../globaltime/globaltime.c:277
@@ -32,9 +34,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"klik untuk modifikasi jam"
+msgstr "%s\nklik untuk memodifikasi waktu"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -44,9 +44,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"tombol 1 untuk mengganti pengaturan \n"
-"tombol 2 untuk menyesuaikan waktu jam"
+msgstr "tombol 1 untuk mengganti pengaturan \ntombol 2 untuk menyesuaikan waktu jam"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -55,9 +53,7 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"sesuaikan untuk mengubah menit. Klik panah dengan tombol 2 untuk mengubah "
-"hanya satu menit."
+msgstr "sesuaikan untuk mengubah menit. Klik panah dengan tombol 2 untuk mengubah hanya satu menit."
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -69,7 +65,7 @@
 
 #: ../globaltime/gt_prefs.c:310
 msgid "Not possible to delete the last clock."
-msgstr "Tak mungkin menghapus jam terakhir."
+msgstr "Tidak diperbolehkan menghapus jam terakhir."
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
@@ -81,7 +77,7 @@
 
 #: ../globaltime/gt_prefs.c:526
 msgid "add new clock using this clock as model"
-msgstr "tambah jam baru menggunakan jam ini sebagai model"
+msgstr "tambah jam baru dengan meniru setelan pada jam ini"
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
@@ -218,8 +214,7 @@
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"Sila ini untuk menggunakan fonta standar sistem daripada fonta terpilih"
+msgstr "Sila ini untuk menggunakan fonta standar sistem daripada fonta terpilih"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -335,7 +330,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Lokasi"
@@ -396,18 +391,18 @@
 msgid "floating"
 msgstr "mengambang"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Waktu global"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Waktu Global Orage"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "Tampilkan jam dari beragam negara"
 
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Waktu Global"
+
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
 msgstr "Tampilan"
@@ -434,8 +429,7 @@
 
 #: ../panel-plugin/oc_config.c:277
 msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
-"Perlu dicatat bahwa anda tak dapat mengubah tinggi dari panel horizontal"
+msgstr "Perlu dicatat bahwa anda tak dapat mengubah tinggi dari panel horizontal"
 
 #: ../panel-plugin/oc_config.c:282
 msgid "set _width:"
@@ -480,12 +474,7 @@
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Anda hanya memerlukan ini jika anda melakukan suspensi atau hibernasi jangka "
-"pendek (kurang dari 5 jam) dan waktu anda yang tampak tidak menyertakan "
-"detik. Dalam keadaan ini dimungkinkan Orageclock menampilkan waktu secara "
-"tidak akurat kecuali anda telah memilih ini. (Memilih ini mencegah cpu dan "
-"interupsi menyimpan fitur dari pekerjaan.)"
+msgstr "Anda hanya memerlukan ini jika anda melakukan suspensi atau hibernasi jangka pendek (kurang dari 5 jam) dan waktu anda yang tampak tidak menyertakan detik. Dalam keadaan ini dimungkinkan Orageclock menampilkan waktu secara tidak akurat kecuali anda telah memilih ini. (Memilih ini mencegah cpu dan interupsi menyimpan fitur dari pekerjaan.)"
 
 #: ../panel-plugin/oc_config.c:432
 msgid ""
@@ -497,16 +486,7 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Program ini menggunakan fungsi strftime untuk mendapatkan waktu.\n"
-"Gunakan kode benar apapun untuk mendapatkan waktu dalam format yang anda "
-"inginkan.\n"
-"Beberapa kode yang umum antara lain:\n"
-"\t%A = hari kerja\t\t\t%B = bulan\n"
-"\t%c = tanggal & waktu\t\t%R = jam & menit\n"
-"\t%V = nomor minggu\t\t%Z = zona waktu yang digunakan\n"
-"\t%H = jam\t\t\t\t%M = menit\n"
-"\t%X = waktu lokal\t\t\t%x = tanggal lokal"
+msgstr "Program ini menggunakan fungsi strftime untuk mendapatkan waktu.\nGunakan kode benar apapun untuk mendapatkan waktu dalam format yang anda inginkan.\nBeberapa kode yang umum antara lain:\n\t%A = hari kerja\t\t\t%B = bulan\n\t%c = tanggal & waktu\t\t%R = jam & menit\n\t%V = nomor minggu\t\t%Z = zona waktu yang digunakan\n\t%H = jam\t\t\t\t%M = menit\n\t%X = waktu lokal\t\t\t%x = tanggal lokal"
 
 #: ../panel-plugin/oc_config.c:457
 msgid "Orage clock Preferences"
@@ -521,7 +501,6 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
@@ -537,21 +516,21 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Akhir"
 
 #: ../src/appointment.c:333
 msgid "Due"
-msgstr "Sampai"
+msgstr "Tempo"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Pilih berkas..."
 
@@ -559,227 +538,281 @@
 msgid "Sound Files"
 msgstr "Berkas Suara"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Semua Berkas"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Informasi janji telah dimodifikasi."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "Anda ingin melanjutkan?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Tidak, tetap di sini"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Ya, urungkan perubahan dan keluar"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "Akhir janji ini lebih awal dari pada awalnya."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "Tak diatur"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Tambah janji baru ke berkas ini."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Berkas standar Orage"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Penambahan janji gagal."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Galat terjadi ketika menambah janji. Lihat detail lebih rinci di berkas catatan."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Pemutakhiran janji gagal."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Lihat detail lebih rinci dari berkas catatan. (Mungkin berkas dimutakhirkan selain menggunakan Orage?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
-msgstr "Janji ini akan dihapus secara permanen."
+msgstr "Perjanjian ini akan dihapus secara permanen."
+
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Tidak, batalkan pembuangan"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Ya, boleh dibuang"
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Pilih tanggal"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Hari Ini"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
-msgstr "Janji tak ada."
+msgstr "Perjanjian tersebut tidak ditemukan."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
 msgstr "Janji mungkin telah dihapus, tolong segarkan layar anda."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Kategori saat ini"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Tambah kategori baru dengan warna"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Kategori:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Warna kategori - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr " *** SALIN ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "Janji baru - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Berkas"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "S_impan dan tutup"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "D_uplikat"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Simpan"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Simpan dan tutup"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Kembalikan"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Duplikat"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Hapus"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Bebas"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Sibuk"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Umum"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Tipe"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Even"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Even yang suatu waktu mungkin terjadi. Misalnya:\n"
-"Rapat atau ulang tahun atau acara TV."
+msgstr "Even yang suatu waktu mungkin terjadi. Misalnya:\nRapat atau ulang tahun atau acara TV."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "Untuk dikerjakan"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Sesuatu yang harus anda lakukan suatu waktu. Misalnya:\n"
-"Cuci mobil anda atau tes versi baru Orage."
+msgstr "Sesuatu yang harus anda lakukan suatu waktu. Misalnya:\nCuci mobil anda atau tes versi baru Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Jurnal"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Buat catatan tentang sesuatu yang terjadi. Misalnya:\n"
-"Catat kapan ibu anda menelepon atau turun salju pertama."
+msgstr "Buat catatan tentang sesuatu yang terjadi. Misalnya:\nCatat kapan ibu anda menelepon atau turun salju pertama."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Judul"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "Even sepanjang hari"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Mulai"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Atur      "
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Durasi"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "hari"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "jam"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "menit"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Ketersediaan"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Terselesaikan"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "Selesai"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Kategori"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Ini adalah kategori spesial, yang dapat digunakan untuk mewarnai janji ini "
-"di tampilan senarai."
+msgstr "Ini adalah kategori spesial, yang dapat digunakan untuk mewarnai janji ini di tampilan senarai."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "mutakhirkan warna untuk kategori."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "Prioritas"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Jika anda mengatur ini 8 atau lebih besar, janji TIDAK ditampilkan di daftar jendela.\nAnda dapat menggunakan fitur tersebut untuk merapikan daftar jendela, tapi membuatnya susah menemukan janji ini.\n(Alarm tetap akan berbunyi normalnya.)\n(Ada parameter yang tidak didokumentasikan sehingga anda dapat mengubah batas standar 8.)"
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Catatan"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -788,140 +821,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"Perintah jalan pintas ini akan langsung mempunyai efek:\n"
-"    <D> masukkan tanggal saat ini dalam format tanggal lokal\n"
-"    <T> masukkan waktu dan\n"
-"    <DT> masukkan tanggal dan waktu.\n"
-"\n"
-"Ini hanya akan dikonversi nanti ketika terlihat:\n"
-"    <&Ynnnn> diterjemahkan ke tahun saat ini minus nnnn.\n"
-"(Ini dapat digunakan sebagai contoh dalam pengingat ulang tahun untuk "
-"memberitahu seberapa tua seseorang nantinya.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Perintah jalan pintas ini akan langsung mempunyai efek:\n    <D> masukkan tanggal saat ini dalam format tanggal lokal\n    <T> masukkan waktu dan\n    <DT> masukkan tanggal dan waktu.\n\nIni hanya akan dikonversi nanti ketika terlihat:\n    <&Ynnnn> diterjemahkan ke tahun saat ini minus nnnn.\n(Ini dapat digunakan sebagai contoh dalam pengingat ulang tahun untuk memberitahu seberapa tua seseorang nantinya.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "Sebelum Mulai"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "Sebelum Akhir"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "Setelah Mulai"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "Setelah Akhir"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Alarm"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Waktu alarm"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Anda sering menginginkan alarm:\n"
-" 1) sebelum Even dimulai\n"
-" 2) sebelum Untuk Dikerjakan selesai\n"
-" 3) setelah Untuk Dikerjakan mulai"
+msgstr "Anda sering menginginkan alarm:\n 1) sebelum Even dimulai\n 2) sebelum Untuk Dikerjakan selesai\n 3) setelah Untuk Dikerjakan mulai"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr "Alarm persisten"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Pilih ini jika anda ingin Orage untuk mengingatkan anda bahkan ketika "
-"pengaturan ini belum diaktifkan ketika alarm berbunyi."
+msgstr "Pilih ini jika anda ingin Orage untuk mengingatkan anda bahkan ketika pengaturan ini belum diaktifkan ketika alarm berbunyi."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Suara"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "Gunakan"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
 msgstr "Pilih ini jika anda ingin alarm yang dapat didengar"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "Ulang suara alarm"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "waktu"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "detik interval"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "Visual"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Gunakan jendela Orage"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
 msgstr "Pilih ini jika anda ingin alarm jendela Orage"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Gunakan pemberitahuan"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
 msgstr "Pilih ini jika anda ingin alarm pemberitahuan"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "Atur waktu habis"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
 msgstr "Pilih ini jika anda ingin pemberitahuan untuk otomatis kadaluarsa"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 = waktu kadaluarsa standar sistem"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "detik"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Prosedur"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
 msgstr "Pilih ini jika anda ingin prosedur atau skrip alarm"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -931,156 +948,150 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
+msgstr "Anda harus memasukkan semua karakter keluar dll sendiri.\nTali ini hanya diberikan ke shell untuk diproses.\nPerintah khusus berikut diganti saat waktu berjalan:\n\t<&T> judul janji\n\t<&D> deskripsi janji\n\t<&AT> waktu alarm\n\t<&ST> waktu mulai janji\n\t<&ET> waktu akhir janji"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
 msgstr "Tes alarm ini dengan menaikkannya sekarang"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "<b>Alarm standar</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
 msgstr "Simpan pengaturan saat ini sebagai alarm standar"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
 msgstr "Atur pengaturan saat ini dari alarm standar"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "None"
 msgstr "Tak ada"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Harian"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Mingguan"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Bulanan"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Tahunan"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
-msgstr ""
+msgstr "Setiap Jam"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Sen"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Sel"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Rab"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Kam"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Jum"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "Sab"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
-msgstr "Ming"
+msgstr "Ahd"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Pengulangan"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Kompleksitas"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Dasar"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Tingkat lanjut"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "Gunakan ini jika anda ingin even berulang reguler"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Gunakan ini jika anda butuh waktu kompleks seperti:\n"
-" Setiap Sabtu dan Minggu atau \n"
-" Selasa pertama setiap bulan"
+msgstr "Gunakan ini jika anda butuh waktu kompleks seperti:\n Setiap Sabtu dan Minggu atau \n Selasa pertama setiap bulan"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Frekuensi"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Tiap"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "kejadian"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Batas frekuensi untuk interval tertentu.\n"
-" Misalnya: Tiap hari ketiga:\n"
-" Frekuensi = Harian dan Interval = 3"
+msgstr "Batas frekuensi untuk interval tertentu.\n Misalnya: Tiap hari ketiga:\n Frekuensi = Harian dan Interval = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Batas"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Ulang selamanya"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Ulang"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Ulang sampai"
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Hari kerja"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "Hari apa"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1088,293 +1099,297 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Tentukan hari kerja apa untuk even bulanan dan tahunan.\n"
-" Misalnya:\n"
-" Rabu kedua tiap bulan:\n"
-"\tFrekuensi = Bulanan,\n"
-"\tHari kerja = hanya cek Rabu,\n"
-"\tHari apa = pilih 2 dari nomor di bawah Rabu"
+msgstr "Tentukan hari kerja apa untuk even bulanan dan tahunan.\n Misalnya:\n Rabu kedua tiap bulan:\n\tFrekuensi = Bulanan,\n\tHari kerja = hanya cek Rabu,\n\tHari apa = pilih 2 dari nomor di bawah Rabu"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr "Dasar TODO"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"TODO rutin terjadi kembali dimulai sejak waktu mulai dan mengulanginya "
-"setelah tiap interval tidak perduli kapan terakhir selesainya"
+msgstr "TODO rutin terjadi kembali dimulai sejak waktu mulai dan mengulanginya setelah tiap interval tidak perduli kapan terakhir selesainya"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"TODO terjadi kembali didasarkan atas waktu lengkap dan pengulangan setelah "
-"interval dihitung dari waktu yang terakhir diselesaikan.\n"
-"(Perlu dicatat bahwa anda tidak dapat memberitahu apapun tentang riwayat "
-"TODO karena terjadi kembali berubah tiap kali selesai.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "TODO terjadi kembali didasarkan atas waktu lengkap dan pengulangan setelah interval dihitung dari waktu yang terakhir diselesaikan.\n(Perlu dicatat bahwa anda tidak dapat memberitahu apapun tentang riwayat TODO karena terjadi kembali berubah tiap kali selesai.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "Pengecualian"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"Tambah beberapa tanggal pengecualian dengan klik hari kalender di bawah.\n"
-" Pengecualian adalah baik pengecualian(-) atau penyertaan(+) tergantung dari "
-"pemilihan.\n"
-"Hapus dengan klik pada data."
+msgstr "Tambah beberapa tanggal pengecualian dengan klik hari kalender di bawah.\n Pengecualian adalah baik pengecualian(-) atau penyertaan(+) tergantung dari pemilihan.\nHapus dengan klik pada data."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr "Tambah tanggal dikecualikan (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr "Hari dikecualikan adalah hari penuh tempat janji ini tidak terjadi"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
 msgstr "Tambah waktu disertakan (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"Waktu disertakan memiliki zona waktu yang sama dengan waktu mulai, tapi "
-"mungkin memiliki waktu yang berbeda"
+msgstr "Waktu disertakan memiliki zona waktu yang sama dengan waktu mulai, tapi mungkin memiliki waktu yang berbeda"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
 msgstr "Tanggal aksi"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Tampilan"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "_Ke"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Baru"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Kembali"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Hari Ini"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Maju"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Mundur satu minggu"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Mundur satu hari"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Maju satu hari"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Maju satu minggu"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
-msgstr "Segar"
+msgstr "Segarkan"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Tutup"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Tak diketahui"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "       Jumlah hari untuk ditampilkan"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - tampilan hari"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Semua hari"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Waktu"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "Tak ada baris dipilih."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Pilih baris untuk memilih dan setelah itu anda dapat menyalinnya."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"Anda akan menghapus permanen\n"
-"semua janji terpilih."
+msgstr "Anda akan menghapus permanen\nsemua janji terpilih."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Ya, boleh dibuang"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Kembali"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Maju"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Cari"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "Tampilan hari"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Hari ekstra untuk ditampilkan"
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Hari ekstra untuk ditampilkan:"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "hanya pengulangan pertama"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Centang ini jika anda hanya ingin melihat even pengulangan pertama. Standarnya semua ditampilkan.\nDengan catatan ini juga menampilkan semua hal yang penting.\nDengan catatan even pengulangan dapat muncul sebelumnya dalam daftar karena hanya pengulangan pertama juga ditampilkan."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "juga tua"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Centang ini jika anda ingin melihat juga even lama. Ini hanya dapat dipilih setelah 'hanya pengulangan pertama' diaktifkan untuk menghindari daftar yang panjang.\nDengan catatan pilihan hari tambahan tetap menentukan jika janji baru ditampilkan."
+
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "Entri jurnal dimulai dari:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Telusur"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "Telusur teks"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Bendera"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Judul"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Klik ganda baris untuk menyuntingnya.\n"
-"\n"
-"Urutan bendera:\n"
-"\t 1. Alarm: n=tak ada alarm\n"
-"\t\t A=Alarm visual S=juga alarm Suara\n"
-"\t 2. Pengulangan: n=tak ada pengulangan\n"
-"\t\t D=Harian W=Mingguan M=Bulanan Y=Tahunan\n"
-"\t 3. Tipe: f=bebas B=Sibuk\n"
-"\t 4. Lokasi di berkas:\n"
-"\t\tO=Orage A=Arsip F=Asing\n"
-"\t 5. Tipe janji:\n"
-"\t\tE=Even T=Untuk dikerjakan J=Jurnal"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Pilih tanggal"
+msgstr "Klik ganda pada baris untuk menyunting.\n\nPanji (sesuai urutan):⏎\n⇥ 1. Alarm: n=tanpa alarm⏎\n⇥⇥ A=Alarm terpasang P=Alarm berulang terpasang⏎\n⇥ 2. Pengulangan: n=tanpa pengulangan⏎\n⇥⇥ H=Jam-an D=Harian W=Mingguan M=Bulanan Y=Tahunan⏎\n⇥ 3. Tipe: f=bebas B=Sibuk⏎\n⇥ 4. Lokasi dalam berkas:⏎\n⇥⇥O=Orage A=Arsip F=Tidak dikenal⏎\n⇥ 5. Tipe perjanjian:⏎\n⇥⇥E=Even T=Rencana J=Jurnal"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tPengulangan berakhir, pindah ke berkas arsip."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Pengarsipan tak diaktifkan. Keluar"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Mengarsipkan ambang: %d bulan"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tMengarsipkan even yang lebih tua dari: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Mengarsipkan uid: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tVTODO tak selesai: tak diarsipkan"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tPengulangan. Tahun akhir: %04d, bulan: %02d, hari: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Pengarsipan selesai\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Memulai penghapusan arsip."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tFASE 1: tata ulang pengulangan janji "
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tFASE 2: kembalikan arsip janji"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Penghapusan arsip selesai\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Alarm standar Orage"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Buat daftar alarm untuk berkas utama Orage:"
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "Bangun senarai alarm: %d alarm ditambah. %d even diproses."
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Buat daftar alarm untuk berkas asing: %s (%s)"
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\tMenambahkan %d alarm. Memproses %d peristiwa."
+
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tMenemukan %d alarm dimana %d alarm aktif. (Menelusuri %d pengulangan "
-"alarm.)"
+msgstr "\tMenemukan %d alarm dimana %d alarm aktif. (Menelusuri %d pengulangan alarm.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1392,7 +1407,16 @@
 msgid "Import file preprocessing done"
 msgstr "Impor praproses berkas selesai"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Menemukan pemutakhiran eksternal pada berkas %s."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Menyegarkan alarm dan kalender karena pemutakhiran berkas eksternal."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Berkas kalender"
 
@@ -1400,616 +1424,670 @@
 msgid "Current foreign files"
 msgstr "Berkas asing saat ini"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "HANYA BACA"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "BACA TULIS"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Tak ada berkas asing *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Penambahan berkas asing gagal"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage hanya dapat menangani 10 berkas asing. Batas tercapai."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Nama berkas kosong."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Nama kosong."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Berkas tidak ada."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Nama berkas yang sama telah ada di Orage."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Nama yang sama telah ada di Orage."
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Impor/ekspor"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Impor"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Baca dari berkas:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Pisahkan nama berkas dengan koma(,).\n"
-" CATATAN: koma bukan karakter yang sah pada nama berkas untuk Orage."
+msgstr "Pisahkan nama berkas dengan koma(,).\n CATATAN: koma bukan karakter yang sah pada nama berkas untuk Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Ekspor"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Tulis ke berkas:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Pilih"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Semua janji"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Janji yang dinamai:"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Perhatikan bahwa hanya berkas janji utama yang dibaca.\n"
-"Even Arsip dan Asing tidak diekspor."
+msgstr "Perhatikan bahwa hanya berkas janji utama yang dibaca.\nEven Arsip dan Asing tidak diekspor."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Perhatikan bahwa hanya janji utama yang dibaca.\n"
-"Even asing tidak diekspor."
+msgstr "Perhatikan bahwa hanya janji utama yang dibaca.\nEven asing tidak diekspor."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "Anda dapat dengan mudah menarik ini dari jendela senarai even."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "UID janji Orage dipisahkan oleh koma."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Arsip"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Arsip sekarang (ambang: %d bulan)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Anda dapat mengganti ambang arsip di parameter"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Ulang arsip sekarang"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Kembalikan semua even yang diarsipkan ke berkas utama orage dan hapus berkas "
-"arsitektur.\n"
-"Ini berguna sebagai contoh ketika melakukan ekspor dan memindahkan janji\n"
-"orage ke sistem lain."
+msgstr "Kembalikan semua even yang diarsipkan ke berkas utama orage dan hapus berkas arsitektur.\nIni berguna sebagai contoh ketika melakukan ekspor dan memindahkan janji\norage ke sistem lain."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Berkas Orage"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Berkas kalender utama Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Berkas saat ini"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Berkas baru"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Opsi aksi"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Berkas saat ini:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Berkas baru:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Opsi aksi:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Ganti nama"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Hanya ganti nama berkas internal Orage.\n"
-"Tak menyentuh sistem berkas eksternal sama sekali.\n"
-"Berkas baru harus ada."
+msgstr "Hanya ganti nama berkas internal Orage.\nTak menyentuh sistem berkas eksternal sama sekali.\nBerkas baru harus ada."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Salin"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-"Berkas saat ini telah tersalin dan tetap tak termodifikasi di tempat lama."
+msgstr "Berkas saat ini telah tersalin dan tetap tak termodifikasi di tempat lama."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Pindah"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "Berkas saat ini telah dipindah dan hilang dari tempat lama."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Berkas arsip"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Berkas asing"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Tambah berkas asing baru"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Berkas asing:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Opsi"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Nama terlihat:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Hanya baca"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Atur ini jika anda ingin memastikan bahwa berkas ini tak akan pernah "
-"dimodifikasi oleh Orage.\n"
-"Perlu dicatat bahwa memodifikasi berkas asing dapat menyebabkan mereka tidak "
-"cocok dengan alat aslinya, tempat mereka berasal!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Atur ini jika anda ingin memastikan bahwa berkas ini tak akan pernah dimodifikasi oleh Orage.\nPerlu dicatat bahwa memodifikasi berkas asing dapat menyebabkan mereka tidak cocok dengan alat aslinya, tempat mereka berasal!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Nama internal ini ditampilkan ke pengguna ketimbang nama berkas."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Pertukaran data - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tIni adalah %s versi %s\n"
-"\n"
+msgstr "\tIni adalah %s versi %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tDirilis di bawah Lisensi Publik Umum GNU.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tDikompilasi kontra GTK+-%d.%d.%d,"
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "menggunakan GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tMenggunakan DBUS untuk impor.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tTak menggunakan DBUS. Impor hanya bekerja sebagian.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tMenggunakan libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tTak menggunakan libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tMenggunakan pengarsipan otomatis.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tTak menggunakan pengarsipan.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tMenggunakan paket sistem operasi libical.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tMenggunakan versi lokal Orage liblical.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Penggunaan: orage [opsi] [berkas]\n"
-"\n"
+msgstr "Penggunaan: orage [opsi] [berkas]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Opsi:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--versi (-v) \t\ttampilkan versi orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tcetak teks ini\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \ttampilkan bentuk pengaturan\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\tbuat orage terlihat\tak terlihat\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) berkas [RW] \ttambah berkas asing\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) berkas [RW] [nama] \ttambah berkas asing\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) berkas \thapus berkas asing\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--export (-e) berkas [janji...] \texport janji dari Orage ke berkas\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "berkas=berkas ical untuk dimuat ke dalam orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tdbus tak disertakan dalam orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\ttanpa dbus [berkas] dan opsi berkas asing(-a & -r) hanya dapat digunakan "
-"ketikamemulai orage \n"
+msgstr "\ttanpa dbus [berkas] dan opsi berkas asing(-a & -r) hanya dapat digunakan ketikamemulai orage \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Opsi %s tak diketahui\n"
-"\n"
+msgstr "\nOpsi %s tak diketahui\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Pertukaran data"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Sunting"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Tampilkan _tanggal terpilih"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Tampilkan _minggu terpilih"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Pilih _Hari Ini"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
 msgstr "Tampilkan Waktu _Global"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "Ba_ntuan"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Belum ada judul"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr "Lokasi: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\nCatatan:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Tak pernah"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Judul: %s\n"
-" Mulai:\t%s\n"
-" Selesai:\t%s\n"
-" Catatan:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "Judul: %s\n%s Mulai:\t%s\nTempo:\t%s\nSelesai:\t%s%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Judul: %s\n"
-" Mulai:\t%s\n"
-" Selesai:\t%s\n"
-" Catatan:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Judul: %s\n%s Mulai:\t%s\nSelesai:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Harus dikerjakan:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Even untuk %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>Even untuk %s - %s:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "Pengaturan utama"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Zona waktu"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "Anda harus selalu menentukan zona waktu lokal anda."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "Ambang arsip (bulan)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = tak ada pengarsipan)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Pengarsipan digunakan untuk menghemat waktu dan ruang ketika menangani even."
+msgstr "Pengarsipan digunakan untuk menghemat waktu dan ruang ketika menangani even."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Perintah suara"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
 msgstr "Perintah ini diberikan ke shell untuk membuat suara pada alarm."
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "Pengaturan tampilan"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Jendela utama kalender"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Jendela kalender"
+
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Detil visual kalender"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "Tampilkan batas"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "Tampilkan menu"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Tampilkan bulan dan tahun"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
 msgstr "Tampilkan nama hari"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
 msgstr "Tampilkan nomor minggu"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Tampilkan bulan dan tahun"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Kolom info kalender"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "Tampilkan senarai harus dikerjakan"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
 msgstr "Jumlah hari untuk ditampilkan di jendela peristiwa"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
 msgstr "0 = jangan tampilkan senarai peristiwa sama sekali"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Tampakan kalender"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
 msgstr "Tampilkan di semua desktop"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
 msgstr "Tetap di atas"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "Tampilkan di batang kerja"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "Tampilkan di pemisah"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "Tampilkan di baki sistem"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "Mulai kalender"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Tampilkan"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Sembunyikan"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Minimalkan"
 
-#: ../src/parameters.c:793
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "Saat jendela kalender terbuka"
+
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Pilih tanggal hari ini"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Pilih tanggal yang sebelumnya"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Klik ganda tanggalan di kalender akan menampilkan"
+
+#: ../src/parameters.c:828
+msgid "Days view"
+msgstr "Tampilan hari"
+
+#: ../src/parameters.c:840
+msgid "Event list"
+msgstr "Senarai even"
+
+#: ../src/parameters.c:862
 msgid "Extra settings"
 msgstr "Pengaturan tambahan"
 
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr "Saat Membuka Jendela Kalender"
-
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "Pilih Hari Ini"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr "Pilih Tanggal Terpilih Sebelumnya"
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Jendela daftar even"
+
+#: ../src/parameters.c:874
+msgid "Number of extra days to show in event list"
+msgstr "Jumlah hari tambahan untuk ditampilkan di senarai peristiwa"
+
+#: ../src/parameters.c:883
+msgid ""
+"This is just the default value, you can change it in the actual eventlist "
+"window."
+msgstr "Ini hanya nilai standar, anda dapat mengubahnya di dalam jendela senarai peristiwa sebenarnya."
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Hanya tampilkan even pengulangan pertama"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Jendela lihat hari bawaan hari pertama"
 
-#: ../src/parameters.c:836
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Hari pertama dalam pekan"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Hari dipilih"
+
+#: ../src/parameters.c:943
 msgid "Use dynamic tray icon"
 msgstr "Gunakan ikon baki dinamis"
 
-#: ../src/parameters.c:841
+#: ../src/parameters.c:948
 msgid "Use dynamic icon"
 msgstr "Gunakan ikon dinamis"
 
-#: ../src/parameters.c:847
+#: ../src/parameters.c:954
 msgid "Dynamic icon shows current month and day of the month."
 msgstr "Ikon dinamis menampilkan bulan ini dan hari dalam bulan."
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Klik ganda Kalender utama menunjukkan"
+#: ../src/parameters.c:962 ../src/parameters.c:967
+msgid "Use wakeup timer"
+msgstr "Gunakan penghitung bangun"
 
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr "Tampilan hari"
+#: ../src/parameters.c:973
+msgid ""
+"Use this timer if Orage has problems waking up properly after suspend or "
+"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "Gunakan penghitung ini jika Orage mempunyai masalah kembali aktif setelah suspensi atau hibernasi. (Misalnya ikon baki tidak dikembalikan atau alarm tidak berbunyi.)"
 
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr "Senarai even"
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Alarm visual standar berkas tak dikenal"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr "Jendela senarai even"
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Jendela Orage"
 
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr "Jumlah hari tambahan untuk ditampilkan di senarai peristiwa"
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Beritahu sistem notifikasi"
 
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-"Ini hanya nilai standar, anda dapat mengubahnya di dalam jendela senarai "
-"peristiwa sebenarnya."
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Selalu berhenti ketika akan ditutup"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Selalu berhenti"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:1029
 msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Biasanya Orage tetap berjalan di latar belakang ketika akan ditutup. Opsi ini mengubah Orage untuk berhenti dan tidak berjalan di latar belakang ketika akan ditutup."
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Pengaturan Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
 msgstr "Pertama memulai Orage. Mencari zona waktu standar."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Zona waktu standar diatur ke %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
 msgstr "Zona waktu standar tak ditemukan, silakan, atur secara manual."
 
@@ -2021,41 +2099,35 @@
 msgid "Open"
 msgstr "Buka"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Pengingat - Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Tunda"
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "Ingatkan saya lagi setelah waktu yang ditentukan"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-"Tekan <Eksekusi> untuk mengingatkan saya lagi setelah waktu yang ditentukan:"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Alarm aktif selanjutnya:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d hari %02d jam %02d menit ke: %s"
+msgstr "\n%02d hari %02d jam %02d menit ke: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Tak ada alarm aktif ditemukan"
+msgstr "\nTak ada alarm aktif ditemukan"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2078,1537 +2150,2229 @@
 msgstr "Afrika/Algeria"
 
 #: ../src/timezone_names.c:41
+msgid "Africa/Asmara"
+msgstr "Afrika/Asmara"
+
+#: ../src/timezone_names.c:42
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
-#: ../src/timezone_names.c:42
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "Afrika/Banjul"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "Afrika/Kairo"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "Afrika/Conakry"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_Salaam"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "Afrika/Djibouti"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "Afrika/Douala"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Aaiun"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "Afrika/Freetown"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaborone"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "Afrika/Juba"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johannesburg"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "Afrika/Khartoum"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinshasa"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "Afrika/Libreville"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbashi"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "Afrika/Mogadishu"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovia"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndjamena"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamey"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nouakchott"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ouagadougou"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripoli"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "Afrika/Windhoek"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "Amerika"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "Amerika/Anchorage"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "Amerika/Anguilla"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "Amerika/Antigua"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "Amerika/Araguaina"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "Amerika/Argentina/Buenos_Aires"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "Amerika/Argentina/Catamarca"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "Amerika/Argentina/ComodRivadavia"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "Amerika/Argentina/Cordoba"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "Amerika/Argentina/Jujuy"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "Amerika/Argentina/La_Rioja"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "Amerika/Argentina/Mendoza"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "Amerika/Argentina/Rio_Gallegos"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "Amerika/Argentina/Salta"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "Amerika/Argentina/San_Juan"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "Amerika/Argentina/San_Luis"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "Amerika/Argentina/Tucuman"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "Amerika/Argentina/Ushuaia"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "Amerika/Asuncion"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "Amerika/Atikokan"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "Amerika/Atka"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "Amerika/Bahia"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "Amerika/Bahia_Banderas"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "Amerika/Blanc-Sablon"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "Amerika/Boise"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Cambridge_Bay"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "Amerika/Campo_Grande"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "Amerika/Cancun"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "Amerika/Caracas"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "Amerika/Catamarca"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "Amerika/Cayenne"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "Amerika/Cayman"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "Amerika/Chicago"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "Amerika/Chihuahua"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "Amerika/Coral_Harbour"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "Amerika/Cordoba"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "Amerika/Kosta_Rika"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "Amerika/Creston"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "Amerika/Cuiaba"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "Amerika/Curacao"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "Amerika/Danmarkshavn"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "Amerika/Dawson"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Dawson_Creek"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "Amerika/Dominika"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "Amerika/Ensenada"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "Amerika/Eirunepe"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "Amerika/Fort_Wayne"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glace_Bay"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "Amerika/Godthab"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "Amerika/Goose_Bay"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grand_Turk"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "Amerika/Guadeloupe"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "Amerika/Guatemala"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "Amerika/Guayaquil"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "Amerika/Guyana"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "Amerika/Halifax"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosillo"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indiana/Indianapolis"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indiana/Knox"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indiana/Marengo"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "Amerika/Indiana/Petersburg"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "Amerika/Indiana/Tell_City"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indiana/Vevay"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "Amerika/Indiana/Vincennes"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "Amerika/Indiana/Winamac"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "Amerika/Indianapolis"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "Amerika/Iqaluit"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "Amerika/Jamaika"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "Amerika/Jujuy"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "Amerika/Juneau"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentucky/Louisville"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentucky/Monticello"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "Amerika/Knox_IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "Amerika/Kralendijk"
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "Amerika/La_Paz"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Angeles"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "Amerika/Louisville"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "Amerika/Lower_Princes"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "Amerika/Maceio"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "Amerika/Managua"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "Amerika/Marigot"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "Amerika/Martinique"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "Amerika/Matamoros"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "Amerika/Mazatlan"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "Amerika/Menominee"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "Amerika/Metlakatla"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "Amerika/Mexico_City"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "Amerika/Miquelon"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "Amerika/Moncton"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "Amerika/Monterrey"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "Amerika/Montserrat"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "Amerika/Nome"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "Amerika/North_Dakota/Beulah"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "Amerika/North_Dakota/Center"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "Amerika/North_Dakota/New_Salem"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "Amerika/Noronha"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "Amerika/Ojinaga"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "Amerika/Phoenix"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Port-au-Prince"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_of_Spain"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "Amerika/Porto_Acre"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "Amerika/Porto_Velho"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Puerto_Rico"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "Amerika/Rainy_River"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Rankin_Inlet"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "Amerika/Recife"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "Amerika/Resolute"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branco"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "Amerika/Rosario"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "Amerika/Santa_Isabel"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "Amerika/Santarem"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "Amerika/Santiago"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo_Domingo"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao_Paulo"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "Amerika/Scoresbysund"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "Amerika/Shiprock"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "Amerika/Sitka"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "Amerika/St_Barthelemy"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "Amerika/St_Johns"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "Amerika/St_Kitts"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "Amerika/St_Lucia"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "Amerika/St_Thomas"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "Amerika/St_Vincent"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "Amerika/Swift_Current"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegucigalpa"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "Amerika/Thule"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Thunder_Bay"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "Amerika/Tijuana"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "Amerika/Toronto"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "Amerika/Vancouver"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "Amerika/Virgin"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "Amerika/Whitehorse"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "Amerika/Winnipeg"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "Amerika/Yakutat"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "Amerika/Yellowknife"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Antartika"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Antartika/Casey"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Antartika/Davis"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Antartika/DumontDUrville"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Antartika/Macquarie"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Antartika/Mawson"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Antartika/McMurdo"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Antartika/Palmer"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Antartika/Rothera"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Antartika/Kutub_Selatan"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "Antartika/Syowa"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Antartika/Vostok"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Artik"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Artik/Longyearbyen"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Asia"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Asia/Aden"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Asia/Almaty"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Asia/Amman"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Asia/Anadyr"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Asia/Aqtau"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aqtobe"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "Asia/Ashgabat"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Asia/Ashkhabad"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "Asia/Baghdad"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Asia/Bahrain"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Asia/Baku"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Asia/Bishkek"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Asia/Brunei"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Asia/Calcutta"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Asia/Choibalsan"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "Asia/Chongqing"
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "Asia/Chungking"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Asia/Kolombo"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Asia/Dacca"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "Asia/Damaskus"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Asia/Dhaka"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Asia/Dubai"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dushanbe"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Asia/Harbin"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Asia/Hebron"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong_Kong"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Asia/Ho_Chi_Minh"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Asia/Hovd"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Asia/Istanbul"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Asia/Jakarta"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Asia/Jerusalem"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamchatka"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Asia/Karachi"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Asia/Kathmandu"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Asia/Katmandu"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Asia/Khandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Asia/Kalkuta"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnoyarsk"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala_Lumpur"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Asia/Kuching"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Asia/Makau"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Asia/Makau"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Asia/Makassar"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Asia/Muskat"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Asia/Nikosia"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Asia/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Asia/Oral"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Asia/Qyzylorda"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangoon"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyadh"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Asia/Riyadh87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Asia/Riyadh88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Asia/Riyadh89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Asia/Sakhalin"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarkand"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Asia/Seoul"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Asia/Singapore"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Asia/Tehran"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Asia/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Asia/Thimbu"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokyo"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
-msgstr "Asia/Ujung_Pandang"
+msgstr "Asia/Makassar"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulaanbaatar"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Asia/Ulan_Bator"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Asia/Ust-Nera"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Asia/Yakutsk"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Atlantik"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azores"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermuda"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Atlantik/Canary"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Tanjung_Verde"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "Atlantik/Faeroe"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlantik/Faroe"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantik/Jan_Mayen"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "Atlantik/Madeira"
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantik/Reykjavik"
 
-#: ../src/timezone_names.c:306
+#: ../src/timezone_names.c:375
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantik/Georgia_Selatan"
 
-#: ../src/timezone_names.c:307
+#: ../src/timezone_names.c:376
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/St_Helena"
 
-#: ../src/timezone_names.c:308
+#: ../src/timezone_names.c:377
 msgid "Atlantic/Stanley"
 msgstr "Atlantik/Stanley"
 
-#: ../src/timezone_names.c:309
+#: ../src/timezone_names.c:378
 msgid "Australia"
 msgstr "Australia"
 
-#: ../src/timezone_names.c:310
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Australia/ACT"
+
+#: ../src/timezone_names.c:380
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaide"
 
-#: ../src/timezone_names.c:311
+#: ../src/timezone_names.c:381
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: ../src/timezone_names.c:312
+#: ../src/timezone_names.c:382
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: ../src/timezone_names.c:313
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Australia/Currie"
+
+#: ../src/timezone_names.c:384
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: ../src/timezone_names.c:314
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Australia/Eucla"
+
+#: ../src/timezone_names.c:386
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: ../src/timezone_names.c:315
+#: ../src/timezone_names.c:387
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: ../src/timezone_names.c:316
+#: ../src/timezone_names.c:388
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: ../src/timezone_names.c:317
+#: ../src/timezone_names.c:389
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: ../src/timezone_names.c:318
+#: ../src/timezone_names.c:390
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: ../src/timezone_names.c:319
+#: ../src/timezone_names.c:391
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brazil"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brazil/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brazil/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brazil/Timur"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brazil/Barat"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Kanada/Atlantik"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Kanada/Tengah"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Kanada/Saskatchewan Timur"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Kanada/Timur"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Kanada/Gunung"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Kanada/Newfoundland"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Kanada/Pasifik"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Kanada/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Kanada/Yukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Chili"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Chili/Kontinental"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Chili/PulauPaskah"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Dll"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Dll/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Dll/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Dll/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Dll/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Dll/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Dll/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Dll/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Dll/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Dll/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Dll/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Dll/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Dll/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Dll/GMT+8"
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Dll/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Dll/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Dll/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Dll/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Dll/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Dll/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Dll/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Dll/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Dll/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Dll/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Dll/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Dll/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Dll/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Dll/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Dll/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Dll/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Dll/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Dll/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Dll/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Dll/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Dll/Universal"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Dll/Zulu"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Eropa"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "Eropa/Amsterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Eropa/Andorra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Eropa/Athena"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Eropa/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Eropa/Beograd"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Eropa/Berlin"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Eropa/Bratislava"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Eropa/Brussels"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Eropa/Bucharest"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Eropa/Budapest"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Eropa/Busingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Eropa/Chisinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Eropa/Kopenhagen"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "Eropa/Dublin"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Eropa/Gibraltar"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Eropa/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Eropa/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Eropa/Isle_of_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Eropa/Istanbul"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Eropa/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Eropa/Kaliningrad"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Eropa/Kiev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Eropa/Lisabon"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "Eropa/Ljubljana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Europe/London"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Europe/Luxembourg"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Europe/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Europe/Malta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Eropa/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Eropa/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Eropa/Monako"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Eropa/Moskow"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "Eropa/Nikosia"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Eropa/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Eropa/Paris"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Eropa/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Eropa/Praha"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Eropa/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Eropa/Roma"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Eropa/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Eropa/San_Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Eropa/Sarajevo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "Eropa/Simferopol"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "Eropa/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Eropa/Sofia"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Eropa/Stockholm"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Eropa/Tallinn"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Eropa/Tirane"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Eropa/Tiraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "Eropa/Uzhgorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Eropa/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Eropa/Vatikan"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Eropa/Wina"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "Eropa/Vilnius"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Eropa/Volgograd"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "Eropa/Warsawa"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Eropa/Zagreb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "Eropa/Zaporozhye"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "Eropa/Zurich"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Hindia"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "Hindia/Antananarivo"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "Hindia/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "Hindia/Christmas"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "Hindiaa/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "Hindia/Komoro"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "Hindia/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "Hindia/Mahe"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "Hindia/Maladewa"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "Hindia/Mauritius"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "Hindia/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "Hindia/Reunion"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Meksiko"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Meksiko/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Meksiko/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Meksiko/Umum"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "TimurTengah"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "TimurTengah/Riyadh87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "TimurTengah/Riyadh88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "TimurTengah/Riyadh89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Pasifik"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "Pasifik/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Pasifik/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Pasifik/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Pasifik/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "Pasifik/Paskah"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "Pasifik/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "Pasifik/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Pasifik/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "Pasifik/Fiji"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Pasifik/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Pasifik/Galapagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Pasifik/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "Pasifik/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Pasifik/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Pasifik/Honolulu"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Pasifik/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "Pasifik/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "Pasifik/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "Pasifik/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Pasifik/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Pasifik/Marquesas"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Pasifik/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Pasifik/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Pasifik/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Pasifik/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "Pasifik/Noumea"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Pasifik/Pago_Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Pasifik/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "Pasifik/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Pasifik/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "Pasifik/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Pasifik/Port_Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Pasifik/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Pasifik/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pasifik/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Pasifik/Tahiti"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Pasifik/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Pasifik/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Pasifik/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Pasifik/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Pasifik/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "Pasifik/Yap"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "AS"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "AS/Alaska"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "AS/Aleutian"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "AS/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "AS/Tengah"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "AS/Timur"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "AS/Indiana-Timur"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "AS/Hawaii"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "AS/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "AS/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "AS/Gunung"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "AS/Pasifik"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "AS/Pasifik-Baru"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "AS/Samoa"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "Janji Baru"
@@ -3626,204 +4390,26 @@
 msgstr "Tampilkan jam dan tanggal?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Kalender"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Pengaturan Kalender Orage"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Pengaturan Orage"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Pengaturan untuk Aplikasi Kalender Xfce 4 (Orage)"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Kalender destop"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Pengaturan Kalender Orage"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Kalender"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Kalender Orage"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Judul: %s\n"
-#~ " Mulai:\t%s\n"
-#~ " Sampai:\t%s\n"
-#~ " Selesai:\t%s\n"
-#~ "Catatan:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Anda harus memasukkan semua karakter keluar dll sendiri.\n"
-#~ "  Tali ini hanya diberikan ke shell untuk diproses"
-
-#~ msgid "Orage clock"
-#~ msgstr "Jam Orage"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Pembuat asli, pemelihara yang telah pensiun"
-
-#~ msgid "Contributor"
-#~ msgstr "Kontributor"
-
-#~ msgid "Info"
-#~ msgstr "Info"
-
-#~ msgid "Warning"
-#~ msgstr "Peringatan"
-
-#~ msgid "Error"
-#~ msgstr "Galat"
-
-#~ msgid "Set sticked"
-#~ msgstr "Atur lekat"
-
-#~ msgid "Select always today"
-#~ msgstr "Selalu pilih hari ini"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Ketika menampilkan kalender utama, atur penunjuk ke hari yang sebelumnya "
-#~ "terpilih atau selalu ke hari ini."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Mengakhiri mode penyesuaian waktu"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Memulai mode penyesuaian waktu"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "sesuaikan untuk ganti menit"
-
-#~ msgid "Vary"
-#~ msgstr "Ragam"
-
-#~ msgid "Select timezone"
-#~ msgstr "Pilih zona waktu"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Ubah Jam"
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "masukkan zona waktu jam,\n"
-#~ "(=nilai TZ benar apapun)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Ubah Pengaturan"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Masukkan zona waktu lokal. (akan digunakan untuk menunjukkan waktu dalam "
-#~ "tanggal sebelum (-) atau setelah (+) dengan menambah +/- setelah waktu)"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr ""
-#~ "Atur nilai zona waktu (=TZ) benar apapun atau pilih satu dari senarai."
-
-#~ msgid "show line _1:"
-#~ msgstr "tampilkan baris _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "tampilkan baris _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "tampilkan baris _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Properti"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Gagal meluncurkan 'orage -o'"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> masukkan tanggal saat ini dalam format tanggal lokal.\n"
-#~ "<T> masukkan waktu dan\n"
-#~ "<DT> masukkan tanggal dan waktu."
-
-#~ msgid "Show event list"
-#~ msgstr "Senarai senarai even"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = gunakan ikon statis)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Ikon dinamis menunjukkan hari dan bulan ini. Ikon hanya tampak di baki. "
-#~ "Jika baki terlalu kecil untuk ukuran ikon dinamis, Orage secara otomatis "
-#~ "mengembalikannya ke ikon statis."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Pengaturan Kalender"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Pengaturan Kalender Xfce 4"
-
-#~ msgid ""
-#~ "Set this if you want to make sure that this file is never modified by "
-#~ "Orage."
-#~ msgstr ""
-#~ "Atur ini jika anda ingin memastikan bahwa berkas ini tak pernah "
-#~ "dimodifikasi oleh Orage."
-
-#~ msgid "Not defined"
-#~ msgstr "Tak ditentukan"
-
-#~ msgid "Monday"
-#~ msgstr "Senin"
-
-#~ msgid "Tuesday"
-#~ msgstr "Selasa"
-
-#~ msgid "Wednesday"
-#~ msgstr "Rabu"
-
-#~ msgid "Thursday"
-#~ msgstr "Kamis"
-
-#~ msgid "Friday"
-#~ msgstr "Jumat"
-
-#~ msgid "Saturday"
-#~ msgstr "Sabtu"
-
-#~ msgid "Sunday"
-#~ msgstr "Minggu"
-
-#~ msgid "Ical week start day"
-#~ msgstr "Ical hari mulai minggu"
-
-#~ msgid ""
-#~ "This is used in some weekly repeating appointment rules. Just set it to "
-#~ "the start day of the week for your country and forget it."
-#~ msgstr ""
-#~ "Ini digunakan dalam peraturan janji yang berulang tiap minggu. Cukup atur "
-#~ "ke permulaan hari dalam seminggu untuk negara anda lalu lupakan."
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Kalender destop"
diff -Nru orage-4.8.3/po/it.po orage-4.12.1/po/it.po
--- orage-4.8.3/po/it.po	2012-01-03 12:01:05.000000000 +0000
+++ orage-4.12.1/po/it.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,33 +1,44 @@
-# Italian translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Alex Dupre <ale@FreeBSD.org>, 2004.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Alessandro B, 2013
+# Alex Dupre <ale@FreeBSD.org>, 2004
 # Cristian Cozzolino <cristiancozzolino@libero.it>, 2009
-#
-# Gianluca Foddis <gianluca.foddis@gmail.com>, 2009, 2009.
+# Cristian Marchi <cri.penta@gmail.com>, 2013-2014
+# Edoardo Maria Elidoro <edoardo.elidoro@gmail.com>, 2013
+# gianluca foddis <gianluca.foddis@gmail.com>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.5\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2010-08-20 12:24+0100\n"
-"Last-Translator: Gianluca Foddis <gianluca.foddis@gmail.com>\n"
-"Language-Team: Italian <xfce-it-translators@googlegroups.com>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2014-10-08 18:27+0000\n"
+"Last-Translator: Cristian Marchi <cri.penta@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/xfce-apps/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"X-Poedit-Language: Italian\n"
-"X-Poedit-Country: ITALY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "nessuna"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "singola"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "doppia"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "bassa"
 
-# GLOSSARIO
-# date = data
-# localtime = ora locale
-# timezone = fuso orario
-# clock time = ora
-# font = tipo di carattere
-# clock = orologio
-# globaltime=ora globale
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
 msgstr "Apertura finestra Ora globale..."
@@ -42,9 +53,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"fare clic per modificare l'orologio"
+msgstr "%s\nfare clic per modificare l'orologio"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -54,22 +63,20 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"tasto sinistro per cambiare le preferenze \n"
-"tasto centrale per regolare l'ora degli orologi"
+msgstr "tasto sinistro per cambiare le preferenze \ntasto centrale per regolare l'ora degli orologi"
 
-# tooltip; iniziamo con la maiuscola;
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
 msgstr "Regolare per cambiare l'ora"
 
-# tooltip
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"Regolare per modificare i minuti; Fare clic col pulsante 2 sulle frecce per "
-"modificare di solo un minuto"
+msgstr "Regolare per modificare i minuti; fare clic con il pulsante 2 sulle frecce per modificare di solo un minuto"
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Ora globale"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -81,13 +88,12 @@
 
 #: ../globaltime/gt_prefs.c:310
 msgid "Not possible to delete the last clock."
-msgstr "Impossibile cancellare l'ultimo orologio."
+msgstr "Impossibile eliminare l'ultimo orologio."
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
 msgstr "Aggiorna quest'orologio"
 
-# tooltip
 #: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
 msgid "add new empty clock"
 msgstr "Aggiunge un nuovo orologio vuoto"
@@ -98,24 +104,20 @@
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
-msgstr "Cancella quest'orologio"
+msgstr "Elimina quest'orologio"
 
-# tooltip
 #: ../globaltime/gt_prefs.c:539
 msgid "move this clock first"
 msgstr "Sposta quest'orologio in alto"
 
-# tooltip
 #: ../globaltime/gt_prefs.c:544
 msgid "move this clock left"
 msgstr "Sposta quest'orologio a sinistra"
 
-# tooltip
 #: ../globaltime/gt_prefs.c:549
 msgid "move this clock right"
 msgstr "Sposta quest'orologio a destra"
 
-# tooltip
 #: ../globaltime/gt_prefs.c:554
 msgid "move this clock last"
 msgstr "Sposta quest'orologio in fondo"
@@ -124,7 +126,6 @@
 msgid "set the timezone of this clock to be local timezone"
 msgstr "Imposta il fuso orario di questo orologio a quello locale"
 
-# tooltip
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
 msgstr "Chiude la finestra ed esce"
@@ -142,7 +143,6 @@
 msgid "Name of the clock:"
 msgstr "Nome dell'orologio:"
 
-# tooltip
 #: ../globaltime/gt_prefs.c:613
 msgid "enter name of clock"
 msgstr "Inserire il nome dell'orologio"
@@ -164,7 +164,6 @@
 msgid "Click to change background colour for clock"
 msgstr "Fare clic per cambiare il colore di sfondo all'orologio"
 
-# tooltip
 #: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
 #: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
 #: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
@@ -177,9 +176,7 @@
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
 #: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
 msgid "Cross this to use default instead of selected value"
-msgstr ""
-"Mettere il segno di spunta per utilizzare il valore predefinito al posto di "
-"quello selezionato"
+msgstr "Mettere il segno di spunta per utilizzare il valore predefinito al posto di quello selezionato"
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
@@ -228,9 +225,7 @@
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
-"Spuntare per usare il colore predefinito di sistema al posto di quello "
-"selezionato"
+msgstr "Spuntare per usare il colore predefinito di sistema al posto di quello selezionato"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
@@ -238,14 +233,11 @@
 
 #: ../globaltime/gt_prefs.c:929
 msgid "Click to change default font for clock name"
-msgstr ""
-"Fare clic per cambiare il carattere predefinito per il nome dell'orologio"
+msgstr "Fare clic per cambiare il carattere predefinito per il nome dell'orologio"
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"Mettere il segno di spunta per usare il carattere predefinito di sistema al "
-"posto di quello selezionato"
+msgstr "Mettere il segno di spunta per usare il carattere predefinito di sistema al posto di quello selezionato"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -261,7 +253,6 @@
 msgid "Underline for time of clock:"
 msgstr "Sottolineatura per l'ora dell'orologio:"
 
-# tooltip
 #: ../globaltime/gt_prefs.c:1027
 msgid "update preferences"
 msgstr "Aggiorna preferenze"
@@ -287,6 +278,10 @@
 msgid "Use normal decorations"
 msgstr "Usa le decorazioni normali"
 
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Nessuna"
+
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
 msgstr "Non mostrare le decorazioni della finestra (bordi)"
@@ -362,7 +357,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Località"
@@ -372,8 +367,6 @@
 msgid "GMT Offset"
 msgstr "Differenza GMT"
 
-# si riferisce alle date in cui è avvenuto l'ultimo/ avverrà il prossimocambio
-# di ora: ultima dom dimarzo e di ottobre.
 #: ../globaltime/timezone_selection.c:264
 #: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
 msgid "Previous/Next Change"
@@ -395,7 +388,7 @@
 #: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
 #: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
 msgid "Pick timezone"
-msgstr "Selezionare il fuso orario"
+msgstr "Selezione del fuso orario"
 
 #: ../globaltime/timezone_selection.c:302
 #: ../globaltime/timezone_selection.c:312
@@ -425,101 +418,108 @@
 msgid "floating"
 msgstr "fluttuante"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Ora globale"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Ora globale di Orage"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "Mostra l'orologio di diversi paesi"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Ora globale"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Nessuna rotazione"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Ruota a sinistra"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Ruota a destra"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "Aspetto"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
 msgstr "Mostra co_rnice"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
 msgstr "Imposta colore _primo piano:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
 msgstr "Imposta colore _sfondo:"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
 msgstr "Imposta alte_zza:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
-"Si noti che non è possibile modificare l'altezza dei pannelli orizzontali"
+msgstr "Si noti che non è possibile modificare l'altezza dei pannelli orizzontali"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
 msgstr "Imposta _larghezza:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
-msgstr ""
-"Si noti che non è possibile modificare lalarghezza dei pannelli verticali"
+msgstr "Si noti che non è possibile modificare la larghezza dei pannelli verticali"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Mostra righe _verticalmente"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "Opzioni dell'orologio"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
 msgstr "Imposta il fuso orario su:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "Linea %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
 msgstr "Inserire un parametro valido per la funzione strftime"
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
 msgstr "Suggerimento:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
 msgstr "Riaggiusta l'ora dopo una sospensione/ibernazione"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Questo è necessario se viene effettuata una sospensione o una ibernazione a "
-"breve termine (meno di 5 ore) e l'ora visualizzata non comprende i secondi. "
-"In queste circostanze è possibile che l'orologio di Orage mostri l'ora in "
-"modo impreciso a meno che non sia stata selezionata questa opzione "
-"(selezionandola, si inibisce il funzionamento della cpu e delle funzioni di "
-"risparmio energetico)"
+msgstr "Questo è necessario se viene effettuata una sospensione o una ibernazione a breve termine (meno di 5 ore) e l'ora visualizzata non comprende i secondi. In queste circostanze è possibile che l'orologio di Orage mostri l'ora in modo impreciso a meno che non sia stata selezionata questa opzione (selezionandola, si inibisce il funzionamento della cpu e delle funzioni di risparmio energetico)"
 
-# # modificato i tab(\t) per far tornare tutto allineato
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -529,23 +529,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Questo programma utilizza la funzione strftime per\n"
-"recuperare le informazioni su data e ora.\n"
-"Utilizzare un qualsiasi codice valido per ottenere la\n"
-"data e l'ora nel formato che si preferisce.\n"
-"I codici più utilizzati sono:\n"
-"\t%A = giorno della settimana\t%B = mese\n"
-"\t%c = data e ora\t\t\t%R = ora e minuti\n"
-"\t%V = numero settimana\t%Z = fuso orario in uso\n"
-"\t%H = ore \t\t\t\t%M = minuti\n"
-"\t%X = ora locale\t\t\t%x = data locale"
+msgstr "Questo programma utilizza la funzione strftime per\nrecuperare le informazioni su data e ora.\nUtilizzare un qualsiasi codice valido per ottenere la\ndata e l'ora nel formato che si preferisce.\nI codici più utilizzati sono:\n\t%A = giorno della settimana\t%B = mese\n\t%c = data e ora\t\t\t%R = ora e minuti\n\t%V = numero settimana\t%Z = fuso orario in uso\n\t%H = ore \t\t\t\t%M = minuti\n\t%X = ora locale\t\t\t%x = data locale"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
 msgstr "Preferenze dell'orologio di Orage"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -554,8 +543,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
 
@@ -570,7 +558,7 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Fine"
 
@@ -578,13 +566,13 @@
 msgid "Due"
 msgstr "Scadenza"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Selezionare un file..."
 
@@ -592,227 +580,281 @@
 msgid "Sound Files"
 msgstr "File audio"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Tutti i File"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Le informazioni sull'appuntamento sono state modificate."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
-msgstr "Continuare davvero?"
+msgstr "Continuare?"
+
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "No, non chiudere"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Sì, ignora le modifiche e chiudi"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
-msgstr "La fine di questo appuntamento è precedente all'inizio."
+msgstr "La fine di questo appuntamento è precedente al suo inizio."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "Non impostato"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Aggiunge un nuovo appuntamento a questo file."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "File predefinito di Orage"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Aggiunta dell'appuntamento non riuscita"
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Errore aggiungendo l'appuntamento; per maggiori dettagli consultare il file di log."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Aggiornamento dell'appuntamento non riuscito"
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Per maggiori dettagli controllare il file di log (il file è forse stato aggiornato al di fuori di Orage?)."
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
 msgstr "Questo appuntamento verrà rimosso in modo permanente."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "No, annulla la rimozione"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Sì, rimuovi"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Seleziona della data"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Oggi"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "Questo appuntamento non esiste."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
 msgstr "Probabilmente è stato rimosso, si prega di aggiornare la schermata."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Categorie correnti"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Aggiungere una nuova categoria con un colore"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Categoria:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Colori delle categorie - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr " *** COPIA ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "Nuovo appuntamento - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_File"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "Salva _e chiudi"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "D_uplica"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Salva"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Salva e chiude"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Ripristina"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Duplica"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
-msgstr "Cancella"
+msgstr "Elimina"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Libero"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Occupato"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Generale"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Tipo"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Evento che accadrà un giorno; per esempio:\n"
-"un incontro, un compleanno, o uno spettacolo alla TV"
+msgstr "Evento che accadrà un giorno; per esempio:\nun incontro, un compleanno, o uno spettacolo alla TV"
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "Compito"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Qualcosa che dovrebbe essere fatto prima o poi; per esempio:\n"
-"lavare la propria auto o provare la nuova versione di Orage"
+msgstr "Qualcosa che dovrebbe essere fatto prima o poi; per esempio:\nlavare la propria auto o provare la nuova versione di Orage"
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Note del giorno"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Scrivere una nota per ricordare che è successo qualcosa; per esempio:\n"
-"annota che la mamma ha chiamato o che è scesa la prima neve"
+msgstr "Scrivere una nota per ricordare che è successo qualcosa; per esempio:\nannota che la mamma ha chiamato o che è scesa la prima neve"
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
-msgstr "Nome"
+msgstr "Titolo"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "Evento che occupa tutto il giorno"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Inizio"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Imposta"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Durata"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "giorni"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "ore"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "minuti"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Disponibilità"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Completato"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "Fatto"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Categorie"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Questa è una categoria speciale, che può essere usata per colorare questo "
-"appuntamento nella visualizzazione a elenco"
+msgstr "Questa è una categoria speciale, che può essere usata per colorare questo appuntamento nella visualizzazione a elenco"
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "Aggiorna i colori per categorie"
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "Priorità"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Impostando il valore a 8 o a un numero superiore, l'appuntamento non è\nvisualizzato nell'elenco. Questa funzione è utile per non appesantire l'elenco, ma rende più difficile identificare questo appuntamento.\n(L'allarme verrà comunque avviato normalmente)\n(C'è un parametro non documentato in modo che sia possibile modificare il limite predefinito pari a 8)"
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Commento"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -821,148 +863,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"I seguenti comandi rapidi hanno effetto immediato:\n"
-"    <D> inserisce la data corrente in formato ora locale\n"
-"    <T> inserisce l'ora e\n"
-"    <DT> inserisce la data e l'ora.\n"
-"\n"
-"Quanto segue è convertito solo dopo essere stato esaminato:\n"
-"    <&Ynnnn> è tradotto in anno corrente meno nnnn.\n"
-"(Può essere utilizzato per esempio in promemoria di compleanni per sapere "
-"quanti anni ha la persona)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "I seguenti comandi rapidi hanno effetto immediato:\n    <D> inserisce la data corrente in formato ora locale\n    <T> inserisce l'ora e\n    <DT> inserisce la data e l'ora.\n\nQuanto segue è convertito solo dopo essere stato esaminato:\n    <&Ynnnn> è tradotto in anno corrente meno nnnn.\n(Può essere utilizzato per esempio in promemoria di compleanni per sapere quanti anni ha la persona)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "Prima dell'inizio"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "Prima della fine"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "Dopo l'inizio"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "Dopo la fine"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Allarme"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Ora dell'allarme"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Spesso si desidera ricevere un allarme:\n"
-" 1) prima che un evento sia iniziato\n"
-" 2) prima che un compito sia terminato\n"
-" 3) dopo che un compito sia iniziato"
+msgstr "Spesso si desidera ricevere un allarme:\n 1) prima che un evento sia iniziato\n 2) prima che un compito sia terminato\n 3) dopo che un compito sia iniziato"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr "Allarme persistente"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Selezionare questa opzione per fare in modo che Orage avvisi comunque anche "
-"se non è attivo al momento dell'allarme"
+msgstr "Selezionare questa opzione per fare in modo che Orage avvisi comunque anche se non è attivo al momento dell'allarme"
 
-# è riferito all'allarme
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Suono"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "Utilizza"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
 msgstr "Selezionare questa opzione se si desidera un allarme acustico"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "Ripeti suono di allarme"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "volte"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "intervallo in secondi"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "Visuale"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Utilizza la finestra di Orage"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
-msgstr ""
-"Selezionare questa opzione se si desidera ricevere l'allarme della finestra "
-"di Orage"
+msgstr "Selezionare questa opzione se si desidera ricevere l'allarme della finestra di Orage"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Usa notifica"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
-msgstr ""
-"Selezionare questa opzione se si desidera ricevere un allarme di notifica"
+msgstr "Selezionare questa opzione per ricevere un allarme di notifica"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "Imposta timeout"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
-msgstr ""
-"Selezionare questa opzione se si desidera ceh la notifica scada "
-"automaticamente"
+msgstr "Selezionare questa opzione se si desidera che la notifica scada automaticamente"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 = intervallo di scadenza predefinito di sistema"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "secondi"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Procedura"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
-msgstr ""
-"Selezionare questa opzione se si intende utilizzare una procedura o uno "
-"script di allarme"
+msgstr "Selezionare questa opzione se si intende utilizzare una procedura o uno script di allarme"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -972,165 +990,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
-"Si devono inserire tutti i caratteri di escape.\n"
-"Questa stringa è inviata dalla shell al processo.\\I seguenti comandi "
-"speciali sono sostituiti durante l'esecuzione:\n"
-"\t<&T> titolo dell'appuntamento\n"
-"\t<&D> descrizione dell'appuntamento\n"
-"\t<&AT> ora dell'allarme\n"
-"\t<&ST> ora di inizio dell'appuntamento\n"
-"\t<&ET> ora di fine dell'appuntamento"
+msgstr "Si devono inserire tutti i caratteri di escape.\nQuesta stringa è inviata dalla shell al processo.\nI seguenti comandi speciali sono sostituiti durante l'esecuzione:\n\t<&T> titolo dell'appuntamento\n\t<&D> descrizione dell'appuntamento\n\t<&AT> ora dell'allarme\n\t<&ST> ora di inizio dell'appuntamento\n\t<&ET> ora di fine dell'appuntamento"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
 msgstr "Prova questo allarme facendolo suonare adesso"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "<b>Allarme predefinito</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
 msgstr "Salva le impostazioni correnti come allarme predefinito"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
-msgstr "carica le impostazioni dell'allarme predefinit"
-
-# si riferisce a "frequenza"
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Nessuna"
+msgstr "Carica le impostazioni dell'allarme predefinito"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Giornaliera"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Settimanale"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Mensile"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Annuale"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
 msgstr "Oraria"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Lun"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Mar"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Mer"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Gio"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Ven"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "Sab"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "Dom"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Ricorrenza"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Complessità"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Base"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Avanzata"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "Usare questa opzione se si vogliono eventi periodici regolari"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Usare questa opzione se occorrono pianificazioni complesse come:\n"
-" ogni sabato e domenica o\n"
-" primo martedì di ogni mese"
+msgstr "Usare questa opzione se occorrono pianificazioni complesse come:\n ogni sabato e domenica o\n primo martedì di ogni mese"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Frequenza"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Ogni"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "occorrenza"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Limita la frequenza a certi intervalli;\n"
-" per esempio: ogni terzo giorno:\n"
-" Frequenza = Giornaliera e Intervallo = 3"
+msgstr "Limita la frequenza a certi intervalli;\n per esempio: ogni terzo giorno:\n Frequenza = Giornaliera e Intervallo = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Limite"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Ripeti per sempre"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Ripeti"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Ripeti fino al "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Giorni della settimana"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "Quale giorno"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1138,301 +1137,297 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Specifica quale giorno della settimana per eventi mensili ed annui;\n"
-" Per esempio:\n"
-" Secondo Mercoledì di ogni mese:\n"
-"\tFrequenza = Mensile\n"
-"\tGiorni della settimana = spuntare solo mercoledì\n"
-"\tQuale giorno = selezionare 2 dal numero sotto mercoledì "
+msgstr "Specifica quale giorno della settimana per eventi mensili ed annui;\n Per esempio:\n Secondo Mercoledì di ogni mese:\n\tFrequenza = Mensile\n\tGiorni della settimana = spuntare solo mercoledì\n\tQuale giorno = selezionare 2 dal numero sotto mercoledì "
 
-# TODO=compito
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr "Base compito"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"Il compito ricorre regolarmente a partire dal tempo di inizio e si ripete "
-"dopo ogni intervallo indipendentemente da quando è stato completato l'ultima "
-"volta"
-
-#: ../src/appointment.c:3354
-msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"La ricorrenza del compito è basata sul tempo di completamento e si ripete "
-"dopo un intervallo calcolato a partire dall'ultimo completamento\n"
-"(Si noti che si può non dire niente in merito allo storico dei compiti dato "
-"che la base della ricorrenza viene modificata a ogni completamento)"
+msgstr "Il compito ricorre regolarmente a partire dal tempo di inizio e si ripete dopo ogni intervallo indipendentemente da quando è stato completato l'ultima volta"
+
+#: ../src/appointment.c:3465
+msgid ""
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "La ricorrenza del compito è basata sul tempo di completamento e si ripete dopo un intervallo calcolato a partire dall'ultimo completamento\n(Si noti che si può non dire niente in merito allo storico dei compiti dato che la base della ricorrenza viene modificata a ogni completamento)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "Eccezioni"
 
-# tooltip
-# nel textbox compaiono i giorni selezionati come eccezioni.
-# per rimuoverli occorre fare doppio clic sui vari elementi
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"Aggiunge ulteriori giorni di eccezione facendo clic nei giorni del "
-"calendario che segue;\n"
-"le eccezioni possono essere sia di esclusione(-) sia di inclusione(+) in "
-"funzione della selezione;\n"
-"rimuove facendo clic sugli elementi"
+msgstr "Aggiunge ulteriori giorni di eccezione facendo clic nei giorni del calendario che segue;\nle eccezioni possono essere sia di esclusione(-) sia di inclusione(+) in funzione della selezione;\nrimuove facendo clic sugli elementi"
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr "Aggiungi giorno escluso"
 
-# tooltip
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-"I giorni esclusi sono giorni interi in cui l'appuntamento non è previsto"
+msgstr "I giorni esclusi sono giorni interi in cui l'appuntamento non è previsto"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
 msgstr "Aggiungi tempi inclusi"
 
-# tooltip
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"I tempi inclusi hanno lo stesso fuso orario dell'istante di inizio, ma "
-"possono avere diversi orari"
+msgstr "I tempi inclusi hanno lo stesso fuso orario dell'istante di inizio, ma possono avere diversi orari"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
 msgstr "Giorni di azione"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Visualizza"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "V_ai"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Nuovo"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Indietro"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Oggi"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Avanti"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Indietro di una settimana"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Indietro di un giorno"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Avanti di un giorno"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Avanti di una settimana"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Ricarica"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Chiudi"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
-msgstr "       Numero di giorni da visualizzare"
+msgstr "Numero di giorni da visualizzare"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - Vista per giorno"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Tutto il giorno"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Ora"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "Non è stata selezionata alcuna riga."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Fare clic su una riga per selezionarla e poi copiarla."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"Verranno rimossi in modo permanente\n"
-"tutti gli appuntamenti selezionati."
+msgstr "Verranno rimossi in modo permanente\ntutti gli appuntamenti selezionati."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Sì, rimuovili"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Indietro"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Avanti"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Trova"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "Vista per giorno"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Giorni aggiuntivi da mostrare"
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Giorni aggiuntivi da mostrare:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "solo la prima occorrenza"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Selezionare questa opzione per visualizzare solo la prima ricorrenza dell'evento; di norma sono visualizzate tutte.\nIn questo modo verranno visualizzate le urgenze.\nGli eventi ricorrenti potrebbero essere visualizzati in anticipo nell'elenco in quanto viene elencata solo la prima occorrenza."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "anche vecchi"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Selezionare questa opzione per vedere solo i vecchi eventi. L'opzione può essere selezionata solo dopo aver abilitato \"solo la prima ricorrenza\" per evitare la visualizzazione di un elenco molto lungo.\nLa selezione per i giorni aggiuntivi definisce se devono essere elencati i nuovi appuntamenti."
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "Appuntamenti della giornata a partire da:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Cerca"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "Cerca testo"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Attributi"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Nome"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Doppio clic sulla riga per modificarla.\n"
-"\n"
-"Attributi in ordine:\n"
-"\t 1. allarme: n=nessun allarme\n"
-"\t\t A=allarme visivo S=solo allarme sonoro\n"
-"\t 2. ricorrente: n=non ricorrente\n"
-"\t\t D=giornaliero W=settimanale M=mensile Y=annuale\n"
-"\t 3. tipo: f=libero B=occupato\n"
-"\t 4. posizionato nel file:\n"
-"\t\tO=Orage A=archivio F=esterno\n"
-"\t 5. tipo di appuntamento:\n"
-"\t\tE=evento T=compito J=note del giorno"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Seleziona della data"
+msgstr "Doppio clic sulla riga per modificarla.\n\nAttributi in ordine:\n1. allarme: n=nessun allarme\n\t\t A=allarme visivo S=solo allarme sonoro\n\t 2. ricorrente: n=non ricorrente\n\t\t D=giornaliero W=settimanale M=mensile Y=annuale\n\t 3. tipo: f=libero B=occupato\n\t 4. posizionato nel file:\n\t\tO=Orage A=archivio F=esterno\n\t 5. tipo di appuntamento:\n\t\tE=evento T=compito J=note del giorno"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tRicorrenza conclusa, spostamento al file di archivio."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Archiviazione non attivata. Esco"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Limite di archiviazione: %d mese(i)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tArchiviazione degli eventi precedenti a: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Uid di archiviazione: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tVCOMPITO non completo; non archiviato"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tRicorrente. Fine anno: %04d, mese: %02d, giorno: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Archiviazione completata\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Avvio rimozione archivio."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tFASE 1: reimposta gli appuntamenti periodici"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tFASE 2: restituisce gli appuntamenti archiviati"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Rimozione archivio completata\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Allarme predefinito di Orage"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Elenco allarme creato per il file principale di Orage"
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Elenco allarmi creato per il file esterno: %s (%s)"
+
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "Creazione lista allarmi: aggiunti %d allarmi. Elaborati %d eventi."
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "⇥Aggiunti %d allarmi. Elaborati %d eventi."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tTrovato %d allarmi, di cui %d attivi (esaminati %d allarmi periodici)."
+msgstr "\tTrovato %d allarmi, di cui %d attivi (esaminati %d allarmi periodici)."
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1450,7 +1445,16 @@
 msgid "Import file preprocessing done"
 msgstr "Pre-elaborazione del file da importare eseguita"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Trovato aggiornamento esterno sul file %s"
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Aggiornamento di allarmi e calendario a seguito dell'aggiornamento del file esterno"
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "File del calendario"
 
@@ -1458,627 +1462,670 @@
 msgid "Current foreign files"
 msgstr "File esterni correnti"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "SOLO LETTURA"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "LETTURA E SCRITTURA"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Nessun file esterno *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Aggiunta del file esterno non riuscita"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage può gestire solo 10 file esterni; è stato raggiunto il limite."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Il nome del file è vuoto."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Il nome è vuoto."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Il file non esiste."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Un file con lo stesso nome esiste già in Orage."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Lo stesso nome esiste già in Orage."
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Importa/esporta"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Importa"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Leggi dal file:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Separa i nomi dei file con virgole(,);\n"
-" NOTA: la virgola non è un carattere valido nei nomi di file per Orage"
+msgstr "Separare i nomi dei file con virgole(,);\nNOTA: la virgola non è un carattere valido nei nomi di file per Orage"
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Esporta"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Scrivi sul file:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Seleziona"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Tutti gli appuntamenti"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Solo determinati appuntamenti"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Si noti che soltanto gli appuntamenti del file principale sono letti;\n"
-"gli eventi archiviati ed esterni non vengono esportati"
+msgstr "Si noti che soltanto gli appuntamenti del file principale sono letti;\ngli eventi archiviati ed esterni non vengono esportati"
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Si noti che vengono letti soltanto gli appuntamenti del file principale;\n"
-"gli eventi archiviati ed esterni non vengono esportati"
+msgstr "Si noti che vengono letti soltanto gli appuntamenti del file principale;\ngli eventi archiviati ed esterni non vengono esportati"
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
-msgstr "Si può trascinarli facilmente dalla finestra della lista eventi"
+msgstr "É possibile trascinarli facilmente dalla finestra della lista eventi"
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "Gli UID degli appuntamenti di Orage separati da virgole"
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Archivia"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Archivia subito (limite: %d mesi)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "È possibile modificare il limite dell'archivio nei parametri"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Ripristina subito l'archivio"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Ripristina tutti gli eventi archiviati nel file principale di orage e "
-"rimuove il file di archivio;\n"
-"ciò è utile ad esempio quando si esporta e si trasferiscono gli\n"
-"appuntamenti di Orage verso un altro sistema"
+msgstr "Ripristina tutti gli eventi archiviati nel file principale di orage e rimuove il file di archivio;\nciò è utile ad esempio quando si esporta e si trasferiscono gli\nappuntamenti di Orage verso un altro sistema"
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "File di Orage"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "File del calendario principale di Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "File corrente"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Nuovo file"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Opzioni dell'azione"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "File corrente:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Nuovo file:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Opzioni dell'azione:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Rinomina"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Rinomina soltanto il file interno di Orage;\n"
-"non ha alcun effetto sul file system esterno;\n"
-"Il nuovo file dovrebbe esistere"
+msgstr "Rinomina soltanto il file interno di Orage;\nnon ha alcun effetto sul file system esterno;\nIl nuovo file dovrebbe esistere"
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Copia"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-"Il file corrente viene copiato e rimane immutato nella posizione precedente"
+msgstr "Il file corrente viene copiato e rimane immutato nella posizione precedente"
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Sposta"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
-msgstr ""
-"Il file corrente viene spostato e cancellato dalla posizione precedente"
+msgstr "Il file corrente viene spostato e cancellato dalla posizione precedente"
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "File di archivio"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "File esterni"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Aggiungi un nuovo file esterno"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "File esterno:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Opzioni"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Nome visibile:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Sola lettura"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"L'opzione viene attivata quando si è sicuri che il file non verrà mai "
-"modificato da Orage;\n"
-"si noti che modificare file esterni può renderli incompatibili con "
-"l'applicazione originale dalla quale essi provengono"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "L'opzione viene attivata quando si è sicuri che il file non verrà mai modificato da Orage;\nsi noti che modificare file esterni può renderli incompatibili con l'applicazione originale dalla quale essi provengono"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Questo nome interno è visualizzato all'utente invece del nome del file."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Scambio dati - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tQuesta è la versione %2$s di %1$s\n"
-"\n"
+msgstr "\tQuesta è la versione %2$s di %1$s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tRilasciata sotto i termini della GNU General Public License.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tCompilata con GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "usando GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tUtilizza DBUS per l'importazione.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tNon utilizza DBUS. L'importazione funziona solo parzialmente.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tUtilizza libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tNon utilizza libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tUtilizza l'archiviazione automatica.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tNon utilizza l'archiviazione automatica.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tUtilizza il pacchetto libcal del sistema operativo.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tUtilizza il pacchetto libcal della versione locale di Orage.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Utilizzo: orage [opzioni] [file]\n"
-"\n"
+msgstr "Utilizzo: orage [opzioni] [file]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Opzioni:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tmostra la versione di orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tstampa questo testo\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \tmostra la finestra delle preferenze\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\trende orage visibile/invisibile\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) file [RW] \taggiunge un file esterno\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) file [RW] [nome] ⇥aggiunge un file esterno\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) file \trimuove un file esterno\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
-"--export (-e) file [appuntamento...] \tesporta gli appuntamenti da Orage in "
-"un file\n"
+msgstr "--export (-e) file [appuntamento...] \tesporta gli appuntamenti da Orage in un file\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "file=file ical da caricare in orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tdbus non incluso in orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\t senza dbus [file] e le opzioni dei file esterni (-a e -r), può essere "
-"utilizzato solamente quando si avvia orage \n"
+msgstr "\t senza dbus [file] e le opzioni dei file esterni (-a e -r), può essere utilizzato solamente quando si avvia orage \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Opzione sconosciuta %s\n"
-"\n"
+msgstr "\nOpzione sconosciuta %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "Scam_bia dati"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Visualizza _data selezionata"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Visualizza _settimana selezionata"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Seleziona _oggi"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
 msgstr "Mosta ora _globale"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Nessun titolo"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr "Posizione: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\nNota:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Mai"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Titolo: %s\n"
-" Inizio:\t%s\n"
-" Fine:\t%s\n"
-" Commento:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "Titolo: %s\n Inizio %s :\t%s\n Termine:\t%s\n Fatto:\t%s%s"
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Titolo: %s\n"
-" Inizio:\t%s\n"
-" Fine:\t%s\n"
-" Commento:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Titolo: %s\n%s Inizio:\t%s\n Fine:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Compito:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Eventi per il %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>Eventi per il %s - %s:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "Impostazioni principali"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Fuso orario"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "Si dovrebbe sempre definire il proprio fuso orario locale"
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "Limite archivio (mesi)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = non archiviare)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"L'archiviazione viene utilizzata per risparmiare tempo e spazio quando "
-"vengono gestiti gli eventi"
+msgstr "L'archiviazione viene utilizzata per risparmiare tempo e spazio quando vengono gestiti gli eventi"
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Comando audio"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-"Questo comando viene passato alla shell per trasformare l'audio in allarmi"
+msgstr "Questo comando viene passato alla shell per trasformare l'audio in allarmi"
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "Impostazioni di visualizzazione"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Finestra del calendario"
 
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Finestra principale del calendario"
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Dettagli di visualizzazione del calendario"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "Mostra bordi"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "Mostra menu"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Mostra mese e anno"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
 msgstr "Mostra nomi dei giorni"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
 msgstr "Mostra numeri delle settimane"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Mostra mese e anno"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Riquadri delle informazioni del calendario"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "Mostra lista compiti"
 
-# preferenze; poco spazio dispo;
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
 msgstr "Numero di giorni nella finestra degli eventi"
 
-# tooltip
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
 msgstr "0 = non visualizza nessun evento"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Visibilità calendario"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
 msgstr "Mostra su tutte le scrivanie"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
 msgstr "Mantieni in primo piano"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "Mostra nella barra delle applicazioni"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "Mostra nel paginatore"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "Mostra nell'area di notifica"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "Avvio calendario"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Mostra"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Nascondi"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Minimizza"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr "Impostazioni supplementari"
-
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
 msgstr "All'apertura della finestra del calendario"
 
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
+#: ../src/parameters.c:792
+msgid "Select today's date"
 msgstr "Seleziona la data di oggi"
 
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
 msgstr "Seleziona la data precedentemente selezionata"
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "Icona di vassoio dinamica"
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "Usa icona dinamica"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "L'icona dinamica mostra il mese corrente e il giorno del mese"
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
 msgstr "Doppio clic sul calendario principale mostra"
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
 msgstr "Vista per giorni"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
 msgstr "Lista eventi"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr "Finestra della lista degli eventi"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Impostazioni supplementari"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Finestra lista eventi"
 
-# finestra delle preferenze; poco spazio;
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
-msgstr "Numero di giorni aggiuntivi nella lista eventi"
+msgstr "Numero di giorni aggiuntivi da visualizzare nella lista eventi"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
-msgstr ""
-"Questo è il valore predefinito; può essere modificato nella finestra della "
-"lista degli eventi"
+msgstr "Questo è il valore predefinito; può essere modificato nella finestra della lista degli eventi"
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Mostra solo l'evento che si ripete per la prima volta"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Primo giorno predefinito della finestra a vista per giorno"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Primo giorno della settimana"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Seleziona giorno"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Icona di vassoio dinamica"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Usa icona dinamica"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "L'icona dinamica mostra il mese corrente e il giorno del mese"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
 msgstr "Utilizza timer"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-"Usare questo timer se Orage ha problemi ad avviarsi dopo una sospensione o "
-"un'ibernazione (per esempio l'icona di vassoio non viene aggiornata o gli "
-"allarmi non vengono eseguiti)."
+msgstr "Usare questo timer se Orage ha problemi ad avviarsi dopo una sospensione o un'ibernazione (per esempio l'icona di vassoio non viene aggiornata o gli allarmi non vengono eseguiti)."
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Allarme visivo predefinito per file esterni"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Finestra di Orage"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Notifica le notifiche"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Uscita quando viene richiesta la chiusura"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Esci sempre"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Normalmente Orage rimane aperto in secondo piano quando ne viene richiesta la chiusura; questa opzione impone a Orage di chiudersi senza rimanere aperto in secondo piano quando se ne richiede la chiusura"
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Preferenze di Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
 msgstr "Primo avvio di Orage. Ricerca del fuso orario predefinito in corso."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Fuso orario impostato a %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
 msgstr "Fuso orario predefinito non trovato, impostarlo manualmente"
 
@@ -2090,40 +2137,35 @@
 msgid "Open"
 msgstr "Apri"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Promemoria - Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Postponi"
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "Ricorda nuovamente dopo il tempo indicato"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr "Premere <Esegui> per ricordare nuovamente dopo il tempo indicato:"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Prossimo allarme attivo:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d g %02d h %02d min a: %s"
+msgstr "\n%02d g %02d h %02d min a: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Non è stato trovato alcun allarme attivo"
+msgstr "\nNon è stato trovato alcun allarme attivo"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2146,1537 +2188,2229 @@
 msgstr "Africa/Algeri"
 
 #: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
+msgid "Africa/Asmara"
 msgstr "Africa/Asmara"
 
 #: ../src/timezone_names.c:42
+msgid "Africa/Asmera"
+msgstr "Africa/Asmara"
+
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "Africa/Bamako"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "Africa/Bangui"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "Africa/Banjul"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "Africa/Bissau"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "Africa/Blantyre"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "Africa/Brazzaville"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "Africa/Bujumbura"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "Africa/Il_Cairo"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "Africa/Casablanca"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "Africa/Ceuta"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "Africa/Conakry"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "Africa/Dakar"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "Africa/Dar_es_Salaam"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "Africa/Gibuti"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "Africa/Douala"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "Africa/El_Ayun"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "Africa/Freetown"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "Africa/Gaborone"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "Africa/Harare"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "Africa/Juba"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "Africa/Johannesburg"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "Africa/Kampala"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "Africa/Khartum"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "Africa/Kigali"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "Africa/Kinshasa"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "Africa/Lagos"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "Africa/Libreville"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "Africa/Lomé"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "Africa/Luanda"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "Africa/Lubumbashi"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "Africa/Lusaka"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "Africa/Malabo"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "Africa/Maputo"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "Africa/Maseru"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "Africa/Mbabane"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "Africa/Mogadiscio"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "Africa/Monrovia"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "Africa/Nairobi"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "Africa/N'Djamena"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "Africa/Niamey"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "Africa/Nouakchott"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "Africa/Ouagadougou"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "Africa/Porto-Novo"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "Africa/Sao_Tomé"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "Africa/Timbuctu"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "Africa/Tripoli"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "Africa/Tunisi"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "Africa/Windhoek"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "America"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "America/Adak"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "America/Anchorage"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "America/Anguilla"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "America/Antigua"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "America/Araguaina"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "America/Argentina/Buenos_Aires"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "America/Argentina/Catamarca"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "America/Argentina/ComodRivadavia"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "America/Argentina/Cordoba"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "America/Argentina/Jujuy"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "America/Argentina/La_Rioja"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "America/Argentina/Mendoza"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "America/Argentina/Rio_Gallegos"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "America/Argentina/Salta"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "America/Argentina/San_Juan"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "America/Argentina/San_Luis"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "America/Argentina/Tucuman"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "America/Argentina/Ushuaia"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "America/Aruba"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "America/Asuncion"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "America/Atikokan"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "America/Atka"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "America/Bahia"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "America/Bahia_Banderas"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "America/Barbados"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "America/Belém"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "America/Belize"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "America/Blanc-Sablon"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "America/Boa_Vista"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "America/Bogota"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "America/Boise"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "America/Buenos_Aires"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "America/Cambridge_Bay"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "America/Campo_Grande"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "America/Cancun"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "America/Caracas"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "America/Catamarca"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "America/Caienna"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "America/Cayman"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "America/Chicago"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "America/Chihuahua"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "America/Coral_Harbour"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "America/Cordoba"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "America/Costa_Rica"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "America/Creston"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "America/Cuiaba"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "America/Curacao"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "America/Danmarkshavn"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "America/Dawson"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "America/Dawson_Creek"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "America/Denver"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "America/Detroit"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "America/Dominica"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "America/Edmonton"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "America/Ensenada"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "America/Eirunepé"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "America/El_Salvador"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "America/Fortaleza"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "America/Fort_Wayne"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "America/Glace_Bay"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "America/Nuuk"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "America/Goose_Bay"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "America/Grand_Turk"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "America/Grenada"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "America/Guadalupa"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "America/Guatemala"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "America/Guayaquil"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "America/Guyana"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "America/Halifax"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "America/L'Avana"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "America/Hermosillo"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "America/Indiana/Indianapolis"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "America/Indiana/Knox"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "America/Indiana/Marengo"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "America/Indiana/Petersburg"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "America/Indiana/Tell_City"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "America/Indiana/Vevay"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "America/Indiana/Vincennes"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "America/Indiana/Winamac"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "America/Indianapolis"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "America/Inuvik"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "America/Iqaluit"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "America/Giamaica"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "America/Jujuy"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "America/Juneau"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "America/Kentucky/Louisville"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "America/Kentucky/Monticello"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "America/Knox_IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "America/Kralendijk"
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "America/La_Paz"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "America/Lima"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "America/Los_Angeles"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "America/Louisville"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "America/Lower_Princes"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "America/Maceio"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "America/Managua"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "America/Manaus"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "America/Marigot"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "America/Martinica"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "America/Matamoros"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "America/Mazatlan"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "America/Mendoza"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "America/Menominee"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "America/Mérida"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "America/Metlakatla"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "America/_Città del Messico"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "America/Miquelon"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "America/Moncton"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "America/Monterrey"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "America/Montevideo"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "America/Montréal"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "America/Montserrat"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "America/Nassau"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "America/New_York"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "America/Nipigon"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "America/Nome"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "America/North_Dakota/Beulah"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "America/North_Dakota/Center"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "America/North_Dakota/New_Salem"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "America/Noronha"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "America/Ojinaga"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "America/Panama"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "America/Pangnirtung"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "America/Paramaribo"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "America/Phoenix"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "America/Port-au-Prince"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "America/Port_of_Spain"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "America/Porto_Acre"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "America/Porto_Velho"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "America/Porto_Rico"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "America/Rainy_River"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "America/Rankin_Inlet"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "America/Recife"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "America/Regina"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "America/Resolute"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "America/Rio_Branco"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "America/Rosario"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "America/Santa_Isabel"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "America/Santarem"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "America/Santiago"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "America/Santo_Domingo"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "America/San_Paolo"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "America/Scoresby_Sund"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "America/Shiprock"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "America/Sitka"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "America/St_Barthelemy"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "America/Saint_John's"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "America/Saint_Kitts"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "America/Saint_Lucia"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "America/Saint_Thomas"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "America/Saint_Vincent"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "America/Swift_Current"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "America/Tegucigalpa"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "America/Qaanaaq"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "America/Thunder_Bay"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "America/Tijuana"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "America/Toronto"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "America/Tortola"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "America/Vancouver"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "America/Virgin"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "America/Whitehorse"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "America/Winnipeg"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "America/Yakutat"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "America/Yellowknife"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Antartide"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Antartide/Casey"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Antartide/Davis"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Antartide/Dumont_d'Urville"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Antarctica/Macquarie"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Antartide/Mawson"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Antartide/McMurdo"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Antartide/Palmer"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Antarctica/Rothera"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Antartide/Polo_Sud"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "Antartide/Syowa"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Antartide/Vostok"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Artide"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Artide/Longyearbyen"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Asia"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Asia/Aden"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Asia/Almaty"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Asia/Amman"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Asia/Anadyr'"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Asia/Aqtau"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aqtobe"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "Asia/Ashgabat"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Asia/Ashkhabad"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "Asia/Baghdad"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Asia/Bahrain"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Asia/Baku"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Asia/Bishkek"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Asia/Brunei"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Asia/Calcutta"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Asia/Choibalsan"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "Asia/Chongqing"
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "Asia/Chongqing"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Asia/Colombo"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Asia/Dacca"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "Asia/Damasco"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Asia/Dacca"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Asia/Dubai"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dushanbe"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Asia/Harbin"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Asia/Hebron"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong_Kong"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Asia/Ho_Chi_Minh"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Asia/Hovd"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Asia/Istanbul"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Asia/Giacarta"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Asia/Gerusalemme"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamchatka"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Asia/Karachi"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Asia/Kathmandu"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Asia/Kathmandu"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Asia/Khandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Asia/Kolkata"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnojarsk"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala_Lumpur"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Asia/Kuching"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Asia/Macau"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Asia/Makassar"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Asia/Mascate"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Asia/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Asia/Oral"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Asia/Qyzylorda"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangoon"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyad"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Asia/Riyadh87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Asia/Riyadh88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Asia/Riyadh89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Asia/Ho_Chi_Minh"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Asia/Sakhalin"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarcanda"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Asia/Seoul"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Asia/Singapore"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Asia/Taskent"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Asia/Teheran"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Asia/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Asia/Thimbu"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokyo"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/_Makassar"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulan Bator"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Asia/Ulan_Bator"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Asia/Ust-Nera"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Asia/Jakutsk"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Ekaterinburg"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Atlantico"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Atlantico/Azzorre"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Atlantico/Bermuda"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Atlantico/Canarie"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantico/Capo_Verde"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "Atlantico/Faeroe"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlantico/Faroe"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantico/Jan_Mayen"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "Atlantico/Madera"
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantico/Reykjavik"
 
-#: ../src/timezone_names.c:306
+#: ../src/timezone_names.c:375
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantico/_Georgia del Sud"
 
-#: ../src/timezone_names.c:307
+#: ../src/timezone_names.c:376
 msgid "Atlantic/St_Helena"
 msgstr "Atlantico/Sant'_Elena"
 
-#: ../src/timezone_names.c:308
+#: ../src/timezone_names.c:377
 msgid "Atlantic/Stanley"
 msgstr "Atlantico/Stanley"
 
-#: ../src/timezone_names.c:309
+#: ../src/timezone_names.c:378
 msgid "Australia"
 msgstr "Australia"
 
-#: ../src/timezone_names.c:310
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Australia/ACT"
+
+#: ../src/timezone_names.c:380
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaide"
 
-#: ../src/timezone_names.c:311
+#: ../src/timezone_names.c:381
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: ../src/timezone_names.c:312
+#: ../src/timezone_names.c:382
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: ../src/timezone_names.c:313
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Australia/Currie"
+
+#: ../src/timezone_names.c:384
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: ../src/timezone_names.c:314
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Australia/Eucla"
+
+#: ../src/timezone_names.c:386
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: ../src/timezone_names.c:315
+#: ../src/timezone_names.c:387
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: ../src/timezone_names.c:316
+#: ../src/timezone_names.c:388
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: ../src/timezone_names.c:317
+#: ../src/timezone_names.c:389
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: ../src/timezone_names.c:318
+#: ../src/timezone_names.c:390
 msgid "Australia/Perth"
 msgstr "Australia/Sydney"
 
-#: ../src/timezone_names.c:319
+#: ../src/timezone_names.c:391
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brasile"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brasile/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brasile/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brasile/Est"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brasile/Ovest"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Canada"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Canada/Atlantico"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Canada/Centrale"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Canada/Est-Saskatchewan"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Canada/Est"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Canada/Montagne"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Canada/Newfoundland"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Canada/Pacifico"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Canada/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Canada/Yukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Chile"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Chile/Continentale"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Chile/EasterIsland"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Universale"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Zulu"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Europa"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Europa/Atene"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrado"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Europa/Berlino"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Europa/Bruxelles"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Europe/Bucarest"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Europe/Busingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Europa/Copenaghen"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "Europa/Dublino"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibilterra"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Europe/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Europa/Isle_of_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Europa/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisbona"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "Europa/Lubiana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Europa/Londra"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Europa/Lussemburgo"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Europa/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Europa/Mosca"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Europa/Parigi"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Europa/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Europa/Praga"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol'"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Europa/Stoccolma"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Europa/Tiraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Užhorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Europa/Vaticano"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Europa/Vienna"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Europa/Volgograd"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "Europa/Varsavia"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagabria"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporizhia"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "Europa/Zurigo"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Indiano"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "Indiano/Antananarivo"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "Indiano/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "Indiano/Natale"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "Indiano/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "Indiano/Comore"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "Indiano/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "Indiano/Mahé"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "Indiano/Maldive"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "Indiano/Mauritius"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "Indiano/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "Indiano/Riunione"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Messico"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Messico/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Messico/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Messico/Generale"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Medioriente"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Medioriente/Riyadh87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Medioriente/Riyadh88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Medioriente/Riyadh89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Pacifico"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "Pacifico/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Pacifico/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Pacifico/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Pacifico/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "Pacifico/Pasqua"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "Pacifico/Éfaté"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "Pacifico/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Pacifico/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "Pacifico/Figi"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Pacifico/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Pacifico/Galapagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Pacifico/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "Pacifico/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Pacifico/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Pacifico/Honolulu"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Pacifico/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "Pacifico/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "Pacifico/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "Pacifico/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Pacifico/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Pacifico/Marchesi"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Pacifico/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Pacifico/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Pacifico/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Pacifico/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "Pacifico/Nouméa"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Pacifico/Pago_Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Pacifico/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "Pacifico/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Pacifico/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "Pacifico/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Pacifico/Port_Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Pacifico/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Pacifico/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pacifico/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Pacifico/Tahiti"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Pacifico/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Pacifico/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Pacifico/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Pacifico/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Pacifico/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "Pacifico/Yap"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "US"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "US/Alaska"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "US/Aleutian"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "US/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "US/Centrale"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "US/Est"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "US/Est-Indiana"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "US/Hawaii"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "US/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "US/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "US/Montagna"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "US/Pacifico"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "US/Pacifico-Nuovo"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "US/Samoa"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "Nuovo appuntamento"
@@ -3694,227 +4428,26 @@
 msgstr "Mostrare ora e data?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Calendario"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Preferenze del calendario di Orage"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Preferenze di Orage"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Impostazioni per l'applicazione Calendario di Xfce4 (Orage)"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Calendario per la scrivania"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Preferenze del calendario di Orage"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Calendario"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Calendario di Orage"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Titolo: %s\n"
-#~ " Inizio:\t%s\n"
-#~ " Scadenza:\t%s\n"
-#~ " Fatto:\t%s\n"
-#~ "Commento:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Si devono inserire tutti i caratteri di escape;\n"
-#~ " Questa stringa viene trasferita alla linea di comando per eseguirla"
-
-#~ msgid "Orage clock"
-#~ msgstr "Orologio di Orage"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Creatore originale, mantenitore ritirato"
-
-#~ msgid "Contributor"
-#~ msgstr "Collaboratore"
-
-#~ msgid "Info"
-#~ msgstr "Informazioni"
-
-#~ msgid "Warning"
-#~ msgstr "Avviso"
-
-#~ msgid "Error"
-#~ msgstr "Errore"
-
-#~ msgid "Set sticked"
-#~ msgstr "Blocca"
-
-#~ msgid "Select always today"
-#~ msgstr "Seleziona sempre oggi"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Quando mostra il calendario principale, colloca l'indicatore o sul giorno "
-#~ "selezionato in precedenza o sempre sul giorno corrente"
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Fine modalità correzione dell'ora"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Avvio modalità correzione dell'ora"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "regolare per cambiare i minuti"
-
-#~ msgid "Vary"
-#~ msgstr "Varia"
-
-#~ msgid "Select timezone"
-#~ msgstr "Selezionare fuso orario"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Modifica Orologio"
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "inserire il fuso orario dell'orologio,\n"
-#~ "(=qualsiasi valore TZ valido)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Modifica preferenze"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Inserire il fuso orario locale (viene usato per mostrare se l'ora si "
-#~ "riferisca alla data immediatamente precedente(-) o successiva(+) "
-#~ "aggiungendo un +/- dopo l'ora)."
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr ""
-#~ "Impostare un valore di fuso orario (=TZ) valido o sceglierne uno "
-#~ "dall'elenco."
-
-#~ msgid "show line _1:"
-#~ msgstr "mostra riga _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "mostra riga _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "mostra riga _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Proprietà"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Avvio di «orage -p» fallito"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> inserire la data corrente nel formato di data locale.\n"
-#~ "<T> inserire l'ora e\n"
-#~ "<DT> inserire data e ora."
-
-#~ msgid "Show event list"
-#~ msgstr "Mostra lista eventi"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = usa icona statica)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "L'icona dinamica mostra il giorno e il mese correnti. È visibile "
-#~ "solamente nell'area di notifica. Se l'area è troppo piccola per le "
-#~ "dimensioni dell'icona dinamica, Orage tornerà automaticamente all'icona "
-#~ "statica."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Impostazioni del calendario"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Impostazioni del calendario di Xfce 4"
-
-#~ msgid "Monday"
-#~ msgstr "Oggi"
-
-#~ msgid "Tuesday"
-#~ msgstr "Oggi"
-
-#~ msgid "Wednesday"
-#~ msgstr "2 giorni"
-
-#~ msgid "Thursday"
-#~ msgstr "Oggi"
-
-#~ msgid "Friday"
-#~ msgstr "2 giorni"
-
-#~ msgid "Sunday"
-#~ msgstr "2 giorni"
-
-#~ msgid "Days"
-#~ msgstr "2 giorni"
-
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%d/%m/%Y"
-
-#~ msgid "Calendar Files"
-#~ msgstr "Calendario"
-
-#~ msgid "Hidden"
-#~ msgstr "Nascondi"
-
-#~ msgid "3 months"
-#~ msgstr "3 mesi"
-
-#~ msgid "6 months"
-#~ msgstr "6 mesi"
-
-#~ msgid "1 year"
-#~ msgstr "1 anno"
-
-#~ msgid "Application"
-#~ msgstr "Applicazione"
-
-#~ msgid "Core developer"
-#~ msgstr "Sviluppatore principale"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Rimuoverai ogni informazione \n"
-#~ "associata a questa data."
-
-#~ msgid "Clear"
-#~ msgstr "Pulisci"
-
-#~ msgid "This should not happen"
-#~ msgstr "Questo non dovrebbe succedere"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Impossibile creare il canale del client MCS"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Calendario per la scrivania"
diff -Nru orage-4.8.3/po/ja.po orage-4.12.1/po/ja.po
--- orage-4.8.3/po/ja.po	2012-01-03 12:01:05.000000000 +0000
+++ orage-4.12.1/po/ja.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,29 +1,38 @@
-# $Id$
-#
-# Japanese translations for orage package.
-# Copyright (C) 2003-2007 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Zhao Ji <zhao-ji@awz.ne.jp>, 2003.
-# Daichi Kawahata <daichi@xfce.org>, 2005-2007.
-#
-# 対訳:
-# event      - 予定
-# journal    - 記録
-# appointment - 用件
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Zhao Ji <zhao-ji@awz.ne.jp>, 2003
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.5.9.6\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2011-09-13 22:48+0900\n"
-"Last-Translator: Masato Hashimoto <cabezon.hashimoto@gmail.com>\n"
-"Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2014-10-24 14:50+0000\n"
+"Last-Translator: Masato HASHIMOTO <cabezon.hashimoto@gmail.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/xfce-apps/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja\n"
-"X-Poedit-Language: Japanese\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "下線なし"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "単線"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "二重線"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "下線"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -39,9 +48,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"クリックで時刻を修正します"
+msgstr "%s\nクリックで時刻を修正します"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -51,9 +58,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"マウスボタン1 で設定を変更します\n"
-"マウスボタン2 で時刻を調整します"
+msgstr "マウスボタン1 で設定を変更します\nマウスボタン2 で時刻を調整します"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -62,9 +67,11 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"分を調整してください。ボタン 2 で矢印ボタンをクリックすると 1 分ずつ変更しま"
-"す。"
+msgstr "分を調整してください。ボタン 2 で矢印ボタンをクリックすると 1 分ずつ変更します。"
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "世界時計"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -125,7 +132,7 @@
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
 msgid "Clock Parameters"
-msgstr "時計のパラメタ"
+msgstr "時計のパラメーター"
 
 #: ../globaltime/gt_prefs.c:607
 msgid "Name of the clock:"
@@ -266,6 +273,10 @@
 msgid "Use normal decorations"
 msgstr "ウィンドウの枠を表示します"
 
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "なし"
+
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
 msgstr "ウィンドウの枠を表示しません"
@@ -327,13 +338,11 @@
 msgid "forward"
 msgstr "+"
 
-# Summer time shift - previous
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
 msgid "not changed"
 msgstr "変更なし"
 
-# Summer time shift - next
 #: ../globaltime/timezone_selection.c:195
 #: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
 msgid "not changing"
@@ -343,10 +352,10 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
-msgstr "現在地"
+msgstr "場所"
 
 #: ../globaltime/timezone_selection.c:258
 #: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
@@ -376,7 +385,6 @@
 msgid "Pick timezone"
 msgstr "タイムゾーンを選択してください"
 
-# Change timezone view
 #: ../globaltime/timezone_selection.c:302
 #: ../globaltime/timezone_selection.c:312
 #: ../panel-plugin/timezone_selection.c:303
@@ -405,96 +413,108 @@
 msgid "floating"
 msgstr "フローティング"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "世界時計"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Orage 世界時計"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "様々な地域の時刻を表示します。"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "世界時計"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "回転なし"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "左に回転"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "右に回転"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "外観"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
 msgstr "枠を表示する(_F)"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
 msgstr "文字色(_C):"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
 msgstr "背景色(_B):"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
 msgstr "縦幅(_H):"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
 msgstr "水平パネルの高さは変更されないことに注意してください"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
 msgstr "横幅(_W):"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
 msgstr "垂直パネルの幅は変更されないことに注意してください"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "線を縦に表示する(_V)"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "時計のオプション"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
 msgstr "タイムゾーン:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "%d 行目:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
 msgstr "関数 strftime(3) の有効なパラメーターを入力してください。"
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
 msgstr "ツールチップ:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
 msgstr "サスペンド/ハイバネート後に時刻を合わせる"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"このオプションは短時間 (5時間以下) のサスペンドまたはハイバネートを行い、時刻"
-"に秒を表示していない場合にのみ必要となります。その条件下でこのオプションを設"
-"定していない場合、 Orage 時計は不正確な時刻を表示する可能性があります (これを"
-"設定すると CPU および割り込み保存が動作するのを抑止します)。"
+msgstr "このオプションは短時間 (5時間以下) のサスペンドまたはハイバネートを行い、時刻に秒を表示していない場合にのみ必要となります。その条件下でこのオプションを設定していない場合、 Orage 時計は不正確な時刻を表示する可能性があります (これを設定すると CPU および割り込み保存が動作するのを抑止します)。"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -504,22 +524,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"このプログラムは時間を取得するのに関数 strftime(3) を利用します。\n"
-"有効なコードを使用すれば、お好きな表示方式で時間を表示できます。\n"
-"以下に一般的なコードの一部を掲載します:\n"
-"\t%A = 曜日\t\t\t\t%B = 月\n"
-"\t%c = 日付と時間\t\t\t%R = 時と分\n"
-"\t%V = 年頭からの経過週\t%Z = 現在のタイムゾーン\n"
-"\t%H = 時\t\t\t\t%M = 分\n"
-"\t%X = 現地の時間\t\t%x = 現地の日付"
+msgstr "このプログラムは時間を取得するのに関数 strftime(3) を利用します。\n有効なコードを使用すれば、お好きな表示方式で時間を表示できます。\n以下に一般的なコードの一部を掲載します:\n\t%A = 曜日\t\t\t\t%B = 月\n\t%c = 日付と時間\t\t\t%R = 時と分\n\t%V = 年頭からの経過週\t%Z = 現在のタイムゾーン\n\t%H = 時\t\t\t\t%M = 分\n\t%X = 現地の時間\t\t%x = 現地の日付"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
 msgstr "Orage 時計の設定"
 
-# FIXME: On IRIX, it makes sense at least
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -528,14 +538,13 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
 msgstr "%x %A"
 
 #: ../src/about-xfcalendar.c:40
 msgid "Maintainer"
-msgstr "メンテナ"
+msgstr "メンテナー"
 
 #: ../src/about-xfcalendar.c:47
 msgid "Manage your time with Orage"
@@ -544,21 +553,21 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "終了"
 
 #: ../src/appointment.c:333
 msgid "Due"
-msgstr "締切り"
+msgstr "締切"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "ファイルを選択してください..."
 
@@ -566,225 +575,281 @@
 msgid "Sound Files"
 msgstr "サウンドファイル"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "すべてのファイル"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "この用件情報は変更されています。"
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "続行しますか?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "いいえ"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "はい、変更は破棄します"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "この用件の終了時刻が開始時刻よりも早くなっています。"
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "設定なし"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "新しい用件情報をこのファイルに追加します。"
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Orage デフォルトファイル"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "用件の追加に失敗しました。"
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "用件の追加時にエラーが発生しました。詳細についてはログファイルを参照してください。"
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "用件の更新に失敗しました。"
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "詳細についてはログファイルを参照してください。(ファイルが外部から更新されているかもしれません)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
 msgstr "この用件は永久に削除されます。"
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "いいえ、削除しません"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "はい、削除します"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "日付を選択してください"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "今日"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "この用件は存在しません。"
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
 msgstr "これはおそらく削除されています。画面を更新してください。"
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "現在のカテゴリ"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "新規カテゴリを色付きで追加します"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "カテゴリ:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "カテゴリの色 - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr "*** コピー ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "新しい用件 - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "保存して閉じる(_E)"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "複製(_U)"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "保存します"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "保存して閉じます"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "元に戻します"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "複製を作成します"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "削除します"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "用事なし"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "用事あり"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "一般"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "タイプ "
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "予定"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
 msgstr "いつか起こる出来事です。例: 会議、誕生日、TV番組など"
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "ToDo"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"いつかやらなければならないことです。\n"
-"例: 洗車、新しいバージョンの Orage のテストなど"
+msgstr "いつかやらなければならないことです。\n例: 洗車、新しいバージョンの Orage のテストなど"
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "記録"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"起こった出来事のメモです。\n"
-"例: お母さんが電話してきた日、初雪の日など"
+msgstr "起こった出来事のメモです。\n例: お母さんが電話してきた日、初雪の日など"
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "件名 "
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "終日"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "開始"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "あり    "
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "期間"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "日"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "時"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "分"
 
-# FIXME:
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "都合"
 
-# XXX
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "完了"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "済み"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "カテゴリ"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
 msgstr "これは特殊なカテゴリで、この用件を色付きでリストに表示します。"
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "カテゴリの色を更新します"
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "優先度"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "8 以上の値を設定すると、用件は一覧ウィンドウに表示されません。\nこれにより一覧ウィンドウを整理できますが、この用件を見つけるのが困難になります。\n(アラームは通常通り通知されます)\n(ドキュメント化されてないパラメーターによってデフォルト値の 8 を変更できます)"
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "備考"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -793,140 +858,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"以下のショートハンドコマンドは即座に解釈されます:\n"
-"    <D> 現在の日付をローカル日付フォーマットで挿入します\n"
-"    <T> 時刻を挿入します\n"
-"    <DT> 日付と時刻を挿入します\n"
-"\n"
-"以下はそれらが表示された時のみ変換されます:\n"
-"    <&Ynnnn> は現在の年から nnnn を引いたものに変換されます。\n"
-"(これは例えば誕生日の通知などで、その人が何歳になったかを表示する場合に使用で"
-"きます)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "以下のショートハンドコマンドは即座に解釈されます:\n    <D> 現在の日付をローカル日付フォーマットで挿入します\n    <T> 時刻を挿入します\n    <DT> 日付と時刻を挿入します\n\n以下はそれらが表示されたときのみ変換されます:\n    <&Ynnnn> は現在の年から nnnn を引いたものに変換されます。\n(これは例えば誕生日の通知などで、その人が何歳になったかを表示する場合に使用できます)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "開始前"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "終了前"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "開始後"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "終了後"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "アラーム"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "アラーム時期"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"アラーム通知するタイミングを指定します:\n"
-" 1) 予定の開始前\n"
-" 2) ToDo の締切り前\n"
-" 3) ToDo の開始後"
+msgstr "アラーム通知するタイミングを指定します:\n 1) 予定の開始前\n 2) ToDo の締切前\n 3) ToDo の開始後"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
-msgstr "アラームを維持する"
+msgstr "持続アラームにする"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"アラームが発生したときに Orage が起動していなくても、後の Orage 起動時に通知"
-"させたいときに設定します。"
+msgstr "アラームが発生したときに Orage が起動していなくても、後の Orage 起動時に通知させたいときに設定します。"
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "サウンド"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "使用する"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
-msgstr "音で通知させたい時に設定します"
+msgstr "音で通知させたいときに設定します"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "アラーム音を繰り返す"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "回繰り返す"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "秒間隔"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "視覚"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Orage ウィンドウを使用する"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
 msgstr "Orage ウィンドウで通知させたいときに設定します"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "デスクトップ通知を使用する"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
 msgstr "デスクトップ通知で通知させたいときに設定します"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "タイムアウト設定"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
 msgstr "通知を自動的に終了させたいときに設定します"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 ならば、システムデフォルトの終了時間になります"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr " 秒"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "プロシージャ"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
 msgstr "プロシージャまたはスクリプトで通知させたいときに設定します"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -936,169 +985,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
-"エスケープなどの文字は自身で入力してください。\n"
-"この文字列はシェルに渡されます。\n"
-"以下は実行時に置き換えられる特殊コマンドです:\n"
-"\t<&T>  件名\n"
-"\t<&D>  備考\n"
-"\t<&AT> アラーム日時\n"
-"\t<&ST> 用件の開始日時\n"
-"\t<&ET> 用件の終了日時"
+msgstr "エスケープなどの文字は自身で入力してください。\nこの文字列はシェルに渡されます。\n以下は実行時に置き換えられる特殊コマンドです:\n\t<&T>  件名\n\t<&D>  備考\n\t<&AT> アラーム日時\n\t<&ST> 用件の開始日時\n\t<&ET> 用件の終了日時"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
 msgstr "このアラームを今すぐテストします"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "<b>デフォルトアラーム</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
 msgstr "現在の設定をデフォルトのアラームとして保存します"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
 msgstr "デフォルトのアラーム設定に戻します"
 
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "無し"
-
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
-msgstr "毎日"
+msgstr "日"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
-msgstr "毎週"
+msgstr "週"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
-msgstr "毎月"
+msgstr "月"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
-msgstr "毎年"
+msgstr "年"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
-msgstr "毎時"
+msgstr "1時間"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "月"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "火"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "水"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "木"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "金"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "土"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "日"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "繰り返し"
 
-# XXX
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "指定方法"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "基本"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "詳細"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "定期的に繰り返す予定の場合、このオプションを使用します。"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"詳細な時間指定を行いた場合にこのオプションを\n"
-"使用します。\n"
-"例)\n"
-" 毎週の土曜日と日曜日または\n"
-" 毎月最初の火曜日"
+msgstr "詳細な時間指定を行いた場合にこのオプションを\n使用します。\n例)\n 毎週の土曜日と日曜日または\n 毎月最初の火曜日"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "頻度"
 
-# ja: This word is unnecessary for ja translation.
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
-msgstr " "
+msgstr "に"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "回繰り返す"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"頻度をある一定の間隔に決めます。\n"
-"例) 3日ごとの場合:\n"
-"  頻度 = 毎日\n"
-"  間隔 = 3"
+msgstr "頻度をある一定の間隔に決めます。\n例) 1 日に 3 回の場合:\n  頻度 = 日\n  間隔 = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "制限"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "ずっと繰り返す"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr " "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "次まで繰り返す "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "曜日"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "第n曜日"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1106,288 +1132,297 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"毎年または毎月の予定での第何曜日かを設定します。\n"
-"例) 毎月第二水曜日の場合:\n"
-"\t頻度 = 毎月\n"
-"\t平日 = 水曜のみチェック\n"
-"\t曜日 = 水曜の下の番号から2を選択"
+msgstr "毎年または毎月の予定での第何曜日かを設定します。\n例1) 毎月第 2 水曜日の場合:\n\t頻度 = 月\n\t曜日 = 水曜のみチェック\n\t第n曜日 = 水曜の下の番号から 2 を選択\n例2) 毎月最終土曜日の場合:\n\t頻度 = 月\n\t曜日 = 土曜のみチェック\n\t第n曜日 = 土曜の下の番号から -1 を選択"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr "ToDo 基準"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"ToDo は開始時刻を基準に指定間隔で定期的に発生し、最終完了時刻を考慮しません。"
+msgstr "ToDo は開始時刻を基準に指定間隔で定期的に発生し、最終完了時刻を考慮しません。"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"ToDo は最後に完了した時刻から指定間隔経過後に繰り返し発生します。\n"
-"(それぞれの完了後に基準を変更しても ToDo 履歴には通知されないことに留意してく"
-"ださい)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "ToDo は最後に完了した時刻から指定間隔経過後に繰り返し発生します。\n(それぞれの完了後に基準を変更しても ToDo 履歴には通知されないことに留意してください)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "例外"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"下のカレンダの日付をクリックすると例外として追加されます。\n"
-"例外は選択日を除外 (-) するか追加 (+) するかのどちらかです。\n"
-"日時のクリックで除去します。"
+msgstr "下のカレンダーの日付をクリックすると例外として追加されます。\n例外は選択日を除外 (-) するか追加 (+) するかのどちらかです。\n日時のクリックで除去します。"
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr "除外日 (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr "すべての除外日にはこの用件は発生しません。"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
 msgstr "追加日時 (+)"
 
-# FIXME:
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"追加日時のタイムゾーンは開始日時と同じになるため、実際の日時とは異なる場合が"
-"あります。"
+msgstr "追加日時のタイムゾーンは開始日時と同じになるため、実際の日時とは異なる場合があります。"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
 msgstr "対象日"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "表示(_V)"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "移動(_G)"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "新しい用件を作成します"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "前日に移動します"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "今日"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "翌日に移動します"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "1 週間戻ります"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "1 日戻ります"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "1 日進みます"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "1 週間戻ります"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "このウィンドウを更新します"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "このウィンドウを閉じます"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "       表示日数"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - 日別表示"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "一日中"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "時間"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "行が選択されていません"
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
 msgstr "行をクリックして選択した後にコピーできます。"
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
 msgstr "選択したすべての用件が削除されます。"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "はい、削除します"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "前日に移動します"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "翌日に移動します"
+
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "検索します"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "日ごとの一覧を表示します"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "表示する日数"
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "追加表示する日数"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "繰り返しの初回のみ"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "このオプションにチェックマークをつけると、繰り返し設定されている予定の初回だけ表示されます。デフォルトではすべて表示されます。\nこれは緊急の用件も表示します。\n初回のみ表示の場合繰り返し設定されている予定は一覧の先に表示されます。"
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "古いものも"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "このオプションにチェックマークをつけると、古い用件も表示します。リストがとても長くなることのないよう、'繰り返しの初回のみ' が有効になっている場合のみ選択できます。\n追加表示日数が指定されていれば、新しい用件も表示されます。"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "エントリの表示開始日"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "検索"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "検索文字列: "
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "フラグ"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "件名"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"編集するには行をダブルクリックしてください。\n"
-"\n"
-"フラグは左から順に:\n"
-"\t1. アラーム: n=アラーム無し\n"
-"\t\tA=アラームを視覚的に表示 S=アラームにサウンドも追加\n"
-"\t2. 繰り返し: n=無し\n"
-"\t\tD=毎日 W=毎週 M=毎月 Y=毎年\n"
-"\t3. 種類:     f=用事無し B=用事有り\n"
-"\t4. ファイルの位置:\n"
-"\t\tO=Orage A=アーカイブ F=外部\n"
-"\t5. 用件の種類:\n"
-"\t\tE=予定 T=ToDo J=記録"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "日付を選択して下さい"
+msgstr "編集するには行をダブルクリックしてください。\n\nフラグは左から順に:\n\t1. アラーム: n=アラームなし\n\t\tA=アラームを設定 P=持続アラームを設定\n\t2. 繰り返し: n=なし\n\t\tD=日ごと W=週ごと M=月ごと Y=年ごと\n\t3. 種類: f=用事なし B=用事有り\n\t4. ファイルの位置:\n\t\tO=Orage A=アーカイブ F=外部\n\t5. 用件の種類:\n\t\tE=予定 T=ToDo J=記録"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\t繰り返しが終了し、アーカイブファイルに移動しています。"
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "アーカイブが有効になっていません。終了しています"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "アーカイブするまでの期間: %d ヵ月"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\t%04d年 %02d月 %02d日 より古い予定をアーカイブしています"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "アーカイブ UID: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tVTODO が不完全です。アーカイブされませんでした"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\t繰り返します。終了年月日: %04d年 %02d月 %02d日"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "アーカイブしました\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "アーカイブの除去を開始しています。"
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tフェイズ 1: 繰り返し用件のリセット"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tフェイズ 2: アーカイブされた用件の復帰"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "アーカイブの除去が終了しました\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Orage のデフォルトアラーム"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "メイン Orage ファイル用に作成されたアラームリスト:"
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "登録アラームリスト: %d 個のアラーム追加、%d 個の予定進行"
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "外部ファイル用に作成されたアラームリスト: %s (%s)"
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "        %d 個のアラームが追加されました。%d 個の予定が進行中です。"
+
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\t%2$d 個が動作中の内、 %1$d 個のアラームが見つかりました。( %3$d 個の繰り返"
-"しアラームを検索しました)"
+msgstr "\t%2$d 個が動作中の内、 %1$d 個のアラームが見つかりました。( %3$d 個の繰り返しアラームを検索しました)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1405,625 +1440,689 @@
 msgid "Import file preprocessing done"
 msgstr "ファイルのインポート処理が終了しました。"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "ファイル %s が外部から更新されました。"
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "外部ファイルが更新されたため、アラームとカレンダーを再読み込みしています。"
+
+#: ../src/interface.c:271
 msgid "Calendar files"
-msgstr "カレンダファイル"
+msgstr "カレンダーファイル"
 
 #: ../src/interface.c:631
 msgid "Current foreign files"
 msgstr "現在の外部ファイル"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "読み込み専用"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "読み込み/書き込み"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** 外部ファイルなし *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "外部ファイルの追加に失敗しました"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage は 10 個の外部ファイルまで扱えます。上限に達しました。"
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "ファイル名が空です。"
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "名前が空です。"
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "ファイルが存在しません。"
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Orage 内で同じ名前のファイルが存在します。"
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Orage 内で同じ名前が存在します。"
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "インポート/エクスポート"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "インポート"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "読み込むファイル:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"ファイル名はカンマ(,)で区切ってください。\n"
-" 注意: カンマはファイル名および Orage で使用できない文字です。"
+msgstr "ファイル名はカンマ(,)で区切ってください。\n 注意: カンマはファイル名および Orage で使用できない文字です。"
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "エクスポート"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
-msgstr "書き込むファイル:"
+msgstr "書き出すファイル:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
-msgstr "選択してください"
+msgstr "エクスポートする用件"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "すべての用件"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
-msgstr "名付けられた用件: "
+msgstr "指定した用件: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"メインファイルの用件のみ読み込まれることに注意してください。\n"
-"アーカイブおよび外部ファイルはエクスポートされません。"
+msgstr "メインファイルの用件のみ読み込まれることに注意してください。\nアーカイブおよび外部ファイルはエクスポートされません。"
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"メインファイルの用件のみ読み込まれることに注意してください。\n"
-"外部ファイルはエクスポートされません。"
+msgstr "メインファイルの用件のみ読み込まれることに注意してください。\n外部ファイルはエクスポートされません。"
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
-msgstr "これらを予定リストウィンドウから簡単にドラッグできます。"
+msgstr "予定リストウィンドウからドラッグして追加できます。"
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "Orage 用件 UID をカンマで区切って指定してください。"
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "アーカイブ"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "直ちにアーカイブする (しきい値: %d ヵ月)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
-msgstr "しきい値はパラメタで変更できます"
+msgstr "しきい値はパラメーターで変更できます"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "直ちにアーカイブを元に戻す"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"すべてのアーカイブされた情報をメインの Orage ファイルに復帰しアーカイブファイ"
-"ルを除去します。\n"
-"これは例えば他のシステムへ Orage 用件を移行するときなどに便利です。"
+msgstr "すべてのアーカイブされた情報をメインの Orage ファイルに復帰しアーカイブファイルを除去します。\nこれは例えば他のシステムへ Orage 用件を移行するときなどに便利です。"
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Orage ファイル"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
-msgstr "Orage メインカレンダファイル"
+msgstr "Orage メインカレンダーファイル"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "現在のファイル"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "現在のファイル:"
 
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "新規ファイル"
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "新規ファイル:"
 
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "動作オプション"
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "動作オプション:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "名前の変更"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Orage 内部ファイルの名前変更のみ行います。\n"
-"外部のファイルシステムにはタッチしません。\n"
-"新しいファイルが存在していなくてはなりません。"
+msgstr "Orage 内部ファイル名の変更のみ行います。\n外部のファイルシステムにはタッチしません。\n新しいファイルが存在していなくてはなりません。"
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "コピー"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr "現在のファイルはコピーされ元の場所は変更されません。"
+msgstr "現在のファイルはコピーされ元のファイルの場所は変更されません。"
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "移動"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
-msgstr "現在のファイルは移動され元の場所は消去されます。"
+msgstr "現在のファイルは移動され元の場所からは消去されます。"
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "アーカイブファイル"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "外部ファイル"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "新規外部ファイルの追加"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "外部ファイル:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "オプション"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "表示名:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "読み込み専用"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"このファイルを Orage によって変更されたくない場合に設定してください。\n"
-"外部ファイルを変更するとオリジナルのアプリケーションとの互換性が失われるかも"
-"しれないことに注意してください。"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "このファイルが Orage によって変更されたくない場合に設定してください。\n外部ファイルを変更するとオリジナルのアプリケーションとの互換性が失われるかもしれないことに注意してください。"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "この内部名はファイル名の代わりに表示されます。"
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "データ交換 - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tこれは %s バージョン %s です｡\n"
-"\n"
+msgstr "\tこれは %s バージョン %s です｡\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tGNU一般公有使用許諾書の制約の下にリリースされています。\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tGTK+-%d.%d.%d に対してコンパイルしたものであり、"
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "GTK+-%d.%d.%d を使用しています。\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tインポートに D-Bus を使用しています。\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tD-Bus を使用していません。インポート機能は一部のみ動作します。\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tlibnotify を使用しています。\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tlibnotify を使用していません。\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\t自動アーカイブを使用しています。\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tアーカイブ化を使用していません。\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tオペレーティングシステムの libical パッケージを使用しています。\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tOrage ローカルバージョン の libical を使用しています。\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"使用法: orage [オプション] [ファイル]\n"
-"\n"
+msgstr "使用法: orage [オプション] [ファイル]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "オプション:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v)\t\t\torage のバージョンを表示します\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h)\t\t\tこのメッセージを表示します\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \t\t設定フォームを表示します\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\t\torage の表示/非表示を切り替えます\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) file [RW] \t外部ファイルを追加します\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) file [RW] [ファイル名]\t外部ファイルを追加します\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) file \t外部ファイルを削除します\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
-"--export (-e) file [用件...] \t用件を Orage からファイルにエクスポートしま"
-"す\n"
+msgstr "--export (-e) file [用件...] \t用件を Orage からファイルにエクスポートします\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "file = orage が読み込む iCal ファイル\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tD-Bus は orage に含まれていません。\n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tD-Bus [ファイル] が無い外部ファイルオプション (-a & -r) は orage 起動後のみ"
-"使用可能です\n"
+msgstr "\tD-Bus [ファイル] がない外部ファイルオプション (-a & -r) は orage 起動後のみ使用可能です\n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"不明なオプション %s\n"
-"\n"
+msgstr "\n不明なオプション %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "データ交換(_E)"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "選択した日を表示(_D)"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "選択した週を表示(_W)"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "今日の日付を選択(_T)"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
 msgstr "世界時計を表示(_G)"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "件名なし"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr " 場所: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n 備考:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "なし"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"件名: %s\n"
-" 開始: %s\n"
-" 終了: %s\n"
-" 備考:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "件名: %s\n%s 開始:\t%s\n 締切:\t%s\n 完了:\t%s%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"件名: %s\n"
-" 開始: %s\n"
-" 終了: %s\n"
-" 備考:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "件名: %s\n%s 開始:\t%s\n 終了:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>To do:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>%s の予定:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>%s - %s の予定:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "基本設定"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "タイムゾーン"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "常にあなたの地域のタイムゾーンを設定するべきです。"
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "アーカイブまでの期間 (月)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = アーカイブしません)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
 msgstr "アーカイブ化は予定を扱う際の時間と領域を節約します。"
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "サウンドコマンド"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
 msgstr "このコマンドはアラーム時にサウンドを鳴らすためにシェルに渡されます。"
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "表示設定"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "メインウィンドウ"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "カレンダーウィンドウ"
+
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "カレンダー表示詳細"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "枠を表示する"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "メニューを表示する"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "年と月を表示する"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
 msgstr "曜日を表示する"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
 msgstr "年内通算週を表示する"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "年と月を表示する"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "カレンダー情報ボックス"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "ToDo リストを表示する"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
 msgstr "予定ウィンドウに表示する日数"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
 msgstr "0 = すべての予定リストを表示しません"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "カレンダー表示場所"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
 msgstr "すべてのデスクトップで表示する"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
 msgstr "常に最前面に置く"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "タスクバーに表示する"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "ページャーに表示する"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "システムトレイに表示する"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "起動時の振る舞い"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "表示する"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "表示しない"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "最小化する"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr "拡張設定"
-
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr "カレンダウィンドウを開いたとき"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "カレンダーウィンドウを開いたとき"
 
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
+#: ../src/parameters.c:792
+msgid "Select today's date"
 msgstr "今日の日付を選択する"
 
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
 msgstr "直前に選択していた日付を選択する"
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "動的トレイアイコンの使用"
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "ダイナミックアイコンを使用する"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "ダイナミックアイコンは現在の月と日を表示します。"
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "メインカレンダをダブルクリックした時に表示するもの"
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "カレンダーの日付をダブルクリックしたときに表示するもの"
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
 msgstr "日別表示"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
 msgstr "予定リスト"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "拡張設定"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
 msgstr "予定リストウィンドウ"
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
 msgstr "予定リストに表示する拡張日数"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
-msgstr ""
-"これはデフォルト値になります。実際の予定リストウィンドウで変更できます。"
+msgstr "これはデフォルト値になります。実際の予定リストウィンドウで変更できます。"
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "繰り返し設定されている予定は初回のみ表示する"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "日表示ウィンドウでのデフォルトの第 1 日"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "週の初日"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "選択した日"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "ダイナミックトレイアイコンの使用"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "ダイナミックアイコンを使用する"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "ダイナミックアイコンを使用すると現在の月と日を表示します。"
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
-msgstr ""
+msgstr "復帰タイマー"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
+msgstr "サスペンドまたはハイバネートからの復帰時に Orage に問題が発生する場合 (例えば、トレイアイコンが更新されない、アラームが鳴らない、など) はこのタイマーを使用してください。"
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "外部ファイルのデフォルトの視覚アラーム"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Orage ウィンドウ"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "デスクトップ通知"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "ウィンドウを閉じたときの振る舞い"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Orage を終了する"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "デフォルトでは、Orage はウィンドウが閉じられたときもバックグラウンドで動作します。このオプションを有効にすると、ウィンドウを閉じたときに Orage は終了します。"
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Orage の設定"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
-msgstr ""
-"始めて Orage が起動されました。デフォルトのタイムゾーンを検出しています。"
+msgstr "始めて Orage が起動されました。デフォルトのタイムゾーンを検出しています。"
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "デフォルトのタイムゾーンを %s に設定します。"
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
-msgstr ""
-"デフォルトのタイムゾーンが見つかりませんでした。手動で設定してください。"
+msgstr "デフォルトのタイムゾーンが見つかりませんでした。手動で設定してください。"
 
 #: ../src/reminder.c:562
 msgid "Reminder "
@@ -2033,40 +2132,35 @@
 msgid "Open"
 msgstr "開く"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "備忘録 - Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "後で"
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "指定時刻後に再度通知します"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr "<実行> を押すと指定時刻後に再度通知します。"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
-msgstr "次回の有効アラーム:"
+msgstr "次回の有効なアラーム:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d 日 %02d 時間 %02d 分: %s"
+msgstr "\nあと %02d 日 %02d 時間 %02d 分: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"有効なアラームがありません"
+msgstr "\n有効なアラームがありません"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2089,1537 +2183,2229 @@
 msgstr "アフリカ/アルジェリア"
 
 #: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
+msgid "Africa/Asmara"
 msgstr "アフリカ/アスマラ"
 
 #: ../src/timezone_names.c:42
+msgid "Africa/Asmera"
+msgstr "アフリカ/アスマラ"
+
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "アフリカ/バマコ"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "アフリカ/バンギ"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "アフリカ/バンジュール"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "アフリカ/ビサウ"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "アフリカ/ブランタイア"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "アフリカ/ブラザビル"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "アフリカ/ブシュンブラ"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "アフリカ/カイロ"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "アフリカ/カサブランカ"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "アフリカ/セウタ"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "アフリカ/コナクリ"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "アフリカ/ダカール"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "アフリカ/ダルエスサラーム"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "アフリカ/ジブチ"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "アフリカ/ドゥアラ"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "アフリカ/アイウン"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "アフリカ/フリータウン"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "アフリカ/ハボローネ"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "アフリカ/ハラレ"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "アフリカ/ジュバ"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "アフリカ/ヨハネスブルグ"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "アフリカ/カンパラ"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "アフリカ/ハルツーム"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "アフリカ/キガリ"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "アフリカ/キンシャサ"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "アフリカ/ラゴス"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "アフリカ/リーブルビル"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "アフリカ/ロメ"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "アフリカ/ルアンダ"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "アフリカ/ルブンバシ"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "アフリカ/ルサカ"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "アフリカ/マラボ"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "アフリカ/マプート"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "アフリカ/マセル"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "アフリカ/ムババネ"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "アフリカ/モガディシュ"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "アフリカ/モンロビア"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "アフリカ/ナイロビ"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "アフリカ/ンジャメナ"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "アフリカ/ニアメ"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "アフリカ/ヌアクショット"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "アフリカ/ワガドゥグー"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "アフリカ/ポルト・ノボ"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "アフリカ/サントメ"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "アフリカ/トンブクトゥ"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "アフリカ/トリポリ"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "アフリカ/チュニス"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "アフリカ/ウィントフック"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "アメリカ"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "アメリカ/アダック"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "アメリカ/アンカレッジ"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "アメリカ/アンギラ"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "アメリカ/アンティグア"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "アメリカ/アラグァイナ"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "アメリカ/アルゼンチン/ブエノス・アイレス"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "アメリカ/アルゼンチン/カタマルカ"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "アメリカ/アルゼンチン/コモドロリバダビア"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "アメリカ/アルゼンチン/コルドバ"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "アメリカ/アルゼンチン/フフイ"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "アメリカ/アルゼンチン/ラ・リオハ"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "アメリカ/アルゼンチン/メンドーサ"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "アメリカ/アルゼンチン/リオ・ガジェゴス"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "アメリカ/アルゼンチン/サルタ"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "アメリカ/アルゼンチン/サン・フアン"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "アメリカ/アルゼンチン/サン・ルイス"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "アメリカ/アルゼンチン/トゥクマン"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "アメリカ/アルゼンチン/ウシュアイア"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "アメリカ/アルバ"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "アメリカ/アスンシオン"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "アメリカ/アティコカン"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "アメリカ/アトカ島"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "アメリカ/バイーア"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "アメリカ/バイーア・デ・バンデラス"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "アメリカ/バルバドス"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "アメリカ/ベレム"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "アメリカ/ベリーズ"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "アメリカ/ブラン・サブロン"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "アメリカ/ボア・ビスタ"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "アメリカ/ボゴタ"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "アメリカ/ボイス"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "アメリカ/ブエノス・アイレス"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "アメリカ/ケンブリッジ・ベイ"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "アメリカ/カンポ・グランデ"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "アメリカ/カンクン"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "アメリカ/カラカス"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "アメリカ/カタマルカ"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "アメリカ/カイエンヌ"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "アメリカ/ケイマン諸島"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "アメリカ/シカゴ"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "アメリカ/チワワ"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "アメリカ/コーラルハーバー"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "アメリカ/コルドバ"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "アメリカ/コスタ・リカ"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "アメリカ/クレストン"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "アメリカ/クイアバ"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "アメリカ/キュラソー"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "アメリカ/デンマークシャウン"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "アメリカ/ドーソン"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "アメリカ/ドーソン・クリーク"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "アメリカ/デンバー"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "アメリカ/デトロイト"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "アメリカ/ドミニカ"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "アメリカ/エドモントン"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "アメリカ/エンセナダ"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "アメリカ/エイルネペ"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "アメリカ/エル・サルバドル"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "アメリカ/フォルタレーザ"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "アメリカ/フォートウェイン"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "アメリカ/グレース・ベイ"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "アメリカ/ヌーク"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "アメリカ/グース・ベイ"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "アメリカ/グランド・ターク"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "アメリカ/グレナダ"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "アメリカ/グアドループ"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "アメリカ/グアテマラ"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "アメリカ/グアヤキル"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "アメリカ/ガイアナ"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "アメリカ/ハリファクス"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "アメリカ/ハバナ"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "アメリカ/エルモシージョ"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "アメリカ/インディアナ/インディアナポリス"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "アメリカ/インディアナ/ノクス"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "アメリカ/インディアナ/マレンゴ"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "アメリカ/インディアナ/ピーターズバーグ"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "アメリカ/インディアナ/テルシティ"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "アメリカ/インディアナ/ビベイ"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "アメリカ/インディアナ/ビンセンズ"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "アメリカ/インディアナ/ウィナマク"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "アメリカ/インディアナポリス"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "アメリカ/イヌービク"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "アメリカ/イクルート"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "アメリカ/ジャマイカ"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "アメリカ/フフイ"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "アメリカ/ジュノー"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "アメリカ/ケンタッキー/ルイスヴィル"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "アメリカ/ケンタッキー/モンティチェロ"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "アメリカ/ノクス (インディアナ)"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "アメリカ/クラレンダイク"
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "アメリカ/ラ・パス"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "アメリカ/リマ"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "アメリカ/ロサンゼルス"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "アメリカ/ルイスヴィル"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "アメリカ/ロアープリンセズクオーター"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "アメリカ/マセイオ"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "アメリカ/マナグア"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "アメリカ/マナウス"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "アメリカ/マリゴ"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "アメリカ/マルティニーク"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "アメリカ/マタモロス"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "アメリカ/マサトラン"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "アメリカ/メンドーサ"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "アメリカ/メノミニー"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "アメリカ/メリダ"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "アメリカ/メトラカトラ"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "アメリカ/メキシコ・シティ"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "アメリカ/ミクロン島"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "アメリカ/モンクトン"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "アメリカ/モントレー"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "アメリカ/モンテビデオ"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "アメリカ/モントリオール"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "アメリカ/モントセラト"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "アメリカ/ナッソー"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "アメリカ/ニューヨーク"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "アメリカ/ニピゴン"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "アメリカ/ノーメ"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "アメリカ/ノースダコタ/ベウラ"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "アメリカ/ノースダコタ/中部"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "アメリカ/ノースダコタ/ニューセーラム"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "アメリカ/ノロニャ"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "アメリカ/オヒナガ"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "アメリカ/パナマ"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "アメリカ/パンナータング"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "アメリカ/パラマリボ"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "アメリカ/フェニックス"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "アメリカ/ポルトープランス"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "アメリカ/ポート・オブ・スペイン"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "アメリカ/ポルト・アクレ"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "アメリカ/ポルト・ベリョ"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "アメリカ/プエルト・リコ"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "アメリカ/レイニー・リバー"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "アメリカ/ランキン・インレット"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "アメリカ/レシフェ"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "アメリカ/レジーナ"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "アメリカ/レゾリュート"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "アメリカ/リオ・ブランコ"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "アメリカ/ロザリオ"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "アメリカ/サンタイサベル"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "アメリカ/サンタレム"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "アメリカ/サンティエゴ"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "アメリカ/サント・ドミンゴ"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "アメリカ/サン・パウロ"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "アメリカ/スコルズビスーン"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "アメリカ/シップロック"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "アメリカ/シトカ"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "アメリカ/セント・バーセルミー"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
-msgstr "アメリカ/セント・ジョーンズ"
+msgstr "アメリカ/セント・ジョンズ"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "アメリカ/セント・キッツ島"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "アメリカ/セント・ルシア島"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "アメリカ/セント・トーマス島"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "アメリカ/セント・ビンセント島"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "アメリカ/スウィフト・カレント"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "アメリカ/テグシガルパ"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "アメリカ/チューレ"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "アメリカ/サンダー・ベイ"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "アメリカ/ティファナ"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "アメリカ/トロント"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "アメリカ/トルトーラ"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "アメリカ/バンクーバー"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "アメリカ/ヴァージン諸島"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "アメリカ/ホワイトホース"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "アメリカ/ウィニペグ"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "アメリカ/ヤクタット"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "アメリカ/イエローナイフ"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "南極"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "南極/ケーシー基地"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "南極/デービス基地"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "南極/デュモンデュルヴィル基地"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "南極/マッコーリー島"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "南極/モーソン基地"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "南極/マクマード基地"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "南極/パーマー基地"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "南極/ロセラ基地"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "南極/南極点"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "南極/昭和基地"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "南極/ボストーク基地"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "北極"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "北極/ロングヤービーエン"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "アジア"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "アジア/アデン"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "アジア/アルマトイ"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "アジア/アンマン"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "アジア/アナドゥイリ"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "アジア/アクタウ"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "アジア/アクトベ"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "アジア/アシガバート"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "アジア/アシハバート"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "アジア/バグダット"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "アジア/バーレーン"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "アジア/バクー"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "アジア/バンコク"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "アジア/ベイルート"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "アジア/ビシュケク"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "アジア/ブルネイ"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "アジア/カルカッタ"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "アジア/チョイバルサン"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "アジア/重慶"
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "アジア/重慶"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "アジア/コロンボ"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "アジア/ダッカ"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "アジア/ダマスカス"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "アジア/ダッカ"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "アジア/ディリ"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "アジア/ドバイ"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "アジア/ドゥシャンベ"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "アジア/ガザ"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "アジア/ハルピン"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "アジア/ヘブロン"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "アジア/香港"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "アジア/ホーチミン"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "アジア/ホブド"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "アジア/イルクーツク"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "アジア/イスタンブール"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "アジア/ジャカルタ"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "アジア/ジャヤプラ"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "アジア/エルサレム"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "アジア/カブール"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "アジア/カムチャツカ"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "アジア/カラチ"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "アジア/カシュガル"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "アジア/カトマンズ"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "アジア/カトマンズ"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "アジア/ハンドゥイガ"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "アジア/コルカタ"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "アジア/クラスノヤルスク"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "アジア/クアラ・ルンプール"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "アジア/クチン"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "アジア/クウェート"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "アジア/マカオ"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "アジア/マカオ"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "アジア/マガダン"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "アジア/マカッサル"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "アジア/マニラ"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "アジア/マスカット"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "アジア/ニコシア"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "アジア/ノヴォクズネツク"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "アジア/ノボシビルスク"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "アジア/オムスク"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "アジア/オラル"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "アジア/プノン・ペン"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "アジア/ポンティアナック"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "アジア/平壌"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "アジア/カタール"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "アジア/クズロルダ"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "アジア/ラングーン"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "アジア/リヤド"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "アジア/リヤド87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "アジア/リヤド88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "アジア/リヤド89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "アジア/サイゴン"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "アジア/サハリン"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "アジア/サマルカンド"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "アジア/ソウル"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "アジア/上海"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "アジア/シンガポール"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "アジア/台北"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "アジア/タシュケント"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "アジア/トビリシ"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "アジア/テヘラン"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "アジア/テルアビブ"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "アジア/ティンブー"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "アジア/ティンプー"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "アジア/東京"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "アジア/ウジュン・パンダン"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "アジア/ウランバートル"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "アジア/ウランバートル"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "アジア/ウルムチ"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "アジア/ウスチ・ネラ"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "アジア/ビエンチャン"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "アジア/ウラジオストク"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "アジア/ヤクーツク"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
-msgstr "アジア/エカテリンブルグ"
+msgstr "アジア/エカテリンブルク"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "アジア/エレバン"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "大西洋"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "大西洋/アゾレス諸島"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
-msgstr "大西洋/バミューダ"
+msgstr "大西洋/バミューダ諸島"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
-msgstr "大西洋/カナリア"
+msgstr "大西洋/カナリア諸島"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "大西洋/カーボ・ベルデ諸島"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "大西洋/フェロー諸島"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "大西洋/フェロー諸島"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "大西洋/ヤン・マイエン島"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "大西洋/マディラ島"
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
-msgstr "大西洋/レイキャビック"
+msgstr "大西洋/レイキャビク"
 
-#: ../src/timezone_names.c:306
+#: ../src/timezone_names.c:375
 msgid "Atlantic/South_Georgia"
 msgstr "大西洋/南ジョージア島"
 
-#: ../src/timezone_names.c:307
+#: ../src/timezone_names.c:376
 msgid "Atlantic/St_Helena"
 msgstr "大西洋/セント・ヘレナ島"
 
-#: ../src/timezone_names.c:308
+#: ../src/timezone_names.c:377
 msgid "Atlantic/Stanley"
-msgstr "大西洋/スタンレー"
+msgstr "大西洋/スタンリー"
 
-#: ../src/timezone_names.c:309
+#: ../src/timezone_names.c:378
 msgid "Australia"
 msgstr "オーストラリア"
 
-#: ../src/timezone_names.c:310
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "オーストラリア/首都特別地域"
+
+#: ../src/timezone_names.c:380
 msgid "Australia/Adelaide"
 msgstr "オーストラリア/アデレード"
 
-#: ../src/timezone_names.c:311
+#: ../src/timezone_names.c:381
 msgid "Australia/Brisbane"
 msgstr "オーストラリア/ブリスベン"
 
-#: ../src/timezone_names.c:312
+#: ../src/timezone_names.c:382
 msgid "Australia/Broken_Hill"
 msgstr "オーストラリア/ブロークン・ヒル"
 
-#: ../src/timezone_names.c:313
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "オーストラリア/カリー"
+
+#: ../src/timezone_names.c:384
 msgid "Australia/Darwin"
 msgstr "オーストラリア/ダーウィン"
 
-#: ../src/timezone_names.c:314
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "オーストラリア/ユークラ"
+
+#: ../src/timezone_names.c:386
 msgid "Australia/Hobart"
 msgstr "オーストラリア/ホバート"
 
-#: ../src/timezone_names.c:315
+#: ../src/timezone_names.c:387
 msgid "Australia/Lindeman"
 msgstr "オーストラリア/リンデマン島"
 
-#: ../src/timezone_names.c:316
+#: ../src/timezone_names.c:388
 msgid "Australia/Lord_Howe"
 msgstr "オーストラリア/ロード・ハウ島"
 
-#: ../src/timezone_names.c:317
+#: ../src/timezone_names.c:389
 msgid "Australia/Melbourne"
 msgstr "オーストラリア/メルボルン"
 
-#: ../src/timezone_names.c:318
+#: ../src/timezone_names.c:390
 msgid "Australia/Perth"
 msgstr "オーストラリア/パース"
 
-#: ../src/timezone_names.c:319
+#: ../src/timezone_names.c:391
 msgid "Australia/Sydney"
 msgstr "オーストラリア/シドニー"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "ブラジル"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "ブラジル/アクレ"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "ブラジル/デ・ノローニャ"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "ブラジル/東部"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "ブラジル/西部"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "カナダ"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "カナダ/大西洋"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "カナダ/中部"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "カナダ/東部サスカチュワン"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "カナダ/東部"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "カナダ/山岳部"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "カナダ/ニューファンドランド"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "カナダ/太平洋"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "カナダ/サスカチュワン"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "カナダ/ユーコン"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "チリ"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "チリ/本土"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "チリ/イースター島"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "その他"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "その他/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "その他/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "その他/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "その他/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "その他/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "その他/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "その他/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "その他/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "その他/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "その他/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "その他/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "その他/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "その他/GMT+8"
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "その他/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "その他/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "その他/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "その他/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "その他/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "その他/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "その他/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "その他/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "その他/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "その他/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "その他/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "その他/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "その他/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "その他/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "その他/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "その他/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "その他/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "その他/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "その他/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "その他/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "その他/ユニバーサル"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "その他/ズールー"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "ヨーロッパ"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "ヨーロッパ/アムステルダム"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "ヨーロッパ/アンドラ"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "ヨーロッパ/アテネ"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "ヨーロッパ/ベルファスト"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "ヨーロッパ/ベオグラード"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "ヨーロッパ/ベルリン"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "ヨーロッパ/ブラチスラバ"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "ヨーロッパ/ブリュッセル"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "ヨーロッパ/ブカレスト"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "ヨーロッパ/ブダペスト"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "ヨーロッパ/ビュージンゲン"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "ヨーロッパ/チシナウ"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "ヨーロッパ/コペンハーゲン"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "ヨーロッパ/ダブリン"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "ヨーロッパ/ジブラルタル"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "ヨーロッパ/ガーンジー"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "ヨーロッパ/ヘルシンキ"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "ヨーロッパ/マン島"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "ヨーロッパ/イスタンブール"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "ヨーロッパ/ジャージー"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "ヨーロッパ/カリーニングラード"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "ヨーロッパ/キエフ"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "ヨーロッパ/リスボン"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "ヨーロッパ/リュブリャナ"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "ヨーロッパ/ロンドン"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "ヨーロッパ/ルクセンブルグ"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "ヨーロッパ/マドリード"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "ヨーロッパ/マルタ"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "ヨーロッパ/マリエハムン"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "ヨーロッパ/ミンスク"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "ヨーロッパ/モナコ"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "ヨーロッパ/モスクワ"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "ヨーロッパ/ニコシア"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "ヨーロッパ/オスロ"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "ヨーロッパ/パリ"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "ヨーロッパ/ポドゴリツァ"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "ヨーロッパ/プラハ"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "ヨーロッパ/リガ"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "ヨーロッパ/ローマ"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "ヨーロッパ/サマラ"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "ヨーロッパ/サン・マリノ"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "ヨーロッパ/サラエボ"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "ヨーロッパ/シンフェロポリ"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "ヨーロッパ/スコピエ"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "ヨーロッパ/ソフィア"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "ヨーロッパ/ストックホルム"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "ヨーロッパ/タリン"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "ヨーロッパ/チラナ"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "ヨーロッパ/ティラスポリ"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "ヨーロッパ/ウシュホロド"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "ヨーロッパ/ファドゥーツ"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "ヨーロッパ/バチカン"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "ヨーロッパ/ウィーン"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "ヨーロッパ/ビルニアス"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "ヨーロッパ/ボルゴグラード"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "ヨーロッパ/ワルシャワ"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "ヨーロッパ/ザグレブ"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "ヨーロッパ/ザポロジエ"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "ヨーロッパ/チューリッヒ"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "インド"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "インド/アンタナナリボ"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "インド/チャゴス諸島"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "インド/クリスマス諸島"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "インド/ココス諸島"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "インド/コモロ諸島"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "インド/ケルゲレン諸島"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "インド/マヘ島"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "インド/モルディブ"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "インド/モーリシャス"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "インド/マヨット島"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "インド/レユニオン島"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "メキシコ"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "メキシコ/バハ・ノルテ"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "メキシコ/バハ・スル"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "メキシコ/中部"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "中東"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "アジア/リヤド87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "アジア/リヤド88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "アジア/リヤド89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "太平洋"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "太平洋/アピア"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "太平洋/オークランド"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "太平洋/チャタム諸島"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "太平洋/チューク"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "太平洋/イースター島"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "太平洋/エファテ島"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "太平洋/エンダベリー諸島"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "太平洋/ファカオフォ島"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "太平洋/フィジー"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "太平洋/フナフティ"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "太平洋/ガラパゴス諸島"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "太平洋/ガンビア"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "太平洋/ガダルカナル島"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "太平洋/グアム島"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "太平洋/ホノルル"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "太平洋/ジョンストン島"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "太平洋/キリチマチ島"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "太平洋/コスラエ島"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "太平洋/クェゼリン島"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "太平洋/マーシャル諸島"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "太平洋/マルケサス諸島"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "太平洋/ミッドウェー諸島"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "太平洋/ナウル"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "太平洋/ニウエ"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
-msgstr "太平洋/ノーフォーク"
+msgstr "太平洋/ノーフォーク島"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "太平洋/ヌメア"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "太平洋/パゴ・パゴ"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "太平洋/パラオ"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "太平洋/ピトケアン諸島"
 
-#: ../src/timezone_names.c:413
-msgid "Pacific/Ponape"
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
 msgstr "太平洋/ポンペイ島"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:557
+msgid "Pacific/Ponape"
+msgstr "太平洋/ポナペ島"
+
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "太平洋/ポート・モレスビー"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "太平洋/ラロトンガ島"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "太平洋/サイパン島"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "太平洋/サモア"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "太平洋/タヒチ"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "太平洋/タラワ"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "太平洋/トンガタプ島"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "太平洋/トラック島"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "太平洋/ウェーク島"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "太平洋/ウォリス・フツナ諸島"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "太平洋/ヤップ島"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "米国"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "米国/アラスカ"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "米国/アリューシャン列島"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "米国/アリゾナ"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "米国/中部"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "米国/東部"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "米国/東部インディアナ"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "米国/ハワイ"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "米国/インディアナ州スターク"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "米国/ミシガン"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "米国/山岳部"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "米国/太平洋"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "米国/太平洋 (新)"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "米国/サモア"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "新しい用件"
@@ -3637,165 +4423,26 @@
 msgstr "今の日付と時刻は?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "カレンダ"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Orage カレンダ設定"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Orage の設定"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Xfce 4 カレンダアプリケーション (Orage) の設定を行います"
+msgstr "Xfce 4 カレンダーアプリケーション (Orage) の設定を行います"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "卓上カレンダ"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Orage カレンダー設定"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
-msgid "Orage Calendar"
-msgstr "Orage カレンダ"
-
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "件名: %s\n"
-#~ " 開始: %s\n"
-#~ " 締切: %s\n"
-#~ " 完了: %s\n"
-#~ "備考:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "エスケープ文字などもすべて入力してください\n"
-#~ "この文字列はこのままプロセスとしてシェルに渡されます"
-
-#~ msgid "Orage clock"
-#~ msgstr "Orage 時計"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "最初の開発者、元メンテナ"
-
-#~ msgid "Contributor"
-#~ msgstr "協力者"
-
-#~ msgid "Info"
-#~ msgstr "情報"
-
-#~ msgid "Warning"
-#~ msgstr "警告"
-
-#~ msgid "Error"
-#~ msgstr "エラー"
-
-#~ msgid "Set sticked"
-#~ msgstr "スティッキーモードにする"
-
-#~ msgid "Select always today"
-#~ msgstr "常に今日の日付を選択する"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr "メインカレンダが表示される時、ポインタを今日の日付にセットします。"
-
-#~ msgid "show line _1:"
-#~ msgstr "1行表示(_1):"
-
-#~ msgid "show line _2:"
-#~ msgstr "2行表示(_2):"
-
-#~ msgid "show line _3:"
-#~ msgstr "3行表示(_3):"
-
-#~ msgid "Show:"
-#~ msgstr "表示日数:"
-
-#~ msgid "extra days"
-#~ msgstr "日"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = スタティックアイコンを使用)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "ダイナミックアイコンは現在の月日を表示します。これはシステムトレイでのみ表"
-#~ "示されます。システムトレイがダイナミックアイコンのサイズより小さい場合 "
-#~ "Orage は自動的にスタティックアイコンに戻します。"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> 現地の日付フォーマットで現在の日付を挿入します。\n"
-#~ "<T> 時刻を挿入します。\n"
-#~ "<DT> 日付と時刻を挿入します。"
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "終了時間調整モード"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "開始時間調整モード"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "分を設定してください"
-
-#~ msgid "Vary"
-#~ msgstr "可変"
-
-#~ msgid "Modify Clock "
-#~ msgstr "時計の修正"
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "時計のタイムゾーン (正しい TZ 値) を\n"
-#~ "入力してください"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "設定の変更"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "現地のタイムゾーンを入力してください (これは時刻の前進/後進により日付が変"
-#~ "わるときに表示するために使用されます"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr ""
-#~ "いずれか有効なタイムゾーン (TZ 値) を設定するか、このリストから一つ選んで"
-#~ "ください。"
-
-#~ msgid "Properties"
-#~ msgstr "プロパティ"
-
-#~ msgid "Calendar Settings"
-#~ msgstr "カレンダ設定"
-
-#~ msgid "Select timezone"
-#~ msgstr "タイムゾーンを選択してください"
+msgid "Calendar"
+msgstr "カレンダー"
 
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "'orage -p' の起動に失敗しました"
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr "Orage カレンダー"
 
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Xfce 4 カレンダの設定"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "卓上カレンダー"
diff -Nru orage-4.8.3/po/ka.po orage-4.12.1/po/ka.po
--- orage-4.8.3/po/ka.po	2012-01-03 12:01:06.000000000 +0000
+++ orage-4.12.1/po/ka.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,3537 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2006-08-24 23:38+0400\n"
-"Last-Translator: Dimitri Gogelia <delphi.knight@gmail.com>\n"
-"Language-Team: Georgian <delphi.knight@gmail.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ka\n"
-"X-Poedit-Language: Georgian\n"
-"X-Poedit-Country: GEORGIA\n"
-
-#: ../globaltime/globaltime.c:100
-msgid "Raising GlobalTime window..."
-msgstr ""
-
-#: ../globaltime/globaltime.c:102
-msgid "GlobalTime window raise failed"
-msgstr ""
-
-#. ********** timezone tooltip **********
-#: ../globaltime/globaltime.c:277
-#, c-format
-msgid ""
-"%s\n"
-"click to modify clock"
-msgstr ""
-
-#: ../globaltime/globaltime.c:386
-#, fuzzy
-msgid "Localtime"
-msgstr "მდებარეობა"
-
-#: ../globaltime/globaltime.c:464
-msgid ""
-"button 1 to change preferences \n"
-"button 2 to adjust time of clocks"
-msgstr ""
-
-#: ../globaltime/globaltime.c:480
-msgid "adjust to change hour"
-msgstr ""
-
-#: ../globaltime/globaltime.c:496
-msgid ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
-msgid "NEW"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:289
-msgid "NEW COPY"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:310
-msgid "Not possible to delete the last clock."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:516
-msgid "update this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
-msgid "add new empty clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:526
-msgid "add new clock using this clock as model"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:531
-msgid "delete this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:539
-msgid "move this clock first"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:544
-msgid "move this clock left"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:549
-msgid "move this clock right"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:554
-msgid "move this clock last"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:562
-msgid "set the timezone of this clock to be local timezone"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
-msgid "close window and exit"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:590
-msgid "Globaltime preferences "
-msgstr ""
-
-#. -----------------------HEADING-------------------------------------------
-#: ../globaltime/gt_prefs.c:603
-msgid "Clock Parameters"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:607
-msgid "Name of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:613
-msgid "enter name of clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:616
-msgid "Timezone of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:643
-msgid "Text Formatting"
-msgstr ""
-
-#. ------------------------background-------------------------
-#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
-msgid "Background color:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:656
-msgid "Click to change background colour for clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
-#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
-#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
-#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
-#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
-msgid "Use default"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
-#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
-#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
-msgid "Cross this to use default instead of selected value"
-msgstr ""
-
-#. ------------------------foreground-------------------------
-#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
-msgid "Foreground (=text) color:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:688
-msgid "Click to change foreground colour for clock"
-msgstr ""
-
-#. ------------------------name font-------------------------
-#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
-msgid "Font for name of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:720
-msgid "Click to change font for clock name"
-msgstr ""
-
-#. ------------------------time font-------------------------
-#: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
-msgid "Font for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:753
-msgid "Click to change font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:780
-msgid "Underline name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:810
-msgid "Underline time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:850
-msgid "Text Default Formatting"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:863
-msgid "Click to change default background colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
-msgid "Cross this to use system default instead of selected color"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:896
-msgid "Click to change default text colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:929
-msgid "Click to change default font for clock name"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
-msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:963
-msgid "Click to change default font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:990
-msgid "Underline for name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:1004
-msgid "Underline for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1027
-msgid "update preferences"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1062
-msgid "Globaltime Preferences"
-msgstr ""
-
-#. -----------------------HEADING--------------------------------------
-#: ../globaltime/gt_prefs.c:1073
-msgid "General Preferences"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1077
-#, fuzzy
-msgid "Decorations:"
-msgstr "მდებარეობა"
-
-#: ../globaltime/gt_prefs.c:1078
-#, fuzzy
-msgid "Standard"
-msgstr "კალენდარი"
-
-#: ../globaltime/gt_prefs.c:1083
-msgid "Use normal decorations"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1094
-msgid "Do not show window decorations (borders)"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1100
-msgid "Clock size:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1101
-msgid "Equal"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1106
-msgid "All clocks have same size"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1111
-msgid "Varying"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1116
-msgid "Clock sizes vary"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1122
-#, fuzzy
-msgid "Local timezone:"
-msgstr "მდებარეობა"
-
-#: ../globaltime/timezone_selection.c:101
-#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
-msgid " Other"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:156
-#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
-#, c-format
-msgid "%d hour %d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:159
-#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, c-format
-msgid "%d hour"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:161
-#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, c-format
-msgid "%d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:167
-#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
-msgid "backward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:170
-#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-msgid "forward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:194
-#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
-msgid "not changed"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:195
-#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
-msgid "not changing"
-msgstr ""
-
-#. location
-#: ../globaltime/timezone_selection.c:247
-#: ../globaltime/timezone_selection.c:252
-#: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
-#: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
-msgid "Location"
-msgstr "მდებარეობა"
-
-#: ../globaltime/timezone_selection.c:258
-#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
-msgid "GMT Offset"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:264
-#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
-msgid "Previous/Next Change"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:269
-#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
-msgid "Country"
-msgstr ""
-
-#. We are actually setting the g_par parameter. In other words
-#. we are setting the global default timezone for Orage. This is
-#. done very seldom and we do not want to allow "floating" here.
-#. This test is ugly, but it is not worth an extra parameter.
-#. this is normal appointment
-#: ../globaltime/timezone_selection.c:299
-#: ../globaltime/timezone_selection.c:309
-#: ../panel-plugin/timezone_selection.c:300
-#: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
-#: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
-msgid "Pick timezone"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:302
-#: ../globaltime/timezone_selection.c:312
-#: ../panel-plugin/timezone_selection.c:303
-#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
-#: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
-msgid "Change mode"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:303
-#: ../globaltime/timezone_selection.c:313
-#: ../globaltime/timezone_selection.c:352
-#: ../panel-plugin/timezone_selection.c:304
-#: ../panel-plugin/timezone_selection.c:314
-#: ../panel-plugin/timezone_selection.c:353 ../src/timezone_selection.c:320
-#: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
-#: ../src/timezone_selection.c:379
-msgid "UTC"
-msgstr ""
-
-#. NOTE: this exists only if ical timezones are being used
-#: ../globaltime/timezone_selection.c:304
-#: ../globaltime/timezone_selection.c:357
-#: ../panel-plugin/timezone_selection.c:305
-#: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
-#: ../src/timezone_selection.c:384
-msgid "floating"
-msgstr ""
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "მდებარეობა"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
-msgid "Orage Globaltime"
-msgstr "კალენდარი"
-
-#: ../globaltime/globaltime.desktop.in.h:3
-msgid "Show clocks from different countries"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:224
-msgid "Appearance"
-msgstr ""
-
-#. show frame
-#: ../panel-plugin/oc_config.c:229
-msgid "Show _frame"
-msgstr ""
-
-#. foreground color
-#: ../panel-plugin/oc_config.c:239
-msgid "set foreground _color:"
-msgstr ""
-
-#. background color
-#: ../panel-plugin/oc_config.c:253
-msgid "set _background color:"
-msgstr ""
-
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
-msgid "set _height:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:277
-msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:282
-msgid "set _width:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:293
-msgid "Note that you can not change the width of vertical panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:316
-msgid "Clock Options"
-msgstr ""
-
-#. timezone
-#: ../panel-plugin/oc_config.c:326
-msgid "set timezone to:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:347
-#, c-format
-msgid "Line %d:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:357
-msgid "Enter any valid strftime function parameter."
-msgstr ""
-
-#. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
-msgid "Tooltip:"
-msgstr ""
-
-#. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
-msgid "fix time after suspend/hibernate"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:415
-msgid ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:432
-msgid ""
-"This program uses strftime function to get time.\n"
-"Use any valid code to get time in the format you prefer.\n"
-"Some common codes are:\n"
-"\t%A = weekday\t\t\t%B = month\n"
-"\t%c = date & time\t\t%R = hour & minute\n"
-"\t%V = week number\t\t%Z = timezone in use\n"
-"\t%H = hours \t\t\t\t%M = minute\n"
-"\t%X = local time\t\t\t%x = local date"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:457
-msgid "Orage clock Preferences"
-msgstr ""
-
-#. no lines yet
-#. TRANSLATORS: Use format characters from strftime(3)
-#. * to get the proper string for your locale.
-#. * I used these:
-#. * %A  : full weekday name
-#. * %d  : day of the month
-#. * %B  : full month name
-#. * %Y  : four digit year
-#. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
-msgid "%A %d %B %Y/%V"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:40
-msgid "Maintainer"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:47
-msgid "Manage your time with Orage"
-msgstr ""
-
-#. if (gtk_toggle_button_get_active(
-#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
-#. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
-msgid "End"
-msgstr ""
-
-#: ../src/appointment.c:333
-msgid "Due"
-msgstr ""
-
-#: ../src/appointment.c:493 ../src/mainbox.c:783
-msgid "Orage"
-msgstr ""
-
-#. to avoid timing problems when updating entry
-#. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
-msgid "Select a file..."
-msgstr ""
-
-#: ../src/appointment.c:680
-msgid "Sound Files"
-msgstr ""
-
-#: ../src/appointment.c:687 ../src/interface.c:290
-msgid "All Files"
-msgstr ""
-
-#: ../src/appointment.c:739
-msgid "The appointment information has been modified."
-msgstr ""
-
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
-msgid "Do you want to continue?"
-msgstr ""
-
-#: ../src/appointment.c:767
-msgid "The end of this appointment is earlier than the beginning."
-msgstr ""
-
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-msgid "Not set"
-msgstr ""
-
-#: ../src/appointment.c:1193
-msgid "This appointment will be permanently removed."
-msgstr ""
-
-#: ../src/appointment.c:1692
-msgid "This appointment does not exist."
-msgstr ""
-
-#: ../src/appointment.c:1693
-msgid "It was probably removed, please refresh your screen."
-msgstr ""
-
-#: ../src/appointment.c:1995
-#, fuzzy
-msgid "Current categories"
-msgstr "კალენდარი"
-
-#: ../src/appointment.c:2010
-msgid "Add new category with color"
-msgstr ""
-
-#: ../src/appointment.c:2014
-msgid "Category:"
-msgstr ""
-
-#: ../src/appointment.c:2045
-msgid "Colors of categories - Orage"
-msgstr ""
-
-#: ../src/appointment.c:2092
-msgid " *** COPY ***"
-msgstr ""
-
-#: ../src/appointment.c:2353
-msgid "New appointment - Orage"
-msgstr ""
-
-#. File menu stuff
-#. ********* File menu *********
-#. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
-msgid "_File"
-msgstr ""
-
-#: ../src/appointment.c:2388
-msgid "Sav_e and close"
-msgstr ""
-
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
-msgid "D_uplicate"
-msgstr ""
-
-#: ../src/appointment.c:2589
-msgid "Save"
-msgstr ""
-
-#: ../src/appointment.c:2591
-msgid "Save and close"
-msgstr ""
-
-#: ../src/appointment.c:2596
-msgid "Revert"
-msgstr ""
-
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
-msgid "Duplicate"
-msgstr ""
-
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
-msgid "Delete"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Free"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Busy"
-msgstr ""
-
-#: ../src/appointment.c:2625
-msgid "General"
-msgstr ""
-
-#. type
-#: ../src/appointment.c:2631
-msgid "Type "
-msgstr ""
-
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
-msgid "Event"
-msgstr ""
-
-#: ../src/appointment.c:2636
-msgid ""
-"Event that will happen sometime. For example:\n"
-"Meeting or birthday or TV show."
-msgstr ""
-
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-msgid "Todo"
-msgstr ""
-
-#: ../src/appointment.c:2642
-msgid ""
-"Something that you should do sometime. For example:\n"
-"Wash your car or test new version of Orage."
-msgstr ""
-
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
-msgid "Journal"
-msgstr ""
-
-#: ../src/appointment.c:2649
-msgid ""
-"Make a note that something happened. For example:\n"
-"Remark that your mother called or first snow came."
-msgstr ""
-
-#. title
-#: ../src/appointment.c:2656
-msgid "Title "
-msgstr ""
-
-#: ../src/appointment.c:2671
-msgid "All day event"
-msgstr ""
-
-#. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
-msgid "Start"
-msgstr ""
-
-#: ../src/appointment.c:2697
-msgid "Set      "
-msgstr ""
-
-#: ../src/appointment.c:2718
-msgid "Duration"
-msgstr ""
-
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
-msgid "days"
-msgstr ""
-
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
-msgid "hours"
-msgstr ""
-
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
-msgid "mins"
-msgstr ""
-
-#. Availability (only for EVENT)
-#: ../src/appointment.c:2738
-msgid "Availability"
-msgstr ""
-
-#. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
-msgid "Completed"
-msgstr ""
-
-#: ../src/appointment.c:2749
-msgid "Done"
-msgstr ""
-
-#. categories
-#: ../src/appointment.c:2770
-msgid "Categories"
-msgstr ""
-
-#: ../src/appointment.c:2782
-msgid ""
-"This is special category, which can be used to color this appointment in "
-"list views."
-msgstr ""
-
-#: ../src/appointment.c:2787
-msgid "update colors for categories."
-msgstr ""
-
-#. priority
-#: ../src/appointment.c:2793
-msgid "Priority"
-msgstr ""
-
-#. note
-#: ../src/appointment.c:2803
-msgid "Note"
-msgstr ""
-
-#: ../src/appointment.c:2824
-msgid ""
-"These shorthand commands take effect immediately:\n"
-"    <D> inserts current date in local date format\n"
-"    <T> inserts time and\n"
-"    <DT> inserts date and time.\n"
-"\n"
-"These are converted only later when they are seen:\n"
-"    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before Start"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before End"
-msgstr ""
-
-#: ../src/appointment.c:2896
-msgid "After Start"
-msgstr ""
-
-#: ../src/appointment.c:2896
-msgid "After End"
-msgstr ""
-
-#: ../src/appointment.c:2903
-msgid "Alarm"
-msgstr ""
-
-#. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-msgid "Alarm time"
-msgstr ""
-
-#: ../src/appointment.c:2933
-msgid ""
-"Often you want to get alarm:\n"
-" 1) before Event start\n"
-" 2) before Todo end\n"
-" 3) after Todo start"
-msgstr ""
-
-#: ../src/appointment.c:2938
-msgid "Persistent alarm"
-msgstr ""
-
-#: ../src/appointment.c:2940
-msgid ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
-msgstr ""
-
-#. **** Audio Alarm ****
-#: ../src/appointment.c:2949
-msgid "Sound"
-msgstr ""
-
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
-msgid "Use"
-msgstr ""
-
-#: ../src/appointment.c:2955
-msgid "Select this if you want audible alarm"
-msgstr ""
-
-#: ../src/appointment.c:2972
-msgid "Repeat alarm sound"
-msgstr ""
-
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
-msgid "times"
-msgstr ""
-
-#: ../src/appointment.c:3004
-msgid "sec interval"
-msgstr ""
-
-#. **** Display Alarm ****
-#: ../src/appointment.c:3014
-msgid "Visual"
-msgstr ""
-
-#: ../src/appointment.c:3018
-msgid "Use Orage window"
-msgstr ""
-
-#: ../src/appointment.c:3020
-msgid "Select this if you want Orage window alarm"
-msgstr ""
-
-#: ../src/appointment.c:3032
-msgid "Use notification"
-msgstr ""
-
-#: ../src/appointment.c:3034
-msgid "Select this if you want notification alarm"
-msgstr ""
-
-#: ../src/appointment.c:3040
-msgid "Set timeout"
-msgstr ""
-
-#: ../src/appointment.c:3043
-msgid "Select this if you want notification to expire automatically"
-msgstr ""
-
-#: ../src/appointment.c:3054
-msgid "0 = system default expiration time"
-msgstr ""
-
-#: ../src/appointment.c:3059
-msgid "seconds"
-msgstr ""
-
-#. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
-msgid "Procedure"
-msgstr ""
-
-#: ../src/appointment.c:3076
-msgid "Select this if you want procedure or script alarm"
-msgstr ""
-
-#: ../src/appointment.c:3082
-msgid ""
-"You must enter all escape etc characters yourself.\n"
-"This string is just given to shell to process.\n"
-"The following special commands are replaced at run time:\n"
-"\t<&T>  appointment title\n"
-"\t<&D>  appointment description\n"
-"\t<&AT> alarm time\n"
-"\t<&ST> appointment start time\n"
-"\t<&ET> appointment end time"
-msgstr ""
-
-#: ../src/appointment.c:3094
-msgid "Test this alarm by raising it now"
-msgstr ""
-
-#: ../src/appointment.c:3101
-msgid "<b>Default alarm</b>"
-msgstr ""
-
-#: ../src/appointment.c:3109
-msgid "Store current settings as default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3114
-msgid "Set current settings from default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Daily"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Weekly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Monthly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Yearly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Hourly"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Mon"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Tue"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Wed"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Thu"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Fri"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Sat"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Sun"
-msgstr ""
-
-#: ../src/appointment.c:3183
-msgid "Recurrence"
-msgstr ""
-
-#. complexity
-#: ../src/appointment.c:3189
-msgid "Complexity"
-msgstr ""
-
-#: ../src/appointment.c:3192
-msgid "Basic"
-msgstr ""
-
-#: ../src/appointment.c:3198
-msgid "Advanced"
-msgstr ""
-
-#: ../src/appointment.c:3202
-msgid "Use this if you want regular repeating event"
-msgstr ""
-
-#: ../src/appointment.c:3204
-msgid ""
-"Use this if you need complex times like:\n"
-" Every Saturday and Sunday or \n"
-" First Tuesday every month"
-msgstr ""
-
-#. frequency
-#: ../src/appointment.c:3211
-msgid "Frequency"
-msgstr ""
-
-#: ../src/appointment.c:3217
-msgid "Each"
-msgstr ""
-
-#: ../src/appointment.c:3224
-msgid "occurrence"
-msgstr ""
-
-#: ../src/appointment.c:3228
-msgid ""
-"Limit frequency to certain interval.\n"
-" For example: Every third day:\n"
-" Frequency = Daily and Interval = 3"
-msgstr ""
-
-#: ../src/appointment.c:3274
-msgid "Limit"
-msgstr ""
-
-#: ../src/appointment.c:3276
-msgid "Repeat forever"
-msgstr ""
-
-#: ../src/appointment.c:3282
-msgid "Repeat "
-msgstr ""
-
-#: ../src/appointment.c:3298
-msgid "Repeat until "
-msgstr ""
-
-#. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-msgid "Weekdays"
-msgstr ""
-
-#: ../src/appointment.c:3323
-msgid "Which day"
-msgstr ""
-
-#: ../src/appointment.c:3331
-msgid ""
-"Specify which weekday for monthly and yearly events.\n"
-" For example:\n"
-" Second Wednesday each month:\n"
-"\tFrequency = Monthly,\n"
-"\tWeekdays = check only Wednesday,\n"
-"\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-
-#. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
-msgid "TODO base"
-msgstr ""
-
-#: ../src/appointment.c:3352
-msgid ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
-msgstr ""
-
-#: ../src/appointment.c:3354
-msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-
-#. exceptions
-#: ../src/appointment.c:3361
-msgid "Exceptions"
-msgstr ""
-
-#: ../src/appointment.c:3374
-msgid ""
-"Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
-"Remove by clicking the data."
-msgstr ""
-
-#: ../src/appointment.c:3379
-msgid "Add excluded date (-)"
-msgstr ""
-
-#: ../src/appointment.c:3381
-msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-
-#: ../src/appointment.c:3387
-msgid "Add included time (+)"
-msgstr ""
-
-#: ../src/appointment.c:3389
-msgid ""
-"Included times have same timezone than start time, but they may have "
-"different time"
-msgstr ""
-
-#. calendars showing the action days
-#: ../src/appointment.c:3406
-msgid "Action dates"
-msgstr ""
-
-#. ********* View menu *********
-#. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
-msgid "_View"
-msgstr ""
-
-#. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
-msgid "_Go"
-msgstr ""
-
-#: ../src/day-view.c:319 ../src/event-list.c:1110
-msgid "New"
-msgstr "ახალი"
-
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr ""
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr ""
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr ""
-
-#: ../src/day-view.c:333 ../src/event-list.c:1128
-msgid "Refresh"
-msgstr ""
-
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
-msgid "Close"
-msgstr ""
-
-#: ../src/day-view.c:454
-msgid "Unknown"
-msgstr ""
-
-#: ../src/day-view.c:704
-msgid "       Number of days to show"
-msgstr ""
-
-#: ../src/day-view.c:935
-#, fuzzy
-msgid "Orage - day view"
-msgstr "კალენდარი"
-
-#. date only appointment
-#: ../src/event-list.c:190
-msgid "All day"
-msgstr ""
-
-#: ../src/event-list.c:580 ../src/event-list.c:1281
-msgid "Time"
-msgstr ""
-
-#: ../src/event-list.c:748
-msgid "No rows have been selected."
-msgstr ""
-
-#: ../src/event-list.c:749
-msgid "Click a row to select it and after that you can copy it."
-msgstr ""
-
-#: ../src/event-list.c:918
-msgid ""
-"You will permanently remove all\n"
-"selected appointments."
-msgstr ""
-
-#: ../src/event-list.c:1130
-msgid "Find"
-msgstr ""
-
-#: ../src/event-list.c:1137
-msgid "Dayview"
-msgstr ""
-
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr ""
-
-#: ../src/event-list.c:1201
-msgid "Journal entries starting from:"
-msgstr ""
-
-#: ../src/event-list.c:1221
-msgid "Search"
-msgstr ""
-
-#: ../src/event-list.c:1224
-msgid "Search text "
-msgstr ""
-
-#: ../src/event-list.c:1289
-msgid "Flags"
-msgstr ""
-
-#: ../src/event-list.c:1297
-msgid "Title"
-msgstr ""
-
-#: ../src/event-list.c:1323
-msgid ""
-"Double click line to edit it.\n"
-"\n"
-"Flags in order:\n"
-"\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
-"\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
-"\t 3. Type: f=free B=Busy\n"
-"\t 4. Located in file:\n"
-"\t\tO=Orage A=Archive F=Foreign\n"
-"\t 5. Appointment type:\n"
-"\t\tE=Event T=Todo J=Journal"
-msgstr ""
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr ""
-
-#. remove since it has ended
-#: ../src/ical-archive.c:267
-msgid "\tRecur ended, moving to archive file."
-msgstr ""
-
-#: ../src/ical-archive.c:329
-msgid "Archiving not enabled. Exiting"
-msgstr ""
-
-#: ../src/ical-archive.c:347
-#, c-format
-msgid "Archiving threshold: %d month(s)"
-msgstr ""
-
-#. yy mon day
-#: ../src/ical-archive.c:350
-#, c-format
-msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr ""
-
-#: ../src/ical-archive.c:377
-#, c-format
-msgid "Archiving uid: %s"
-msgstr ""
-
-#. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
-msgid "\tVTODO not complete; not archived"
-msgstr ""
-
-#. it is recurrent event
-#: ../src/ical-archive.c:388
-#, c-format
-msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr ""
-
-#: ../src/ical-archive.c:405
-msgid "Archiving done\n"
-msgstr ""
-
-#. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
-msgid "Starting archive removal."
-msgstr ""
-
-#: ../src/ical-archive.c:422
-msgid "\tPHASE 1: reset recurring appointments"
-msgstr ""
-
-#. PHASE 2: go through archive file and add everything back to base orage.
-#. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
-msgid "\tPHASE 2: return archived appointments"
-msgstr ""
-
-#: ../src/ical-archive.c:470
-msgid "Archive removal done\n"
-msgstr ""
-
-#: ../src/ical-code.c:932
-msgid "Orage default alarm"
-msgstr ""
-
-#: ../src/ical-code.c:3115
-#, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-
-#: ../src/ical-code.c:3117
-#, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-
-#: ../src/ical-expimp.c:123
-msgid "Starting import file preprocessing"
-msgstr ""
-
-#: ../src/ical-expimp.c:158
-msgid "... Patched DCREATED to be CREATED."
-msgstr ""
-
-#: ../src/ical-expimp.c:197
-msgid "... Patched timezone to Orage format."
-msgstr ""
-
-#: ../src/ical-expimp.c:206
-msgid "Import file preprocessing done"
-msgstr ""
-
-#: ../src/interface.c:284
-#, fuzzy
-msgid "Calendar files"
-msgstr "კალენდარი"
-
-#: ../src/interface.c:631
-msgid "Current foreign files"
-msgstr ""
-
-#: ../src/interface.c:643
-msgid "READ ONLY"
-msgstr ""
-
-#: ../src/interface.c:645
-msgid "READ WRITE"
-msgstr ""
-
-#: ../src/interface.c:663
-msgid "***** No foreign files *****"
-msgstr ""
-
-#: ../src/interface.c:974
-msgid "Import/export"
-msgstr ""
-
-#: ../src/interface.c:981
-msgid "Import"
-msgstr ""
-
-#: ../src/interface.c:986
-msgid "Read from file:"
-msgstr ""
-
-#: ../src/interface.c:1003
-msgid ""
-"Separate filenames with comma(,).\n"
-" NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-
-#: ../src/interface.c:1008
-msgid "Export"
-msgstr ""
-
-#: ../src/interface.c:1013
-msgid "Write to file:"
-msgstr ""
-
-#: ../src/interface.c:1034 ../src/interface.c:1046
-msgid "Select"
-msgstr ""
-
-#: ../src/interface.c:1037
-msgid "All appointments"
-msgstr ""
-
-#: ../src/interface.c:1050
-msgid "Named appointments: "
-msgstr ""
-
-#: ../src/interface.c:1062
-msgid ""
-"Note that only main file appointments are read.\n"
-"Archived and Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1065
-msgid ""
-"Note that only main file appointments are read.\n"
-"Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1068
-msgid "You can easily drag these from event-list window."
-msgstr ""
-
-#: ../src/interface.c:1070
-msgid "Orage appointment UIDs separated by commas."
-msgstr ""
-
-#: ../src/interface.c:1076
-msgid "Archive"
-msgstr ""
-
-#: ../src/interface.c:1084
-#, c-format
-msgid "Archive now (threshold: %d months)"
-msgstr ""
-
-#: ../src/interface.c:1094
-msgid "You can change archive threshold in parameters"
-msgstr ""
-
-#: ../src/interface.c:1101
-msgid "Revert archive now"
-msgstr ""
-
-#: ../src/interface.c:1107
-msgid ""
-"Return all archived events into main orage file and remove arch file.\n"
-"This is useful for example when doing export and moving orage\n"
-"appointments to another system."
-msgstr ""
-
-#: ../src/interface.c:1118
-#, fuzzy
-msgid "Orage files"
-msgstr "კალენდარი"
-
-#: ../src/interface.c:1125
-#, fuzzy
-msgid "Orage main calendar file"
-msgstr "კალენდარი"
-
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "კალენდარი"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr ""
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr ""
-
-#: ../src/interface.c:1156 ../src/interface.c:1222
-msgid "Rename"
-msgstr ""
-
-#: ../src/interface.c:1160
-msgid ""
-"Orage internal file rename only.\n"
-"Does not touch external filesystem at all.\n"
-"New file must exist."
-msgstr ""
-
-#: ../src/interface.c:1164 ../src/interface.c:1227
-msgid "Copy"
-msgstr ""
-
-#: ../src/interface.c:1168
-msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-
-#: ../src/interface.c:1172 ../src/interface.c:1232
-msgid "Move"
-msgstr ""
-
-#: ../src/interface.c:1176
-msgid "Current file is moved and vanishes from the old place."
-msgstr ""
-
-#: ../src/interface.c:1190
-msgid "Archive file"
-msgstr ""
-
-#: ../src/interface.c:1254
-msgid "Foreign files"
-msgstr ""
-
-#: ../src/interface.c:1261
-msgid "Add new foreign file"
-msgstr ""
-
-#: ../src/interface.c:1266
-msgid "Foreign file:"
-msgstr ""
-
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr ""
-
-#: ../src/interface.c:1286
-msgid "Read only"
-msgstr ""
-
-#: ../src/interface.c:1294
-msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-
-#: ../src/interface.c:1308
-msgid "Exchange data - Orage"
-msgstr ""
-
-#: ../src/main.c:268
-#, c-format
-msgid ""
-"\tThis is %s version %s\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:270
-#, c-format
-msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
-
-#: ../src/main.c:271
-#, c-format
-msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
-
-#: ../src/main.c:273
-#, c-format
-msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
-
-#: ../src/main.c:276
-#, c-format
-msgid "\tUsing DBUS for import.\n"
-msgstr ""
-
-#: ../src/main.c:278
-#, c-format
-msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
-
-#: ../src/main.c:281
-#, c-format
-msgid "\tUsing libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:283
-#, c-format
-msgid "\tNot using libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:286
-#, c-format
-msgid "\tUsing automatic archiving.\n"
-msgstr ""
-
-#: ../src/main.c:288
-#, c-format
-msgid "\tNot using archiving.\n"
-msgstr ""
-
-#: ../src/main.c:291
-#, c-format
-msgid "\tUsing operating system package libical.\n"
-msgstr ""
-
-#: ../src/main.c:293
-#, c-format
-msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
-
-#: ../src/main.c:306
-#, c-format
-msgid ""
-"Usage: orage [options] [files]\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:307
-#, c-format
-msgid "Options:\n"
-msgstr ""
-
-#: ../src/main.c:308
-#, c-format
-msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
-
-#: ../src/main.c:309
-#, c-format
-msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
-
-#: ../src/main.c:310
-#, c-format
-msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
-
-#: ../src/main.c:311
-#, c-format
-msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
-
-#: ../src/main.c:312
-#, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:313
-#, c-format
-msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:314
-#, c-format
-msgid ""
-"--export (-e) file [appointment...] \texport appointments from Orage to "
-"file\n"
-msgstr ""
-
-#: ../src/main.c:316
-#, c-format
-msgid "files=ical files to load into orage\n"
-msgstr ""
-
-#: ../src/main.c:318
-#, c-format
-msgid "\tdbus not included in orage. \n"
-msgstr ""
-
-#: ../src/main.c:319
-#, c-format
-msgid ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
-msgstr ""
-
-#: ../src/main.c:511
-#, c-format
-msgid ""
-"\n"
-"Unknown option %s\n"
-"\n"
-msgstr ""
-
-#: ../src/mainbox.c:287
-msgid "_Exchange data"
-msgstr ""
-
-#. Edit menu
-#: ../src/mainbox.c:298
-msgid "_Edit"
-msgstr ""
-
-#: ../src/mainbox.c:308
-msgid "View selected _date"
-msgstr ""
-
-#: ../src/mainbox.c:311
-msgid "View selected _week"
-msgstr ""
-
-#: ../src/mainbox.c:317
-msgid "Select _Today"
-msgstr ""
-
-#: ../src/mainbox.c:323
-#, fuzzy
-msgid "Show _Globaltime"
-msgstr "მდებარეობა"
-
-#. Help menu
-#: ../src/mainbox.c:327
-msgid "_Help"
-msgstr ""
-
-#: ../src/mainbox.c:448
-msgid "Never"
-msgstr ""
-
-#: ../src/mainbox.c:453
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:460
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:546
-msgid "<b>To do:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:582
-#, c-format
-msgid "<b>Events for %s:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:593
-#, c-format
-msgid "<b>Events for %s - %s:</b>"
-msgstr ""
-
-#: ../src/parameters.c:522
-msgid "Main settings"
-msgstr ""
-
-#: ../src/parameters.c:528
-msgid "Timezone"
-msgstr ""
-
-#: ../src/parameters.c:543
-msgid "You should always define your local timezone."
-msgstr ""
-
-#: ../src/parameters.c:552
-msgid "Archive threshold (months)"
-msgstr ""
-
-#: ../src/parameters.c:562
-msgid "(0 = no archiving)"
-msgstr ""
-
-#: ../src/parameters.c:565
-msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-
-#: ../src/parameters.c:574
-msgid "Sound command"
-msgstr ""
-
-#: ../src/parameters.c:589
-msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr ""
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr ""
-
-#: ../src/parameters.c:618
-msgid "Show borders"
-msgstr ""
-
-#: ../src/parameters.c:625
-msgid "Show menu"
-msgstr ""
-
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr ""
-
-#: ../src/parameters.c:639
-msgid "Show day names"
-msgstr ""
-
-#: ../src/parameters.c:646
-msgid "Show week numbers"
-msgstr ""
-
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr ""
-
-#: ../src/parameters.c:660
-msgid "Number of days to show in event window"
-msgstr ""
-
-#: ../src/parameters.c:666
-msgid "0 = do not show event list at all"
-msgstr ""
-
-#: ../src/parameters.c:676
-msgid "Show on all desktops"
-msgstr ""
-
-#: ../src/parameters.c:683
-msgid "Keep on top"
-msgstr ""
-
-#: ../src/parameters.c:690
-msgid "Show in taskbar"
-msgstr ""
-
-#: ../src/parameters.c:697
-msgid "Show in pager"
-msgstr ""
-
-#: ../src/parameters.c:704
-msgid "Show in systray"
-msgstr ""
-
-#: ../src/parameters.c:739
-#, fuzzy
-msgid "Calendar start"
-msgstr "კალენდარი"
-
-#: ../src/parameters.c:744
-msgid "Show"
-msgstr ""
-
-#: ../src/parameters.c:756
-msgid "Hide"
-msgstr ""
-
-#: ../src/parameters.c:768
-msgid "Minimized"
-msgstr ""
-
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr ""
-
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr ""
-
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr ""
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr ""
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
-
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr ""
-
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr ""
-
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr ""
-
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr ""
-
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
-
-#: ../src/parameters.c:921
-msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-
-#: ../src/parameters.c:938
-msgid "Orage Preferences"
-msgstr ""
-
-#: ../src/parameters.c:1050
-msgid "First Orage start. Searching default timezone."
-msgstr ""
-
-#: ../src/parameters.c:1069
-#, c-format
-msgid "Default timezone set to %s."
-msgstr ""
-
-#: ../src/parameters.c:1072
-msgid "Default timezone not found, please, set it manually."
-msgstr ""
-
-#: ../src/reminder.c:562
-msgid "Reminder "
-msgstr ""
-
-#: ../src/reminder.c:591
-msgid "Open"
-msgstr ""
-
-#: ../src/reminder.c:722
-msgid "Reminder - Orage"
-msgstr ""
-
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
-
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-
-#: ../src/reminder.c:1099
-msgid "Next active alarms:"
-msgstr ""
-
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
-#, c-format
-msgid ""
-"\n"
-"%02d d %02d h %02d min to: %s"
-msgstr ""
-
-#: ../src/reminder.c:1166
-#, c-format
-msgid ""
-"\n"
-"No active alarms found"
-msgstr ""
-
-#: ../src/timezone_names.c:36
-msgid "Africa"
-msgstr ""
-
-#: ../src/timezone_names.c:37
-msgid "Africa/Abidjan"
-msgstr ""
-
-#: ../src/timezone_names.c:38
-msgid "Africa/Accra"
-msgstr ""
-
-#: ../src/timezone_names.c:39
-msgid "Africa/Addis_Ababa"
-msgstr ""
-
-#: ../src/timezone_names.c:40
-msgid "Africa/Algiers"
-msgstr ""
-
-#: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr ""
-
-#: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr ""
-
-#: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr ""
-
-#: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr ""
-
-#: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr ""
-
-#: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr ""
-
-#: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr ""
-
-#: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr ""
-
-#: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr ""
-
-#: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr ""
-
-#: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr ""
-
-#: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr ""
-
-#: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr ""
-
-#: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr ""
-
-#: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr ""
-
-#: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr ""
-
-#: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr ""
-
-#: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr ""
-
-#: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr ""
-
-#: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr ""
-
-#: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr ""
-
-#: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr ""
-
-#: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr ""
-
-#: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr ""
-
-#: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr ""
-
-#: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr ""
-
-#: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr ""
-
-#: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr ""
-
-#: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr ""
-
-#: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr ""
-
-#: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr ""
-
-#: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr ""
-
-#: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr ""
-
-#: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr ""
-
-#: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr ""
-
-#: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr ""
-
-#: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr ""
-
-#: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr ""
-
-#: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr ""
-
-#: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr ""
-
-#: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr ""
-
-#: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr ""
-
-#: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr ""
-
-#: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr ""
-
-#: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr ""
-
-#: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr ""
-
-#: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr ""
-
-#: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr ""
-
-#: ../src/timezone_names.c:89
-msgid "America"
-msgstr ""
-
-#: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr ""
-
-#: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr ""
-
-#: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr ""
-
-#: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr ""
-
-#: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr ""
-
-#: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:96
-msgid "America/Argentina/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:97
-msgid "America/Argentina/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:98
-msgid "America/Argentina/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:99
-msgid "America/Argentina/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr ""
-
-#: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr ""
-
-#: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr ""
-
-#: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr ""
-
-#: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr ""
-
-#: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr ""
-
-#: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr ""
-
-#: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr ""
-
-#: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr ""
-
-#: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr ""
-
-#: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr ""
-
-#: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr ""
-
-#: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr ""
-
-#: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr ""
-
-#: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr ""
-
-#: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr ""
-
-#: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr ""
-
-#: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr ""
-
-#: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr ""
-
-#: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr ""
-
-#: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr ""
-
-#: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr ""
-
-#: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr ""
-
-#: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr ""
-
-#: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr ""
-
-#: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr ""
-
-#: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr ""
-
-#: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr ""
-
-#: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr ""
-
-#: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr ""
-
-#: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr ""
-
-#: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr ""
-
-#: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr ""
-
-#: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr ""
-
-#: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr ""
-
-#: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr ""
-
-#: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr ""
-
-#: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr ""
-
-#: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr ""
-
-#: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr ""
-
-#: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr ""
-
-#: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr ""
-
-#: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr ""
-
-#: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr ""
-
-#: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr ""
-
-#: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr ""
-
-#: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr ""
-
-#: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr ""
-
-#: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr ""
-
-#: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr ""
-
-#: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr ""
-
-#: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr ""
-
-#: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr ""
-
-#: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr ""
-
-#: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr ""
-
-#: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr ""
-
-#: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr ""
-
-#: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr ""
-
-#: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr ""
-
-#: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr ""
-
-#: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr ""
-
-#: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr ""
-
-#: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr ""
-
-#: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr ""
-
-#: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr ""
-
-#: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr ""
-
-#: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr ""
-
-#: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr ""
-
-#: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr ""
-
-#: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr ""
-
-#: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr ""
-
-#: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr ""
-
-#: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr ""
-
-#: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr ""
-
-#: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr ""
-
-#: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr ""
-
-#: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr ""
-
-#: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr ""
-
-#: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr ""
-
-#: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr ""
-
-#: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr ""
-
-#: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr ""
-
-#: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr ""
-
-#: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr ""
-
-#: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr ""
-
-#: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr ""
-
-#: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr ""
-
-#: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr ""
-
-#: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr ""
-
-#: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr ""
-
-#: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr ""
-
-#: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr ""
-
-#: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr ""
-
-#: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr ""
-
-#: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr ""
-
-#: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr ""
-
-#: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr ""
-
-#: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr ""
-
-#: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr ""
-
-#: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr ""
-
-#: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr ""
-
-#: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr ""
-
-#: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr ""
-
-#: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr ""
-
-#: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr ""
-
-#: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr ""
-
-#: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr ""
-
-#: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr ""
-
-#: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr ""
-
-#: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr ""
-
-#: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr ""
-
-#: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr ""
-
-#: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr ""
-
-#: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr ""
-
-#: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr ""
-
-#: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr ""
-
-#: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr ""
-
-#: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr ""
-
-#: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr ""
-
-#: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr ""
-
-#: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr ""
-
-#: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr ""
-
-#: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr ""
-
-#: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr ""
-
-#: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr ""
-
-#: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr ""
-
-#: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr ""
-
-#: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr ""
-
-#: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr ""
-
-#: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr ""
-
-#: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr ""
-
-#: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr ""
-
-#: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr ""
-
-#: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr ""
-
-#: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr ""
-
-#: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr ""
-
-#: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr ""
-
-#: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr ""
-
-#: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr ""
-
-#: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr ""
-
-#: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr ""
-
-#: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr ""
-
-#: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr ""
-
-#: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr ""
-
-#: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr ""
-
-#: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr ""
-
-#: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr ""
-
-#: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr ""
-
-#: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr ""
-
-#: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr ""
-
-#: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr ""
-
-#: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr ""
-
-#: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr ""
-
-#: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr ""
-
-#: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr ""
-
-#: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr ""
-
-#: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr ""
-
-#: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr ""
-
-#: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr ""
-
-#: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr ""
-
-#: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr ""
-
-#: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr ""
-
-#: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr ""
-
-#: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr ""
-
-#: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr ""
-
-#: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr ""
-
-#: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr ""
-
-#: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr ""
-
-#: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr ""
-
-#: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr ""
-
-#: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr ""
-
-#: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr ""
-
-#: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr ""
-
-#: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr ""
-
-#: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr ""
-
-#: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr ""
-
-#: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr ""
-
-#: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr ""
-
-#: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr ""
-
-#: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr ""
-
-#: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr ""
-
-#: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr ""
-
-#: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr ""
-
-#: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr ""
-
-#: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr ""
-
-#: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr ""
-
-#: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr ""
-
-#: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr ""
-
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr ""
-
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr ""
-
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr ""
-
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr ""
-
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr ""
-
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr ""
-
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr ""
-
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr ""
-
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr ""
-
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr ""
-
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr ""
-
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr ""
-
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr ""
-
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr ""
-
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr ""
-
-#: ../src/timezone_names.c:320
-msgid "Europe"
-msgstr "ევროპა"
-
-#: ../src/timezone_names.c:321
-msgid "Europe/Amsterdam"
-msgstr ""
-
-#: ../src/timezone_names.c:322
-msgid "Europe/Andorra"
-msgstr ""
-
-#: ../src/timezone_names.c:323
-msgid "Europe/Athens"
-msgstr ""
-
-#: ../src/timezone_names.c:324
-msgid "Europe/Belfast"
-msgstr ""
-
-#: ../src/timezone_names.c:325
-msgid "Europe/Belgrade"
-msgstr ""
-
-#: ../src/timezone_names.c:326
-msgid "Europe/Berlin"
-msgstr ""
-
-#: ../src/timezone_names.c:327
-msgid "Europe/Bratislava"
-msgstr ""
-
-#: ../src/timezone_names.c:328
-msgid "Europe/Brussels"
-msgstr ""
-
-#: ../src/timezone_names.c:329
-msgid "Europe/Bucharest"
-msgstr ""
-
-#: ../src/timezone_names.c:330
-msgid "Europe/Budapest"
-msgstr ""
-
-#: ../src/timezone_names.c:331
-msgid "Europe/Chisinau"
-msgstr ""
-
-#: ../src/timezone_names.c:332
-msgid "Europe/Copenhagen"
-msgstr ""
-
-#: ../src/timezone_names.c:333
-msgid "Europe/Dublin"
-msgstr ""
-
-#: ../src/timezone_names.c:334
-msgid "Europe/Gibraltar"
-msgstr ""
-
-#: ../src/timezone_names.c:335
-msgid "Europe/Helsinki"
-msgstr ""
-
-#: ../src/timezone_names.c:336
-msgid "Europe/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:337
-msgid "Europe/Kaliningrad"
-msgstr ""
-
-#: ../src/timezone_names.c:338
-msgid "Europe/Kiev"
-msgstr ""
-
-#: ../src/timezone_names.c:339
-msgid "Europe/Lisbon"
-msgstr ""
-
-#: ../src/timezone_names.c:340
-msgid "Europe/Ljubljana"
-msgstr ""
-
-#: ../src/timezone_names.c:341
-msgid "Europe/London"
-msgstr ""
-
-#: ../src/timezone_names.c:342
-msgid "Europe/Luxembourg"
-msgstr ""
-
-#: ../src/timezone_names.c:343
-msgid "Europe/Madrid"
-msgstr ""
-
-#: ../src/timezone_names.c:344
-msgid "Europe/Malta"
-msgstr ""
-
-#: ../src/timezone_names.c:345
-msgid "Europe/Minsk"
-msgstr ""
-
-#: ../src/timezone_names.c:346
-msgid "Europe/Monaco"
-msgstr ""
-
-#: ../src/timezone_names.c:347
-msgid "Europe/Moscow"
-msgstr ""
-
-#: ../src/timezone_names.c:348
-msgid "Europe/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:349
-msgid "Europe/Oslo"
-msgstr ""
-
-#: ../src/timezone_names.c:350
-msgid "Europe/Paris"
-msgstr ""
-
-#: ../src/timezone_names.c:351
-msgid "Europe/Prague"
-msgstr ""
-
-#: ../src/timezone_names.c:352
-msgid "Europe/Riga"
-msgstr ""
-
-#: ../src/timezone_names.c:353
-msgid "Europe/Rome"
-msgstr ""
-
-#: ../src/timezone_names.c:354
-msgid "Europe/Samara"
-msgstr ""
-
-#: ../src/timezone_names.c:355
-msgid "Europe/San_Marino"
-msgstr ""
-
-#: ../src/timezone_names.c:356
-msgid "Europe/Sarajevo"
-msgstr ""
-
-#: ../src/timezone_names.c:357
-msgid "Europe/Simferopol"
-msgstr ""
-
-#: ../src/timezone_names.c:358
-msgid "Europe/Skopje"
-msgstr ""
-
-#: ../src/timezone_names.c:359
-msgid "Europe/Sofia"
-msgstr ""
-
-#: ../src/timezone_names.c:360
-msgid "Europe/Stockholm"
-msgstr ""
-
-#: ../src/timezone_names.c:361
-msgid "Europe/Tallinn"
-msgstr ""
-
-#: ../src/timezone_names.c:362
-msgid "Europe/Tirane"
-msgstr ""
-
-#: ../src/timezone_names.c:363
-msgid "Europe/Uzhgorod"
-msgstr ""
-
-#: ../src/timezone_names.c:364
-msgid "Europe/Vaduz"
-msgstr ""
-
-#: ../src/timezone_names.c:365
-msgid "Europe/Vatican"
-msgstr ""
-
-#: ../src/timezone_names.c:366
-msgid "Europe/Vienna"
-msgstr ""
-
-#: ../src/timezone_names.c:367
-msgid "Europe/Vilnius"
-msgstr ""
-
-#: ../src/timezone_names.c:368
-msgid "Europe/Warsaw"
-msgstr ""
-
-#: ../src/timezone_names.c:369
-msgid "Europe/Zagreb"
-msgstr ""
-
-#: ../src/timezone_names.c:370
-msgid "Europe/Zaporozhye"
-msgstr ""
-
-#: ../src/timezone_names.c:371
-msgid "Europe/Zurich"
-msgstr ""
-
-#: ../src/timezone_names.c:372
-msgid "Indian"
-msgstr ""
-
-#: ../src/timezone_names.c:373
-msgid "Indian/Antananarivo"
-msgstr ""
-
-#: ../src/timezone_names.c:374
-msgid "Indian/Chagos"
-msgstr ""
-
-#: ../src/timezone_names.c:375
-msgid "Indian/Christmas"
-msgstr ""
-
-#: ../src/timezone_names.c:376
-msgid "Indian/Cocos"
-msgstr ""
-
-#: ../src/timezone_names.c:377
-msgid "Indian/Comoro"
-msgstr ""
-
-#: ../src/timezone_names.c:378
-msgid "Indian/Kerguelen"
-msgstr ""
-
-#: ../src/timezone_names.c:379
-msgid "Indian/Mahe"
-msgstr ""
-
-#: ../src/timezone_names.c:380
-msgid "Indian/Maldives"
-msgstr ""
-
-#: ../src/timezone_names.c:381
-msgid "Indian/Mauritius"
-msgstr ""
-
-#: ../src/timezone_names.c:382
-msgid "Indian/Mayotte"
-msgstr ""
-
-#: ../src/timezone_names.c:383
-msgid "Indian/Reunion"
-msgstr ""
-
-#: ../src/timezone_names.c:384
-msgid "Pacific"
-msgstr ""
-
-#: ../src/timezone_names.c:385
-msgid "Pacific/Apia"
-msgstr ""
-
-#: ../src/timezone_names.c:386
-msgid "Pacific/Auckland"
-msgstr ""
-
-#: ../src/timezone_names.c:387
-msgid "Pacific/Chatham"
-msgstr ""
-
-#: ../src/timezone_names.c:388
-msgid "Pacific/Easter"
-msgstr ""
-
-#: ../src/timezone_names.c:389
-msgid "Pacific/Efate"
-msgstr ""
-
-#: ../src/timezone_names.c:390
-msgid "Pacific/Enderbury"
-msgstr ""
-
-#: ../src/timezone_names.c:391
-msgid "Pacific/Fakaofo"
-msgstr ""
-
-#: ../src/timezone_names.c:392
-msgid "Pacific/Fiji"
-msgstr ""
-
-#: ../src/timezone_names.c:393
-msgid "Pacific/Funafuti"
-msgstr ""
-
-#: ../src/timezone_names.c:394
-msgid "Pacific/Galapagos"
-msgstr ""
-
-#: ../src/timezone_names.c:395
-msgid "Pacific/Gambier"
-msgstr ""
-
-#: ../src/timezone_names.c:396
-msgid "Pacific/Guadalcanal"
-msgstr ""
-
-#: ../src/timezone_names.c:397
-msgid "Pacific/Guam"
-msgstr ""
-
-#: ../src/timezone_names.c:398
-msgid "Pacific/Honolulu"
-msgstr ""
-
-#: ../src/timezone_names.c:399
-msgid "Pacific/Johnston"
-msgstr ""
-
-#: ../src/timezone_names.c:400
-msgid "Pacific/Kiritimati"
-msgstr ""
-
-#: ../src/timezone_names.c:401
-msgid "Pacific/Kosrae"
-msgstr ""
-
-#: ../src/timezone_names.c:402
-msgid "Pacific/Kwajalein"
-msgstr ""
-
-#: ../src/timezone_names.c:403
-msgid "Pacific/Majuro"
-msgstr ""
-
-#: ../src/timezone_names.c:404
-msgid "Pacific/Marquesas"
-msgstr ""
-
-#: ../src/timezone_names.c:405
-msgid "Pacific/Midway"
-msgstr ""
-
-#: ../src/timezone_names.c:406
-msgid "Pacific/Nauru"
-msgstr ""
-
-#: ../src/timezone_names.c:407
-msgid "Pacific/Niue"
-msgstr ""
-
-#: ../src/timezone_names.c:408
-msgid "Pacific/Norfolk"
-msgstr ""
-
-#: ../src/timezone_names.c:409
-msgid "Pacific/Noumea"
-msgstr ""
-
-#: ../src/timezone_names.c:410
-msgid "Pacific/Pago_Pago"
-msgstr ""
-
-#: ../src/timezone_names.c:411
-msgid "Pacific/Palau"
-msgstr ""
-
-#: ../src/timezone_names.c:412
-msgid "Pacific/Pitcairn"
-msgstr ""
-
-#: ../src/timezone_names.c:413
-msgid "Pacific/Ponape"
-msgstr ""
-
-#: ../src/timezone_names.c:414
-msgid "Pacific/Port_Moresby"
-msgstr ""
-
-#: ../src/timezone_names.c:415
-msgid "Pacific/Rarotonga"
-msgstr ""
-
-#: ../src/timezone_names.c:416
-msgid "Pacific/Saipan"
-msgstr ""
-
-#: ../src/timezone_names.c:417
-msgid "Pacific/Tahiti"
-msgstr ""
-
-#: ../src/timezone_names.c:418
-msgid "Pacific/Tarawa"
-msgstr ""
-
-#: ../src/timezone_names.c:419
-msgid "Pacific/Tongatapu"
-msgstr ""
-
-#: ../src/timezone_names.c:420
-msgid "Pacific/Truk"
-msgstr ""
-
-#: ../src/timezone_names.c:421
-msgid "Pacific/Wake"
-msgstr ""
-
-#: ../src/timezone_names.c:422
-msgid "Pacific/Wallis"
-msgstr ""
-
-#: ../src/timezone_names.c:423
-msgid "Pacific/Yap"
-msgstr ""
-
-#: ../src/tray_icon.c:469
-msgid "New appointment"
-msgstr ""
-
-#: ../src/tray_icon.c:485
-msgid "About Orage"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-msgid "Orage Panel Clock"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-msgid "Show time and date?"
-msgstr ""
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "კალენდარი"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "კალენდარი"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "კალენდარი"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr ""
-
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr ""
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "კალენდარი"
-
-#, fuzzy
-#~ msgid "Calendar Files"
-#~ msgstr "კალენდარი"
diff -Nru orage-4.8.3/po/kk.po orage-4.12.1/po/kk.po
--- orage-4.8.3/po/kk.po	2012-01-03 12:01:06.000000000 +0000
+++ orage-4.12.1/po/kk.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,22 +1,22 @@
-# orage to kazakh.
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2010.
-#
+# 
+# Translators:
+# Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: trunk\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2010-09-11 14:51+0600\n"
-"Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
-"Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
+"POT-Creation-Date: 2013-11-18 18:30+0100\n"
+"PO-Revision-Date: 2013-11-19 15:56+0000\n"
+"Last-Translator: Xfce <transifex@xfce.org>\n"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/xfce/language/kk/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"X-Poedit-Language: Kazakh\n"
-"X-Poedit-Country: KAZAKHSTAN\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -128,7 +128,7 @@
 
 #: ../globaltime/gt_prefs.c:643
 msgid "Text Formatting"
-msgstr ""
+msgstr "Мәтін пішімі"
 
 #. ------------------------background-------------------------
 #: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
@@ -263,7 +263,7 @@
 
 #: ../globaltime/gt_prefs.c:1101
 msgid "Equal"
-msgstr ""
+msgstr "Тең"
 
 #: ../globaltime/gt_prefs.c:1106
 msgid "All clocks have same size"
@@ -328,7 +328,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2771
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Орналасуы"
@@ -389,16 +389,16 @@
 msgid "floating"
 msgstr ""
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
+#: ../globaltime/globaltime.desktop.in.h:1
+msgid "Orage Globaltime"
 msgstr ""
 
 #: ../globaltime/globaltime.desktop.in.h:2
-msgid "Orage Globaltime"
+msgid "Show clocks from different countries"
 msgstr ""
 
-#: ../globaltime/globaltime.desktop.in.h:3
-msgid "Show clocks from different countries"
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
 msgstr ""
 
 #: ../panel-plugin/oc_config.c:224
@@ -499,7 +499,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr ""
@@ -509,14 +509,13 @@
 msgstr "Жауапты"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "Xfce4 көмегімен уақытыңызды басқарыңыз"
+msgstr ""
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2800
 msgid "End"
 msgstr "Соңы"
 
@@ -524,13 +523,13 @@
 msgid "Due"
 msgstr ""
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr ""
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Файлды таңдаңыз..."
 
@@ -538,219 +537,273 @@
 msgid "Sound Files"
 msgstr ""
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Барлық файлдар"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr ""
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1282 ../src/event-list.c:921
 msgid "Do you want to continue?"
 msgstr "Жалғастыруды қалайсыз ба?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr ""
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr ""
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr ""
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1918
 msgid "Not set"
 msgstr "Орнатылмаған"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1220
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1221
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1231
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1232
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1281
 msgid "This appointment will be permanently removed."
 msgstr ""
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1283 ../src/event-list.c:922
+msgid "No, cancel the removal"
+msgstr ""
+
+#: ../src/appointment.c:1284
+msgid "Yes, remove it"
+msgstr ""
+
+#: ../src/appointment.c:1373 ../src/appointment.c:1388 ../src/day-view.c:457
+#: ../src/event-list.c:980
+msgid "Pick the date"
+msgstr ""
+
+#: ../src/appointment.c:1375 ../src/appointment.c:1390 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:982 ../src/event-list.c:1132
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Бүгін"
+
+#: ../src/appointment.c:1798
 msgid "This appointment does not exist."
 msgstr ""
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1799
 msgid "It was probably removed, please refresh your screen."
 msgstr ""
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2100
 msgid "Current categories"
 msgstr ""
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2115
 msgid "Add new category with color"
 msgstr ""
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2119
 msgid "Category:"
-msgstr ""
+msgstr "Санат: "
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2150
 msgid "Colors of categories - Orage"
 msgstr ""
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2196
 msgid " *** COPY ***"
 msgstr " *** КӨШІРМЕ ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2461
 msgid "New appointment - Orage"
 msgstr ""
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2491 ../src/day-view.c:279 ../src/event-list.c:1033
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Файл"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2497
 msgid "Sav_e and close"
 msgstr ""
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2510 ../src/event-list.c:1039
 msgid "D_uplicate"
 msgstr ""
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2697
 msgid "Save"
 msgstr "Сақтау"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2699
 msgid "Save and close"
 msgstr ""
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2704
 msgid "Revert"
 msgstr "Қайтару"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2706 ../src/event-list.c:1123
 msgid "Duplicate"
-msgstr ""
+msgstr "Қосарландыру"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2711 ../src/event-list.c:1125
 msgid "Delete"
 msgstr "Өшіру"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Free"
-msgstr ""
+msgstr "Бос"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Busy"
 msgstr "Бос емес"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2733
 msgid "General"
 msgstr "Жалпы"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2739
 msgid "Type "
 msgstr "Түрі"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2741 ../src/event-list.c:1176
 msgid "Event"
 msgstr "Оқиға"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2744
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
 msgstr ""
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2747 ../src/event-list.c:1196
 msgid "Todo"
 msgstr ""
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2750
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
 msgstr ""
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2753 ../src/event-list.c:1209
 msgid "Journal"
-msgstr ""
+msgstr "Журнал"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2757
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
 msgstr ""
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2764
 msgid "Title "
 msgstr "Атауы"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2779
 msgid "All day event"
 msgstr ""
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2785 ../src/appointment.c:3446 ../src/day-view.c:801
 msgid "Start"
 msgstr "Бастау"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2805
 msgid "Set      "
 msgstr "Орнату"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2826
 msgid "Duration"
 msgstr "Уақыты"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2830 ../src/appointment.c:3020 ../src/reminder.c:758
 msgid "days"
 msgstr "күн"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2832 ../src/appointment.c:3022 ../src/reminder.c:760
 msgid "hours"
-msgstr ""
+msgstr "сағат"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2834 ../src/appointment.c:3024 ../src/reminder.c:762
 msgid "mins"
 msgstr ""
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2846
 msgid "Availability"
 msgstr "Қол жетерлік"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2854 ../src/appointment.c:3452
 msgid "Completed"
 msgstr "Аяқталған"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2857
 msgid "Done"
 msgstr "Аяқталды"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2878
 msgid "Categories"
 msgstr "Санаттар"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2890
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
 msgstr ""
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2895
 msgid "update colors for categories."
 msgstr ""
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2901
 msgid "Priority"
 msgstr "Приоритеті"
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2911
 msgid "Note"
 msgstr "Қысқажазба"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2932
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -759,36 +812,35 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before Start"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before End"
 msgstr ""
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After Start"
 msgstr ""
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After End"
 msgstr ""
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3011
 msgid "Alarm"
-msgstr ""
+msgstr "Оятқыш"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3017
 msgid "Alarm time"
 msgstr ""
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3041
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
@@ -796,88 +848,88 @@
 " 3) after Todo start"
 msgstr ""
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3046
 msgid "Persistent alarm"
 msgstr ""
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3048
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
 msgstr ""
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3057
 msgid "Sound"
 msgstr "Дыбыстар"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3061 ../src/appointment.c:3181
 msgid "Use"
 msgstr "Қолдану"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3063
 msgid "Select this if you want audible alarm"
 msgstr ""
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3080
 msgid "Repeat alarm sound"
 msgstr ""
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3096 ../src/appointment.c:3395
 msgid "times"
 msgstr ""
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3112
 msgid "sec interval"
 msgstr ""
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3122
 msgid "Visual"
 msgstr ""
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3126
 msgid "Use Orage window"
 msgstr ""
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3128
 msgid "Select this if you want Orage window alarm"
 msgstr ""
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3140
 msgid "Use notification"
 msgstr ""
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3142
 msgid "Select this if you want notification alarm"
 msgstr ""
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3148
 msgid "Set timeout"
 msgstr "Таймаут орнату"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3150
 msgid "Select this if you want notification to expire automatically"
 msgstr ""
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3161
 msgid "0 = system default expiration time"
 msgstr ""
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3166
 msgid "seconds"
 msgstr "секунд"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3177
 msgid "Procedure"
 msgstr ""
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3183
 msgid "Select this if you want procedure or script alarm"
 msgstr ""
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3189
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -889,97 +941,96 @@
 "\t<&ET> appointment end time"
 msgstr ""
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3201
 msgid "Test this alarm by raising it now"
 msgstr ""
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3208
 msgid "<b>Default alarm</b>"
 msgstr ""
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3216
 msgid "Store current settings as default alarm"
 msgstr ""
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3221
 msgid "Set current settings from default alarm"
 msgstr ""
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "None"
 msgstr "Ешнәрсе"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Daily"
 msgstr "Күнде"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Weekly"
 msgstr ""
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Monthly"
 msgstr ""
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Yearly"
 msgstr ""
 
-#: ../src/appointment.c:3176
-#, fuzzy
+#: ../src/appointment.c:3283
 msgid "Hourly"
-msgstr "Ел"
+msgstr ""
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Mon"
-msgstr ""
+msgstr "Дс"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Tue"
-msgstr ""
+msgstr "Сс"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Wed"
-msgstr ""
+msgstr "Ср"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Thu"
-msgstr ""
+msgstr "Бс"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Fri"
-msgstr ""
+msgstr "Жм"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sat"
-msgstr ""
+msgstr "Сн"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sun"
-msgstr ""
+msgstr "Күн"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3290
 msgid "Recurrence"
 msgstr ""
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3296
 msgid "Complexity"
 msgstr ""
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3299
 msgid "Basic"
 msgstr "Қарапайым"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3305
 msgid "Advanced"
 msgstr "Кеңейтілген"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3309
 msgid "Use this if you want regular repeating event"
 msgstr ""
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3311
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
@@ -987,51 +1038,51 @@
 msgstr ""
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3317
 msgid "Frequency"
 msgstr "Жиілігі"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3323
 msgid "Each"
 msgstr ""
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3330
 msgid "occurrence"
-msgstr ""
+msgstr "Кiру"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3334
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
 msgstr ""
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3379
 msgid "Limit"
 msgstr "Шегі"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3381
 msgid "Repeat forever"
 msgstr ""
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3387
 msgid "Repeat "
 msgstr "Қайталау"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3403
 msgid "Repeat until "
 msgstr ""
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3416
 msgid "Weekdays"
 msgstr "Апта күндері"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3428
 msgid "Which day"
 msgstr ""
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3436
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1042,105 +1093,105 @@
 msgstr ""
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3443
 msgid "TODO base"
 msgstr ""
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3456
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
 msgstr ""
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3458
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3464
 msgid "Exceptions"
-msgstr ""
+msgstr "Ерекше жағдайлар"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3477
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
 msgstr ""
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3482
 msgid "Add excluded date (-)"
 msgstr ""
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3484
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr ""
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3490
 msgid "Add included time (+)"
 msgstr ""
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3492
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
 msgstr ""
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3509
 msgid "Action dates"
 msgstr ""
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1056 ../src/mainbox.c:323
 msgid "_View"
 msgstr "Тү_рі"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1075
 msgid "_Go"
 msgstr "Ө_ту"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1121
 msgid "New"
 msgstr "Жаңа"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Артқа"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr ""
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Бүгін"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Алға"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1139
 msgid "Refresh"
 msgstr "Жаңарту"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1146 ../src/interface.c:834
 msgid "Close"
 msgstr "Жабу"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Белгісіз"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr ""
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr ""
 
@@ -1149,65 +1200,77 @@
 msgid "All day"
 msgstr ""
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:583 ../src/event-list.c:1292
 msgid "Time"
 msgstr "Уақыты"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:751
 msgid "No rows have been selected."
 msgstr ""
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:752
 msgid "Click a row to select it and after that you can copy it."
 msgstr ""
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:920
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
 msgstr ""
 
+#: ../src/event-list.c:923
+msgid "Yes, remove them"
+msgstr ""
+
 #: ../src/event-list.c:1130
+msgid "Back"
+msgstr "Артқа"
+
+#: ../src/event-list.c:1134
+msgid "Forward"
+msgstr "Алға"
+
+#: ../src/event-list.c:1141
 msgid "Find"
 msgstr "Табу"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1148
 msgid "Dayview"
 msgstr ""
 
-#: ../src/event-list.c:1170
+#: ../src/event-list.c:1181
 msgid "Extra days to show "
 msgstr ""
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1212
 msgid "Journal entries starting from:"
 msgstr ""
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1232
 msgid "Search"
 msgstr "Іздеу"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1235
 msgid "Search text "
 msgstr "Мәтінді іздеу"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1300
 msgid "Flags"
 msgstr "Жалаушалар"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1308
 msgid "Title"
 msgstr "Атауы"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1334
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
@@ -1215,79 +1278,84 @@
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
 
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr ""
-
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr ""
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr ""
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr ""
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr ""
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr ""
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr ""
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr ""
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr ""
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr ""
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr ""
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr ""
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr ""
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr ""
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr ""
+
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
+msgid "\tAdded %d alarms. Processed %d events."
 msgstr ""
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
@@ -1309,7 +1377,16 @@
 msgid "Import file preprocessing done"
 msgstr ""
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr ""
 
@@ -1317,312 +1394,345 @@
 msgid "Current foreign files"
 msgstr ""
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "ТЕК ОҚУ"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "ОҚУ МЕН ЖАЗУ"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr ""
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr ""
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr ""
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
-msgstr ""
+msgstr "Импорт"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr ""
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
 msgstr ""
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Экспорт"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr ""
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Таңдау"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr ""
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr ""
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr ""
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr ""
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Архив"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr ""
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr ""
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr ""
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
 msgstr ""
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr ""
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr ""
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
 msgstr ""
 
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Жаңа файл"
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
 
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
 msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Атын ауыстыру"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
 msgstr ""
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Көшіру"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr ""
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Жылжыту"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr ""
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
-msgstr ""
+msgstr "Архив файлы"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr ""
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr ""
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr ""
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Опциялар"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Тек оқу"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr ""
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
 msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr ""
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
 msgstr ""
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr ""
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr ""
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr ""
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr ""
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr ""
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr ""
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr ""
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr ""
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr ""
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr ""
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr ""
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
 msgstr ""
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Опциялар:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr ""
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr ""
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr ""
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr ""
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
 msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr ""
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
 msgstr ""
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr ""
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr ""
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
 msgstr ""
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
@@ -1630,266 +1740,321 @@
 "\n"
 msgstr ""
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr ""
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "Түз_ету"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr ""
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr ""
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr ""
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Қо_ршауын көрсету"
+msgstr ""
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "Кө_мек"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr ""
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr ""
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr ""
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Ешқашан"
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:495
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr ""
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr ""
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr ""
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:486
 msgid "Main settings"
-msgstr "Жауапты"
+msgstr ""
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:492
 msgid "Timezone"
 msgstr "Уақыт белдеуі"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:507
 msgid "You should always define your local timezone."
 msgstr ""
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:515
 msgid "Archive threshold (months)"
 msgstr ""
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:525
 msgid "(0 = no archiving)"
 msgstr ""
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:528
 msgid "Archiving is used to save time and space when handling events."
 msgstr ""
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:536
 msgid "Sound command"
 msgstr ""
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:551
 msgid "This command is given to shell to make sound in alarms."
 msgstr ""
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Дисплей"
+#: ../src/parameters.c:590
+msgid "Calendar window"
+msgstr ""
 
-#: ../src/parameters.c:613
-msgid "Calendar main window"
+#: ../src/parameters.c:597
+msgid "Calendar visual details"
 msgstr ""
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:603
 msgid "Show borders"
 msgstr "Қоршамасын көрсету"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:608
 msgid "Show menu"
 msgstr "Мәзірді көрсету"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr ""
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:616
 msgid "Show day names"
 msgstr ""
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:621
 msgid "Show week numbers"
 msgstr ""
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:629
+msgid "Show month and year"
+msgstr ""
+
+#: ../src/parameters.c:649
+msgid "Calendar info boxes"
+msgstr ""
+
+#: ../src/parameters.c:654
 msgid "Show todo list"
 msgstr ""
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:661
 msgid "Number of days to show in event window"
 msgstr ""
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:667
 msgid "0 = do not show event list at all"
 msgstr ""
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:680
+msgid "Calendar visibility"
+msgstr ""
+
+#: ../src/parameters.c:685
 msgid "Show on all desktops"
 msgstr ""
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:690
 msgid "Keep on top"
 msgstr ""
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:698
 msgid "Show in taskbar"
 msgstr ""
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:703
 msgid "Show in pager"
 msgstr ""
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:711
 msgid "Show in systray"
 msgstr ""
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:732
 msgid "Calendar start"
 msgstr ""
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:737
 msgid "Show"
 msgstr "Көрсету"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:749
 msgid "Hide"
 msgstr "Жасыру"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:761
 msgid "Minimized"
 msgstr "Қайырылған"
 
-#: ../src/parameters.c:793
+#: ../src/parameters.c:781
+msgid "On calendar window open"
+msgstr ""
+
+#: ../src/parameters.c:786
+msgid "Select today's date"
+msgstr ""
+
+#: ../src/parameters.c:799
+msgid "Select previously selected date"
+msgstr ""
+
+#: ../src/parameters.c:817
+msgid "Calendar day double click shows"
+msgstr ""
+
+#: ../src/parameters.c:822
+msgid "Days view"
+msgstr ""
+
+#: ../src/parameters.c:834
+msgid "Event list"
+msgstr ""
+
+#: ../src/parameters.c:856
 msgid "Extra settings"
 msgstr ""
 
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
+#: ../src/parameters.c:863
+msgid "Event list window extra days"
+msgstr ""
+
+#: ../src/parameters.c:868
+msgid "Number of extra days to show in event list"
+msgstr ""
+
+#: ../src/parameters.c:876
+msgid ""
+"This is just the default value, you can change it in the actual eventlist "
+"window."
+msgstr ""
+
+#: ../src/parameters.c:886
+msgid "Day view window default first day"
 msgstr ""
 
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
+#: ../src/parameters.c:891
+msgid "First day of week"
 msgstr ""
 
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:904
+msgid "Selected day"
 msgstr ""
 
-#: ../src/parameters.c:836
+#: ../src/parameters.c:922
 msgid "Use dynamic tray icon"
 msgstr ""
 
-#: ../src/parameters.c:841
+#: ../src/parameters.c:927
 msgid "Use dynamic icon"
 msgstr ""
 
-#: ../src/parameters.c:847
+#: ../src/parameters.c:933
 msgid "Dynamic icon shows current month and day of the month."
 msgstr ""
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
+#: ../src/parameters.c:941 ../src/parameters.c:946
+msgid "Use wakeup timer"
 msgstr ""
 
-#: ../src/parameters.c:861
-msgid "Days view"
+#: ../src/parameters.c:952
+msgid ""
+"Use this timer if Orage has problems waking up properly after suspend or "
+"hibernate. (For example tray icon not refreshed or alarms not firing.)"
 msgstr ""
 
-#: ../src/parameters.c:873
-msgid "Event list"
+#: ../src/parameters.c:961
+msgid "Foreign file default visual alarm"
 msgstr ""
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
+#: ../src/parameters.c:966
+msgid "Orage window"
 msgstr ""
 
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
+#: ../src/parameters.c:979
+msgid "Notify notification"
 msgstr ""
 
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
+#: ../src/parameters.c:997
+msgid "Always quit when asked to close"
 msgstr ""
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
+#: ../src/parameters.c:1002
+msgid "Always quit"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:1008
 msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1024
 msgid "Orage Preferences"
 msgstr "Orage баптаулары"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1136
 msgid "First Orage start. Searching default timezone."
 msgstr ""
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1155
 #, c-format
 msgid "Default timezone set to %s."
 msgstr ""
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1158
 msgid "Default timezone not found, please, set it manually."
 msgstr ""
 
@@ -1901,31 +2066,30 @@
 msgid "Open"
 msgstr "Ашу"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr ""
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
+#: ../src/reminder.c:803
+msgid "Postpone"
 msgstr ""
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
 msgstr ""
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr ""
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
 msgstr ""
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
@@ -1938,211 +2102,211 @@
 
 #: ../src/timezone_names.c:37
 msgid "Africa/Abidjan"
-msgstr ""
+msgstr "Африка/Абиджан"
 
 #: ../src/timezone_names.c:38
 msgid "Africa/Accra"
-msgstr ""
+msgstr "Африка/Аккра"
 
 #: ../src/timezone_names.c:39
 msgid "Africa/Addis_Ababa"
-msgstr ""
+msgstr "Африка/Аддис-Абеба"
 
 #: ../src/timezone_names.c:40
 msgid "Africa/Algiers"
-msgstr ""
+msgstr "Африка/Алжир"
 
 #: ../src/timezone_names.c:41
 msgid "Africa/Asmera"
-msgstr ""
+msgstr "Африка/Асмара"
 
 #: ../src/timezone_names.c:42
 msgid "Africa/Bamako"
-msgstr ""
+msgstr "Африка/Бамако"
 
 #: ../src/timezone_names.c:43
 msgid "Africa/Bangui"
-msgstr ""
+msgstr "Африка/Банги"
 
 #: ../src/timezone_names.c:44
 msgid "Africa/Banjul"
-msgstr ""
+msgstr "Африка/Банжул"
 
 #: ../src/timezone_names.c:45
 msgid "Africa/Bissau"
-msgstr ""
+msgstr "Африка/Бисау"
 
 #: ../src/timezone_names.c:46
 msgid "Africa/Blantyre"
-msgstr ""
+msgstr "Африка/Блантир"
 
 #: ../src/timezone_names.c:47
 msgid "Africa/Brazzaville"
-msgstr ""
+msgstr "Африка/Браззавиль"
 
 #: ../src/timezone_names.c:48
 msgid "Africa/Bujumbura"
-msgstr ""
+msgstr "Африка/Бужумбура"
 
 #: ../src/timezone_names.c:49
 msgid "Africa/Cairo"
-msgstr ""
+msgstr "Африка/Каир"
 
 #: ../src/timezone_names.c:50
 msgid "Africa/Casablanca"
-msgstr ""
+msgstr "Африка/Касабланка"
 
 #: ../src/timezone_names.c:51
 msgid "Africa/Ceuta"
-msgstr ""
+msgstr "Африка/Сеута"
 
 #: ../src/timezone_names.c:52
 msgid "Africa/Conakry"
-msgstr ""
+msgstr "Африка/Конакри"
 
 #: ../src/timezone_names.c:53
 msgid "Africa/Dakar"
-msgstr ""
+msgstr "Африка/Дакар"
 
 #: ../src/timezone_names.c:54
 msgid "Africa/Dar_es_Salaam"
-msgstr ""
+msgstr "Африка/Дар-эс-Салам"
 
 #: ../src/timezone_names.c:55
 msgid "Africa/Djibouti"
-msgstr ""
+msgstr "Африка/Джибути"
 
 #: ../src/timezone_names.c:56
 msgid "Africa/Douala"
-msgstr ""
+msgstr "Африка/Дуала"
 
 #: ../src/timezone_names.c:57
 msgid "Africa/El_Aaiun"
-msgstr ""
+msgstr "Африка/Эль-Ааиун"
 
 #: ../src/timezone_names.c:58
 msgid "Africa/Freetown"
-msgstr ""
+msgstr "Африка/Фритаун"
 
 #: ../src/timezone_names.c:59
 msgid "Africa/Gaborone"
-msgstr ""
+msgstr "Африка/Габороне"
 
 #: ../src/timezone_names.c:60
 msgid "Africa/Harare"
-msgstr ""
+msgstr "Африка/Хараре"
 
 #: ../src/timezone_names.c:61
 msgid "Africa/Johannesburg"
-msgstr ""
+msgstr "Африка/Йоханнесбург"
 
 #: ../src/timezone_names.c:62
 msgid "Africa/Kampala"
-msgstr ""
+msgstr "Африка/Кампала"
 
 #: ../src/timezone_names.c:63
 msgid "Africa/Khartoum"
-msgstr ""
+msgstr "Африка/Хартум"
 
 #: ../src/timezone_names.c:64
 msgid "Africa/Kigali"
-msgstr ""
+msgstr "Африка/Кигали"
 
 #: ../src/timezone_names.c:65
 msgid "Africa/Kinshasa"
-msgstr ""
+msgstr "Африка/Киншаса"
 
 #: ../src/timezone_names.c:66
 msgid "Africa/Lagos"
-msgstr ""
+msgstr "Африка/Лагос"
 
 #: ../src/timezone_names.c:67
 msgid "Africa/Libreville"
-msgstr ""
+msgstr "Африка/Либревиль"
 
 #: ../src/timezone_names.c:68
 msgid "Africa/Lome"
-msgstr ""
+msgstr "Африка/Ломе"
 
 #: ../src/timezone_names.c:69
 msgid "Africa/Luanda"
-msgstr ""
+msgstr "Африка/Луанда"
 
 #: ../src/timezone_names.c:70
 msgid "Africa/Lubumbashi"
-msgstr ""
+msgstr "Африка/Лубумбаши"
 
 #: ../src/timezone_names.c:71
 msgid "Africa/Lusaka"
-msgstr ""
+msgstr "Африка/Лусака"
 
 #: ../src/timezone_names.c:72
 msgid "Africa/Malabo"
-msgstr ""
+msgstr "Африка/Малабо"
 
 #: ../src/timezone_names.c:73
 msgid "Africa/Maputo"
-msgstr ""
+msgstr "Африка/Мапуто"
 
 #: ../src/timezone_names.c:74
 msgid "Africa/Maseru"
-msgstr ""
+msgstr "Африка/Масеру"
 
 #: ../src/timezone_names.c:75
 msgid "Africa/Mbabane"
-msgstr ""
+msgstr "Африка/Мбабане"
 
 #: ../src/timezone_names.c:76
 msgid "Africa/Mogadishu"
-msgstr ""
+msgstr "Африка/Могадишу"
 
 #: ../src/timezone_names.c:77
 msgid "Africa/Monrovia"
-msgstr ""
+msgstr "Африка/Монровия"
 
 #: ../src/timezone_names.c:78
 msgid "Africa/Nairobi"
-msgstr ""
+msgstr "Африка/Найроби"
 
 #: ../src/timezone_names.c:79
 msgid "Africa/Ndjamena"
-msgstr ""
+msgstr "Африка/Нджамена"
 
 #: ../src/timezone_names.c:80
 msgid "Africa/Niamey"
-msgstr ""
+msgstr "Африка/Ниамей"
 
 #: ../src/timezone_names.c:81
 msgid "Africa/Nouakchott"
-msgstr ""
+msgstr "Африка/Нуакшотт"
 
 #: ../src/timezone_names.c:82
 msgid "Africa/Ouagadougou"
-msgstr ""
+msgstr "Африка/Уагадугу"
 
 #: ../src/timezone_names.c:83
 msgid "Africa/Porto-Novo"
-msgstr ""
+msgstr "Африка/Порто-Ново"
 
 #: ../src/timezone_names.c:84
 msgid "Africa/Sao_Tome"
-msgstr ""
+msgstr "Африка/Сао-Томе"
 
 #: ../src/timezone_names.c:85
 msgid "Africa/Timbuktu"
-msgstr ""
+msgstr "Африка/Тимбукту"
 
 #: ../src/timezone_names.c:86
 msgid "Africa/Tripoli"
-msgstr ""
+msgstr "Африка/Триполи"
 
 #: ../src/timezone_names.c:87
 msgid "Africa/Tunis"
-msgstr ""
+msgstr "Африка/Тунис"
 
 #: ../src/timezone_names.c:88
 msgid "Africa/Windhoek"
-msgstr ""
+msgstr "Африка/Виндхук"
 
 #: ../src/timezone_names.c:89
 msgid "America"
@@ -2150,491 +2314,491 @@
 
 #: ../src/timezone_names.c:90
 msgid "America/Adak"
-msgstr ""
+msgstr "Америка/Адак"
 
 #: ../src/timezone_names.c:91
 msgid "America/Anchorage"
-msgstr ""
+msgstr "Америка/Анкоридж"
 
 #: ../src/timezone_names.c:92
 msgid "America/Anguilla"
-msgstr ""
+msgstr "Америка/Ангилья"
 
 #: ../src/timezone_names.c:93
 msgid "America/Antigua"
-msgstr ""
+msgstr "Америка/Антигуа"
 
 #: ../src/timezone_names.c:94
 msgid "America/Araguaina"
-msgstr ""
+msgstr "Америка/Арагуайна"
 
 #: ../src/timezone_names.c:95
 msgid "America/Argentina/Buenos_Aires"
-msgstr ""
+msgstr "Америка/Аргентина/Буэнос-Айрес"
 
 #: ../src/timezone_names.c:96
 msgid "America/Argentina/Catamarca"
-msgstr ""
+msgstr "Америка/Аргентина/Катамарка"
 
 #: ../src/timezone_names.c:97
 msgid "America/Argentina/Cordoba"
-msgstr ""
+msgstr "Америка/Аргентина/Кордоба"
 
 #: ../src/timezone_names.c:98
 msgid "America/Argentina/Jujuy"
-msgstr ""
+msgstr "Америка/Аргентина/Жужуй"
 
 #: ../src/timezone_names.c:99
 msgid "America/Argentina/Mendoza"
-msgstr ""
+msgstr "Америка/Аргентина/Мендоза"
 
 #: ../src/timezone_names.c:100
 msgid "America/Aruba"
-msgstr ""
+msgstr "Америка/Аруба"
 
 #: ../src/timezone_names.c:101
 msgid "America/Asuncion"
-msgstr ""
+msgstr "Америка/Асунсьон"
 
 #: ../src/timezone_names.c:102
 msgid "America/Barbados"
-msgstr ""
+msgstr "Америка/Барбадос"
 
 #: ../src/timezone_names.c:103
 msgid "America/Belem"
-msgstr ""
+msgstr "Америка/Белем"
 
 #: ../src/timezone_names.c:104
 msgid "America/Belize"
-msgstr ""
+msgstr "Америка/Белиз"
 
 #: ../src/timezone_names.c:105
 msgid "America/Boa_Vista"
-msgstr ""
+msgstr "Америка/Боа-Виста"
 
 #: ../src/timezone_names.c:106
 msgid "America/Bogota"
-msgstr ""
+msgstr "Америка/Богота"
 
 #: ../src/timezone_names.c:107
 msgid "America/Boise"
-msgstr ""
+msgstr "Америка/Бойсе"
 
 #: ../src/timezone_names.c:108
 msgid "America/Buenos_Aires"
-msgstr ""
+msgstr "Америка/Буэнос-Айрес"
 
 #: ../src/timezone_names.c:109
 msgid "America/Cambridge_Bay"
-msgstr ""
+msgstr "Америка/Кембридж-Бей"
 
 #: ../src/timezone_names.c:110
 msgid "America/Cancun"
-msgstr ""
+msgstr "Америка/Канкун"
 
 #: ../src/timezone_names.c:111
 msgid "America/Caracas"
-msgstr ""
+msgstr "Америка/Каракас"
 
 #: ../src/timezone_names.c:112
 msgid "America/Catamarca"
-msgstr ""
+msgstr "Америка/Катамарка"
 
 #: ../src/timezone_names.c:113
 msgid "America/Cayenne"
-msgstr ""
+msgstr "Америка/Кайенне"
 
 #: ../src/timezone_names.c:114
 msgid "America/Cayman"
-msgstr ""
+msgstr "Америка/Кайман"
 
 #: ../src/timezone_names.c:115
 msgid "America/Chicago"
-msgstr ""
+msgstr "Америка/Чикаго"
 
 #: ../src/timezone_names.c:116
 msgid "America/Chihuahua"
-msgstr ""
+msgstr "Америка/Чихуахуа"
 
 #: ../src/timezone_names.c:117
 msgid "America/Cordoba"
-msgstr ""
+msgstr "Америка/Кордоба"
 
 #: ../src/timezone_names.c:118
 msgid "America/Costa_Rica"
-msgstr ""
+msgstr "Америка/Коста-Рика"
 
 #: ../src/timezone_names.c:119
 msgid "America/Cuiaba"
-msgstr ""
+msgstr "Америка/Куяба"
 
 #: ../src/timezone_names.c:120
 msgid "America/Curacao"
-msgstr ""
+msgstr "Америка/Кюрасао"
 
 #: ../src/timezone_names.c:121
 msgid "America/Dawson"
-msgstr ""
+msgstr "Америка/Доусон"
 
 #: ../src/timezone_names.c:122
 msgid "America/Dawson_Creek"
-msgstr ""
+msgstr "Америка/Доусон-Крик"
 
 #: ../src/timezone_names.c:123
 msgid "America/Denver"
-msgstr ""
+msgstr "Америка/Денвер"
 
 #: ../src/timezone_names.c:124
 msgid "America/Detroit"
-msgstr ""
+msgstr "Америка/Детройт"
 
 #: ../src/timezone_names.c:125
 msgid "America/Dominica"
-msgstr ""
+msgstr "Америка/Доминика"
 
 #: ../src/timezone_names.c:126
 msgid "America/Edmonton"
-msgstr ""
+msgstr "Америка/Эдмонтон"
 
 #: ../src/timezone_names.c:127
 msgid "America/Eirunepe"
-msgstr ""
+msgstr "Америка/Эйрунепе"
 
 #: ../src/timezone_names.c:128
 msgid "America/El_Salvador"
-msgstr ""
+msgstr "Америка/Эл Сальвадор"
 
 #: ../src/timezone_names.c:129
 msgid "America/Fortaleza"
-msgstr ""
+msgstr "Америка/Форталеза"
 
 #: ../src/timezone_names.c:130
 msgid "America/Glace_Bay"
-msgstr ""
+msgstr "Америка/Глейс-Бей"
 
 #: ../src/timezone_names.c:131
 msgid "America/Godthab"
-msgstr ""
+msgstr "Америка/Готтаб"
 
 #: ../src/timezone_names.c:132
 msgid "America/Goose_Bay"
-msgstr ""
+msgstr "Америка/Гус-Бей"
 
 #: ../src/timezone_names.c:133
 msgid "America/Grand_Turk"
-msgstr ""
+msgstr "Америка/Гранд-Турк"
 
 #: ../src/timezone_names.c:134
 msgid "America/Grenada"
-msgstr ""
+msgstr "Америка/Гренада"
 
 #: ../src/timezone_names.c:135
 msgid "America/Guadeloupe"
-msgstr ""
+msgstr "Америка/Гваделупе"
 
 #: ../src/timezone_names.c:136
 msgid "America/Guatemala"
-msgstr ""
+msgstr "Америка/Гватемала"
 
 #: ../src/timezone_names.c:137
 msgid "America/Guayaquil"
-msgstr ""
+msgstr "Америка/Гуаякиль"
 
 #: ../src/timezone_names.c:138
 msgid "America/Guyana"
-msgstr ""
+msgstr "Америка/Гайана"
 
 #: ../src/timezone_names.c:139
 msgid "America/Halifax"
-msgstr ""
+msgstr "Америка/Галифакс"
 
 #: ../src/timezone_names.c:140
 msgid "America/Havana"
-msgstr ""
+msgstr "Америка/Гавана"
 
 #: ../src/timezone_names.c:141
 msgid "America/Hermosillo"
-msgstr ""
+msgstr "Америка/Гермосилло"
 
 #: ../src/timezone_names.c:142
 msgid "America/Indiana/Indianapolis"
-msgstr ""
+msgstr "Америка/Индиана/Индианаполис"
 
 #: ../src/timezone_names.c:143
 msgid "America/Indiana/Knox"
-msgstr ""
+msgstr "Америка/Индиана/Нокс"
 
 #: ../src/timezone_names.c:144
 msgid "America/Indiana/Marengo"
-msgstr ""
+msgstr "Америка/Индиана/Маренго"
 
 #: ../src/timezone_names.c:145
 msgid "America/Indiana/Vevay"
-msgstr ""
+msgstr "Америка/Индиана/Вивей"
 
 #: ../src/timezone_names.c:146
 msgid "America/Indianapolis"
-msgstr ""
+msgstr "Америка/Индианаполис"
 
 #: ../src/timezone_names.c:147
 msgid "America/Inuvik"
-msgstr ""
+msgstr "Америка/Инувик"
 
 #: ../src/timezone_names.c:148
 msgid "America/Iqaluit"
-msgstr ""
+msgstr "Америка/Икалуит"
 
 #: ../src/timezone_names.c:149
 msgid "America/Jamaica"
-msgstr ""
+msgstr "Америка/Ямайка"
 
 #: ../src/timezone_names.c:150
 msgid "America/Jujuy"
-msgstr ""
+msgstr "Америка/Жужуй"
 
 #: ../src/timezone_names.c:151
 msgid "America/Juneau"
-msgstr ""
+msgstr "Америка/Джуно"
 
 #: ../src/timezone_names.c:152
 msgid "America/Kentucky/Louisville"
-msgstr ""
+msgstr "Америка//Кентуки/Луивилл"
 
 #: ../src/timezone_names.c:153
 msgid "America/Kentucky/Monticello"
-msgstr ""
+msgstr "Америка/Кентуки/Монтицелло"
 
 #: ../src/timezone_names.c:154
 msgid "America/La_Paz"
-msgstr ""
+msgstr "Америка/Ла-Пас"
 
 #: ../src/timezone_names.c:155
 msgid "America/Lima"
-msgstr ""
+msgstr "Америка/Лима"
 
 #: ../src/timezone_names.c:156
 msgid "America/Los_Angeles"
-msgstr ""
+msgstr "Америка/Лос-Анджелес"
 
 #: ../src/timezone_names.c:157
 msgid "America/Louisville"
-msgstr ""
+msgstr "Америка/Луисвилл"
 
 #: ../src/timezone_names.c:158
 msgid "America/Maceio"
-msgstr ""
+msgstr "Америка/Масейо"
 
 #: ../src/timezone_names.c:159
 msgid "America/Managua"
-msgstr ""
+msgstr "Америка/Манагуа"
 
 #: ../src/timezone_names.c:160
 msgid "America/Manaus"
-msgstr ""
+msgstr "Америка/Манаус"
 
 #: ../src/timezone_names.c:161
 msgid "America/Martinique"
-msgstr ""
+msgstr "Америка/Мартиника"
 
 #: ../src/timezone_names.c:162
 msgid "America/Mazatlan"
-msgstr ""
+msgstr "Америка/Мазатлан"
 
 #: ../src/timezone_names.c:163
 msgid "America/Mendoza"
-msgstr ""
+msgstr "Америка/Мендоза"
 
 #: ../src/timezone_names.c:164
 msgid "America/Menominee"
-msgstr ""
+msgstr "Америка/Меномини"
 
 #: ../src/timezone_names.c:165
 msgid "America/Merida"
-msgstr ""
+msgstr "Америка/Мерида"
 
 #: ../src/timezone_names.c:166
 msgid "America/Mexico_City"
-msgstr ""
+msgstr "Америка/Мехико-сити"
 
 #: ../src/timezone_names.c:167
 msgid "America/Miquelon"
-msgstr ""
+msgstr "Америка/Микелон"
 
 #: ../src/timezone_names.c:168
 msgid "America/Monterrey"
-msgstr ""
+msgstr "Америка/Монтеррей"
 
 #: ../src/timezone_names.c:169
 msgid "America/Montevideo"
-msgstr ""
+msgstr "Америка/Монтевидео"
 
 #: ../src/timezone_names.c:170
 msgid "America/Montreal"
-msgstr ""
+msgstr "Америка/Монреаль"
 
 #: ../src/timezone_names.c:171
 msgid "America/Montserrat"
-msgstr ""
+msgstr "Америка/Монтсеррат"
 
 #: ../src/timezone_names.c:172
 msgid "America/Nassau"
-msgstr ""
+msgstr "Америка/Нассау"
 
 #: ../src/timezone_names.c:173
 msgid "America/New_York"
-msgstr ""
+msgstr "Америка/Нью-Йорк"
 
 #: ../src/timezone_names.c:174
 msgid "America/Nipigon"
-msgstr ""
+msgstr "Америка/Нипигон"
 
 #: ../src/timezone_names.c:175
 msgid "America/Nome"
-msgstr ""
+msgstr "Америка/Ном"
 
 #: ../src/timezone_names.c:176
 msgid "America/Noronha"
-msgstr ""
+msgstr "Америка/Норонха"
 
 #: ../src/timezone_names.c:177
 msgid "America/Panama"
-msgstr ""
+msgstr "Америка/Панама"
 
 #: ../src/timezone_names.c:178
 msgid "America/Pangnirtung"
-msgstr ""
+msgstr "Америка/Пангниртанг"
 
 #: ../src/timezone_names.c:179
 msgid "America/Paramaribo"
-msgstr ""
+msgstr "Америка/Парамарибо"
 
 #: ../src/timezone_names.c:180
 msgid "America/Phoenix"
-msgstr ""
+msgstr "Америка/Феникс"
 
 #: ../src/timezone_names.c:181
 msgid "America/Port-au-Prince"
-msgstr ""
+msgstr "Америка/Порт-о-Пренс"
 
 #: ../src/timezone_names.c:182
 msgid "America/Port_of_Spain"
-msgstr ""
+msgstr "Америка/Порт-оф-Спейн"
 
 #: ../src/timezone_names.c:183
 msgid "America/Porto_Velho"
-msgstr ""
+msgstr "Америка/Порто-Велью"
 
 #: ../src/timezone_names.c:184
 msgid "America/Puerto_Rico"
-msgstr ""
+msgstr "Америка/Пуэрто-Рико"
 
 #: ../src/timezone_names.c:185
 msgid "America/Rainy_River"
-msgstr ""
+msgstr "Америка/Рэйни-Ривер"
 
 #: ../src/timezone_names.c:186
 msgid "America/Rankin_Inlet"
-msgstr ""
+msgstr "Америка/Рэнкин-Инлет"
 
 #: ../src/timezone_names.c:187
 msgid "America/Recife"
-msgstr ""
+msgstr "Америка/Ресифи"
 
 #: ../src/timezone_names.c:188
 msgid "America/Regina"
-msgstr ""
+msgstr "Америка/Регина"
 
 #: ../src/timezone_names.c:189
 msgid "America/Rio_Branco"
-msgstr ""
+msgstr "Америка/Рио-Бранко"
 
 #: ../src/timezone_names.c:190
 msgid "America/Rosario"
-msgstr ""
+msgstr "Америка/Розарио"
 
 #: ../src/timezone_names.c:191
 msgid "America/Santiago"
-msgstr ""
+msgstr "Америка/Сантьяго"
 
 #: ../src/timezone_names.c:192
 msgid "America/Santo_Domingo"
-msgstr ""
+msgstr "Америка/Санто-Доминго"
 
 #: ../src/timezone_names.c:193
 msgid "America/Sao_Paulo"
-msgstr ""
+msgstr "Америка/Сан-Паулу"
 
 #: ../src/timezone_names.c:194
 msgid "America/Scoresbysund"
-msgstr ""
+msgstr "Америка/Скорсбисунд"
 
 #: ../src/timezone_names.c:195
 msgid "America/Shiprock"
-msgstr ""
+msgstr "Америка/Шипрок"
 
 #: ../src/timezone_names.c:196
 msgid "America/St_Johns"
-msgstr ""
+msgstr "Америка/Сент-Джонс"
 
 #: ../src/timezone_names.c:197
 msgid "America/St_Kitts"
-msgstr ""
+msgstr "Америка/Сент-Китс"
 
 #: ../src/timezone_names.c:198
 msgid "America/St_Lucia"
-msgstr ""
+msgstr "Америка/Сент-Люсия"
 
 #: ../src/timezone_names.c:199
 msgid "America/St_Thomas"
-msgstr ""
+msgstr "Америка/Сент-Томас"
 
 #: ../src/timezone_names.c:200
 msgid "America/St_Vincent"
-msgstr ""
+msgstr "Америка/Сент-Винсент"
 
 #: ../src/timezone_names.c:201
 msgid "America/Swift_Current"
-msgstr ""
+msgstr "Америка/Свифт-Каррент"
 
 #: ../src/timezone_names.c:202
 msgid "America/Tegucigalpa"
-msgstr ""
+msgstr "Америка/Тегусигальпа"
 
 #: ../src/timezone_names.c:203
 msgid "America/Thule"
-msgstr ""
+msgstr "Америка/Туле"
 
 #: ../src/timezone_names.c:204
 msgid "America/Thunder_Bay"
-msgstr ""
+msgstr "Америка/Сандер-Бей"
 
 #: ../src/timezone_names.c:205
 msgid "America/Tijuana"
-msgstr ""
+msgstr "Америка/Тиюана"
 
 #: ../src/timezone_names.c:206
 msgid "America/Tortola"
-msgstr ""
+msgstr "Америка/Тортола"
 
 #: ../src/timezone_names.c:207
 msgid "America/Vancouver"
-msgstr ""
+msgstr "Америка/Ванкувер"
 
 #: ../src/timezone_names.c:208
 msgid "America/Whitehorse"
-msgstr ""
+msgstr "Америка/Вайтхорс"
 
 #: ../src/timezone_names.c:209
 msgid "America/Winnipeg"
-msgstr ""
+msgstr "Америка/Виннипег"
 
 #: ../src/timezone_names.c:210
 msgid "America/Yakutat"
-msgstr ""
+msgstr "Америка/Якутат"
 
 #: ../src/timezone_names.c:211
 msgid "America/Yellowknife"
-msgstr ""
+msgstr "Америка/Йеллоунайф"
 
 #: ../src/timezone_names.c:212
 msgid "Antarctica"
@@ -2642,39 +2806,39 @@
 
 #: ../src/timezone_names.c:213
 msgid "Antarctica/Casey"
-msgstr ""
+msgstr "Антарктида/Кэйси"
 
 #: ../src/timezone_names.c:214
 msgid "Antarctica/Davis"
-msgstr ""
+msgstr "Антарктика/Дэвис"
 
 #: ../src/timezone_names.c:215
 msgid "Antarctica/DumontDUrville"
-msgstr ""
+msgstr "Антарктика/Дюмон-д'Юрвил"
 
 #: ../src/timezone_names.c:216
 msgid "Antarctica/Mawson"
-msgstr ""
+msgstr "Антарктика/Моусон"
 
 #: ../src/timezone_names.c:217
 msgid "Antarctica/McMurdo"
-msgstr ""
+msgstr "Антарктика/Мак-Мердо"
 
 #: ../src/timezone_names.c:218
 msgid "Antarctica/Palmer"
-msgstr ""
+msgstr "Антарктика/Палмер"
 
 #: ../src/timezone_names.c:219
 msgid "Antarctica/South_Pole"
-msgstr ""
+msgstr "Антарктика/Оңтүстік полюс"
 
 #: ../src/timezone_names.c:220
 msgid "Antarctica/Syowa"
-msgstr ""
+msgstr "Антарктика/Сева"
 
 #: ../src/timezone_names.c:221
 msgid "Antarctica/Vostok"
-msgstr ""
+msgstr "Антарктика/Восток"
 
 #: ../src/timezone_names.c:222
 msgid "Arctic"
@@ -2682,7 +2846,7 @@
 
 #: ../src/timezone_names.c:223
 msgid "Arctic/Longyearbyen"
-msgstr ""
+msgstr "Арктика/Лонгйербиен"
 
 #: ../src/timezone_names.c:224
 msgid "Asia"
@@ -2690,7 +2854,7 @@
 
 #: ../src/timezone_names.c:225
 msgid "Asia/Aden"
-msgstr ""
+msgstr "Азия/Аден"
 
 #: ../src/timezone_names.c:226
 msgid "Asia/Almaty"
@@ -2698,103 +2862,103 @@
 
 #: ../src/timezone_names.c:227
 msgid "Asia/Amman"
-msgstr ""
+msgstr "Азия/Амман"
 
 #: ../src/timezone_names.c:228
 msgid "Asia/Anadyr"
-msgstr ""
+msgstr "Азия/Анадырь"
 
 #: ../src/timezone_names.c:229
 msgid "Asia/Aqtau"
-msgstr ""
+msgstr "Азия/Ақтау"
 
 #: ../src/timezone_names.c:230
 msgid "Asia/Aqtobe"
-msgstr ""
+msgstr "Азия/Ақтөбе"
 
 #: ../src/timezone_names.c:231
 msgid "Asia/Ashgabat"
-msgstr ""
+msgstr "Азия/Ашхабад"
 
 #: ../src/timezone_names.c:232
 msgid "Asia/Baghdad"
-msgstr ""
+msgstr "Азия/Багдад"
 
 #: ../src/timezone_names.c:233
 msgid "Asia/Bahrain"
-msgstr ""
+msgstr "Азия/Бахрейн"
 
 #: ../src/timezone_names.c:234
 msgid "Asia/Baku"
-msgstr ""
+msgstr "Азия/Баку"
 
 #: ../src/timezone_names.c:235
 msgid "Asia/Bangkok"
-msgstr ""
+msgstr "Азия/Бангкок"
 
 #: ../src/timezone_names.c:236
 msgid "Asia/Beirut"
-msgstr ""
+msgstr "Азия/Бейрут"
 
 #: ../src/timezone_names.c:237
 msgid "Asia/Bishkek"
-msgstr ""
+msgstr "Азия/Бішкек"
 
 #: ../src/timezone_names.c:238
 msgid "Asia/Brunei"
-msgstr ""
+msgstr "Азия/Бруней"
 
 #: ../src/timezone_names.c:239
 msgid "Asia/Calcutta"
-msgstr ""
+msgstr "Азия/Калькутта"
 
 #: ../src/timezone_names.c:240
 msgid "Asia/Chungking"
-msgstr ""
+msgstr "Азия/Чунцин"
 
 #: ../src/timezone_names.c:241
 msgid "Asia/Colombo"
-msgstr ""
+msgstr "Азия/Коломбо"
 
 #: ../src/timezone_names.c:242
 msgid "Asia/Damascus"
-msgstr ""
+msgstr "Азия/Дамаск"
 
 #: ../src/timezone_names.c:243
 msgid "Asia/Dhaka"
-msgstr ""
+msgstr "Азия/Дакка"
 
 #: ../src/timezone_names.c:244
 msgid "Asia/Dili"
-msgstr ""
+msgstr "Азия/Дили"
 
 #: ../src/timezone_names.c:245
 msgid "Asia/Dubai"
-msgstr ""
+msgstr "Азия/Дубай"
 
 #: ../src/timezone_names.c:246
 msgid "Asia/Dushanbe"
-msgstr ""
+msgstr "Азия/Душанбе"
 
 #: ../src/timezone_names.c:247
 msgid "Asia/Gaza"
-msgstr ""
+msgstr "Азия/Газа"
 
 #: ../src/timezone_names.c:248
 msgid "Asia/Harbin"
-msgstr ""
+msgstr "Азия/Харбин"
 
 #: ../src/timezone_names.c:249
 msgid "Asia/Hong_Kong"
-msgstr ""
+msgstr "Азия/Сянган (Гонконг)"
 
 #: ../src/timezone_names.c:250
 msgid "Asia/Hovd"
-msgstr ""
+msgstr "Азия/Қобд"
 
 #: ../src/timezone_names.c:251
 msgid "Asia/Irkutsk"
-msgstr ""
+msgstr "Азия/Иркутск"
 
 #: ../src/timezone_names.c:252
 msgid "Asia/Istanbul"
@@ -2802,179 +2966,179 @@
 
 #: ../src/timezone_names.c:253
 msgid "Asia/Jakarta"
-msgstr ""
+msgstr "Азия/Джакарта"
 
 #: ../src/timezone_names.c:254
 msgid "Asia/Jayapura"
-msgstr ""
+msgstr "Азия/Джаяпура"
 
 #: ../src/timezone_names.c:255
 msgid "Asia/Jerusalem"
-msgstr ""
+msgstr "Азия/Иерусалим"
 
 #: ../src/timezone_names.c:256
 msgid "Asia/Kabul"
-msgstr ""
+msgstr "Азия/Қабул"
 
 #: ../src/timezone_names.c:257
 msgid "Asia/Kamchatka"
-msgstr ""
+msgstr "Азия/Камчатка"
 
 #: ../src/timezone_names.c:258
 msgid "Asia/Karachi"
-msgstr ""
+msgstr "Азия/Карачи"
 
 #: ../src/timezone_names.c:259
 msgid "Asia/Kashgar"
-msgstr ""
+msgstr "Азия/Кашгар"
 
 #: ../src/timezone_names.c:260
 msgid "Asia/Katmandu"
-msgstr ""
+msgstr "Азия/Катманду"
 
 #: ../src/timezone_names.c:261
 msgid "Asia/Krasnoyarsk"
-msgstr ""
+msgstr "Азия/Красноярск"
 
 #: ../src/timezone_names.c:262
 msgid "Asia/Kuala_Lumpur"
-msgstr ""
+msgstr "Азия/Куала-Лумпур"
 
 #: ../src/timezone_names.c:263
 msgid "Asia/Kuching"
-msgstr ""
+msgstr "Азия/Кучинг"
 
 #: ../src/timezone_names.c:264
 msgid "Asia/Kuwait"
-msgstr ""
+msgstr "Азия/Кувейт"
 
 #: ../src/timezone_names.c:265
 msgid "Asia/Macao"
-msgstr ""
+msgstr "Азия/Аомын (Макао)"
 
 #: ../src/timezone_names.c:266
 msgid "Asia/Magadan"
-msgstr ""
+msgstr "Азия/Магадан"
 
 #: ../src/timezone_names.c:267
 msgid "Asia/Manila"
-msgstr ""
+msgstr "Азия/Манила"
 
 #: ../src/timezone_names.c:268
 msgid "Asia/Muscat"
-msgstr ""
+msgstr "Азия/Мускат"
 
 #: ../src/timezone_names.c:269
 msgid "Asia/Nicosia"
-msgstr ""
+msgstr "Азия/Никозия"
 
 #: ../src/timezone_names.c:270
 msgid "Asia/Novosibirsk"
-msgstr ""
+msgstr "Азия/Новосибирск"
 
 #: ../src/timezone_names.c:271
 msgid "Asia/Omsk"
-msgstr ""
+msgstr "Азия/Омбы"
 
 #: ../src/timezone_names.c:272
 msgid "Asia/Phnom_Penh"
-msgstr ""
+msgstr "Азия/Пномпень"
 
 #: ../src/timezone_names.c:273
 msgid "Asia/Pontianak"
-msgstr ""
+msgstr "Азия/Понтианак"
 
 #: ../src/timezone_names.c:274
 msgid "Asia/Pyongyang"
-msgstr ""
+msgstr "Азия/Пхеньян"
 
 #: ../src/timezone_names.c:275
 msgid "Asia/Qatar"
-msgstr ""
+msgstr "Азия/Катар"
 
 #: ../src/timezone_names.c:276
 msgid "Asia/Rangoon"
-msgstr ""
+msgstr "Азия/Рангун"
 
 #: ../src/timezone_names.c:277
 msgid "Asia/Riyadh"
-msgstr ""
+msgstr "Азия/Эр-Рияд"
 
 #: ../src/timezone_names.c:278
 msgid "Asia/Saigon"
-msgstr ""
+msgstr "Азия/Хошимин"
 
 #: ../src/timezone_names.c:279
 msgid "Asia/Samarkand"
-msgstr ""
+msgstr "Азия/Самаркант"
 
 #: ../src/timezone_names.c:280
 msgid "Asia/Seoul"
-msgstr ""
+msgstr "Азия/Сеул"
 
 #: ../src/timezone_names.c:281
 msgid "Asia/Shanghai"
-msgstr ""
+msgstr "Азия/Шанхай"
 
 #: ../src/timezone_names.c:282
 msgid "Asia/Singapore"
-msgstr ""
+msgstr "Азия/Сингапур"
 
 #: ../src/timezone_names.c:283
 msgid "Asia/Taipei"
-msgstr ""
+msgstr "Азия/Тайбей"
 
 #: ../src/timezone_names.c:284
 msgid "Asia/Tashkent"
-msgstr ""
+msgstr "Азия/Ташкент"
 
 #: ../src/timezone_names.c:285
 msgid "Asia/Tbilisi"
-msgstr ""
+msgstr "Азия/Тбилиси"
 
 #: ../src/timezone_names.c:286
 msgid "Asia/Tehran"
-msgstr ""
+msgstr "Азия/Теһран"
 
 #: ../src/timezone_names.c:287
 msgid "Asia/Thimphu"
-msgstr ""
+msgstr "Азия/Тхимпху"
 
 #: ../src/timezone_names.c:288
 msgid "Asia/Tokyo"
-msgstr ""
+msgstr "Азия/Токио"
 
 #: ../src/timezone_names.c:289
 msgid "Asia/Ujung_Pandang"
-msgstr ""
+msgstr "Азия/Уджунг-Панданг"
 
 #: ../src/timezone_names.c:290
 msgid "Asia/Ulaanbaatar"
-msgstr ""
+msgstr "Азия/Улан-Батор"
 
 #: ../src/timezone_names.c:291
 msgid "Asia/Urumqi"
-msgstr ""
+msgstr "Азия/Ұрымжы"
 
 #: ../src/timezone_names.c:292
 msgid "Asia/Vientiane"
-msgstr ""
+msgstr "Азия/Вьентьян"
 
 #: ../src/timezone_names.c:293
 msgid "Asia/Vladivostok"
-msgstr ""
+msgstr "Азия/Владивосток"
 
 #: ../src/timezone_names.c:294
 msgid "Asia/Yakutsk"
-msgstr ""
+msgstr "Азия/Якутск"
 
 #: ../src/timezone_names.c:295
 msgid "Asia/Yekaterinburg"
-msgstr ""
+msgstr "Азия/Екатеринбург"
 
 #: ../src/timezone_names.c:296
 msgid "Asia/Yerevan"
-msgstr ""
+msgstr "Азия/Ереван"
 
 #: ../src/timezone_names.c:297
 msgid "Atlantic"
@@ -2982,47 +3146,47 @@
 
 #: ../src/timezone_names.c:298
 msgid "Atlantic/Azores"
-msgstr ""
+msgstr "Атлант мұхиты/Азор"
 
 #: ../src/timezone_names.c:299
 msgid "Atlantic/Bermuda"
-msgstr ""
+msgstr "Атлант мұхиты/Бермуда"
 
 #: ../src/timezone_names.c:300
 msgid "Atlantic/Canary"
-msgstr ""
+msgstr "Атлант мұхиты/Канар"
 
 #: ../src/timezone_names.c:301
 msgid "Atlantic/Cape_Verde"
-msgstr ""
+msgstr "Атлант мұхиты/Кабо-Верде"
 
 #: ../src/timezone_names.c:302
 msgid "Atlantic/Faeroe"
-msgstr ""
+msgstr "Атлант мұхиты/Фаэро"
 
 #: ../src/timezone_names.c:303
 msgid "Atlantic/Jan_Mayen"
-msgstr ""
+msgstr "Атлант мұхиты/Ян-Майен"
 
 #: ../src/timezone_names.c:304
 msgid "Atlantic/Madeira"
-msgstr ""
+msgstr "Атлант мұхиты/Мадейра"
 
 #: ../src/timezone_names.c:305
 msgid "Atlantic/Reykjavik"
-msgstr ""
+msgstr "Атлант мұхиты/Рейкъявик"
 
 #: ../src/timezone_names.c:306
 msgid "Atlantic/South_Georgia"
-msgstr ""
+msgstr "Атлант мұхиты/Оңтүстік Георгия"
 
 #: ../src/timezone_names.c:307
 msgid "Atlantic/St_Helena"
-msgstr ""
+msgstr "Атлант мұхиты/Әулие Елена"
 
 #: ../src/timezone_names.c:308
 msgid "Atlantic/Stanley"
-msgstr ""
+msgstr "Атлант мұхиты/Стэнли"
 
 #: ../src/timezone_names.c:309
 msgid "Australia"
@@ -3030,43 +3194,43 @@
 
 #: ../src/timezone_names.c:310
 msgid "Australia/Adelaide"
-msgstr ""
+msgstr "Аустралия/Аделаида"
 
 #: ../src/timezone_names.c:311
 msgid "Australia/Brisbane"
-msgstr ""
+msgstr "Аустралия/Брисбен"
 
 #: ../src/timezone_names.c:312
 msgid "Australia/Broken_Hill"
-msgstr ""
+msgstr "Аустралия/Брокен-Хилл"
 
 #: ../src/timezone_names.c:313
 msgid "Australia/Darwin"
-msgstr ""
+msgstr "Аустралия/Дарвин"
 
 #: ../src/timezone_names.c:314
 msgid "Australia/Hobart"
-msgstr ""
+msgstr "Аустралия/Хобарт"
 
 #: ../src/timezone_names.c:315
 msgid "Australia/Lindeman"
-msgstr ""
+msgstr "Аустралия/Линдеман"
 
 #: ../src/timezone_names.c:316
 msgid "Australia/Lord_Howe"
-msgstr ""
+msgstr "Аустралия/Лорд-Хау"
 
 #: ../src/timezone_names.c:317
 msgid "Australia/Melbourne"
-msgstr ""
+msgstr "Аустралия/Мельбурн"
 
 #: ../src/timezone_names.c:318
 msgid "Australia/Perth"
-msgstr ""
+msgstr "Аустралия/Перт"
 
 #: ../src/timezone_names.c:319
 msgid "Australia/Sydney"
-msgstr ""
+msgstr "Аустралия/Сидней"
 
 #: ../src/timezone_names.c:320
 msgid "Europe"
@@ -3074,111 +3238,111 @@
 
 #: ../src/timezone_names.c:321
 msgid "Europe/Amsterdam"
-msgstr ""
+msgstr "Еуропа/Амстердам"
 
 #: ../src/timezone_names.c:322
 msgid "Europe/Andorra"
-msgstr ""
+msgstr "Еуропа/Андорра"
 
 #: ../src/timezone_names.c:323
 msgid "Europe/Athens"
-msgstr ""
+msgstr "Еуропа/Афин"
 
 #: ../src/timezone_names.c:324
 msgid "Europe/Belfast"
-msgstr ""
+msgstr "Еуропа/Белфаст"
 
 #: ../src/timezone_names.c:325
 msgid "Europe/Belgrade"
-msgstr ""
+msgstr "Еуропа/Белград"
 
 #: ../src/timezone_names.c:326
 msgid "Europe/Berlin"
-msgstr ""
+msgstr "Еуропа/Берлин"
 
 #: ../src/timezone_names.c:327
 msgid "Europe/Bratislava"
-msgstr ""
+msgstr "Еуропа/Братислава"
 
 #: ../src/timezone_names.c:328
 msgid "Europe/Brussels"
-msgstr ""
+msgstr "Еуропа/Брюссель"
 
 #: ../src/timezone_names.c:329
 msgid "Europe/Bucharest"
-msgstr ""
+msgstr "Еуропа/Бухарест"
 
 #: ../src/timezone_names.c:330
 msgid "Europe/Budapest"
-msgstr ""
+msgstr "Еуропа/Будапешт"
 
 #: ../src/timezone_names.c:331
 msgid "Europe/Chisinau"
-msgstr ""
+msgstr "Еуропа/Кишинеу"
 
 #: ../src/timezone_names.c:332
 msgid "Europe/Copenhagen"
-msgstr ""
+msgstr "Еуропа/Копенгаген"
 
 #: ../src/timezone_names.c:333
 msgid "Europe/Dublin"
-msgstr ""
+msgstr "Еуропа/Дублин"
 
 #: ../src/timezone_names.c:334
 msgid "Europe/Gibraltar"
-msgstr ""
+msgstr "Еуропа/Гибралтар"
 
 #: ../src/timezone_names.c:335
 msgid "Europe/Helsinki"
-msgstr ""
+msgstr "Еуропа/Хельсинки"
 
 #: ../src/timezone_names.c:336
 msgid "Europe/Istanbul"
-msgstr ""
+msgstr "Еуропа/Ыстанбол"
 
 #: ../src/timezone_names.c:337
 msgid "Europe/Kaliningrad"
-msgstr ""
+msgstr "Еуропа/Калининград"
 
 #: ../src/timezone_names.c:338
 msgid "Europe/Kiev"
-msgstr ""
+msgstr "Еуропа/Киев"
 
 #: ../src/timezone_names.c:339
 msgid "Europe/Lisbon"
-msgstr ""
+msgstr "Еуропа/Лиссабон"
 
 #: ../src/timezone_names.c:340
 msgid "Europe/Ljubljana"
-msgstr ""
+msgstr "Еуропа/Любляна"
 
 #: ../src/timezone_names.c:341
 msgid "Europe/London"
-msgstr ""
+msgstr "Еуропа/Лондон"
 
 #: ../src/timezone_names.c:342
 msgid "Europe/Luxembourg"
-msgstr ""
+msgstr "Еуропа/Люксембург"
 
 #: ../src/timezone_names.c:343
 msgid "Europe/Madrid"
-msgstr ""
+msgstr "Еуропа/Мадрид"
 
 #: ../src/timezone_names.c:344
 msgid "Europe/Malta"
-msgstr ""
+msgstr "Еуропа/Мальта"
 
 #: ../src/timezone_names.c:345
 msgid "Europe/Minsk"
-msgstr ""
+msgstr "Еуропа/Минск"
 
 #: ../src/timezone_names.c:346
 msgid "Europe/Monaco"
-msgstr ""
+msgstr "Еуропа/Монако"
 
 #: ../src/timezone_names.c:347
 msgid "Europe/Moscow"
-msgstr ""
+msgstr "Еуропа/Мәскеу"
 
 #: ../src/timezone_names.c:348
 msgid "Europe/Nicosia"
@@ -3186,95 +3350,95 @@
 
 #: ../src/timezone_names.c:349
 msgid "Europe/Oslo"
-msgstr ""
+msgstr "Еуропа/Осло"
 
 #: ../src/timezone_names.c:350
 msgid "Europe/Paris"
-msgstr ""
+msgstr "Еуропа/Париж"
 
 #: ../src/timezone_names.c:351
 msgid "Europe/Prague"
-msgstr ""
+msgstr "Еуропа/Прага"
 
 #: ../src/timezone_names.c:352
 msgid "Europe/Riga"
-msgstr ""
+msgstr "Еуропа/Рига"
 
 #: ../src/timezone_names.c:353
 msgid "Europe/Rome"
-msgstr ""
+msgstr "Еуропа/Рим"
 
 #: ../src/timezone_names.c:354
 msgid "Europe/Samara"
-msgstr ""
+msgstr "Еуропа/Самара"
 
 #: ../src/timezone_names.c:355
 msgid "Europe/San_Marino"
-msgstr ""
+msgstr "Еуропа/Сан-Марино"
 
 #: ../src/timezone_names.c:356
 msgid "Europe/Sarajevo"
-msgstr ""
+msgstr "Еуропа/Сараево"
 
 #: ../src/timezone_names.c:357
 msgid "Europe/Simferopol"
-msgstr ""
+msgstr "Еуропа/Симферополь"
 
 #: ../src/timezone_names.c:358
 msgid "Europe/Skopje"
-msgstr ""
+msgstr "Еуропа/Скопье"
 
 #: ../src/timezone_names.c:359
 msgid "Europe/Sofia"
-msgstr ""
+msgstr "Еуропа/София"
 
 #: ../src/timezone_names.c:360
 msgid "Europe/Stockholm"
-msgstr ""
+msgstr "Еуропа/Стокгольм"
 
 #: ../src/timezone_names.c:361
 msgid "Europe/Tallinn"
-msgstr ""
+msgstr "Еуропа/Таллинн"
 
 #: ../src/timezone_names.c:362
 msgid "Europe/Tirane"
-msgstr ""
+msgstr "Еуропа/Тирана"
 
 #: ../src/timezone_names.c:363
 msgid "Europe/Uzhgorod"
-msgstr ""
+msgstr "Еуропа/Ужгород"
 
 #: ../src/timezone_names.c:364
 msgid "Europe/Vaduz"
-msgstr ""
+msgstr "Еуропа/Вадуц"
 
 #: ../src/timezone_names.c:365
 msgid "Europe/Vatican"
-msgstr ""
+msgstr "Еуропа/Ватикан"
 
 #: ../src/timezone_names.c:366
 msgid "Europe/Vienna"
-msgstr ""
+msgstr "Еуропа/Вена"
 
 #: ../src/timezone_names.c:367
 msgid "Europe/Vilnius"
-msgstr ""
+msgstr "Еуропа/Вильнюс"
 
 #: ../src/timezone_names.c:368
 msgid "Europe/Warsaw"
-msgstr ""
+msgstr "Еуропа/Варшава"
 
 #: ../src/timezone_names.c:369
 msgid "Europe/Zagreb"
-msgstr ""
+msgstr "Еуропа/Загреб"
 
 #: ../src/timezone_names.c:370
 msgid "Europe/Zaporozhye"
-msgstr ""
+msgstr "Еуропа/Запорожье"
 
 #: ../src/timezone_names.c:371
 msgid "Europe/Zurich"
-msgstr ""
+msgstr "Еуропа/Цюрих"
 
 #: ../src/timezone_names.c:372
 msgid "Indian"
@@ -3282,47 +3446,47 @@
 
 #: ../src/timezone_names.c:373
 msgid "Indian/Antananarivo"
-msgstr ""
+msgstr "Үнді мұхиты/Антананариву"
 
 #: ../src/timezone_names.c:374
 msgid "Indian/Chagos"
-msgstr ""
+msgstr "Үнді мұхиты/Чагос"
 
 #: ../src/timezone_names.c:375
 msgid "Indian/Christmas"
-msgstr ""
+msgstr "Үнді мұхиты/Милад ар."
 
 #: ../src/timezone_names.c:376
 msgid "Indian/Cocos"
-msgstr ""
+msgstr "Үнді мұхиты/Кокос а-ры"
 
 #: ../src/timezone_names.c:377
 msgid "Indian/Comoro"
-msgstr ""
+msgstr "Үнді мұхиты/Комор а-ры"
 
 #: ../src/timezone_names.c:378
 msgid "Indian/Kerguelen"
-msgstr ""
+msgstr "Үнді мұхиты/Кергелен"
 
 #: ../src/timezone_names.c:379
 msgid "Indian/Mahe"
-msgstr ""
+msgstr "Үнді мұхиты/Махе"
 
 #: ../src/timezone_names.c:380
 msgid "Indian/Maldives"
-msgstr ""
+msgstr "Үнді мұхиты/Мальдив а-ры"
 
 #: ../src/timezone_names.c:381
 msgid "Indian/Mauritius"
-msgstr ""
+msgstr "Үнді мұхиты/Маврикий"
 
 #: ../src/timezone_names.c:382
 msgid "Indian/Mayotte"
-msgstr ""
+msgstr "Үнді мұхиты/Мариотт"
 
 #: ../src/timezone_names.c:383
 msgid "Indian/Reunion"
-msgstr ""
+msgstr "Үнді мұхит/Реюньон"
 
 #: ../src/timezone_names.c:384
 msgid "Pacific"
@@ -3330,159 +3494,159 @@
 
 #: ../src/timezone_names.c:385
 msgid "Pacific/Apia"
-msgstr ""
+msgstr "Тынық мұхит/Апиа"
 
 #: ../src/timezone_names.c:386
 msgid "Pacific/Auckland"
-msgstr ""
+msgstr "Тынық мұхит/Окленд"
 
 #: ../src/timezone_names.c:387
 msgid "Pacific/Chatham"
-msgstr ""
+msgstr "Тынық мұхит/Чатем"
 
 #: ../src/timezone_names.c:388
 msgid "Pacific/Easter"
-msgstr ""
+msgstr "Тынық мұхит/Пасха ар."
 
 #: ../src/timezone_names.c:389
 msgid "Pacific/Efate"
-msgstr ""
+msgstr "Тынық мұхит/Эфате"
 
 #: ../src/timezone_names.c:390
 msgid "Pacific/Enderbury"
-msgstr ""
+msgstr "Тынық мұхит/Эндербури"
 
 #: ../src/timezone_names.c:391
 msgid "Pacific/Fakaofo"
-msgstr ""
+msgstr "Тынық мұхит/Факаофо"
 
 #: ../src/timezone_names.c:392
 msgid "Pacific/Fiji"
-msgstr ""
+msgstr "Тынық мұхит/Фиджи"
 
 #: ../src/timezone_names.c:393
 msgid "Pacific/Funafuti"
-msgstr ""
+msgstr "Тынық мұхит/Фунафути"
 
 #: ../src/timezone_names.c:394
 msgid "Pacific/Galapagos"
-msgstr ""
+msgstr "Тынық мұхит/Галапагос а-ры"
 
 #: ../src/timezone_names.c:395
 msgid "Pacific/Gambier"
-msgstr ""
+msgstr "Тынық мұхит/Гамбье"
 
 #: ../src/timezone_names.c:396
 msgid "Pacific/Guadalcanal"
-msgstr ""
+msgstr "Тынық мұхит/Гуадалканал"
 
 #: ../src/timezone_names.c:397
 msgid "Pacific/Guam"
-msgstr ""
+msgstr "Тынық мұхит/Гуам"
 
 #: ../src/timezone_names.c:398
 msgid "Pacific/Honolulu"
-msgstr ""
+msgstr "Тынық мұхит/Гонолулу"
 
 #: ../src/timezone_names.c:399
 msgid "Pacific/Johnston"
-msgstr ""
+msgstr "Тынық мұхит/Джонстон"
 
 #: ../src/timezone_names.c:400
 msgid "Pacific/Kiritimati"
-msgstr ""
+msgstr "Тынық мұхит/Киритимати"
 
 #: ../src/timezone_names.c:401
 msgid "Pacific/Kosrae"
-msgstr ""
+msgstr "Тынық мұхит/Косрае"
 
 #: ../src/timezone_names.c:402
 msgid "Pacific/Kwajalein"
-msgstr ""
+msgstr "Тынық мұхит/Кваялейн"
 
 #: ../src/timezone_names.c:403
 msgid "Pacific/Majuro"
-msgstr ""
+msgstr "Тынық мұхит/Маюро"
 
 #: ../src/timezone_names.c:404
 msgid "Pacific/Marquesas"
-msgstr ""
+msgstr "Тынық мұхит/Маркизас"
 
 #: ../src/timezone_names.c:405
 msgid "Pacific/Midway"
-msgstr ""
+msgstr "Тынық мұхит/Мидуэй"
 
 #: ../src/timezone_names.c:406
 msgid "Pacific/Nauru"
-msgstr ""
+msgstr "Тынық мұхит/Науру"
 
 #: ../src/timezone_names.c:407
 msgid "Pacific/Niue"
-msgstr ""
+msgstr "Тынық мұхит/Нуе"
 
 #: ../src/timezone_names.c:408
 msgid "Pacific/Norfolk"
-msgstr ""
+msgstr "Тынық мұхит/Норфолк"
 
 #: ../src/timezone_names.c:409
 msgid "Pacific/Noumea"
-msgstr ""
+msgstr "Тынық мұхит/Нумеа"
 
 #: ../src/timezone_names.c:410
 msgid "Pacific/Pago_Pago"
-msgstr ""
+msgstr "Тынық мұхит/Паго-Паго"
 
 #: ../src/timezone_names.c:411
 msgid "Pacific/Palau"
-msgstr ""
+msgstr "Тынық мұхит/Палау"
 
 #: ../src/timezone_names.c:412
 msgid "Pacific/Pitcairn"
-msgstr ""
+msgstr "Тынық мұхит/Питкарн"
 
 #: ../src/timezone_names.c:413
 msgid "Pacific/Ponape"
-msgstr ""
+msgstr "Тынық мұхит/Понапе"
 
 #: ../src/timezone_names.c:414
 msgid "Pacific/Port_Moresby"
-msgstr ""
+msgstr "Тынық мұхит/Порт-Морсби"
 
 #: ../src/timezone_names.c:415
 msgid "Pacific/Rarotonga"
-msgstr ""
+msgstr "Тынық мұхит/Раротонга"
 
 #: ../src/timezone_names.c:416
 msgid "Pacific/Saipan"
-msgstr ""
+msgstr "Тынық мұхит/Сайпан"
 
 #: ../src/timezone_names.c:417
 msgid "Pacific/Tahiti"
-msgstr ""
+msgstr "Тынық мұхит/Таити"
 
 #: ../src/timezone_names.c:418
 msgid "Pacific/Tarawa"
-msgstr ""
+msgstr "Тынық мұхит/Тарава"
 
 #: ../src/timezone_names.c:419
 msgid "Pacific/Tongatapu"
-msgstr ""
+msgstr "Тынық мұхит/Тонгатапу"
 
 #: ../src/timezone_names.c:420
 msgid "Pacific/Truk"
-msgstr ""
+msgstr "Тынық мұхит/Трук"
 
 #: ../src/timezone_names.c:421
 msgid "Pacific/Wake"
-msgstr ""
+msgstr "Тынық мұхит/Уаке"
 
 #: ../src/timezone_names.c:422
 msgid "Pacific/Wallis"
-msgstr ""
+msgstr "Тынық мұхит/Уаллис"
 
 #: ../src/timezone_names.c:423
 msgid "Pacific/Yap"
-msgstr ""
+msgstr "Тынық мұхит/Яп"
 
 #: ../src/tray_icon.c:469
 msgid "New appointment"
@@ -3501,38 +3665,26 @@
 msgstr "Уақыт пен күнді көрсету керек пе?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Күнтізбе"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Orage күнтізбе баптаулары"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Orage баптаулары"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Xfce 4 күнтізбе қолданбасының (Orage) баптаулары "
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Жұмыс үстел күнтізбесі"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Orage күнтізбе баптаулары"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Күнтізбе"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Orage күнтізбе бағдарламасы"
 
-#~ msgid "Orage clock"
-#~ msgstr "Orage сағаты"
-
-#~ msgid "Info"
-#~ msgstr "Ақпарат"
-
-#~ msgid "Warning"
-#~ msgstr "Ескерту"
-
-#~ msgid "Error"
-#~ msgstr "Қате"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Жұмыс үстел күнтізбесі"
diff -Nru orage-4.8.3/po/ko.po orage-4.12.1/po/ko.po
--- orage-4.8.3/po/ko.po	2012-01-03 12:01:06.000000000 +0000
+++ orage-4.12.1/po/ko.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,29 +1,50 @@
-# Korean translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team
-# This file is distributed under the same license as the orage package.
-# ByungHyun Choi <byunghyun.choi@gmail.com>, 2005.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# ByungHyun Choi <byunghyun.choi@gmail.com>, 2005
+# Seong-ho Cho <darkcircle.0426@gmail.com>, 2013-2014
+# Seong-ho Cho <darkcircle.0426@gmail.com>, 2011-2013
+# Sungjin Kang <potopro@gmail.com>, 2013
+# Sungjin Kang <potopro@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.4.0\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2008-08-26 01:36+0900\n"
-"Last-Translator: ByungHyun Choi<byunghyunchoi@debianusers.org>\n"
-"Language-Team: xfce4-users-kr-i18n <xfce4-users-kr-i18n@lists.sourceforge."
-"net>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2014-10-04 16:44+0000\n"
+"Last-Translator: Sungjin Kang <potopro@gmail.com>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/xfce-apps/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "밑줄 안함"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "싱글"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "더블"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "낮음"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr "세계시간 창 올림..."
+msgstr "세계시간 창 띄우는 중..."
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
-msgstr "세계시간 창을 올리지 못 했습니다."
+msgstr "세계시간 창을 띄우는데 실패했습니다"
 
 #. ********** timezone tooltip **********
 #: ../globaltime/globaltime.c:277
@@ -31,9 +52,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"클릭해서 시계를 바꾸세요."
+msgstr "%s\n시계를 조정하려면 누르십시오"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -43,26 +62,28 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"속성 변경은 버튼1 \n"
-"시간 설정은 버튼2"
+msgstr "기본 설정을 바꾸려면 1번 단추 \n시계의 시간 설정은 2번 단추"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
-msgstr "시 설정"
+msgstr "시를 바꾸려면 조절합니다"
 
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
+msgstr "분을 바꾸려면 조정합니다. 화살표가 그려진 2번 단추를 누르면 1분만 바뀝니다."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "세계 시간"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
-msgstr "새로운"
+msgstr "새로 만들기"
 
 #: ../globaltime/gt_prefs.c:289
 msgid "NEW COPY"
-msgstr "새로 복사"
+msgstr "새 복사본 만들기"
 
 #: ../globaltime/gt_prefs.c:310
 msgid "Not possible to delete the last clock."
@@ -70,15 +91,15 @@
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
-msgstr "이 시계 변경"
+msgstr "이 시계 업데이트"
 
 #: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
 msgid "add new empty clock"
-msgstr "새로운 시계 추가"
+msgstr "새 빈 시계 더하기"
 
 #: ../globaltime/gt_prefs.c:526
 msgid "add new clock using this clock as model"
-msgstr "현재 시계를 모델로 새로운 시계 추가"
+msgstr "현재 시계를 모델로 새로운 시계 더하기"
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
@@ -86,32 +107,31 @@
 
 #: ../globaltime/gt_prefs.c:539
 msgid "move this clock first"
-msgstr "현재 시계를 선두로 이동"
+msgstr "현재 시계를 처음으로 이동"
 
 #: ../globaltime/gt_prefs.c:544
 msgid "move this clock left"
-msgstr "현재 시계를 왼쪽으로"
+msgstr "현재 시계를 왼쪽으로 이동"
 
 #: ../globaltime/gt_prefs.c:549
 msgid "move this clock right"
-msgstr "현재 시계를 오른쪽으로"
+msgstr "현재 시계를 오른쪽으로 이동"
 
 #: ../globaltime/gt_prefs.c:554
 msgid "move this clock last"
-msgstr "현재 시계를 마지막으로"
+msgstr "현재 시계를 마지막으로 이동"
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
-msgstr "현재 시계의 시간대를 지역시간대로"
+msgstr "현재 시계의 시간대를 지역 시간대로 설정"
 
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
-msgstr "창닫고 종료"
+msgstr "창을 닫고 나가기"
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "속성 변경"
+msgstr "세계시간 기본 설정"
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -124,11 +144,11 @@
 
 #: ../globaltime/gt_prefs.c:613
 msgid "enter name of clock"
-msgstr "시계이름을 입력하세요"
+msgstr "시계 이름을 입력합니다"
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
-msgstr "시간대"
+msgstr "시계 시간대:"
 
 #: ../globaltime/gt_prefs.c:643
 msgid "Text Formatting"
@@ -137,11 +157,11 @@
 #. ------------------------background-------------------------
 #: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
 msgid "Background color:"
-msgstr "바탕색"
+msgstr "배경색:"
 
 #: ../globaltime/gt_prefs.c:656
 msgid "Click to change background colour for clock"
-msgstr "클릭해서 시계의 배경색 변경"
+msgstr "시계의 배경색을 바꾸려면 누르십시오"
 
 #: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
 #: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
@@ -149,102 +169,101 @@
 #: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
 #: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
 msgid "Use default"
-msgstr "초기값 사용"
+msgstr "기본값 사용"
 
 #: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
 #: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
 msgid "Cross this to use default instead of selected value"
-msgstr "선택한 것을 버리고 초기값을 사용"
+msgstr "선택한 값 대신 기본값을 사용하려면 표시하십시오"
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
 msgid "Foreground (=text) color:"
-msgstr "글자색:"
+msgstr "전경 (=글자) 색:"
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
-msgstr "클릭하여 글자색 변경"
+msgstr "시계 글자색을 바꾸려면 누르십시오"
 
 #. ------------------------name font-------------------------
 #: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
 msgid "Font for name of clock:"
-msgstr "시계의 글꼴"
+msgstr "시계 이름 글꼴:"
 
 #: ../globaltime/gt_prefs.c:720
 msgid "Click to change font for clock name"
-msgstr "클릭해서 글꼴 변경"
+msgstr "시계 이름의 글꼴을 바꾸려면 누르십시오"
 
 #. ------------------------time font-------------------------
 #: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
 msgid "Font for time of clock:"
-msgstr "시간의 글꼴"
+msgstr "시계 시간 글꼴:"
 
 #: ../globaltime/gt_prefs.c:753
 msgid "Click to change font for clock time"
-msgstr "클릭해서 글꼴 변경"
+msgstr "시계 시간의 글꼴을 바꾸려면 누르십시오"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:780
 msgid "Underline name of clock:"
-msgstr "시계이름에 밑줄:"
+msgstr "시계 이름에 밑줄:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:810
 msgid "Underline time of clock:"
-msgstr "시간에 밑줄:"
+msgstr "시계 시간에 밑줄:"
 
 #: ../globaltime/gt_prefs.c:850
 msgid "Text Default Formatting"
-msgstr "기본 형식"
+msgstr "글자 기본 형식"
 
 #: ../globaltime/gt_prefs.c:863
 msgid "Click to change default background colour for clocks"
-msgstr "클릭해서 시계의 배경색 바꾸기"
+msgstr "시계 기본 배경색을 바꾸려면 누르십시오"
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr "선택한 색을 버리고 시스템 설정 사용"
+msgstr "선택한 색 대신 시스템 기본값을 사용하려면 표시하십시오"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
-msgstr "클릭해서 시계의 글자색 바꾸기"
+msgstr "시계의 기본 글자색을 바꾸려면 누르십시오"
 
 #: ../globaltime/gt_prefs.c:929
 msgid "Click to change default font for clock name"
-msgstr "클릭해서 시계이름 바꾸기"
+msgstr "시계 이름의 기본 글꼴을 바꾸려면 누르십시오"
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr "선택한 글꼴을 버리고 시스템 설정 사용"
+msgstr "선택한 글꼴 대신 시스틈 기본 글꼴을 사용하려면 표시하십시오"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
-msgstr "클릭하여 시간의 글꼴 변경"
+msgstr "시계 시간의 기본 글꼴을 바꾸려면 누르십시오"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:990
 msgid "Underline for name of clock:"
-msgstr "시계이름에 밑줄:"
+msgstr "시계 이름에 밑줄:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:1004
 msgid "Underline for time of clock:"
-msgstr "시간에 밑줄:"
+msgstr "시계 시간에 밑줄:"
 
 #: ../globaltime/gt_prefs.c:1027
 msgid "update preferences"
-msgstr "속성 변경"
+msgstr "업데이트 기본 설정"
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "일반 속성"
+msgstr "세계시간 기본 설정"
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
 msgid "General Preferences"
-msgstr "일반 속성"
+msgstr "일반 기본 설정"
 
 #: ../globaltime/gt_prefs.c:1077
 msgid "Decorations:"
@@ -258,9 +277,13 @@
 msgid "Use normal decorations"
 msgstr "기본 꾸미기 사용"
 
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "없음"
+
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
-msgstr "창틀을 숨기시렵니까"
+msgstr "창 장식(테두리)을 보일 수 없습니다"
 
 #: ../globaltime/gt_prefs.c:1100
 msgid "Clock size:"
@@ -280,61 +303,60 @@
 
 #: ../globaltime/gt_prefs.c:1116
 msgid "Clock sizes vary"
-msgstr "시계크기 변경"
+msgstr "변경할 시계 크기"
 
 #: ../globaltime/gt_prefs.c:1122
 msgid "Local timezone:"
-msgstr "현지 시간대"
+msgstr "현지 시간대:"
 
 #: ../globaltime/timezone_selection.c:101
 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
 msgid " Other"
-msgstr ""
+msgstr " 기타"
 
 #: ../globaltime/timezone_selection.c:156
 #: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
 #, c-format
 msgid "%d hour %d mins"
-msgstr ""
+msgstr "%d 시간 %d 분"
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
-msgstr "시간"
+msgstr "%d 시간"
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "%d mins"
-msgstr "분"
+msgstr "%d 분"
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
 msgid "backward"
-msgstr ""
+msgstr "뒤로"
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-#, fuzzy
 msgid "forward"
 msgstr "앞으로"
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
 msgid "not changed"
-msgstr ""
+msgstr "바꾸지 않음"
 
 #: ../globaltime/timezone_selection.c:195
 #: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
 msgid "not changing"
-msgstr ""
+msgstr "바꾸지 않는중"
 
 #. location
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "위치"
@@ -342,17 +364,17 @@
 #: ../globaltime/timezone_selection.c:258
 #: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
 msgid "GMT Offset"
-msgstr ""
+msgstr "GMT 오프셋"
 
 #: ../globaltime/timezone_selection.c:264
 #: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
 msgid "Previous/Next Change"
-msgstr ""
+msgstr "이전/다음 바꾸기"
 
 #: ../globaltime/timezone_selection.c:269
 #: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
 msgid "Country"
-msgstr ""
+msgstr "국가"
 
 #. We are actually setting the g_par parameter. In other words
 #. we are setting the global default timezone for Orage. This is
@@ -373,7 +395,7 @@
 #: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
 #: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
 msgid "Change mode"
-msgstr ""
+msgstr "모드 바꾸기"
 
 #: ../globaltime/timezone_selection.c:303
 #: ../globaltime/timezone_selection.c:313
@@ -393,96 +415,110 @@
 #: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
 #: ../src/timezone_selection.c:384
 msgid "floating"
-msgstr "모름"
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "지역시간"
+msgstr "띄우기"
 
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "Orage - 달력"
+msgstr "Orage 세계시간"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
-msgstr ""
+msgstr "다른 국가의 시계를 보여줍니다"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "세계시간"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "회전 안함"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "왼쪽으로 회전"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "오른쪽으로 회전"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "겉 모양"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
-msgstr "틀보이기(_f)"
+msgstr "틀 표시(_F)"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
-msgstr "글자색(_c)"
+msgstr "글자색(_C):"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
-msgstr "바탕색(_b)"
+msgstr "배경색 설정(_B):"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
-msgstr "높이(_h)"
+msgstr "높이 설정(_H):"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
+msgstr "수평 패널의 높이는 바꿀 수 없음을 참고하십시오"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
-msgstr "폭(_w)"
+msgstr "폭 설정(_W):"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
-msgstr ""
+msgstr "수직 패널의 너비는 바꿀 수 없음을 참고하십시오"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "행 수직으로 보기 (_v)"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
-msgstr "시계 선택사항"
+msgstr "시계 옵션"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
-msgstr "시간대 설정:"
+msgstr "다음으로 시간대 설정:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
-msgstr ""
+msgstr "%d번째 줄:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
-msgstr "strftime 함수의 파라미터를 입력하시면 됩니다."
+msgstr "strftime 함수 파라미터를 입력합니다."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
-msgstr "힌트"
+msgstr "풍선 도움말:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
-msgstr ""
+msgstr "대기/최대절전 이후 시간 교정"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
+msgstr "짧은 주기(5시간 미만)동안의 대기 또는 최대절전을 수행하고, 보이는 시간에 초단위를 포함하지 않았을 경우에만 이것이 필요합니다. 이러한 환경에서 Orage시계는 이를 선택하기 전까지는 부정확한 시계를 보여줄 가능성이 있습니다. (이것을 선택하면 동작중 cpu와 인터럽트 저장기능을 막을 수 있습니다.)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -492,22 +528,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"이 프로그램은 strftime()함수를 이용하여 시간을 나타냅니다.\n"
-"시간표시 코드를 이용하여 원하는 형식으로 시간을 표시하십시오.\n"
-"다음은 자주 사용하는 코드입니다.:\n"
-"\t%A = 요일\t\t\t%B = 월\n"
-"\t%c = 날짜와 시간\t\t%R = 시분\n"
-"\t%V = 요일(숫자)\t\t%Z = 현재 시간대\n"
-"\t%H = 시 \t\t\t\t%M = 분\n"
-"\t%X = 현지 시간\t\t\t%x = 현지 날짜"
+msgstr "이 프로그램은 strftime()함수를 이용하여 시간을 나타냅니다.\n시간표시 코드를 이용하여 원하는 형식으로 시간을 표시하십시오.\n다음은 자주 사용하는 코드입니다:\n\t%A = 요일\t\t\t\t%B = 월\n\t%c = 날짜와 시간\t\t%R = 시분\n\t%V = 연중 주차\t\t\t%Z = 현재 시간대\n\t%H = 시 \t\t\t\t%M = 분\n\t%X = 현지 시간\t\t\t%x = 현지 날짜"
 
-#: ../panel-plugin/oc_config.c:457
-#, fuzzy
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
-msgstr "Orage 속성"
+msgstr "Orage 시계 기본 설정"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -516,265 +542,318 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
-msgstr "%Y-%m-%d %A/%V"
+msgstr "%Y년 %B %d일 %A %V주차"
 
 #: ../src/about-xfcalendar.c:40
 msgid "Maintainer"
-msgstr "메인터너"
+msgstr "메인테이너"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "Xfce4로 일정을 관리합시다."
+msgstr "Orage로 시간을 관리하세요"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
-msgstr "끝"
+msgstr "말일"
 
 #: ../src/appointment.c:333
 msgid "Due"
 msgstr "기한"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
-msgstr "화일을 선택하시지요."
+msgstr "파일 선택..."
 
 #: ../src/appointment.c:680
 msgid "Sound Files"
-msgstr "소리 화일"
+msgstr "소리 파일"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
-msgstr "모든 화일"
+msgstr "모든 파일"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
-msgstr "일정을 변경하셨습니다."
+msgstr "일정 정보를 변경하였습니다."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
-msgstr " 계속 진행하실렵니까?"
+msgstr "계속 진행하시렵니까?"
+
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "아니요, 나가지 않습니다"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "예, 수정 사항을 무시하고 나갑니다."
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
-msgstr "일정의 마지막이 시작보다 전입니다."
+msgstr "일정 말일이 시작보다 빠르십시오."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
-msgstr "설정 안됨"
+msgstr "설정 안함"
+
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "새 일정을 이 파일에 추가합니다."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Orage 기본 파일"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "일정 추가에 실패했습니다."
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "일정 추가에 오류가 발생했습니다. 자세한 내용은 로그 파일을 보십시오."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "일정 업데이트에 실패했습니다."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "자세한 내용은 로그 파일을 보십시오.(아마 파일 내용이 Orage 외부에서 업데이트 되었을지도?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
-msgstr "일정을 완전히 삭제합니다."
+msgstr "이 일정을 완전히 제거합니다."
+
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "아니요, 제거하지 않습니다"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "예, 제거합니다"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "날짜 선택"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "오늘"
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
-msgstr "이 일정은 없습니다."
+msgstr "이 일정이 없습니다."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
-msgstr "아마도 지워졌을 겁니다. 화면을 새로 고쳐보시지요."
+msgstr "아마도 지워진 것 같습니다. 화면을 새로 고침 하십시오."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "현재 분류"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
-msgstr "색을 지정해서 새로운 분류 추가"
+msgstr "색을 지정해서 새로운 분류 더하기"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "분류:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "분류에 대한 색 - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr " *** 복사 ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
-msgstr "새로운 일정 - Orage"
+msgstr "새 일정 - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
-msgstr "화일(_F)"
+msgstr "파일(_F)"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
-msgstr "저장하고 종료(_e)"
+msgstr "저장하고 종료(_E)"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
-msgstr "복사(_u)"
+msgstr "복사(_U)"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "저장"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
-msgstr "저장하고 종료"
+msgstr "저장하고 닫기"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "되돌리기"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "복사"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "삭제"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "여유"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "바쁨"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "일반"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "형태"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
-msgstr "이벤트"
+msgstr "행사"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"주기적으로 일어나는 일. 예:\n"
-"모임, 생일, 또는 TV쇼."
+msgstr "가끔 일어나는 행사입니다. 예:\n모임, 생일, 또는 TV쇼가 있습니다."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
-msgstr "할일"
+msgstr "할 일"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"반드시 해야할 일. 예:\n"
-"세차, Orage 새버전 테트스."
+msgstr "가끔 해야할 일. 예:\n세차, Orage 새버전 테스트."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "저널"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"어떤 일에 대한 메모. 예:\n"
-"어머니께서 전화, 첫눈이 왔다."
+msgstr "어떤 일에 대한 메모. 예:\n어머니께서 전화, 첫눈이 왔다."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "제목"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
-msgstr "하루 종일"
+msgstr "종일 행사"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "시작"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "설정     "
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "주기"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "일"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "시간"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "분"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
-msgstr "이용가능"
+msgstr "가능성"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "완료"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "완료"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "분류"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"특별한 분류항목이기 때문에, 리스트에 있는 약속을 표시하는 데 사용합니다."
+msgstr "특별한 분류 항목이기 때문에, 목록에 있는 일정을 표시하는 데 사용합니다."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
-msgstr "분류에 대한 색을 새로 고침"
+msgstr "분류에 대한 색을 업데이트 합니다."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
-msgstr ""
+msgstr "우선순위"
+
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "8 이상의 값을 설정하면, 창에 일정을 표시하지 않습니다.\n목록 창을 채우는 내용을 일부 가릴 경우 이 기능을 사용할 수 있지만, 일정을 찾기 어렵게 할 수도 있습니다.\n(알림은 평상시대로 울립니다.)\n(문서에 언급하지 않은 인자가 있으므로 8 아래로 값을 바꿀 수 있습니다.)"
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "메모"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -783,129 +862,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "이 짧은 명령의 결과는 즉시 나타납니다:\n    <D> 지역 날짜 형식에 현재 날짜 삽입\n    <T> 시간 삽입 그리고\n    <DT> 날짜와 시간 삽입.\n\n이것은 요소가 표시된 후에 바뀝니다:\n    <&Ynnnn>은 현재 연도에 nnnn을 뺀 값으로 해석됩니다.\n(사람의 나이가 어떻게 될 지 알려주는 생일 알림과 같은 경우에 사용할 수 있습니다.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "시작하기 전"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
-msgstr "끝나기 전"
+msgstr "마치기 전"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "시작한 후"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
-msgstr "끝난 후"
+msgstr "마친 후"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
-msgstr "알리미"
+msgstr "알림"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
-msgstr "알리미 시간"
+msgstr "알림 시간"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"알리미 설정:\n"
-" 1) 이벤트가 시작하기 전\n"
-" 2) 할일이 끝나기 전\n"
-" 3) 할일이 시작한 다음"
+msgstr "알림 설정:\n 1) 행사를 시작하기 전\n 2) 할 일이 끝나기 전\n 3) 할 일이 시작한 다음"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
-msgstr "계속 사용하는 알리미"
+msgstr "계속 사용하는 알림"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr "사용하지 않는 알리미이더라도 생긴 것을 알고 싶으면 선택하십시오."
+msgstr "사용하지 않는 알림이더라도 생긴 것을 알고 싶으면 선택하십시오."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "소리"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "사용"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
-msgstr "소리나는 알리미을 사용하려면 선택하십시오."
+msgstr "소리나는 알림을 사용하려면 선택하십시오."
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
-msgstr "알리미 소리 반복"
+msgstr "알림 소리 반복"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "번"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "초 간격"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
-msgstr "눈에 보이는 알리미"
+msgstr "눈에 보이는 알림"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Orage 창 사용"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
-msgstr "창 알리미을 사용하시려면 선택하십시오."
+msgstr "창 알림을 사용하시려면 선택하십시오."
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "알림기능 사용"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
 msgstr "알림기능을 사용하시려면 선택하십시오."
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "종료시간"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
-msgstr "선택하시면 알리미가 자동으로 멈춥니다."
+msgstr "선택하시면 알림가 자동으로 멈춥니다."
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 = 시스템 기본 종료시간"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "초"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "외부기능"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
-msgstr "외부기능이나 스크립트를 알리미로 사용할 수 있습니다."
+msgstr "외부기능이나 스크립트를 알림으로 사용할 수 있습니다."
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -915,157 +989,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
+msgstr "모든 이스케이프 기타 문자를 알아서 입력해야 합니다.\n이 문자열은 처리할 쉘에만 주어집니다.\n다음 특별한 명령은 실행 중에 바꿀 수 있습니다:\n\t<&T>  일정 제목\n\t<&D>  일정 설명\n\t<&AT> 알림 시간\n\t<&ST> 일정 시작 시간\n\t<&ET> 일정 마감 시간"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
-msgstr ""
+msgstr "이것을 지금 띄워서 알림을 시험하기"
 
-#: ../src/appointment.c:3101
-#, fuzzy
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
-msgstr "기본 알리미"
+msgstr "<b>기본 알림</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
-msgstr "현재 설정을 기본 알리미로 합니다."
+msgstr "현재 설정을 기본 알림으로 합니다."
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
-msgstr "기본 알리미를 현재 설정으로 합니다.f"
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "없음"
+msgstr "기본 알림를 현재 설정으로 합니다.f"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "매일"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "매주"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "매달"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "매년"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
-msgstr ""
+msgstr "시간별"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "월"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "화"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "수"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "목"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "금"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "토"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "일"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "반복"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "반복정도"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "단순"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "복잡"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
-msgstr "주기적으로 반복되는 이벤트에 사용하십시오."
+msgstr "주기적으로 반복하는 행사에 사용하십시오."
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"다음과 같이 반복 주기 설정이 복잡한 경우에 사용하십시오.\n"
-" 매주 토요일과 일요일 또는 \n"
-" 매월 첫번째 화요일"
+msgstr "다음과 같이 반복 주기 설정이 복잡한 경우에 사용하십시오.\n 매주 토요일과 일요일 또는 \n 매월 첫번째 화요일"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "주기"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "매"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "회"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"주기를 특정간격으로 제한합니다. \n"
-"설정 예: 3일마다:\n"
-"주기 = 매일 그리고 기간 = 3"
+msgstr "주기를 특정간격으로 제한합니다. \n설정 예: 3일마다:\n주기 = 매일 그리고 기간 = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "제한"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "계속 반복"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "반복"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "~까지 반복"
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "요일"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "몇 번째"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1073,924 +1136,997 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"매년 매월 어느 요일인지를 설정하십시오.\n"
-" 설정 예:\n"
-" 매월 2번째 수요일:\n"
-"\t주기 = 매월,\n"
-"\t요일 = 수요일만 선택,\n"
-"\t몇 번째 = 수요일 아래의 숫자란에서 2를 선택합니다."
+msgstr "매년 매월 어느 요일의 행사인지 설정하십시오.\n 설정 예:\n 매월 2번째 수요일:\n\t주기 = 매월,\n\t요일 = 수요일만 선택,\n\t몇 번째 = 수요일 아래의 숫자란에서 2를 선택합니다."
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
-msgstr ""
+msgstr "할 일 기반"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
+msgstr "할 일은 일반적으로 시작시간에 시작하게끔 다시 알리며 이미 마지막으로 마친 때의 여부와는 관계없이 각각의 시간 간격 이후에 반복합니다. "
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "할 일의 다시알림은 완료시간을 기반으로 하며 최종 완료시간부터 계산한 시간간격 이후로 반복합니다.\n(각각의 완료 상황 이후 다시 알림 기반 내용을 바꾸려면 어떤 TODO 기록도 언급할 수 없음을 참고하십시오.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
-#, fuzzy
+#: ../src/appointment.c:3471
 msgid "Exceptions"
-msgstr "선택사항"
+msgstr "예외"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
+msgstr "아래 달력의 날짜를 눌러 예외 날짜를 더합니다.\n예외는 선택 여부에 따라 제외(-) 또는 포함(+)입니다.\n데이터를 누르면 지워집니다."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
-msgstr ""
+msgstr "제외할 날짜 더하기 (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
+msgstr "아무 일정이 없는 날은 제외된 날입니다"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
-msgstr ""
+msgstr "포함할 시간 더하기 (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
+msgstr "포함한 시간은 시작시간보다는 시간대를 포함하는데, 제각기 다른 시간을 지니고 있을 수도 있습니다"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
-#, fuzzy
+#: ../src/appointment.c:3516
 msgid "Action dates"
-msgstr "적용 동작"
+msgstr "실행 일자"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "보기(_V)"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "이동(_G)"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "새로 만들기"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "뒤로"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "오늘"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "앞으로"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "일주일 뒤로"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "하루 뒤로"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "하루 앞으로"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "일주일 앞으로"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "새로 고침"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "닫기"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "모름"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
-msgstr ""
+msgstr "       보여줄 기간 수"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - 날짜로 보기"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "하루 종일"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "시간"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "뭘 좀 고르시지요."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
-msgstr "클릭해서 줄을 선택하면 복사할 수 있습니다."
+msgstr "눌러서 줄을 선택하면 복사할 수 있습니다."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"션택한 모든 일정을 완전히\n"
-"삭제합니다."
+msgstr "션택한 모든 일정을 완전히\n제거합니다."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "예, 그것을 제거했습니다."
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "뒤로"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "앞으로"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "찾기"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "날짜별"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "이후 며칠까지"
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "표시할 추가 날짜 수:"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "처음 반복되는 행사만"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "처음 반복하는 행사만 보려면 이 옵션을 표시하십시오. 기본적으로, 반복되는 모든 행사를 표시합니다.\n참고로 모든 긴급 사항에 대해서도 표시합니다.\n게다가 반복되는 행사는 처음 일어나는 행사만 표시하는 것처럼 먼저 나타날 수 있습니다."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "이전 행사 포함"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "이전 행사도 보려면 이 옵션을 표시하십시오. 이 옵션은 '처음 반복되는 행사만' 옵션을 표시한 다음 목록이 상당히 길어지는 현상을 막으려는 경우에만 선택할 수 있습니다.\n참고로 추가 날짜 선택은 새 일정을 목록에 표시했을 경우에 정의할 수 있습니다."
+
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "일지를 적기 시작한 날짜:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
-msgstr "찾기"
+msgstr "검색"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
-msgstr "문장 찾기 "
+msgstr "문장 검색 "
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
-msgstr "Flags"
+msgstr "플래그"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "제목"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"수정하려는 라인을 따닥 하십시오.\n"
-"\n"
-"Flags in order:\n"
-"\t 1. 알리미: n=알리미설정 없음\n"
-"\t\tA= 화면으로 알림  S= 소리로 알림\n"
-"\t 2. 반복: n=반복하지 않음\n"
-"\t\t D=매일 W=매주 M=매월 Y=매년\n"
-"\t 3. 형태: f=여유 B=바쁨\n"
-"\t 4. 위치:\n"
-"\t\tO=Orage A=압축화일 F=외부화일\n"
-"\t 5. 일정형태:\n"
-"\t\tE=이벤트 T=할일 J=일지"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "날짜 선택"
+msgstr "줄을 두 번 눌러서 편집하십시오.\n\n순서별 플래그:\n⇥ 1. Alarm: n=알림 없음\n⇥⇥ A=알림 설정함 P=지속 알림 설정\n⇥ 2. Recurrence: n=반복 안함\n⇥⇥ H=시간별 D=일일 W=주간 M=월간 Y=연간\n⇥ 3. Type: f=용무 없음 B=용무 있음\n⇥ 4. 파일 위치:\n⇥⇥O=Orage A=아카이브 F=외부\n⇥ 5. 일정 형식\n⇥⇥E=행사 T=할 일 J=일기"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
-msgstr "\t"
+msgstr "\t반복이 끝나서, 보관파일로 이동합니다."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
-msgstr "압축기능을 켜지 않았습니다. 종료"
+msgstr "보관기능을 활성화 하지 않았습니다. 끝냅니다"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
-msgstr "압축 주기: %d 개월"
+msgstr "보관 주기: %d 개월"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr "\t %04d-%02d-%02d보다 오래된 이벤트를 압축합니다."
+msgstr "\t %04d-%02d-%02d보다 오래된 행사를 보관합니다."
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
-msgstr "압축 uid: %s"
+msgstr "보관 uid: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
-msgstr "\tVTOD 진행 중이므로 압축하지 않습니다"
+msgstr "\tVTOD 진행 중이므로 보관하지 않습니다"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\t반복하기. 종료 연: %04d, 월: %02d, 일: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
-msgstr "압축 완료\n"
+msgstr "보관처리 완료\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
-msgstr "압축 제거 개시."
+msgstr "보관내용 제거 시작중입니다."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\t1단계: 반복일정 리셋"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
-msgstr "\t2단계: 압축된 일정을 가져옴"
+msgstr "\t2단계: 보관한 일정을 가져옴"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
-msgstr "압축 제거 완료\n"
+msgstr "보관내용 제거 완료\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
-msgstr "Orage 기본 알리미"
+msgstr "Orage 기본 알림"
+
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "메인 Orage 파일에 대한 알림을 만들었습니다:"
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "외부 파일에 대한 알림 목록을 만들었습니다: %s (%s)"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "알리미 목록 만들기: 추가한 알리미 %d개. 처리한 이벤트 %d개."
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "⇥%d개의 알림을 추가했습니다. %d개의 행사를 처리했습니다."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr "\t알리미 %d개 발견(동작중인 전체 알리미  %d, 반복 알리미  %d개 검색)"
+msgstr "\t알림 %d개 발견(동작중인 전체 알림  %d, 반복 알림  %d개 검색)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
-msgstr "화일 가져오기 전처리 개시"
+msgstr "파일 가져오기 전처리 개시"
 
 #: ../src/ical-expimp.c:158
 msgid "... Patched DCREATED to be CREATED."
-msgstr "... DCREATED를 CREATED로 변경"
+msgstr "... 패치한 DCREATED는 CREATED가 됩니다."
 
 #: ../src/ical-expimp.c:197
 msgid "... Patched timezone to Orage format."
-msgstr "... 시간대를 Orage 혁식으로 변경"
+msgstr "... 패치한 시간대는 Orage 형식이 됩니다."
 
 #: ../src/ical-expimp.c:206
 msgid "Import file preprocessing done"
-msgstr "화일 가져오기 완료"
+msgstr "파일 가져오기 완료"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "%s 파일의 외부 업데이트를 발견했습니다."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "외부에서 파일을 업데이트하여 알림과 달력을 새로 고칩니다."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
-msgstr "달력 화일"
+msgstr "달력 파일"
 
 #: ../src/interface.c:631
 msgid "Current foreign files"
-msgstr "사용중인 외부 화일"
+msgstr "사용중인 외부 파일"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "읽기 전용"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "읽고 쓰기 가능"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
-msgstr "***** 외부 화일 없음 *****"
+msgstr "***** 외부 파일 없음 *****"
+
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "외부 파일 추가에 실패했습니다"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage는 외부 파일을 10개 까지만 처리할 수 있습니다. 한계에 도달했습니다."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "파일 이름이 없습니다."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "이름이 없습니다."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "파일이 없습니다."
 
-#: ../src/interface.c:974
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Orage에 같은 파일 이름이 있습니다."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Orage에 같은 이름이 있습니다."
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "가져오기/내보내기"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "가져오기"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
-msgstr "화일에서 읽기:"
+msgstr "파일에서 읽기:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"쉼표(,)로 화일이름을 분리하십시오.\n"
-" 알림:쉼표는 Orage의 화일이름으로 사용할 수 없는 문자"
+msgstr "쉼표(,)로 파일 이름을 분리하십시오.\n 알림:쉼표는 Orage의 파일 이름으로 사용할 수 없는 문자"
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "내보내기"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
-msgstr "저장할 화일:"
+msgstr "저장할 파일:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "선택"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "모든 일정"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "이름붙인 일정"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"메인 화일의 일정만 읽어 들입니다.\n"
-"압축된 이벤트와 외부 이벤트는 내보내지 않습니다."
+msgstr "메인 파일의 일정만 읽어 들입니다.\n보관한 행사와 외부 행사는 내보내지 않습니다."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"메인 화일의 일정만 읽어 들입니다.\n"
-"이벤트는 내보내지 않습니다."
+msgstr "메인 파일의 일정만 읽어 들입니다.\n일정은 내보내지 않습니다."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
-msgstr "그냥 이벤트 목록 창에 끌어다 놓을 수 있습니다."
+msgstr "이벤트 목록 창에 쉽게 끌어다 놓을 수 있습니다."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
-msgstr "쉼표로 분리된 Orage의 일정 UID"
+msgstr "쉼표로 분리된 Orage의 일정 UID입니다."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
-msgstr "압축"
+msgstr "보관"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
-msgstr "현재 압축 기준( %d 개월)"
+msgstr "현재 보관 기준( %d 개월)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
-msgstr "매개변수로 압축 주기를 바꿀 수 있습니다."
+msgstr "매개변수로 보관 주기를 바꿀 수 있습니다."
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
-msgstr "당장 압축 풀기"
+msgstr "지금 보관내용 복귀"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"압축된 모든 이벤트를 메인 orage에 돌려 주고 압축화일을 삭제합니다.\n"
-"orage 일정을 뽑아내서 다른 시스템으로 이동하려는 경우에 \n"
-"상당히 편리한 기능입니다."
+msgstr "보관된 모든 행사를 메인 orage에 돌려 주고 보관 파일을 제거합니다.\norage 일정을 내보내서 다른 시스템으로 옮기려는 경우에 \n상당히 편리한 기능입니다."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
-msgstr "Orage 화일"
+msgstr "Orage 파일"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
-msgstr "Orage 달력 화일"
+msgstr "Orage 달력 파일"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "현재 화일"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "현재 파일:"
 
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "새로운 화일"
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "새 파일:"
 
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "적용 동작"
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "동작 옵션:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "이름 변경"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Orage 내부 화일만 이름을 바꿉니다.\n"
-"외부 화일 시스템에 대해서는 아무 짓도 안합니다.\n"
-"새로운 화일이 있어야만 합니다."
+msgstr "Orage 내부 파일만 이름을 바꿉니다.\n외부 파일 시스템에 대해서는 아무 짓도 안합니다.\n새로운 파일이 있어야만 합니다."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "복사"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr "현재의 화일을 복사하기 때문에 원본은 그대로 남아있습니다."
+msgstr "현재의 파일을 복사하기 때문에 원본은 그대로 남아있습니다."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "이동"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
-msgstr "현재의 화일을 다른 곳으로 옮깁니다."
+msgstr "현재의 파일을 다른 곳으로 옮깁니다."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
-msgstr "압축화일"
+msgstr "보관파일"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
-msgstr "외부화일"
+msgstr "외부파일"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
-msgstr "새로운 외부화일을 추가"
+msgstr "새로운 외부파일을 추가"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
-msgstr "외부 화일:"
+msgstr "외부 파일:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "선택사항"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "표시할 이름:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "읽기 전용"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Orage에서 이 화일을 절대로 변경하지 않기를 바라면 선택하십시오.\n"
-"외부화일을 수정하면, 원래 그 화일을 이용하던 프로그램과의 호환성을 읽게 될 지"
-"도 모름니다!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Orage에서 이 파일을 절대로 변경하지 않기를 바라면 선택하십시오.\n외부파일을 수정하면, 원래 그 파일을 이용하던 프로그램과의 호환성을 읽을 지도 모름니다!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "이 내부 이름은 사용자에게 파일 이름 대신 보여줍니다."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
-msgstr "데이터 교환 - Orageㄹ"
+msgstr "데이터 교환 - Orage"
 
-#: ../src/main.c:268
-#, fuzzy, c-format
+#: ../src/main.c:275
+#, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\t%s이고요, 버전은 %s( Xfce %s)\n"
-"\n"
+msgstr "\t%s 버전 %s입니다\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr "GNU GPL을 준수하면서 릴리즈되었습니다.\n"
+msgstr "GNU General Public License 조항에 따라 릴리즈했습니다.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr "\tGTK+-%d.%d.%d로 컴파일했고, "
+msgstr "\tGTK+-%d.%d.%d(으)로 컴파일했고, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
-msgstr "GTK+-%d.%d.%d를 사용합니다.\n"
+msgstr "GTK+-%d.%d.%d을(를) 사용합니다.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
-msgstr "DBUS를 이용해서 가져오기\n"
+msgstr "\t가져오기위해 DBUS를 사용합니다.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr "\tDBUS를 이용하지 않음. 가져오기의 일부기능만 사용\n"
+msgstr "\tDBUS를 이용하지 않음. 가져오기의 일부기능만 사용합니다.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
-msgstr "\t libnotify 사용\n"
+msgstr "\t libnotify를 사용합니다.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
-msgstr "\tlibnotify 사용안합\n"
+msgstr "\tlibnotify를 사용하지 않습니다.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
-msgstr "\t자동 압축 사용\n"
+msgstr "\t자동 보관을 사용합니다.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
-msgstr "\t자동압축 사용안함\n"
+msgstr "\t보관기능 사용안함.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
-msgstr ""
+msgstr "\t운영체제 패키지 libical을 사용합니다.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
+msgstr "\tlibical의 Orage 지역 버전을 사용합니다.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"사용법: orage [선택사항] [화일]\n"
-"\n"
+msgstr "사용법: orage [옵션] [파일]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
-msgstr "선택사항:\n"
+msgstr "옵션:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\torage의 버전을 보여줍니다.\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
-msgstr "--help (-h) \t\t지금 보고 있는 것을 보여줍니다.\n"
+msgstr "--help (-h) \t\t지금 보고 있는 내용을 보여줍니다.\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
-msgstr "--preferences (-p) \t속성 설정 창을 보여줍니다.\n"
+msgstr "--preferences (-p) \t기본 설정 창을 보여줍니다.\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr "--toggle (-t) \t\torage 보여주거나 감춤니다.\n"
+msgstr "--toggle (-t) \t\torage를 보여주거나 감춤니다.\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) 화일 [RW] \t외부화일을 추가합니다.\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) 파일 [RW] [이름] ⇥외부 파일을 추가합니다\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr "--remove-foreign (-r) 화일 \t외부화일을 제거합니다.\n"
+msgstr "--remove-foreign (-r) 파일 \t외부 파일을 제거합니다.\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--export (-e) file [appointment...] \tOrage 일정을 파일로 내보냅니다\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
-msgstr "화일=orage로 읽어들일 화일\n"
+msgstr "파일=orage로 읽어들일 파일\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\torage에 dbus를 포함하지 않았습니다.\n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\t'dbus [화일] 제외'와 '외부화일 제외' 선택사항(-a와 -r)은 orage를 실행시킬 "
-"때만 사용할 수 있습니다.\n"
+msgstr "\torage를 시작할 때만 dbus [파일]과 외부 파일 옵션(-a와 -r)을 사용할 수 있습니다.\n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"%s가 뭡니까\n"
-"\n"
+msgstr "\n알 수 없는 옵션 %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "데이터 교환(_E)"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
-msgstr "수정(_E)"
+msgstr "편집(_E)"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
-msgstr "선택한 날짜 보기(_d)"
+msgstr "선택한 날짜 보기(_D)"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
-msgstr "선택한 주 보기(_w)"
+msgstr "선택한 주 보기(_W)"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
-msgstr "오늘을 선택하세요(_T)"
+msgstr "오늘 선택(_T)"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "지역시간"
+msgstr "세계시간 표시(_G)"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "도움말(_H)"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "지정한 제목이 없습니다"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr "위치: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n참고:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "안함"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"제목: %s\n"
-" 시작:\t%s\n"
-" 끝:\t%s\n"
-"메모:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "제목: %s\n%s 시작:⇥%s\n기한:⇥%s\n완료:⇥%s%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"제목: %s\n"
-" 시작:\t%s\n"
-" 끝:\t%s\n"
-"메모:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "제목: %s⏎\n%s 시작:⇥%s⏎\n종료:⇥%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
-msgstr "<b>할일:</b>"
+msgstr "<b>할 일:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
-msgstr "<b>%s에 대한 이벤트:</b>"
+msgstr "<b>%s의 행사:</b>"
 
-#: ../src/mainbox.c:593
-#, fuzzy, c-format
+#: ../src/mainbox.c:660
+#, c-format
 msgid "<b>Events for %s - %s:</b>"
-msgstr "<b>%s에 대한 이벤트:</b>"
+msgstr "<b>%s - %s의 행사:</b>"
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "메인 설정"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "시간대"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
-msgstr "시간대를 반드시 설정하셔야합니다."
+msgstr "지역 시간대를 항상 정의하셔야 합니다."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
-msgstr "압축 기준(개월)"
+msgstr "보관 기준(개월)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
-msgstr "(0 = 압축안함)"
+msgstr "(0 = 보관 안함)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr "압축기능을 이용해서 시간과 공간을 절약하십시오."
+msgstr "보관기능을 이용해서 시간과 공간을 절약하십시오."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "소리 명령어"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr "알리미 기능에서 소리를 내도록 쉘에 전달하는 명령어입니다."
+msgstr "알림 기능에서 소리를 내도록 쉘에 전달하는 명령어입니다."
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "표시"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
+#: ../src/parameters.c:596
+msgid "Calendar window"
 msgstr "달력 창"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "달력 시각 요소 세부사항"
+
+#: ../src/parameters.c:609
 msgid "Show borders"
-msgstr "틀보이기"
+msgstr "틀 표시"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
-msgstr "메뉴 보이기"
+msgstr "메뉴 표시"
 
-#: ../src/parameters.c:632
-#, fuzzy
-msgid "Show month and year"
-msgstr "페이저에 보이기"
-
-#: ../src/parameters.c:639
-#, fuzzy
+#: ../src/parameters.c:622
 msgid "Show day names"
-msgstr "틀보이기(_f)"
+msgstr "요일 이름 표시"
 
-#: ../src/parameters.c:646
-#, fuzzy
+#: ../src/parameters.c:627
 msgid "Show week numbers"
-msgstr "틀보이기"
+msgstr "몇번째 주인지 표시"
 
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr "할일 목록 보이기"
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "연 월 표시"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "달력 정보 상자"
 
 #: ../src/parameters.c:660
+msgid "Show todo list"
+msgstr "할 일 목록 표시"
+
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
-msgstr ""
+msgstr "행사 창에 보여줄 날짜 수"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
-msgstr ""
+msgstr "0 = 모든 행사 목록을 표시하지 않습니다"
+
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "달력 모양새"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
-msgstr ""
+msgstr "모든 데스크톱에 표시"
 
-#: ../src/parameters.c:683
-#, fuzzy
+#: ../src/parameters.c:696
 msgid "Keep on top"
-msgstr "맨위로 설정"
+msgstr "맨 위에 유지"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
-msgstr "태스크바에 보이기"
+msgstr "작업표시줄에 표시"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
-msgstr "페이저에 보이기"
+msgstr "페이저에 표시"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
-msgstr "트레이에 보이기"
+msgstr "트레이에 표시"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "시작하면서 달력을"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
-msgstr "보여줌"
+msgstr "보이기"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
-msgstr "숨김"
+msgstr "숨기기"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "최소화"
 
-#: ../src/parameters.c:793
-#, fuzzy
-msgid "Extra settings"
-msgstr "기타"
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "달력 창"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "오늘을 선택하세요(_T)"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
-
-#: ../src/parameters.c:841
-#, fuzzy
-msgid "Use dynamic icon"
-msgstr "동정 아이콘 크기"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "메인 달력을 따닥하면 보입니다."
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "달력 창을 열었을 때"
+
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "오늘 날짜를 선택하십시오"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "이전에 선택한 날짜를 선택하십시오"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "표시할 달력 날짜를 두번 누르십시오"
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
 msgstr "일 단위 보기"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
-msgstr "이벤트 목록"
+msgstr "행사 목록"
 
-#: ../src/parameters.c:890
-#, fuzzy
-msgid "Eventlist window"
-msgstr "이벤트 목록"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "추가 설정"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "행사 목록 창"
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
-msgstr ""
+msgstr "행사 목록에 보여줄 추가 날짜 수"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
-msgstr ""
+msgstr "단지 기본값일 뿐입니다. 행사 목록 창에서 바꿀 수 있습니다."
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "처음 반복하는 행사만 표시"
 
-#: ../src/parameters.c:921
-msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "첫째날을 기본으로 하는 날짜 보기 창"
 
-#: ../src/parameters.c:938
-msgid "Orage Preferences"
-msgstr "Orage 속성"
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "주 첫째날"
 
-#: ../src/parameters.c:1050
-msgid "First Orage start. Searching default timezone."
-msgstr ""
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "선택한 날"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "동적 표시줄 아이콘 사용"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "동적 아이콘 사용"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "동적 이 달의 월, 일을 보여줍니다."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
+msgid "Use wakeup timer"
+msgstr "기상 시계 사용"
+
+#: ../src/parameters.c:973
+msgid ""
+"Use this timer if Orage has problems waking up properly after suspend or "
+"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "대기 또는 최대 절전 이후에 적절하게 시스템 상태를 복귀하는데 Orage에 문제가 있다면 이 시계를 사용합니다. (예를 들어 표시줄 아이콘을 새로 고치지 않거나 알림을 시작하지 않는 경우.)"
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "외부 파일에 시각 알림 기본 적용"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Orage 창"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "공지 알림"
 
-#: ../src/parameters.c:1069
-#, fuzzy, c-format
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "닫기 요청을 받으면 항상 끝내기"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "항상 끝내기"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "기본적으로 Orage는 닫기 요청을 받으면 백그라운드에 연 상태로 둡니다. 이 옵션은 닫기 요청을 받으면 Orage를 끝내도록 하고 백그라운드에 남아있지 않도록 합니다."
+
+#: ../src/parameters.c:1045
+msgid "Orage Preferences"
+msgstr "Orage 기본 설정"
+
+#: ../src/parameters.c:1157
+msgid "First Orage start. Searching default timezone."
+msgstr "Orage를 처음 시작합니다. 기본 시간대를 검색중입니다."
+
+#: ../src/parameters.c:1176
+#, c-format
 msgid "Default timezone set to %s."
-msgstr "시간대 설정:"
+msgstr "%s 기본 시간대로 설정했습니다."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
-msgstr ""
+msgstr "기본 시간대가 없으니 직접 설정하십시오."
 
 #: ../src/reminder.c:562
 msgid "Reminder "
@@ -1998,1773 +2134,2319 @@
 
 #: ../src/reminder.c:591
 msgid "Open"
-msgstr "열기f"
+msgstr "열기"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "알리미 - Orage"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "연기"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
+msgstr "시간을 정하고 나면 다시 알려주기"
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
-msgstr "다음 알리미:"
+msgstr "다음 활성 알림:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d 일 %02d 시간 %02d 분을: %s"
+msgstr "\n%02d 일 %02d 시간 %02d 분을: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"알리미가 설정되어 있지 않습니다."
+msgstr "\n활성화 한 알림이 없습니다"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
-msgstr "아프리카대륙"
+msgstr "아프리카"
 
 #: ../src/timezone_names.c:37
 msgid "Africa/Abidjan"
-msgstr "아프리카대륙/Abidjan"
+msgstr "아프리카/아비잔"
 
 #: ../src/timezone_names.c:38
 msgid "Africa/Accra"
-msgstr "아프리카대륙/Accra"
+msgstr "아프리카/아크라"
 
 #: ../src/timezone_names.c:39
 msgid "Africa/Addis_Ababa"
-msgstr "아프리카대륙/Addis_Ababa"
+msgstr "아프리카/아디스아바바"
 
 #: ../src/timezone_names.c:40
 msgid "Africa/Algiers"
-msgstr "아프리카대륙/Algiers"
+msgstr "아프리카/알제"
 
 #: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr "아프리카대륙/Asmera"
+msgid "Africa/Asmara"
+msgstr "Africa/Asmara"
 
 #: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr "아프리카대륙/Bamako"
+msgid "Africa/Asmera"
+msgstr "아프리카/아스메라"
 
 #: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr "아프리카대륙/Bangui"
+msgid "Africa/Bamako"
+msgstr "아프리카/바마코"
 
 #: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr "아프리카대륙/Banjul"
+msgid "Africa/Bangui"
+msgstr "아프리카/방구이"
 
 #: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr "아프리카대륙/Bissau"
+msgid "Africa/Banjul"
+msgstr "아프리카/반줄"
 
 #: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr "아프리카대륙/Blantyre"
+msgid "Africa/Bissau"
+msgstr "아프리카/비사우"
 
 #: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr "아프리카대륙/Brazzaville"
+msgid "Africa/Blantyre"
+msgstr "아프리카/블랜타이어"
 
 #: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr "아프리카대륙/Bujumbura"
+msgid "Africa/Brazzaville"
+msgstr "아프리카/브라자빌"
 
 #: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr "아프리카대륙/Cairo"
+msgid "Africa/Bujumbura"
+msgstr "아프리카/부줌부라"
 
 #: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr "아프리카대륙/Casablanca"
+msgid "Africa/Cairo"
+msgstr "아프리카/카이로"
 
 #: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr "아프리카대륙/Ceuta"
+msgid "Africa/Casablanca"
+msgstr "아프리카/카사블랑카"
 
 #: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr "아프리카대륙/Conakry"
+msgid "Africa/Ceuta"
+msgstr "아프리카/세우타"
 
 #: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr "아프리카대륙/Dakar"
+msgid "Africa/Conakry"
+msgstr "아프리카/코아크리"
 
 #: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr "아프리카대륙/Dar_es_Salaam"
+msgid "Africa/Dakar"
+msgstr "아프리카/다카르"
 
 #: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr "아프리카대륙/Djibouti"
+msgid "Africa/Dar_es_Salaam"
+msgstr "아프리카/다르에스살람"
 
 #: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr "아프리카대륙/Douala"
+msgid "Africa/Djibouti"
+msgstr "아프리카/지부티"
 
 #: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr "아프리카대륙/El_Aaiun"
+msgid "Africa/Douala"
+msgstr "아프리카/두알라"
 
 #: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr "아프리카대륙/Freetown"
+msgid "Africa/El_Aaiun"
+msgstr "아프리카/엘아이운"
 
 #: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr "아프리카대륙/Gaborone"
+msgid "Africa/Freetown"
+msgstr "아프리카/프리타운"
 
 #: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr "아프리카대륙/Harare"
+msgid "Africa/Gaborone"
+msgstr "아프리카/가보로네"
 
 #: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr "아프리카대륙/Johannesburg"
+msgid "Africa/Harare"
+msgstr "아프리카/하라레"
 
 #: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr "아프리카대륙/Kampala"
+msgid "Africa/Juba"
+msgstr "Africa/Juba"
 
 #: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr "아프리카대륙/Khartoum"
+msgid "Africa/Johannesburg"
+msgstr "아프리카/요하네스버그"
 
 #: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr "아프리카대륙/Kigali"
+msgid "Africa/Kampala"
+msgstr "아프리카/캄팔라"
 
 #: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr "아프리카대륙/Kinshasa"
+msgid "Africa/Khartoum"
+msgstr "아프리카/카르툼"
 
 #: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr "아프리카대륙/Lagos"
+msgid "Africa/Kigali"
+msgstr "아프리카/키갈리"
 
 #: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr "아프리카대륙/Libreville"
+msgid "Africa/Kinshasa"
+msgstr "아프리카/킨샤사"
 
 #: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr "아프리카대륙/Lome"
+msgid "Africa/Lagos"
+msgstr "아프리카/라고스"
 
 #: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr "아프리카대륙/Luanda"
+msgid "Africa/Libreville"
+msgstr "아프리카/리브르빌"
 
 #: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr "아프리카대륙/Lubumbashi"
+msgid "Africa/Lome"
+msgstr "아프리카/로메"
 
 #: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr "아프리카대륙/Lusaka"
+msgid "Africa/Luanda"
+msgstr "아프리카/르완다"
 
 #: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr "아프리카대륙/Malabo"
+msgid "Africa/Lubumbashi"
+msgstr "아프리카/루붐바시"
 
 #: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr "아프리카대륙/Maputo"
+msgid "Africa/Lusaka"
+msgstr "아프리카/루사카"
 
 #: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr "아프리카대륙/Maseru"
+msgid "Africa/Malabo"
+msgstr "아프리카/말라보"
 
 #: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr "아프리카대륙/Mbabane"
+msgid "Africa/Maputo"
+msgstr "아프리카/마푸투"
 
 #: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr "아프리카대륙/Mogadishu"
+msgid "Africa/Maseru"
+msgstr "아프리카/마세루"
 
 #: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr "아프리카대륙/Monrovia"
+msgid "Africa/Mbabane"
+msgstr "아프리카/음바바네"
 
 #: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr "아프리카대륙/Nairobi"
+msgid "Africa/Mogadishu"
+msgstr "아프리카/모가디슈"
 
 #: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr "아프리카대륙/Ndjamena"
+msgid "Africa/Monrovia"
+msgstr "아프리카/먼로비아"
 
 #: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr "아프리카대륙/Niamey"
+msgid "Africa/Nairobi"
+msgstr "아프리카/나이로비"
 
 #: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr "아프리카대륙/Nouakchott"
+msgid "Africa/Ndjamena"
+msgstr "아프리카/언자메이너"
 
 #: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr "아프리카대륙/Ouagadougou"
+msgid "Africa/Niamey"
+msgstr "아프리카/니아메"
 
 #: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr "아프리카대륙/Porto"
+msgid "Africa/Nouakchott"
+msgstr "아프리카/누악쇼트"
 
 #: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr "아프리카대륙/Sao_Tome"
+msgid "Africa/Ouagadougou"
+msgstr "아프리카/와가두구"
 
 #: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr "아프리카대륙/Timbuktu"
+msgid "Africa/Porto-Novo"
+msgstr "아프리카/포르토노보"
 
 #: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr "아프리카대륙/Tripoli"
+msgid "Africa/Sao_Tome"
+msgstr "아프리카/상투메"
 
 #: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr "아프리카대륙/Tunis"
+msgid "Africa/Timbuktu"
+msgstr "아프리카/팀북투"
 
 #: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr "아프리카대륙/Windhoek"
+msgid "Africa/Tripoli"
+msgstr "아프리카/트리폴리"
 
 #: ../src/timezone_names.c:89
-msgid "America"
-msgstr "아메리카대륙"
+msgid "Africa/Tunis"
+msgstr "아프리카/튀니스"
 
 #: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr "아메리카대륙"
+msgid "Africa/Windhoek"
+msgstr "아프리카/빈트후크"
 
 #: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr "아메리카대륙/Anchorage"
+msgid "America"
+msgstr "아메리카"
 
 #: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr "아메리카대륙/Anguilla"
+msgid "America/Adak"
+msgstr "아메리카"
 
 #: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr "아메리카대륙/Antigua"
+msgid "America/Anchorage"
+msgstr "아메리카/앵커리지"
 
 #: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr "아메리카대륙/Araguaina"
+msgid "America/Anguilla"
+msgstr "아메리카/앵길라"
 
 #: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr "아메리카대륙/Argentina/Buenos_Aires"
+msgid "America/Antigua"
+msgstr "아메리카/안티구아"
 
 #: ../src/timezone_names.c:96
-msgid "America/Argentina/Catamarca"
-msgstr "아메리카대륙//ArgentinaCatamarca"
+msgid "America/Araguaina"
+msgstr "아메리카/아라과이나"
 
 #: ../src/timezone_names.c:97
-msgid "America/Argentina/Cordoba"
-msgstr "아메리카대륙/Argentina/Cordoba"
+msgid "America/Argentina/Buenos_Aires"
+msgstr "아메리카/아르헨티나/부에노스아이레스"
 
 #: ../src/timezone_names.c:98
-msgid "America/Argentina/Jujuy"
-msgstr "아메리카대륙/Argentina/Jujuy"
+msgid "America/Argentina/Catamarca"
+msgstr "아메리카/아르헨티나/카타마르카"
 
 #: ../src/timezone_names.c:99
-msgid "America/Argentina/Mendoza"
-msgstr "아메리카대륙/Argentina/Mendoza"
+msgid "America/Argentina/ComodRivadavia"
+msgstr "America/Argentina/ComodRivadavia"
 
 #: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr "아메리카대륙/Aruba"
+msgid "America/Argentina/Cordoba"
+msgstr "아메리카/아르헨티나/코르도바"
 
 #: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr "아메리카대륙/Asuncion"
+msgid "America/Argentina/Jujuy"
+msgstr "아메리카/아르헨티나/후후이"
 
 #: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr "아메리카대륙/Barbados"
+msgid "America/Argentina/La_Rioja"
+msgstr "America/Argentina/La_Rioja"
 
 #: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr "아메리카대륙/Belem"
+msgid "America/Argentina/Mendoza"
+msgstr "아메리카/아르헨티나/멘도쟈"
 
 #: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr "아메리카대륙/Belize"
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "America/Argentina/Rio_Gallegos"
 
 #: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr "아메리카대륙/Boa_Vista"
+msgid "America/Argentina/Salta"
+msgstr "America/Argentina/Salta"
 
 #: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr "아메리카대륙/Bogota"
+msgid "America/Argentina/San_Juan"
+msgstr "America/Argentina/San_Juan"
 
 #: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr "아메리카대륙/Boise"
+msgid "America/Argentina/San_Luis"
+msgstr "America/Argentina/San_Luis"
 
 #: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr "아메리카대륙/Buenos_Aires"
+msgid "America/Argentina/Tucuman"
+msgstr "America/Argentina/Tucuman"
 
 #: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr "아메리카대륙/Cambridge_Bay"
+msgid "America/Argentina/Ushuaia"
+msgstr "America/Argentina/Ushuaia"
 
 #: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr "아메리카대륙/Cancun"
+msgid "America/Aruba"
+msgstr "아메리카/아루바"
 
 #: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr "아메리카대륙/Caracas"
+msgid "America/Asuncion"
+msgstr "아메리카/아순시온"
 
 #: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr "아메리카대륙/Catamarca"
+msgid "America/Atikokan"
+msgstr "America/Atikokan"
 
 #: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr "아메리카대륙/Cayenne"
+msgid "America/Atka"
+msgstr "America/Atka"
 
 #: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr "아메리카대륙/Cayman"
+msgid "America/Bahia"
+msgstr "America/Bahia"
 
 #: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr "아메리카대륙/Chicago"
+msgid "America/Bahia_Banderas"
+msgstr "America/Bahia_Banderas"
 
 #: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr "아메리카대륙/Chihuahua"
+msgid "America/Barbados"
+msgstr "아메리카/바베이도스"
 
 #: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr "아메리카대륙/Cordoba"
+msgid "America/Belem"
+msgstr "아메리카/벨렘"
 
 #: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr "아메리카대륙/Costa_Rica"
+msgid "America/Belize"
+msgstr "아메리카/벨리즈"
 
 #: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr "아메리카대륙/Cuiaba"
+msgid "America/Blanc-Sablon"
+msgstr "America/Blanc-Sablon"
 
 #: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr "아메리카대륙/Curacao"
+msgid "America/Boa_Vista"
+msgstr "아메리카/보아비스타"
 
 #: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr "아메리카대륙/Dawson"
+msgid "America/Bogota"
+msgstr "아메리카/보고타"
 
 #: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr "아메리카대륙/Dawson_Creek"
+msgid "America/Boise"
+msgstr "아메리카/보이시"
 
 #: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr "아메리카대륙/Denver"
+msgid "America/Buenos_Aires"
+msgstr "아메리카/부에노스아이레스"
 
 #: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr "아메리카대륙/Detroit"
+msgid "America/Cambridge_Bay"
+msgstr "아메리카/케임브리지베이"
 
 #: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr "아메리카대륙/Dominica"
+msgid "America/Campo_Grande"
+msgstr "America/Campo_Grande"
 
 #: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr "아메리카대륙/Edmonton"
+msgid "America/Cancun"
+msgstr "아메리카/칸쿤"
 
 #: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr "아메리카대륙/Eirunepe"
+msgid "America/Caracas"
+msgstr "아메리카/카라카스"
 
 #: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr "아메리카대륙/El_Salvador"
+msgid "America/Catamarca"
+msgstr "아메리카/카타마르카"
 
 #: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr "아메리카대륙/Fortaleza"
+msgid "America/Cayenne"
+msgstr "아메리카/카옌"
 
 #: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr "아메리카대륙/Glace_Bay"
+msgid "America/Cayman"
+msgstr "아메리카/케이먼"
 
 #: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr "아메리카대륙/Godthab"
+msgid "America/Chicago"
+msgstr "아메리카/시카고"
 
 #: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr "아메리카대륙/Goose_Bay"
+msgid "America/Chihuahua"
+msgstr "아메리카/치와와"
 
 #: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr "아메리카대륙/Grand_Turk"
+msgid "America/Coral_Harbour"
+msgstr "America/Coral_Harbour"
 
 #: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr "아메리카대륙/Grenada"
+msgid "America/Cordoba"
+msgstr "아메리카/꼬르도바"
 
 #: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr "아메리카대륙/Guadeloupe"
+msgid "America/Costa_Rica"
+msgstr "아메리카/코스타리카"
 
 #: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr "아메리카대륙/Guatemala"
+msgid "America/Creston"
+msgstr "America/Creston"
 
 #: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr "아메리카대륙/Guayaquil"
+msgid "America/Cuiaba"
+msgstr "아메리카/쿠이아바"
 
 #: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr "아메리카대륙/Guyana"
+msgid "America/Curacao"
+msgstr "아메리카/쿠라카오"
 
 #: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr "아메리카대륙/Halifax"
+msgid "America/Danmarkshavn"
+msgstr "America/Danmarkshavn"
 
 #: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr "아메리카대륙/Havana"
+msgid "America/Dawson"
+msgstr "아메리카/도슨"
 
 #: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr "아메리카대륙/Hermosillo"
+msgid "America/Dawson_Creek"
+msgstr "아메리카/도슨크릭"
 
 #: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr "아메리카대륙/Indiana/Indianapolis"
+msgid "America/Denver"
+msgstr "아메리카/덴버"
 
 #: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr "아메리카대륙/Indiana"
+msgid "America/Detroit"
+msgstr "아메리카/디트로이트"
 
 #: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr "아메리카대륙/Indiana/Marengo"
+msgid "America/Dominica"
+msgstr "아메리카/도미니카"
 
 #: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr "아메리카대륙/Indiana/Vevay"
+msgid "America/Edmonton"
+msgstr "아메리카/에드먼튼"
 
 #: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr "아메리카대륙/Indianapolis"
+msgid "America/Ensenada"
+msgstr "America/Ensenada"
 
 #: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr "아메리카대륙/Inuvik"
+msgid "America/Eirunepe"
+msgstr "아메리카/에이루네페"
 
 #: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr "아메리카대륙/Iqaluit"
+msgid "America/El_Salvador"
+msgstr "아메리카/엘살바도르"
 
 #: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr "아메리카대륙/Jamaica"
+msgid "America/Fortaleza"
+msgstr "아메리카/포르탈레자"
 
 #: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr "아메리카대륙/Jujuy"
+msgid "America/Fort_Wayne"
+msgstr "America/Fort_Wayne"
 
 #: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr "아메리카대륙/Juneau"
+msgid "America/Glace_Bay"
+msgstr "아메리카/글레이스베이"
 
 #: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr "아메리카대륙/Kentucky/Louisville"
+msgid "America/Godthab"
+msgstr "아메리카/고드호프"
 
 #: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr "아메리카대륙/Kentucky/Monticello"
+msgid "America/Goose_Bay"
+msgstr "아메리카/구스베이"
 
 #: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr "아메리카대륙/La_Paz"
+msgid "America/Grand_Turk"
+msgstr "아메리카/그랜드터크"
 
 #: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr "아메리카대륙/Lima"
+msgid "America/Grenada"
+msgstr "아메리카/그레나다"
 
 #: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr "아메리카대륙/Los_Angeles"
+msgid "America/Guadeloupe"
+msgstr "아메리카/과들루프"
 
 #: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr "아메리카대륙/Louisville"
+msgid "America/Guatemala"
+msgstr "아메리카/과테말라"
 
 #: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr "아메리카대륙/Maceio"
+msgid "America/Guayaquil"
+msgstr "아메리카/과야킬"
 
 #: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr "아메리카대륙/Managua"
+msgid "America/Guyana"
+msgstr "아메리카/가이아나"
 
 #: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr "아메리카대륙/Manaus"
+msgid "America/Halifax"
+msgstr "아메리카/핼리팩스"
 
 #: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr "아메리카대륙/Martinique"
+msgid "America/Havana"
+msgstr "아메리카/아바나"
 
 #: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr "아메리카대륙/Mazatlan"
+msgid "America/Hermosillo"
+msgstr "아메리카/에르모시요"
 
 #: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr "아메리카대륙/Mendoza"
+msgid "America/Indiana/Indianapolis"
+msgstr "아메리카/인디아나/인니아나폴리스"
 
 #: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr "아메리카대륙/Menominee"
+msgid "America/Indiana/Knox"
+msgstr "아메리카/인디아나/녹스"
 
 #: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr "아메리카대륙/Merida"
+msgid "America/Indiana/Marengo"
+msgstr "아메리카/인디아나/마렝고"
 
 #: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr "아메리카대륙/Mexico_City"
+msgid "America/Indiana/Petersburg"
+msgstr "America/Indiana/Petersburg"
 
 #: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr "아메리카대륙/Miquelon"
+msgid "America/Indiana/Tell_City"
+msgstr "America/Indiana/Tell_City"
 
 #: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr "아메리카대륙/Monterrey"
+msgid "America/Indiana/Vevay"
+msgstr "아메리카/인디아나/비베이"
 
 #: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr "아메리카대륙/Montevideo"
+msgid "America/Indiana/Vincennes"
+msgstr "America/Indiana/Vincennes"
 
 #: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr "아메리카대륙/Montreal"
+msgid "America/Indiana/Winamac"
+msgstr "America/Indiana/Winamac"
 
 #: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr "아메리카대륙/Montserrat"
+msgid "America/Indianapolis"
+msgstr "아메리카/인디아나폴리스"
 
 #: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr "아메리카대륙/Nassau"
+msgid "America/Inuvik"
+msgstr "아메리카/이누빅"
 
 #: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr "아메리카대륙/New_York"
+msgid "America/Iqaluit"
+msgstr "아메리카/이콸루이트"
 
 #: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr "아메리카대륙/Nipigon"
+msgid "America/Jamaica"
+msgstr "아메리카/자메이카"
 
 #: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr "아메리카대륙/Nome"
+msgid "America/Jujuy"
+msgstr "아메리카/후후이"
 
 #: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr "아메리카대륙/Noronha"
+msgid "America/Juneau"
+msgstr "아메리카/주노"
 
 #: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr "아메리카대륙/Panama"
+msgid "America/Kentucky/Louisville"
+msgstr "아메리카/켄터키/루이빌"
 
 #: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr "아메리카대륙/Pangnirtung"
+msgid "America/Kentucky/Monticello"
+msgstr "아메리카/켄터키/몬티첼로"
 
 #: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr "아메리카대륙/Paramaribo"
+msgid "America/Knox_IN"
+msgstr "America/Knox_IN"
 
 #: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr "아메리카대륙/Phoenix"
+msgid "America/Kralendijk"
+msgstr "America/Kralendijk"
 
 #: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr "아메리카대륙/Port-au-Prince"
+msgid "America/La_Paz"
+msgstr "아메리카/라파스"
 
 #: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr "아메리카대륙/Port_of_Spain"
+msgid "America/Lima"
+msgstr "아메리카/리마"
 
 #: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr "아메리카대륙/Porto_Velho"
+msgid "America/Los_Angeles"
+msgstr "아메리카/로스앤젤레스"
 
 #: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr "아메리카대륙/Puerto_Rico"
+msgid "America/Louisville"
+msgstr "아메리카/루이빌"
 
 #: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr "아메리카대륙/Rainy_River"
+msgid "America/Lower_Princes"
+msgstr "America/Lower_Princes"
 
 #: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr "아메리카대륙/Rankin_Inlet"
+msgid "America/Maceio"
+msgstr "아메리카/마세이오"
 
 #: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr "아메리카대륙/Recife"
+msgid "America/Managua"
+msgstr "아메리카/마나과"
 
 #: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr "아메리카대륙/Regina"
+msgid "America/Manaus"
+msgstr "아메리카/마나우스"
 
 #: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr "아메리카대륙/Rio_Branco"
+msgid "America/Marigot"
+msgstr "America/Marigot"
 
 #: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr "아메리카대륙/Rosario"
+msgid "America/Martinique"
+msgstr "아메리카/마르티니끄"
 
 #: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr "아메리카대륙/Santiago"
+msgid "America/Matamoros"
+msgstr "America/Matamoros"
 
 #: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr "아메리카대륙/Santo_Domingo"
+msgid "America/Mazatlan"
+msgstr "아메리카/마사틀란"
 
 #: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr "아메리카대륙/Sao_Paulo"
+msgid "America/Mendoza"
+msgstr "아메리카/멘도자"
 
 #: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr "아메리카대륙/Scoresbysund"
+msgid "America/Menominee"
+msgstr "아메리카/메노미니"
 
 #: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr "아메리카대륙/Shiprock"
+msgid "America/Merida"
+msgstr "아메리카/메리다"
 
 #: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr "아메리카대륙/St_Johns"
+msgid "America/Metlakatla"
+msgstr "America/Metlakatla"
 
 #: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr "아메리카대륙/St_Kitts"
+msgid "America/Mexico_City"
+msgstr "아메리카/멕시코시티"
 
 #: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr "아메리카대륙/St_Lucia"
+msgid "America/Miquelon"
+msgstr "아메리카/미클롱"
 
 #: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr "아메리카대륙/St_Thomas"
+msgid "America/Moncton"
+msgstr "America/Moncton"
 
 #: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr "아메리카대륙/St_Vincent"
+msgid "America/Monterrey"
+msgstr "아메리카/몬테레이"
 
 #: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr "아메리카대륙/Swift_Current"
+msgid "America/Montevideo"
+msgstr "아메리카/몬테비데오"
 
 #: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr "아메리카대륙/Tegucigalpa"
+msgid "America/Montreal"
+msgstr "아메리카/몬트리얼"
 
 #: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr "아메리카대륙/Thule"
+msgid "America/Montserrat"
+msgstr "아메리카/몬세라트"
 
 #: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr "아메리카대륙/Thunder_Bay"
+msgid "America/Nassau"
+msgstr "아메리카/나소"
 
 #: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr "아메리카대륙/Tijuana"
+msgid "America/New_York"
+msgstr "아메리카/뉴욕"
 
 #: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr "아메리카대륙/Tortola"
+msgid "America/Nipigon"
+msgstr "아메리카/니피곤"
 
 #: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr "아메리카대륙/Vancouver"
+msgid "America/Nome"
+msgstr "아메리카/놈"
 
 #: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr "아메리카대륙/Whitehorse"
+msgid "America/North_Dakota/Beulah"
+msgstr "America/North_Dakota/Beulah"
 
 #: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr "아메리카대륙/Winnipeg"
+msgid "America/North_Dakota/Center"
+msgstr "America/North_Dakota/Center"
 
 #: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr "아메리카대륙/Yakutat"
+msgid "America/North_Dakota/New_Salem"
+msgstr "America/North_Dakota/New_Salem"
 
 #: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr "아메리카대륙/Yellowknife"
+msgid "America/Noronha"
+msgstr "아메리카/노로냐"
 
 #: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr "남극대륙"
+msgid "America/Ojinaga"
+msgstr "America/Ojinaga"
 
 #: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr "남극대륙/Casey"
+msgid "America/Panama"
+msgstr "아메리카/파나마"
 
 #: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr "남극대륙/Davis"
+msgid "America/Pangnirtung"
+msgstr "아메리카/팡니르퉁"
 
 #: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr "남극대륙/DumontDUrville"
+msgid "America/Paramaribo"
+msgstr "아메리카/팔라마리보"
 
 #: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr "남극대륙/Mawson"
+msgid "America/Phoenix"
+msgstr "아메리카/피닉스"
 
 #: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr "남극대륙/McMurdo"
+msgid "America/Port-au-Prince"
+msgstr "아메리카/포르토프랭스"
 
 #: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr "남극대륙/Palmer"
+msgid "America/Port_of_Spain"
+msgstr "아메리카/포트오브스페인"
 
 #: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr "남극대륙/South_Pole"
+msgid "America/Porto_Acre"
+msgstr "America/Porto_Acre"
 
 #: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr "남극대륙/Syowa"
+msgid "America/Porto_Velho"
+msgstr "아메리카/포르토벨료"
 
 #: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr "남극대륙/Vostok"
+msgid "America/Puerto_Rico"
+msgstr "아메리카/푸에르토리코"
 
 #: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr "북극대륙"
+msgid "America/Rainy_River"
+msgstr "아메리카/레이니강"
 
 #: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr "북극대륙/Longyearbyen"
+msgid "America/Rankin_Inlet"
+msgstr "아메리카/랑킨인렛"
 
 #: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr "아시아"
+msgid "America/Recife"
+msgstr "아메리카/헤시피"
 
 #: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr "아시아/Aden"
+msgid "America/Regina"
+msgstr "아메리카/레지나"
 
 #: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr "아시아/Almaty"
+msgid "America/Resolute"
+msgstr "America/Resolute"
 
 #: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr "아시아/Amman"
+msgid "America/Rio_Branco"
+msgstr "아메리카/리우브랑코"
 
 #: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr "아시아/Anadyr"
+msgid "America/Rosario"
+msgstr "아메리카/로사리오"
 
 #: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr "아시아/Aqtau"
+msgid "America/Santa_Isabel"
+msgstr "America/Santa_Isabel"
 
 #: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr "아시아/Aqtobe"
+msgid "America/Santarem"
+msgstr "America/Santarem"
 
 #: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr "아시아/Ashgabat"
+msgid "America/Santiago"
+msgstr "아메리카/산티아고"
 
 #: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr "아시아/Baghdad"
+msgid "America/Santo_Domingo"
+msgstr "아메리카/산토도밍고"
 
 #: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr "아시아/Bahrain"
+msgid "America/Sao_Paulo"
+msgstr "아메리카/상파울로"
 
 #: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr "아시아/Baku"
+msgid "America/Scoresbysund"
+msgstr "아메리카/스코레스뷔슨"
 
 #: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr "아시아/Bangkok"
+msgid "America/Shiprock"
+msgstr "아메리카/쉽록"
 
 #: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr "아시아/Beirut"
+msgid "America/Sitka"
+msgstr "America/Sitka"
 
 #: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr "아시아/Bishkek"
+msgid "America/St_Barthelemy"
+msgstr "America/St_Barthelemy"
 
 #: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr "아시아/Brunei"
+msgid "America/St_Johns"
+msgstr "아메리카/세인트존"
 
 #: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr "아시아/Calcutta"
+msgid "America/St_Kitts"
+msgstr "아메리카/세인트키츠"
 
 #: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr "아시아/Chungking"
+msgid "America/St_Lucia"
+msgstr "아메리카/세인트루시아"
 
 #: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr "아시아/Colombo"
+msgid "America/St_Thomas"
+msgstr "아메리카/세인트토마스"
 
 #: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr "아시아/Damascus"
+msgid "America/St_Vincent"
+msgstr "아메리카/세인트빈센트"
 
 #: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr "아시아/Dhaka"
+msgid "America/Swift_Current"
+msgstr "아메리카/스위프트커런트"
 
 #: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr "아시아/Dili"
+msgid "America/Tegucigalpa"
+msgstr "아메리카/테구시갈파"
 
 #: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr "아시아/Dubai"
+msgid "America/Thule"
+msgstr "아메리카/툴레"
 
 #: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr "아시아/Dushanbe"
+msgid "America/Thunder_Bay"
+msgstr "아메리카/선더베이"
 
 #: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr "아시아/Gaza"
+msgid "America/Tijuana"
+msgstr "아메리카/티후아나"
 
 #: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr "아시아/Harbin"
+msgid "America/Toronto"
+msgstr "America/Toronto"
 
 #: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr "아시아/Hong_Kong"
+msgid "America/Tortola"
+msgstr "아메리카/토르톨라"
 
 #: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr "아시아/Hovd"
+msgid "America/Vancouver"
+msgstr "아메리카/밴쿠버"
 
 #: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr "아시아/Irkutsk"
+msgid "America/Virgin"
+msgstr "America/Virgin"
 
 #: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr "아시아/Istanbul"
+msgid "America/Whitehorse"
+msgstr "아메리카/화이트호스"
 
 #: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr "아시아/Jakarta"
+msgid "America/Winnipeg"
+msgstr "아메리카/위니펙"
 
 #: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr "아시아/Jayapura"
+msgid "America/Yakutat"
+msgstr "아메리카/야쿠타트"
 
 #: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr "아시아/Jerusalem"
+msgid "America/Yellowknife"
+msgstr "아메리카/옐로나이프"
 
 #: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr "아시아/Kabul"
+msgid "Antarctica"
+msgstr "남극"
 
 #: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr "아시아/Kamchatka"
+msgid "Antarctica/Casey"
+msgstr "남극/케이시"
 
 #: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr "아시아/Karachi"
+msgid "Antarctica/Davis"
+msgstr "남극/데이비스"
 
 #: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr "아시아/Kashgar"
+msgid "Antarctica/DumontDUrville"
+msgstr "남극/뒤몽뒤르빌"
 
 #: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr "아시아/Katmandu"
+msgid "Antarctica/Macquarie"
+msgstr "Antarctica/Macquarie"
 
 #: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr "아시아/Krasnoyarsk"
+msgid "Antarctica/Mawson"
+msgstr "남극/모손"
 
 #: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr "아시아/Kuala_Lumpur"
+msgid "Antarctica/McMurdo"
+msgstr "남극/맥머도"
 
 #: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr "아시아/Kuching"
+msgid "Antarctica/Palmer"
+msgstr "남극/파머"
 
 #: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr "아시아/Kuwait"
+msgid "Antarctica/Rothera"
+msgstr "Antarctica/Rothera"
 
 #: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr "아시아/Macao"
+msgid "Antarctica/South_Pole"
+msgstr "남극/남극점"
 
 #: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr "아시아/Magadan"
+msgid "Antarctica/Syowa"
+msgstr "남극/쇼와"
 
 #: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr "아시아/Manila"
+msgid "Antarctica/Vostok"
+msgstr "남극/보스토크"
 
 #: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr "아시아/Muscat"
+msgid "Arctic"
+msgstr "북극"
 
 #: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr "아시아/Nicosia"
+msgid "Arctic/Longyearbyen"
+msgstr "북극/롱예르뷔엔"
 
 #: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr "아시아/Novosibirsk"
+msgid "Asia"
+msgstr "아시아"
 
 #: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr "아시아/Omsk"
+msgid "Asia/Aden"
+msgstr "아시아/아덴"
 
 #: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr "아시아/Phnom_Penh"
+msgid "Asia/Almaty"
+msgstr "아시아/알마티"
 
 #: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr "아시아/Pontianak"
+msgid "Asia/Amman"
+msgstr "아시아/암만"
 
 #: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr "아시아/Pyongyang"
+msgid "Asia/Anadyr"
+msgstr "아시아/아나디르"
 
 #: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr "아시아/Qatar"
+msgid "Asia/Aqtau"
+msgstr "아시아/악토"
 
 #: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr "아시아/Rangoon"
+msgid "Asia/Aqtobe"
+msgstr "아시아/악툐베"
 
 #: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr "아시아/Riyadh"
+msgid "Asia/Ashgabat"
+msgstr "아시아/아시가바트"
 
 #: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr "아시아/Saigon"
+msgid "Asia/Ashkhabad"
+msgstr "Asia/Ashkhabad"
 
 #: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr "아시아/Samarkand"
+msgid "Asia/Baghdad"
+msgstr "아시아/바그다드"
 
 #: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr "아시아/서울"
+msgid "Asia/Bahrain"
+msgstr "아시아/바레인"
 
 #: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr "아시아/Shanghai"
+msgid "Asia/Baku"
+msgstr "아시아/바쿠"
 
 #: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr "아시아/Singapore"
+msgid "Asia/Bangkok"
+msgstr "아시아/방콕"
 
 #: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr "아시아/Taipei"
+msgid "Asia/Beirut"
+msgstr "아시아/베이루트"
 
 #: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr "아시아/Tashkent"
+msgid "Asia/Bishkek"
+msgstr "아시아/비슈케크"
 
 #: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr "아시아/Tbilisi"
+msgid "Asia/Brunei"
+msgstr "아시아/브루나이"
 
 #: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr "아시아/Tehran"
+msgid "Asia/Calcutta"
+msgstr "아시아/캘커타"
 
 #: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr "아시아/Thimphu"
+msgid "Asia/Choibalsan"
+msgstr "Asia/Choibalsan"
 
 #: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr "아시아/Tokyo"
+msgid "Asia/Chongqing"
+msgstr "Asia/Chongqing"
 
 #: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr "아시아/Ujung_Pandang"
+msgid "Asia/Chungking"
+msgstr "아시아/충칭"
 
 #: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr "아시아/Ulaanbaatar"
+msgid "Asia/Colombo"
+msgstr "아시아/콜롬보"
 
 #: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr "아시아/Urumqi"
+msgid "Asia/Dacca"
+msgstr "Asia/Dacca"
 
 #: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr "아시아/Vientiane"
+msgid "Asia/Damascus"
+msgstr "아시아/다마스쿠스"
 
 #: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr "아시아/Vladivostok"
+msgid "Asia/Dhaka"
+msgstr "아시아/다카"
 
 #: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr "아시아/Yakutsk"
+msgid "Asia/Dili"
+msgstr "아시아/딜리"
 
 #: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr "아시아/Yekaterinburg"
+msgid "Asia/Dubai"
+msgstr "아시아/두바이"
 
 #: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr "아시아/Yerevan"
+msgid "Asia/Dushanbe"
+msgstr "아시아/두샨베"
 
 #: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr "대서양"
+msgid "Asia/Gaza"
+msgstr "아시아/가자"
 
 #: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr "대서양/Azores"
+msgid "Asia/Harbin"
+msgstr "아시아/하얼빈"
 
 #: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr "대서양/Bermuda"
+msgid "Asia/Hebron"
+msgstr "Asia/Hebron"
 
 #: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr "대서양/Canary"
+msgid "Asia/Hong_Kong"
+msgstr "아시아/홍콩"
 
 #: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr "대서양/Cape_Verde"
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Asia/Ho_Chi_Minh"
 
 #: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr "대서양/Faeroe"
+msgid "Asia/Hovd"
+msgstr "아시아/호브드"
 
 #: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr "대서양/Jan_Mayen"
+msgid "Asia/Irkutsk"
+msgstr "아시아/이르쿠츠크"
 
 #: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr "대서양/Madeira"
+msgid "Asia/Istanbul"
+msgstr "아시아/이스탄불"
 
 #: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr "대서양/Reykjavik"
+msgid "Asia/Jakarta"
+msgstr "아시아/자카르타"
 
 #: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr "대서양/South_Georgia"
+msgid "Asia/Jayapura"
+msgstr "아시아/자야푸라"
 
 #: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr "대서양/St_Helena"
+msgid "Asia/Jerusalem"
+msgstr "아시아/예루살렘"
 
 #: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr "대서양/Stanley"
+msgid "Asia/Kabul"
+msgstr "아시아/카불"
 
 #: ../src/timezone_names.c:309
+msgid "Asia/Kamchatka"
+msgstr "아시아/캄차카"
+
+#: ../src/timezone_names.c:310
+msgid "Asia/Karachi"
+msgstr "아시아/카라치"
+
+#: ../src/timezone_names.c:311
+msgid "Asia/Kashgar"
+msgstr "아시아/카슈가르"
+
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Asia/Kathmandu"
+
+#: ../src/timezone_names.c:313
+msgid "Asia/Katmandu"
+msgstr "아시아/카트만두"
+
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Asia/Khandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Asia/Kolkata"
+
+#: ../src/timezone_names.c:316
+msgid "Asia/Krasnoyarsk"
+msgstr "아시아/크라스노야르스크"
+
+#: ../src/timezone_names.c:317
+msgid "Asia/Kuala_Lumpur"
+msgstr "아시아/콸라름푸르"
+
+#: ../src/timezone_names.c:318
+msgid "Asia/Kuching"
+msgstr "아시아/쿠칭"
+
+#: ../src/timezone_names.c:319
+msgid "Asia/Kuwait"
+msgstr "아시아/쿠웨이트"
+
+#: ../src/timezone_names.c:320
+msgid "Asia/Macao"
+msgstr "아시아/마카오"
+
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Asia/Macau"
+
+#: ../src/timezone_names.c:322
+msgid "Asia/Magadan"
+msgstr "아시아/마가단"
+
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Asia/Makassar"
+
+#: ../src/timezone_names.c:324
+msgid "Asia/Manila"
+msgstr "아시아/마닐라"
+
+#: ../src/timezone_names.c:325
+msgid "Asia/Muscat"
+msgstr "아시아/무스카트"
+
+#: ../src/timezone_names.c:326
+msgid "Asia/Nicosia"
+msgstr "아시아/니코시아"
+
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Asia/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
+msgid "Asia/Novosibirsk"
+msgstr "아시아/노보시비르스크"
+
+#: ../src/timezone_names.c:329
+msgid "Asia/Omsk"
+msgstr "아시아/옴스크"
+
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Asia/Oral"
+
+#: ../src/timezone_names.c:331
+msgid "Asia/Phnom_Penh"
+msgstr "아시아/프놈펜"
+
+#: ../src/timezone_names.c:332
+msgid "Asia/Pontianak"
+msgstr "아시아/폰티아낙"
+
+#: ../src/timezone_names.c:333
+msgid "Asia/Pyongyang"
+msgstr "아시아/평양"
+
+#: ../src/timezone_names.c:334
+msgid "Asia/Qatar"
+msgstr "아시아/카타르"
+
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Asia/Qyzylorda"
+
+#: ../src/timezone_names.c:336
+msgid "Asia/Rangoon"
+msgstr "아시아/양곤"
+
+#: ../src/timezone_names.c:337
+msgid "Asia/Riyadh"
+msgstr "아시아/리야드"
+
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Asia/Riyadh87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Asia/Riyadh88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Asia/Riyadh89"
+
+#: ../src/timezone_names.c:341
+msgid "Asia/Saigon"
+msgstr "아시아/사이공"
+
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Asia/Sakhalin"
+
+#: ../src/timezone_names.c:343
+msgid "Asia/Samarkand"
+msgstr "아시아/사마르칸트"
+
+#: ../src/timezone_names.c:344
+msgid "Asia/Seoul"
+msgstr "아시아/서울"
+
+#: ../src/timezone_names.c:345
+msgid "Asia/Shanghai"
+msgstr "아시아/상하이"
+
+#: ../src/timezone_names.c:346
+msgid "Asia/Singapore"
+msgstr "아시아/싱가포르"
+
+#: ../src/timezone_names.c:347
+msgid "Asia/Taipei"
+msgstr "아시아/타이페이"
+
+#: ../src/timezone_names.c:348
+msgid "Asia/Tashkent"
+msgstr "아시아/타슈켄트"
+
+#: ../src/timezone_names.c:349
+msgid "Asia/Tbilisi"
+msgstr "아시아/트빌리시"
+
+#: ../src/timezone_names.c:350
+msgid "Asia/Tehran"
+msgstr "아시아/테헤란"
+
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Asia/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Asia/Thimbu"
+
+#: ../src/timezone_names.c:353
+msgid "Asia/Thimphu"
+msgstr "아시아/팀부"
+
+#: ../src/timezone_names.c:354
+msgid "Asia/Tokyo"
+msgstr "아시아/도쿄"
+
+#: ../src/timezone_names.c:355
+msgid "Asia/Ujung_Pandang"
+msgstr "아시아/우중판당"
+
+#: ../src/timezone_names.c:356
+msgid "Asia/Ulaanbaatar"
+msgstr "아시아/울란바타르"
+
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Asia/Ulan_Bator"
+
+#: ../src/timezone_names.c:358
+msgid "Asia/Urumqi"
+msgstr "아시아/우루무치"
+
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Asia/Ust-Nera"
+
+#: ../src/timezone_names.c:360
+msgid "Asia/Vientiane"
+msgstr "아시아/비엔티안"
+
+#: ../src/timezone_names.c:361
+msgid "Asia/Vladivostok"
+msgstr "아시아/블라디보스토크"
+
+#: ../src/timezone_names.c:362
+msgid "Asia/Yakutsk"
+msgstr "아시아/야쿠츠크"
+
+#: ../src/timezone_names.c:363
+msgid "Asia/Yekaterinburg"
+msgstr "아시아/예카테린부르크"
+
+#: ../src/timezone_names.c:364
+msgid "Asia/Yerevan"
+msgstr "아시아/예레반"
+
+#: ../src/timezone_names.c:365
+msgid "Atlantic"
+msgstr "대서양"
+
+#: ../src/timezone_names.c:366
+msgid "Atlantic/Azores"
+msgstr "대서양/아조레스"
+
+#: ../src/timezone_names.c:367
+msgid "Atlantic/Bermuda"
+msgstr "대서양/버뮤다"
+
+#: ../src/timezone_names.c:368
+msgid "Atlantic/Canary"
+msgstr "대서양/카나리아"
+
+#: ../src/timezone_names.c:369
+msgid "Atlantic/Cape_Verde"
+msgstr "대서양/카보베르데"
+
+#: ../src/timezone_names.c:370
+msgid "Atlantic/Faeroe"
+msgstr "대서양/페로"
+
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlantic/Faroe"
+
+#: ../src/timezone_names.c:372
+msgid "Atlantic/Jan_Mayen"
+msgstr "대서양/얀마이옌"
+
+#: ../src/timezone_names.c:373
+msgid "Atlantic/Madeira"
+msgstr "대서양/마데이라"
+
+#: ../src/timezone_names.c:374
+msgid "Atlantic/Reykjavik"
+msgstr "대서양/레이캬빅"
+
+#: ../src/timezone_names.c:375
+msgid "Atlantic/South_Georgia"
+msgstr "대서양/사우스조지아"
+
+#: ../src/timezone_names.c:376
+msgid "Atlantic/St_Helena"
+msgstr "대서양/세인트헬레나"
+
+#: ../src/timezone_names.c:377
+msgid "Atlantic/Stanley"
+msgstr "대서양/스탠리"
+
+#: ../src/timezone_names.c:378
 msgid "Australia"
 msgstr "오스트레일리아"
 
-#: ../src/timezone_names.c:310
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Australia/ACT"
+
+#: ../src/timezone_names.c:380
 msgid "Australia/Adelaide"
-msgstr "오스트레일리아/Adelaide"
+msgstr "오스트레일리아/애들레이드"
 
-#: ../src/timezone_names.c:311
+#: ../src/timezone_names.c:381
 msgid "Australia/Brisbane"
-msgstr "오스트레일리아/Brisbane"
+msgstr "오스트레일리아/브리즈번"
 
-#: ../src/timezone_names.c:312
+#: ../src/timezone_names.c:382
 msgid "Australia/Broken_Hill"
-msgstr "오스트레일리아/Broken_Hill"
+msgstr "오스트레일리아/브로큰힐"
 
-#: ../src/timezone_names.c:313
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Australia/Currie"
+
+#: ../src/timezone_names.c:384
 msgid "Australia/Darwin"
-msgstr "오스트레일리아/Darwin"
+msgstr "오스트레일리아/다윈"
 
-#: ../src/timezone_names.c:314
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Australia/Eucla"
+
+#: ../src/timezone_names.c:386
 msgid "Australia/Hobart"
-msgstr "오스트레일리아/Hobart"
+msgstr "오스트레일리아/호바트"
 
-#: ../src/timezone_names.c:315
+#: ../src/timezone_names.c:387
 msgid "Australia/Lindeman"
-msgstr "오스트레일리아/Lindeman"
+msgstr "오스트레일리아/린데먼"
 
-#: ../src/timezone_names.c:316
+#: ../src/timezone_names.c:388
 msgid "Australia/Lord_Howe"
-msgstr "오스트레일리아/Lord_Howe"
+msgstr "오스트레일리아/로드하우"
 
-#: ../src/timezone_names.c:317
+#: ../src/timezone_names.c:389
 msgid "Australia/Melbourne"
-msgstr "오스트레일리아/Melbourne"
+msgstr "오스트레일리아/멜버른"
 
-#: ../src/timezone_names.c:318
+#: ../src/timezone_names.c:390
 msgid "Australia/Perth"
-msgstr "오스트레일리아/Perth"
+msgstr "오스트레일리아/퍼스"
 
-#: ../src/timezone_names.c:319
+#: ../src/timezone_names.c:391
 msgid "Australia/Sydney"
-msgstr "오스트레일리아/Sydney"
+msgstr "오스트레일리아/시드니"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brazil"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brazil/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brazil/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brazil/East"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brazil/West"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Canada"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Canada/Atlantic"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Canada/Central"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Canada/East-Saskatchewan"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Canada/Eastern"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Canada/Mountain"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Canada/Newfoundland"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Canada/Pacific"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Canada/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Canada/Yukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Chile"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Chile/Continental"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Chile/EasterIsland"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Universal"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Zulu"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "유럽"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
-msgstr "유럽/Amsterdam"
+msgstr "유럽/암스테르담"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
-msgstr "유럽/Andorra"
+msgstr "유럽/안도라"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
-msgstr "유럽/Athens"
+msgstr "유럽/아테네"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
-msgstr "유럽/Belfast"
+msgstr "유럽/벨파스트"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
-msgstr "유럽/Belgrade"
+msgstr "유럽/베오그라드"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
-msgstr "유럽/Berlin"
+msgstr "유럽/베를린"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
-msgstr "유럽/Bratislava"
+msgstr "유럽/브라티슬라바"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
-msgstr "유럽/Brussels"
+msgstr "유럽/브뤼셀"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
-msgstr "유럽/Bucharest"
+msgstr "유럽/부쿠레슈티"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
-msgstr "유럽/Budapest"
+msgstr "유럽/부다페스트"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Europe/Busingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
-msgstr "유럽/Chisinau"
+msgstr "유럽/키시나우"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
-msgstr "유럽/Copenhagen"
+msgstr "유럽/코펜하겐"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
-msgstr "유럽/Dublin"
+msgstr "유럽/더블린"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
-msgstr "유럽/Gibraltar"
+msgstr "유럽/지브롤터"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Europe/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
-msgstr "유럽/Helsinki"
+msgstr "유럽/헬싱키"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Europe/Isle_of_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
-msgstr "유럽/Istanbul"
+msgstr "유럽/이스탄불"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Europe/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
-msgstr "유럽/Kaliningrad"
+msgstr "유럽/칼리닌그라드"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
-msgstr "유럽/Kiev"
+msgstr "유럽/키예프"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
-msgstr "유럽/Lisbon"
+msgstr "유럽/리스본"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
-msgstr "유럽/Ljubljana"
+msgstr "유럽/류블랴나"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
-msgstr "유럽/London"
+msgstr "유럽/런던"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
-msgstr "유럽/Luxembourg"
+msgstr "유럽/룩셈부르크"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
-msgstr "유럽/Madrid"
+msgstr "유럽/마드리드"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
-msgstr "유럽/Malta"
+msgstr "유럽/몰타"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Europe/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
-msgstr "유럽/Minsk"
+msgstr "유럽/민스크"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
-msgstr "유럽/Monaco"
+msgstr "유럽/모나코"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
-msgstr "유럽/Moscow"
+msgstr "유럽/모스크바"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
-msgstr "유럽/Nicosia"
+msgstr "유럽/니코시아"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
-msgstr "유럽/Oslo"
+msgstr "유럽/오슬로"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
-msgstr "유럽/Paris"
+msgstr "유럽/파리"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Europe/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
-msgstr "유럽/Prague"
+msgstr "유럽/프라하"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
-msgstr "유럽/Riga"
+msgstr "유럽/리가"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
-msgstr "유럽/Rome"
+msgstr "유럽/로마"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
-msgstr "유럽/Samara"
+msgstr "유럽/사마라"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
-msgstr "유럽/San_Marino"
+msgstr "유럽/산마리노"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
-msgstr "유럽/Sarajevo"
+msgstr "유럽/사라예보"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
-msgstr "유럽/Simferopol"
+msgstr "유럽/심페로폴"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
-msgstr "유럽/Skopje"
+msgstr "유럽/스코페"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
-msgstr "유럽/Sofia"
+msgstr "유럽/소피아"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
-msgstr "유럽/Stockholm"
+msgstr "유럽/스톡홀름"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
-msgstr "유럽/Tallinn"
+msgstr "유럽/탈린"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
-msgstr "유럽/Tirane"
+msgstr "유럽/티라나"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Europe/Tiraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
-msgstr "유럽/Uzhgorod"
+msgstr "유럽/우즈고로트"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
-msgstr "유럽/Vaduz"
+msgstr "유럽/바두츠"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
-msgstr "유럽/Vatican"
+msgstr "유럽/바티칸"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
-msgstr "유럽/Vienna"
+msgstr "유럽/비엔나"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
-msgstr "유럽/Vilnius"
+msgstr "유럽/빌뉴스"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Europe/Volgograd"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
-msgstr "유럽/Warsaw"
+msgstr "유럽/바르샤바"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
-msgstr "유럽/Zagreb"
+msgstr "유럽/자그레브"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
-msgstr "유럽/Zaporozhye"
+msgstr "유럽/자포로제"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
-msgstr "유럽/Zurich"
+msgstr "유럽/취리히"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "동인도"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
-msgstr "동인도/Antananarivo"
+msgstr "동인도/안타나나리보"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
-msgstr "동인도/Chagos"
+msgstr "동인도/차고스"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
-msgstr "동인도/Christmas"
+msgstr "동인도/크리스마스"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
-msgstr "동인도/Cocos"
+msgstr "동인도/코코스"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
-msgstr "동인도/Comoro"
+msgstr "동인도/코모로"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
-msgstr "동인도/Kerguelen"
+msgstr "동인도/케르구엘렌"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
-msgstr "동인도/Mahe"
+msgstr "동인도/마헤"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
-msgstr "동인도/Maldives"
+msgstr "동인도/몰디브"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
-msgstr "동인도/Mauritius"
+msgstr "동인도/모리셔스"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
-msgstr "동인도/Mayotte"
+msgstr "동인도/마요뜨"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
-msgstr "동인도/Reunion"
+msgstr "동인도/레위니옹"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Mexico"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Mexico/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Mexico/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Mexico/General"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Mideast"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Mideast/Riyadh87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Mideast/Riyadh88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Mideast/Riyadh89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "태평양"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
-msgstr "태평양/Apia"
+msgstr "태평양/아피아"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
-msgstr "태평양/Auckland"
+msgstr "태평양/오클랜드"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
-msgstr "태평양/Chatham"
+msgstr "태평양/채텀"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Pacific/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
-msgstr "태평양/Easter"
+msgstr "태평양/이스터"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
-msgstr "태평양/Efate"
+msgstr "태평양/에파테"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
-msgstr "태평양/Enderbury"
+msgstr "태평양/엔더베리"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
-msgstr "태평양/Fakaofo"
+msgstr "태평양/파카오포"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
-msgstr "태평양/Fiji"
+msgstr "태평양/피지"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
-msgstr "태평양/Funafuti"
+msgstr "태평양/푸나푸티"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
-msgstr "태평양/Galapagos"
+msgstr "태평양/갈라파고스"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
-msgstr "태평양/Gambier"
+msgstr "태평양/갬비어"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
-msgstr "태평양/Guadalcanal"
+msgstr "태평양/과달카날"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
-msgstr "태평양/Guam"
+msgstr "태평양/괌"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
-msgstr "태평양/Honolulu"
+msgstr "태평양/호놀룰루"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
-msgstr "태평양/Johnston"
+msgstr "태평양/존스턴"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
-msgstr "태평양/Kiritimati"
+msgstr "태평양/키리티마티"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
-msgstr "태평양/Kosrae"
+msgstr "태평양/코스라에"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
-msgstr "태평양/Kwajalein"
+msgstr "태평양/콰잘렌"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
-msgstr "태평양/Majuro"
+msgstr "태평양/마주로"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
-msgstr "태평양/Marquesas"
+msgstr "태평양/마르키즈"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
-msgstr "태평양/Midway"
+msgstr "태평양/미드웨이"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
-msgstr "태평양/Nauru"
+msgstr "태평양/나우루"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
-msgstr "태평양/Niue"
+msgstr "태평양/니우에"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
-msgstr "태평양/Norfolk"
+msgstr "태평양/노퍽"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
-msgstr "태평양/Noumea"
+msgstr "태평양/누메아"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
-msgstr "태평양/Pago_Pago"
+msgstr "태평양/파고_파고"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
-msgstr "태평양/Palau"
+msgstr "태평양/팔라우"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
-msgstr "태평양/Pitcairn"
+msgstr "태평양/핏케언"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Pacific/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
-msgstr "태평양/Ponape"
+msgstr "태평양/포나페"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
-msgstr "태평양/Port_Moresby"
+msgstr "태평양/포트모르즈비"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
-msgstr "태평양/Rarotonga"
+msgstr "태평양/라로통가"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
-msgstr "태평양/Saipan"
+msgstr "태평양/사이판"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pacific/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
-msgstr "태평양/Tahiti"
+msgstr "태평양/타히티"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
-msgstr "태평양/Tarawa"
+msgstr "태평양/타라와"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
-msgstr "태평양/Tongatapu"
+msgstr "태평양/통가타푸"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
-msgstr "태평양/Truk"
+msgstr "태평양/트럭"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
-msgstr "태평양/Wake"
+msgstr "태평양/웨이크"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
-msgstr "태평양/Wallis"
+msgstr "태평양/왈리스"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
-msgstr "태평양/Yap"
+msgstr "태평양/야프"
+
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "US"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "US/Alaska"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "US/Aleutian"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "US/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "US/Central"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "US/Eastern"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "US/East-Indiana"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "US/Hawaii"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "US/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "US/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "US/Mountain"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "US/Pacific"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "US/Pacific-New"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "US/Samoa"
 
 #: ../src/tray_icon.c:469
 msgid "New appointment"
-msgstr "새로운 일정"
+msgstr "새 일정"
 
 #: ../src/tray_icon.c:485
 msgid "About Orage"
-msgstr "Orage란..."
+msgstr "Orage 정보..."
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Orage Panel Clock"
-msgstr "Orage 시계"
+msgstr "Orage 패널 시계"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
 msgid "Show time and date?"
-msgstr "시간과 날짜는요?"
+msgstr "시간과 날짜를 보여줄까요?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "달력"
+msgid "Orage preferences"
+msgstr "Orage 기본 설정"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Orage 속성"
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr "Xfce 4 달력 프로그램(Orage)을 설정합니다"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Orage 속성"
+msgid "Orage Calendar Preferences"
+msgstr "Orage 달력 기본 설정"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Xfce 4 달력의 환경 설정"
-
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "작업 공간 달력"
-
 #: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "Orage - 달력"
-
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "제목: %s\n"
-#~ " 시작:\t%s\n"
-#~ " 기한:\t%s\n"
-#~ " 완료:\t%s\n"
-#~ "메모:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "이스케잎 문자열을 직접 입력해야만 합니다.\n"
-#~ "  처리하고자 하는 쉘에 전달하는 문자열입니다."
-
-#~ msgid "Orage clock"
-#~ msgstr "Orage 시계"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "원작자, 은퇴한 메인터너"
-
-#~ msgid "Contributor"
-#~ msgstr "도와주신 분들"
-
-#~ msgid "Info"
-#~ msgstr "정보"
-
-#~ msgid "Warning"
-#~ msgstr "경고"
-
-#~ msgid "Error"
-#~ msgstr "에러"
-
-#~ msgid "Set sticked"
-#~ msgstr "고정"
-
-#~ msgid "Select always today"
-#~ msgstr "항상 오늘을 선택합니다."
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "달력을 보일때, 전에 선택한 날짜를 보여줄 지 오늘을 가리키도록 할 지 결정합"
-#~ "니다."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "시간설정 모드 끝"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "시간설정 모드 시작"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "분 설정"
-
-#~ msgid "Vary"
-#~ msgstr "변함"
-
-#~ msgid "Select timezone"
-#~ msgstr "시간대 설정"
-
-#~ msgid "Modify Clock "
-#~ msgstr "시계 변경"
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "시간대를 입력하세요,\n"
-#~ "(=유효한 TZ 값)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "속성 편집"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "지역 시간대를 입력하세요. (시간뒤에 +/-를 붙여서 이전날짜(-) 또는 이후날짜"
-#~ "(+)를 알려줍니다."
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr "시간대 코드(TZ)를 입력하시거나 아래 목록에서 선택하십시오."
-
-#~ msgid "show line _1:"
-#~ msgstr "line_1 표시:"
-
-#~ msgid "show line _2:"
-#~ msgstr "line_2 표시:"
-
-#~ msgid "show line _3:"
-#~ msgstr "line_3 표시:"
-
-#~ msgid "Properties"
-#~ msgstr "속성"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "'orage -p'로 기동 실패"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D>  현재 날짜를 지역 날짜 형식으로 추가.\n"
-#~ "<T> 시간을 추가\n"
-#~ "<DT> 날짜와 시간을 추가."
-
-#~ msgid "Show event list"
-#~ msgstr "이벤트 목록 보이기"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = 고정크기 아이콘 사용)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "동적 아이콘은 트레이에 현재 날짜를 보여줍니다. 트레이가 작으면 고정 아이콘"
-#~ "으로 전환합니다."
+msgid "Calendar"
+msgstr "달력"
 
-#~ msgid "Calendar Settings"
-#~ msgstr "달력 설정"
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr "Orage 달력"
 
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Xfce 4 달력 설정"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "데스크톱 달력"
diff -Nru orage-4.8.3/po/ku.po orage-4.12.1/po/ku.po
--- orage-4.8.3/po/ku.po	2012-01-03 12:01:06.000000000 +0000
+++ orage-4.12.1/po/ku.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,3608 +0,0 @@
-# translation of ku.po to Kurdish
-# Copyright (C) 2003-2005 Mickaël Graf and The Xfce development team.
-# This file is distributed under the same license as the xfcalendar package.
-# Erdal Ronahi <erdal.ronahi@gmail.com>, 2005.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: xfcalendar 4.2.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2008-11-03 03:14+0100\n"
-"Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
-"Language-Team: Kurdish <ku@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ku\n"
-"Plural-Forms: n != 1\n"
-
-#: ../globaltime/globaltime.c:100
-msgid "Raising GlobalTime window..."
-msgstr ""
-
-#: ../globaltime/globaltime.c:102
-msgid "GlobalTime window raise failed"
-msgstr ""
-
-#. ********** timezone tooltip **********
-#: ../globaltime/globaltime.c:277
-#, c-format
-msgid ""
-"%s\n"
-"click to modify clock"
-msgstr ""
-
-#: ../globaltime/globaltime.c:386
-msgid "Localtime"
-msgstr ""
-
-#: ../globaltime/globaltime.c:464
-msgid ""
-"button 1 to change preferences \n"
-"button 2 to adjust time of clocks"
-msgstr ""
-
-#: ../globaltime/globaltime.c:480
-msgid "adjust to change hour"
-msgstr ""
-
-#: ../globaltime/globaltime.c:496
-msgid ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
-msgid "NEW"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:289
-msgid "NEW COPY"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:310
-msgid "Not possible to delete the last clock."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:516
-msgid "update this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
-msgid "add new empty clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:526
-msgid "add new clock using this clock as model"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:531
-msgid "delete this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:539
-msgid "move this clock first"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:544
-msgid "move this clock left"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:549
-msgid "move this clock right"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:554
-msgid "move this clock last"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:562
-msgid "set the timezone of this clock to be local timezone"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
-#, fuzzy
-msgid "close window and exit"
-msgstr "Paceyê _bigire"
-
-#: ../globaltime/gt_prefs.c:590
-#, fuzzy
-msgid "Globaltime preferences "
-msgstr "Vebijêrk"
-
-#. -----------------------HEADING-------------------------------------------
-#: ../globaltime/gt_prefs.c:603
-msgid "Clock Parameters"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:607
-msgid "Name of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:613
-msgid "enter name of clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:616
-msgid "Timezone of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:643
-msgid "Text Formatting"
-msgstr ""
-
-#. ------------------------background-------------------------
-#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
-msgid "Background color:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:656
-msgid "Click to change background colour for clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
-#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
-#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
-#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
-#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
-msgid "Use default"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
-#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
-#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
-msgid "Cross this to use default instead of selected value"
-msgstr ""
-
-#. ------------------------foreground-------------------------
-#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
-msgid "Foreground (=text) color:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:688
-msgid "Click to change foreground colour for clock"
-msgstr ""
-
-#. ------------------------name font-------------------------
-#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
-msgid "Font for name of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:720
-msgid "Click to change font for clock name"
-msgstr ""
-
-#. ------------------------time font-------------------------
-#: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
-msgid "Font for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:753
-msgid "Click to change font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:780
-msgid "Underline name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:810
-msgid "Underline time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:850
-msgid "Text Default Formatting"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:863
-msgid "Click to change default background colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
-msgid "Cross this to use system default instead of selected color"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:896
-msgid "Click to change default text colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:929
-msgid "Click to change default font for clock name"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
-msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:963
-msgid "Click to change default font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:990
-msgid "Underline for name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:1004
-msgid "Underline for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1027
-#, fuzzy
-msgid "update preferences"
-msgstr "Vebijêrk"
-
-#: ../globaltime/gt_prefs.c:1062
-#, fuzzy
-msgid "Globaltime Preferences"
-msgstr "Vebijêrk"
-
-#. -----------------------HEADING--------------------------------------
-#: ../globaltime/gt_prefs.c:1073
-#, fuzzy
-msgid "General Preferences"
-msgstr "Vebijêrk"
-
-#: ../globaltime/gt_prefs.c:1077
-msgid "Decorations:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1078
-msgid "Standard"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1083
-msgid "Use normal decorations"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1094
-msgid "Do not show window decorations (borders)"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1100
-msgid "Clock size:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1101
-msgid "Equal"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1106
-msgid "All clocks have same size"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1111
-#, fuzzy
-msgid "Varying"
-msgstr "Hişyar"
-
-#: ../globaltime/gt_prefs.c:1116
-msgid "Clock sizes vary"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1122
-msgid "Local timezone:"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:101
-#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
-msgid " Other"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:156
-#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
-#, c-format
-msgid "%d hour %d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:159
-#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, c-format
-msgid "%d hour"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:161
-#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, c-format
-msgid "%d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:167
-#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
-msgid "backward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:170
-#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-msgid "forward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:194
-#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
-msgid "not changed"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:195
-#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
-msgid "not changing"
-msgstr ""
-
-#. location
-#: ../globaltime/timezone_selection.c:247
-#: ../globaltime/timezone_selection.c:252
-#: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
-#: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
-msgid "Location"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:258
-#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
-msgid "GMT Offset"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:264
-#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
-msgid "Previous/Next Change"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:269
-#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
-msgid "Country"
-msgstr ""
-
-#. We are actually setting the g_par parameter. In other words
-#. we are setting the global default timezone for Orage. This is
-#. done very seldom and we do not want to allow "floating" here.
-#. This test is ugly, but it is not worth an extra parameter.
-#. this is normal appointment
-#: ../globaltime/timezone_selection.c:299
-#: ../globaltime/timezone_selection.c:309
-#: ../panel-plugin/timezone_selection.c:300
-#: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
-#: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
-msgid "Pick timezone"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:302
-#: ../globaltime/timezone_selection.c:312
-#: ../panel-plugin/timezone_selection.c:303
-#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
-#: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
-msgid "Change mode"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:303
-#: ../globaltime/timezone_selection.c:313
-#: ../globaltime/timezone_selection.c:352
-#: ../panel-plugin/timezone_selection.c:304
-#: ../panel-plugin/timezone_selection.c:314
-#: ../panel-plugin/timezone_selection.c:353 ../src/timezone_selection.c:320
-#: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
-#: ../src/timezone_selection.c:379
-msgid "UTC"
-msgstr ""
-
-#. NOTE: this exists only if ical timezones are being used
-#: ../globaltime/timezone_selection.c:304
-#: ../globaltime/timezone_selection.c:357
-#: ../panel-plugin/timezone_selection.c:305
-#: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
-#: ../src/timezone_selection.c:384
-msgid "floating"
-msgstr ""
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "Vebijêrk"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
-msgid "Orage Globaltime"
-msgstr "Salname"
-
-#: ../globaltime/globaltime.desktop.in.h:3
-msgid "Show clocks from different countries"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:224
-msgid "Appearance"
-msgstr ""
-
-#. show frame
-#: ../panel-plugin/oc_config.c:229
-msgid "Show _frame"
-msgstr ""
-
-#. foreground color
-#: ../panel-plugin/oc_config.c:239
-msgid "set foreground _color:"
-msgstr ""
-
-#. background color
-#: ../panel-plugin/oc_config.c:253
-msgid "set _background color:"
-msgstr ""
-
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
-msgid "set _height:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:277
-msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:282
-msgid "set _width:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:293
-msgid "Note that you can not change the width of vertical panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:316
-msgid "Clock Options"
-msgstr ""
-
-#. timezone
-#: ../panel-plugin/oc_config.c:326
-msgid "set timezone to:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:347
-#, c-format
-msgid "Line %d:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:357
-msgid "Enter any valid strftime function parameter."
-msgstr ""
-
-#. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
-msgid "Tooltip:"
-msgstr ""
-
-#. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
-msgid "fix time after suspend/hibernate"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:415
-msgid ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:432
-msgid ""
-"This program uses strftime function to get time.\n"
-"Use any valid code to get time in the format you prefer.\n"
-"Some common codes are:\n"
-"\t%A = weekday\t\t\t%B = month\n"
-"\t%c = date & time\t\t%R = hour & minute\n"
-"\t%V = week number\t\t%Z = timezone in use\n"
-"\t%H = hours \t\t\t\t%M = minute\n"
-"\t%X = local time\t\t\t%x = local date"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:457
-#, fuzzy
-msgid "Orage clock Preferences"
-msgstr "Vebijêrk"
-
-#. no lines yet
-#. TRANSLATORS: Use format characters from strftime(3)
-#. * to get the proper string for your locale.
-#. * I used these:
-#. * %A  : full weekday name
-#. * %d  : day of the month
-#. * %B  : full month name
-#. * %Y  : four digit year
-#. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
-msgid "%A %d %B %Y/%V"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:40
-msgid "Maintainer"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:47
-#, fuzzy
-msgid "Manage your time with Orage"
-msgstr "Dema xwe bi Xfce4 idare bike"
-
-#. if (gtk_toggle_button_get_active(
-#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
-#. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
-msgid "End"
-msgstr ""
-
-#: ../src/appointment.c:333
-msgid "Due"
-msgstr ""
-
-#: ../src/appointment.c:493 ../src/mainbox.c:783
-msgid "Orage"
-msgstr ""
-
-#. to avoid timing problems when updating entry
-#. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
-msgid "Select a file..."
-msgstr ""
-
-#: ../src/appointment.c:680
-msgid "Sound Files"
-msgstr ""
-
-#: ../src/appointment.c:687 ../src/interface.c:290
-msgid "All Files"
-msgstr ""
-
-#: ../src/appointment.c:739
-msgid "The appointment information has been modified."
-msgstr ""
-
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
-msgid "Do you want to continue?"
-msgstr ""
-
-#: ../src/appointment.c:767
-msgid "The end of this appointment is earlier than the beginning."
-msgstr ""
-
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-msgid "Not set"
-msgstr ""
-
-#: ../src/appointment.c:1193
-msgid "This appointment will be permanently removed."
-msgstr ""
-
-#: ../src/appointment.c:1692
-msgid "This appointment does not exist."
-msgstr ""
-
-#: ../src/appointment.c:1693
-msgid "It was probably removed, please refresh your screen."
-msgstr ""
-
-#: ../src/appointment.c:1995
-msgid "Current categories"
-msgstr ""
-
-#: ../src/appointment.c:2010
-msgid "Add new category with color"
-msgstr ""
-
-#: ../src/appointment.c:2014
-msgid "Category:"
-msgstr ""
-
-#: ../src/appointment.c:2045
-msgid "Colors of categories - Orage"
-msgstr ""
-
-#: ../src/appointment.c:2092
-msgid " *** COPY ***"
-msgstr ""
-
-#: ../src/appointment.c:2353
-msgid "New appointment - Orage"
-msgstr ""
-
-#. File menu stuff
-#. ********* File menu *********
-#. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
-msgid "_File"
-msgstr "_Pel"
-
-#: ../src/appointment.c:2388
-msgid "Sav_e and close"
-msgstr ""
-
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
-msgid "D_uplicate"
-msgstr ""
-
-#: ../src/appointment.c:2589
-msgid "Save"
-msgstr ""
-
-#: ../src/appointment.c:2591
-msgid "Save and close"
-msgstr ""
-
-#: ../src/appointment.c:2596
-msgid "Revert"
-msgstr ""
-
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
-msgid "Duplicate"
-msgstr ""
-
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
-msgid "Delete"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Free"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Busy"
-msgstr ""
-
-#: ../src/appointment.c:2625
-msgid "General"
-msgstr ""
-
-#. type
-#: ../src/appointment.c:2631
-msgid "Type "
-msgstr ""
-
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
-msgid "Event"
-msgstr ""
-
-#: ../src/appointment.c:2636
-msgid ""
-"Event that will happen sometime. For example:\n"
-"Meeting or birthday or TV show."
-msgstr ""
-
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-#, fuzzy
-msgid "Todo"
-msgstr "Îro"
-
-#: ../src/appointment.c:2642
-msgid ""
-"Something that you should do sometime. For example:\n"
-"Wash your car or test new version of Orage."
-msgstr ""
-
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
-#, fuzzy
-msgid "Journal"
-msgstr "Asayî"
-
-#: ../src/appointment.c:2649
-msgid ""
-"Make a note that something happened. For example:\n"
-"Remark that your mother called or first snow came."
-msgstr ""
-
-#. title
-#: ../src/appointment.c:2656
-msgid "Title "
-msgstr ""
-
-#: ../src/appointment.c:2671
-msgid "All day event"
-msgstr ""
-
-#. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
-msgid "Start"
-msgstr ""
-
-#: ../src/appointment.c:2697
-msgid "Set      "
-msgstr ""
-
-#: ../src/appointment.c:2718
-msgid "Duration"
-msgstr ""
-
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
-msgid "days"
-msgstr "roj"
-
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
-msgid "hours"
-msgstr ""
-
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
-msgid "mins"
-msgstr ""
-
-#. Availability (only for EVENT)
-#: ../src/appointment.c:2738
-msgid "Availability"
-msgstr ""
-
-#. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
-#, fuzzy
-msgid "Completed"
-msgstr "Kompakt"
-
-#: ../src/appointment.c:2749
-msgid "Done"
-msgstr ""
-
-#. categories
-#: ../src/appointment.c:2770
-msgid "Categories"
-msgstr ""
-
-#: ../src/appointment.c:2782
-msgid ""
-"This is special category, which can be used to color this appointment in "
-"list views."
-msgstr ""
-
-#: ../src/appointment.c:2787
-msgid "update colors for categories."
-msgstr ""
-
-#. priority
-#: ../src/appointment.c:2793
-msgid "Priority"
-msgstr ""
-
-#. note
-#: ../src/appointment.c:2803
-msgid "Note"
-msgstr ""
-
-#: ../src/appointment.c:2824
-msgid ""
-"These shorthand commands take effect immediately:\n"
-"    <D> inserts current date in local date format\n"
-"    <T> inserts time and\n"
-"    <DT> inserts date and time.\n"
-"\n"
-"These are converted only later when they are seen:\n"
-"    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before Start"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before End"
-msgstr ""
-
-#: ../src/appointment.c:2896
-msgid "After Start"
-msgstr ""
-
-#: ../src/appointment.c:2896
-msgid "After End"
-msgstr ""
-
-#: ../src/appointment.c:2903
-msgid "Alarm"
-msgstr ""
-
-#. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-msgid "Alarm time"
-msgstr ""
-
-#: ../src/appointment.c:2933
-msgid ""
-"Often you want to get alarm:\n"
-" 1) before Event start\n"
-" 2) before Todo end\n"
-" 3) after Todo start"
-msgstr ""
-
-#: ../src/appointment.c:2938
-msgid "Persistent alarm"
-msgstr ""
-
-#: ../src/appointment.c:2940
-msgid ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
-msgstr ""
-
-#. **** Audio Alarm ****
-#: ../src/appointment.c:2949
-msgid "Sound"
-msgstr ""
-
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
-msgid "Use"
-msgstr ""
-
-#: ../src/appointment.c:2955
-msgid "Select this if you want audible alarm"
-msgstr ""
-
-#: ../src/appointment.c:2972
-msgid "Repeat alarm sound"
-msgstr ""
-
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
-msgid "times"
-msgstr ""
-
-#: ../src/appointment.c:3004
-msgid "sec interval"
-msgstr ""
-
-#. **** Display Alarm ****
-#: ../src/appointment.c:3014
-msgid "Visual"
-msgstr ""
-
-#: ../src/appointment.c:3018
-#, fuzzy
-msgid "Use Orage window"
-msgstr "Paceyê _bigire"
-
-#: ../src/appointment.c:3020
-msgid "Select this if you want Orage window alarm"
-msgstr ""
-
-#: ../src/appointment.c:3032
-msgid "Use notification"
-msgstr ""
-
-#: ../src/appointment.c:3034
-msgid "Select this if you want notification alarm"
-msgstr ""
-
-#: ../src/appointment.c:3040
-msgid "Set timeout"
-msgstr ""
-
-#: ../src/appointment.c:3043
-msgid "Select this if you want notification to expire automatically"
-msgstr ""
-
-#: ../src/appointment.c:3054
-msgid "0 = system default expiration time"
-msgstr ""
-
-#: ../src/appointment.c:3059
-msgid "seconds"
-msgstr ""
-
-#. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
-msgid "Procedure"
-msgstr ""
-
-#: ../src/appointment.c:3076
-msgid "Select this if you want procedure or script alarm"
-msgstr ""
-
-#: ../src/appointment.c:3082
-msgid ""
-"You must enter all escape etc characters yourself.\n"
-"This string is just given to shell to process.\n"
-"The following special commands are replaced at run time:\n"
-"\t<&T>  appointment title\n"
-"\t<&D>  appointment description\n"
-"\t<&AT> alarm time\n"
-"\t<&ST> appointment start time\n"
-"\t<&ET> appointment end time"
-msgstr ""
-
-#: ../src/appointment.c:3094
-msgid "Test this alarm by raising it now"
-msgstr ""
-
-#: ../src/appointment.c:3101
-msgid "<b>Default alarm</b>"
-msgstr ""
-
-#: ../src/appointment.c:3109
-msgid "Store current settings as default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3114
-msgid "Set current settings from default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Daily"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Weekly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Monthly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Yearly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Hourly"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Mon"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Tue"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Wed"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Thu"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Fri"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Sat"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Sun"
-msgstr ""
-
-#: ../src/appointment.c:3183
-msgid "Recurrence"
-msgstr ""
-
-#. complexity
-#: ../src/appointment.c:3189
-msgid "Complexity"
-msgstr ""
-
-#: ../src/appointment.c:3192
-msgid "Basic"
-msgstr ""
-
-#: ../src/appointment.c:3198
-msgid "Advanced"
-msgstr ""
-
-#: ../src/appointment.c:3202
-msgid "Use this if you want regular repeating event"
-msgstr ""
-
-#: ../src/appointment.c:3204
-msgid ""
-"Use this if you need complex times like:\n"
-" Every Saturday and Sunday or \n"
-" First Tuesday every month"
-msgstr ""
-
-#. frequency
-#: ../src/appointment.c:3211
-msgid "Frequency"
-msgstr ""
-
-#: ../src/appointment.c:3217
-msgid "Each"
-msgstr ""
-
-#: ../src/appointment.c:3224
-msgid "occurrence"
-msgstr ""
-
-#: ../src/appointment.c:3228
-msgid ""
-"Limit frequency to certain interval.\n"
-" For example: Every third day:\n"
-" Frequency = Daily and Interval = 3"
-msgstr ""
-
-#: ../src/appointment.c:3274
-msgid "Limit"
-msgstr ""
-
-#: ../src/appointment.c:3276
-msgid "Repeat forever"
-msgstr ""
-
-#: ../src/appointment.c:3282
-msgid "Repeat "
-msgstr ""
-
-#: ../src/appointment.c:3298
-msgid "Repeat until "
-msgstr ""
-
-#. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-msgid "Weekdays"
-msgstr ""
-
-#: ../src/appointment.c:3323
-msgid "Which day"
-msgstr ""
-
-#: ../src/appointment.c:3331
-msgid ""
-"Specify which weekday for monthly and yearly events.\n"
-" For example:\n"
-" Second Wednesday each month:\n"
-"\tFrequency = Monthly,\n"
-"\tWeekdays = check only Wednesday,\n"
-"\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-
-#. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
-msgid "TODO base"
-msgstr ""
-
-#: ../src/appointment.c:3352
-msgid ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
-msgstr ""
-
-#: ../src/appointment.c:3354
-msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-
-#. exceptions
-#: ../src/appointment.c:3361
-msgid "Exceptions"
-msgstr ""
-
-#: ../src/appointment.c:3374
-msgid ""
-"Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
-"Remove by clicking the data."
-msgstr ""
-
-#: ../src/appointment.c:3379
-msgid "Add excluded date (-)"
-msgstr ""
-
-#: ../src/appointment.c:3381
-msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-
-#: ../src/appointment.c:3387
-msgid "Add included time (+)"
-msgstr ""
-
-#: ../src/appointment.c:3389
-msgid ""
-"Included times have same timezone than start time, but they may have "
-"different time"
-msgstr ""
-
-#. calendars showing the action days
-#: ../src/appointment.c:3406
-msgid "Action dates"
-msgstr ""
-
-#. ********* View menu *********
-#. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
-msgid "_View"
-msgstr "_Dîtin"
-
-#. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
-msgid "_Go"
-msgstr ""
-
-#: ../src/day-view.c:319 ../src/event-list.c:1110
-msgid "New"
-msgstr ""
-
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr ""
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Îro"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr ""
-
-#: ../src/day-view.c:333 ../src/event-list.c:1128
-msgid "Refresh"
-msgstr ""
-
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
-msgid "Close"
-msgstr ""
-
-#: ../src/day-view.c:454
-msgid "Unknown"
-msgstr ""
-
-#: ../src/day-view.c:704
-msgid "       Number of days to show"
-msgstr ""
-
-#: ../src/day-view.c:935
-msgid "Orage - day view"
-msgstr ""
-
-#. date only appointment
-#: ../src/event-list.c:190
-msgid "All day"
-msgstr ""
-
-#: ../src/event-list.c:580 ../src/event-list.c:1281
-msgid "Time"
-msgstr ""
-
-#: ../src/event-list.c:748
-msgid "No rows have been selected."
-msgstr ""
-
-#: ../src/event-list.c:749
-msgid "Click a row to select it and after that you can copy it."
-msgstr ""
-
-#: ../src/event-list.c:918
-msgid ""
-"You will permanently remove all\n"
-"selected appointments."
-msgstr ""
-
-#: ../src/event-list.c:1130
-msgid "Find"
-msgstr ""
-
-#: ../src/event-list.c:1137
-msgid "Dayview"
-msgstr ""
-
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr ""
-
-#: ../src/event-list.c:1201
-msgid "Journal entries starting from:"
-msgstr ""
-
-#: ../src/event-list.c:1221
-msgid "Search"
-msgstr ""
-
-#: ../src/event-list.c:1224
-msgid "Search text "
-msgstr ""
-
-#: ../src/event-list.c:1289
-msgid "Flags"
-msgstr ""
-
-#: ../src/event-list.c:1297
-msgid "Title"
-msgstr "Sernav"
-
-#: ../src/event-list.c:1323
-msgid ""
-"Double click line to edit it.\n"
-"\n"
-"Flags in order:\n"
-"\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
-"\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
-"\t 3. Type: f=free B=Busy\n"
-"\t 4. Located in file:\n"
-"\t\tO=Orage A=Archive F=Foreign\n"
-"\t 5. Appointment type:\n"
-"\t\tE=Event T=Todo J=Journal"
-msgstr ""
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr ""
-
-#. remove since it has ended
-#: ../src/ical-archive.c:267
-msgid "\tRecur ended, moving to archive file."
-msgstr ""
-
-#: ../src/ical-archive.c:329
-msgid "Archiving not enabled. Exiting"
-msgstr ""
-
-#: ../src/ical-archive.c:347
-#, c-format
-msgid "Archiving threshold: %d month(s)"
-msgstr ""
-
-#. yy mon day
-#: ../src/ical-archive.c:350
-#, c-format
-msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr ""
-
-#: ../src/ical-archive.c:377
-#, c-format
-msgid "Archiving uid: %s"
-msgstr ""
-
-#. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
-msgid "\tVTODO not complete; not archived"
-msgstr ""
-
-#. it is recurrent event
-#: ../src/ical-archive.c:388
-#, c-format
-msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr ""
-
-#: ../src/ical-archive.c:405
-msgid "Archiving done\n"
-msgstr ""
-
-#. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
-msgid "Starting archive removal."
-msgstr ""
-
-#: ../src/ical-archive.c:422
-msgid "\tPHASE 1: reset recurring appointments"
-msgstr ""
-
-#. PHASE 2: go through archive file and add everything back to base orage.
-#. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
-msgid "\tPHASE 2: return archived appointments"
-msgstr ""
-
-#: ../src/ical-archive.c:470
-msgid "Archive removal done\n"
-msgstr ""
-
-#: ../src/ical-code.c:932
-msgid "Orage default alarm"
-msgstr ""
-
-#: ../src/ical-code.c:3115
-#, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-
-#: ../src/ical-code.c:3117
-#, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-
-#: ../src/ical-expimp.c:123
-msgid "Starting import file preprocessing"
-msgstr ""
-
-#: ../src/ical-expimp.c:158
-msgid "... Patched DCREATED to be CREATED."
-msgstr ""
-
-#: ../src/ical-expimp.c:197
-msgid "... Patched timezone to Orage format."
-msgstr ""
-
-#: ../src/ical-expimp.c:206
-msgid "Import file preprocessing done"
-msgstr ""
-
-#: ../src/interface.c:284
-msgid "Calendar files"
-msgstr ""
-
-#: ../src/interface.c:631
-msgid "Current foreign files"
-msgstr ""
-
-#: ../src/interface.c:643
-msgid "READ ONLY"
-msgstr ""
-
-#: ../src/interface.c:645
-msgid "READ WRITE"
-msgstr ""
-
-#: ../src/interface.c:663
-msgid "***** No foreign files *****"
-msgstr ""
-
-#: ../src/interface.c:974
-msgid "Import/export"
-msgstr ""
-
-#: ../src/interface.c:981
-msgid "Import"
-msgstr ""
-
-#: ../src/interface.c:986
-msgid "Read from file:"
-msgstr ""
-
-#: ../src/interface.c:1003
-msgid ""
-"Separate filenames with comma(,).\n"
-" NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-
-#: ../src/interface.c:1008
-msgid "Export"
-msgstr ""
-
-#: ../src/interface.c:1013
-msgid "Write to file:"
-msgstr ""
-
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
-msgid "Select"
-msgstr "Îro _hilbijêre"
-
-#: ../src/interface.c:1037
-#, fuzzy
-msgid "All appointments"
-msgstr "Randevu"
-
-#: ../src/interface.c:1050
-#, fuzzy
-msgid "Named appointments: "
-msgstr "Randevu"
-
-#: ../src/interface.c:1062
-msgid ""
-"Note that only main file appointments are read.\n"
-"Archived and Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1065
-msgid ""
-"Note that only main file appointments are read.\n"
-"Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1068
-msgid "You can easily drag these from event-list window."
-msgstr ""
-
-#: ../src/interface.c:1070
-msgid "Orage appointment UIDs separated by commas."
-msgstr ""
-
-#: ../src/interface.c:1076
-msgid "Archive"
-msgstr ""
-
-#: ../src/interface.c:1084
-#, c-format
-msgid "Archive now (threshold: %d months)"
-msgstr ""
-
-#: ../src/interface.c:1094
-msgid "You can change archive threshold in parameters"
-msgstr ""
-
-#: ../src/interface.c:1101
-msgid "Revert archive now"
-msgstr ""
-
-#: ../src/interface.c:1107
-msgid ""
-"Return all archived events into main orage file and remove arch file.\n"
-"This is useful for example when doing export and moving orage\n"
-"appointments to another system."
-msgstr ""
-
-#: ../src/interface.c:1118
-msgid "Orage files"
-msgstr ""
-
-#: ../src/interface.c:1125
-msgid "Orage main calendar file"
-msgstr ""
-
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr ""
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr ""
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr ""
-
-#: ../src/interface.c:1156 ../src/interface.c:1222
-msgid "Rename"
-msgstr ""
-
-#: ../src/interface.c:1160
-msgid ""
-"Orage internal file rename only.\n"
-"Does not touch external filesystem at all.\n"
-"New file must exist."
-msgstr ""
-
-#: ../src/interface.c:1164 ../src/interface.c:1227
-msgid "Copy"
-msgstr ""
-
-#: ../src/interface.c:1168
-msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-
-#: ../src/interface.c:1172 ../src/interface.c:1232
-msgid "Move"
-msgstr "Guhestin"
-
-#: ../src/interface.c:1176
-msgid "Current file is moved and vanishes from the old place."
-msgstr ""
-
-#: ../src/interface.c:1190
-msgid "Archive file"
-msgstr ""
-
-#: ../src/interface.c:1254
-msgid "Foreign files"
-msgstr ""
-
-#: ../src/interface.c:1261
-msgid "Add new foreign file"
-msgstr ""
-
-#: ../src/interface.c:1266
-msgid "Foreign file:"
-msgstr ""
-
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr ""
-
-#: ../src/interface.c:1286
-msgid "Read only"
-msgstr ""
-
-#: ../src/interface.c:1294
-msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-
-#: ../src/interface.c:1308
-msgid "Exchange data - Orage"
-msgstr ""
-
-#: ../src/main.c:268
-#, c-format
-msgid ""
-"\tThis is %s version %s\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:270
-#, c-format
-msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
-
-#: ../src/main.c:271
-#, c-format
-msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
-
-#: ../src/main.c:273
-#, c-format
-msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
-
-#: ../src/main.c:276
-#, c-format
-msgid "\tUsing DBUS for import.\n"
-msgstr ""
-
-#: ../src/main.c:278
-#, c-format
-msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
-
-#: ../src/main.c:281
-#, c-format
-msgid "\tUsing libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:283
-#, c-format
-msgid "\tNot using libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:286
-#, c-format
-msgid "\tUsing automatic archiving.\n"
-msgstr ""
-
-#: ../src/main.c:288
-#, c-format
-msgid "\tNot using archiving.\n"
-msgstr ""
-
-#: ../src/main.c:291
-#, c-format
-msgid "\tUsing operating system package libical.\n"
-msgstr ""
-
-#: ../src/main.c:293
-#, c-format
-msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
-
-#: ../src/main.c:306
-#, c-format
-msgid ""
-"Usage: orage [options] [files]\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:307
-#, c-format
-msgid "Options:\n"
-msgstr ""
-
-#: ../src/main.c:308
-#, c-format
-msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
-
-#: ../src/main.c:309
-#, c-format
-msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
-
-#: ../src/main.c:310
-#, c-format
-msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
-
-#: ../src/main.c:311
-#, c-format
-msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
-
-#: ../src/main.c:312
-#, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:313
-#, c-format
-msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:314
-#, c-format
-msgid ""
-"--export (-e) file [appointment...] \texport appointments from Orage to "
-"file\n"
-msgstr ""
-
-#: ../src/main.c:316
-#, c-format
-msgid "files=ical files to load into orage\n"
-msgstr ""
-
-#: ../src/main.c:318
-#, c-format
-msgid "\tdbus not included in orage. \n"
-msgstr ""
-
-#: ../src/main.c:319
-#, c-format
-msgid ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
-msgstr ""
-
-#: ../src/main.c:511
-#, c-format
-msgid ""
-"\n"
-"Unknown option %s\n"
-"\n"
-msgstr ""
-
-#: ../src/mainbox.c:287
-msgid "_Exchange data"
-msgstr ""
-
-#. Edit menu
-#: ../src/mainbox.c:298
-msgid "_Edit"
-msgstr ""
-
-#: ../src/mainbox.c:308
-msgid "View selected _date"
-msgstr ""
-
-#: ../src/mainbox.c:311
-msgid "View selected _week"
-msgstr ""
-
-#: ../src/mainbox.c:317
-msgid "Select _Today"
-msgstr "Îro _hilbijêre"
-
-#: ../src/mainbox.c:323
-#, fuzzy
-msgid "Show _Globaltime"
-msgstr "Vebijêrk"
-
-#. Help menu
-#: ../src/mainbox.c:327
-msgid "_Help"
-msgstr "_Alîkarî"
-
-#: ../src/mainbox.c:448
-msgid "Never"
-msgstr ""
-
-#: ../src/mainbox.c:453
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:460
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:546
-msgid "<b>To do:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:582
-#, c-format
-msgid "<b>Events for %s:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:593
-#, c-format
-msgid "<b>Events for %s - %s:</b>"
-msgstr ""
-
-#: ../src/parameters.c:522
-#, fuzzy
-msgid "Main settings"
-msgstr "Mîhengên Salnameyê"
-
-#: ../src/parameters.c:528
-msgid "Timezone"
-msgstr ""
-
-#: ../src/parameters.c:543
-msgid "You should always define your local timezone."
-msgstr ""
-
-#: ../src/parameters.c:552
-msgid "Archive threshold (months)"
-msgstr ""
-
-#: ../src/parameters.c:562
-msgid "(0 = no archiving)"
-msgstr ""
-
-#: ../src/parameters.c:565
-msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-
-#: ../src/parameters.c:574
-msgid "Sound command"
-msgstr ""
-
-#: ../src/parameters.c:589
-msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Mîhengên Salnameyê"
-
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
-msgstr "Paceyê _bigire"
-
-#: ../src/parameters.c:618
-msgid "Show borders"
-msgstr ""
-
-#: ../src/parameters.c:625
-msgid "Show menu"
-msgstr ""
-
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr ""
-
-#: ../src/parameters.c:639
-msgid "Show day names"
-msgstr ""
-
-#: ../src/parameters.c:646
-msgid "Show week numbers"
-msgstr ""
-
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr ""
-
-#: ../src/parameters.c:660
-msgid "Number of days to show in event window"
-msgstr ""
-
-#: ../src/parameters.c:666
-msgid "0 = do not show event list at all"
-msgstr ""
-
-#: ../src/parameters.c:676
-msgid "Show on all desktops"
-msgstr ""
-
-#: ../src/parameters.c:683
-msgid "Keep on top"
-msgstr ""
-
-#: ../src/parameters.c:690
-msgid "Show in taskbar"
-msgstr ""
-
-#: ../src/parameters.c:697
-msgid "Show in pager"
-msgstr ""
-
-#: ../src/parameters.c:704
-msgid "Show in systray"
-msgstr ""
-
-#: ../src/parameters.c:739
-msgid "Calendar start"
-msgstr ""
-
-#: ../src/parameters.c:744
-msgid "Show"
-msgstr ""
-
-#: ../src/parameters.c:756
-msgid "Hide"
-msgstr ""
-
-#: ../src/parameters.c:768
-msgid "Minimized"
-msgstr ""
-
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr ""
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Paceyê _bigire"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "Îro _hilbijêre"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr ""
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
-
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr ""
-
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr ""
-
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr ""
-
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr ""
-
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
-
-#: ../src/parameters.c:921
-msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-
-#: ../src/parameters.c:938
-#, fuzzy
-msgid "Orage Preferences"
-msgstr "Vebijêrk"
-
-#: ../src/parameters.c:1050
-msgid "First Orage start. Searching default timezone."
-msgstr ""
-
-#: ../src/parameters.c:1069
-#, c-format
-msgid "Default timezone set to %s."
-msgstr ""
-
-#: ../src/parameters.c:1072
-msgid "Default timezone not found, please, set it manually."
-msgstr ""
-
-#: ../src/reminder.c:562
-#, fuzzy
-msgid "Reminder "
-msgstr "Bîranîn"
-
-#: ../src/reminder.c:591
-msgid "Open"
-msgstr ""
-
-#: ../src/reminder.c:722
-#, fuzzy
-msgid "Reminder - Orage"
-msgstr "Bîranîn"
-
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
-
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-
-#: ../src/reminder.c:1099
-msgid "Next active alarms:"
-msgstr ""
-
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
-#, c-format
-msgid ""
-"\n"
-"%02d d %02d h %02d min to: %s"
-msgstr ""
-
-#: ../src/reminder.c:1166
-#, c-format
-msgid ""
-"\n"
-"No active alarms found"
-msgstr ""
-
-#: ../src/timezone_names.c:36
-msgid "Africa"
-msgstr ""
-
-#: ../src/timezone_names.c:37
-msgid "Africa/Abidjan"
-msgstr ""
-
-#: ../src/timezone_names.c:38
-msgid "Africa/Accra"
-msgstr ""
-
-#: ../src/timezone_names.c:39
-msgid "Africa/Addis_Ababa"
-msgstr ""
-
-#: ../src/timezone_names.c:40
-msgid "Africa/Algiers"
-msgstr ""
-
-#: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr ""
-
-#: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr ""
-
-#: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr ""
-
-#: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr ""
-
-#: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr ""
-
-#: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr ""
-
-#: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr ""
-
-#: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr ""
-
-#: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr ""
-
-#: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr ""
-
-#: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr ""
-
-#: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr ""
-
-#: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr ""
-
-#: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr ""
-
-#: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr ""
-
-#: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr ""
-
-#: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr ""
-
-#: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr ""
-
-#: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr ""
-
-#: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr ""
-
-#: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr ""
-
-#: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr ""
-
-#: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr ""
-
-#: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr ""
-
-#: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr ""
-
-#: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr ""
-
-#: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr ""
-
-#: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr ""
-
-#: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr ""
-
-#: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr ""
-
-#: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr ""
-
-#: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr ""
-
-#: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr ""
-
-#: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr ""
-
-#: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr ""
-
-#: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr ""
-
-#: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr ""
-
-#: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr ""
-
-#: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr ""
-
-#: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr ""
-
-#: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr ""
-
-#: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr ""
-
-#: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr ""
-
-#: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr ""
-
-#: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr ""
-
-#: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr ""
-
-#: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr ""
-
-#: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr ""
-
-#: ../src/timezone_names.c:89
-msgid "America"
-msgstr ""
-
-#: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr ""
-
-#: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr ""
-
-#: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr ""
-
-#: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr ""
-
-#: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr ""
-
-#: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:96
-msgid "America/Argentina/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:97
-msgid "America/Argentina/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:98
-msgid "America/Argentina/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:99
-msgid "America/Argentina/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr ""
-
-#: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr ""
-
-#: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr ""
-
-#: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr ""
-
-#: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr ""
-
-#: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr ""
-
-#: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr ""
-
-#: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr ""
-
-#: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr ""
-
-#: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr ""
-
-#: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr ""
-
-#: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr ""
-
-#: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr ""
-
-#: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr ""
-
-#: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr ""
-
-#: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr ""
-
-#: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr ""
-
-#: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr ""
-
-#: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr ""
-
-#: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr ""
-
-#: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr ""
-
-#: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr ""
-
-#: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr ""
-
-#: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr ""
-
-#: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr ""
-
-#: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr ""
-
-#: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr ""
-
-#: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr ""
-
-#: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr ""
-
-#: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr ""
-
-#: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr ""
-
-#: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr ""
-
-#: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr ""
-
-#: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr ""
-
-#: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr ""
-
-#: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr ""
-
-#: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr ""
-
-#: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr ""
-
-#: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr ""
-
-#: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr ""
-
-#: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr ""
-
-#: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr ""
-
-#: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr ""
-
-#: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr ""
-
-#: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr ""
-
-#: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr ""
-
-#: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr ""
-
-#: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr ""
-
-#: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr ""
-
-#: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr ""
-
-#: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr ""
-
-#: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr ""
-
-#: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr ""
-
-#: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr ""
-
-#: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr ""
-
-#: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr ""
-
-#: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr ""
-
-#: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr ""
-
-#: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr ""
-
-#: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr ""
-
-#: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr ""
-
-#: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr ""
-
-#: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr ""
-
-#: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr ""
-
-#: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr ""
-
-#: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr ""
-
-#: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr ""
-
-#: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr ""
-
-#: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr ""
-
-#: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr ""
-
-#: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr ""
-
-#: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr ""
-
-#: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr ""
-
-#: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr ""
-
-#: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr ""
-
-#: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr ""
-
-#: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr ""
-
-#: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr ""
-
-#: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr ""
-
-#: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr ""
-
-#: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr ""
-
-#: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr ""
-
-#: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr ""
-
-#: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr ""
-
-#: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr ""
-
-#: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr ""
-
-#: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr ""
-
-#: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr ""
-
-#: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr ""
-
-#: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr ""
-
-#: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr ""
-
-#: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr ""
-
-#: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr ""
-
-#: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr ""
-
-#: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr ""
-
-#: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr ""
-
-#: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr ""
-
-#: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr ""
-
-#: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr ""
-
-#: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr ""
-
-#: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr ""
-
-#: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr ""
-
-#: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr ""
-
-#: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr ""
-
-#: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr ""
-
-#: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr ""
-
-#: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr ""
-
-#: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr ""
-
-#: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr ""
-
-#: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr ""
-
-#: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr ""
-
-#: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr ""
-
-#: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr ""
-
-#: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr ""
-
-#: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr ""
-
-#: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr ""
-
-#: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr ""
-
-#: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr ""
-
-#: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr ""
-
-#: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr ""
-
-#: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr ""
-
-#: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr ""
-
-#: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr ""
-
-#: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr ""
-
-#: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr ""
-
-#: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr ""
-
-#: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr ""
-
-#: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr ""
-
-#: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr ""
-
-#: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr ""
-
-#: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr ""
-
-#: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr ""
-
-#: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr ""
-
-#: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr ""
-
-#: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr ""
-
-#: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr ""
-
-#: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr ""
-
-#: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr ""
-
-#: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr ""
-
-#: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr ""
-
-#: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr ""
-
-#: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr ""
-
-#: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr ""
-
-#: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr ""
-
-#: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr ""
-
-#: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr ""
-
-#: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr ""
-
-#: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr ""
-
-#: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr ""
-
-#: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr ""
-
-#: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr ""
-
-#: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr ""
-
-#: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr ""
-
-#: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr ""
-
-#: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr ""
-
-#: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr ""
-
-#: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr ""
-
-#: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr ""
-
-#: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr ""
-
-#: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr ""
-
-#: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr ""
-
-#: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr ""
-
-#: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr ""
-
-#: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr ""
-
-#: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr ""
-
-#: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr ""
-
-#: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr ""
-
-#: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr ""
-
-#: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr ""
-
-#: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr ""
-
-#: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr ""
-
-#: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr ""
-
-#: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr ""
-
-#: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr ""
-
-#: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr ""
-
-#: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr ""
-
-#: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr ""
-
-#: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr ""
-
-#: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr ""
-
-#: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr ""
-
-#: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr ""
-
-#: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr ""
-
-#: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr ""
-
-#: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr ""
-
-#: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr ""
-
-#: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr ""
-
-#: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr ""
-
-#: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr ""
-
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr ""
-
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr ""
-
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr ""
-
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr ""
-
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr ""
-
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr ""
-
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr ""
-
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr ""
-
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr ""
-
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr ""
-
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr ""
-
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr ""
-
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr ""
-
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr ""
-
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr ""
-
-#: ../src/timezone_names.c:320
-msgid "Europe"
-msgstr ""
-
-#: ../src/timezone_names.c:321
-msgid "Europe/Amsterdam"
-msgstr ""
-
-#: ../src/timezone_names.c:322
-msgid "Europe/Andorra"
-msgstr ""
-
-#: ../src/timezone_names.c:323
-msgid "Europe/Athens"
-msgstr ""
-
-#: ../src/timezone_names.c:324
-msgid "Europe/Belfast"
-msgstr ""
-
-#: ../src/timezone_names.c:325
-msgid "Europe/Belgrade"
-msgstr ""
-
-#: ../src/timezone_names.c:326
-msgid "Europe/Berlin"
-msgstr ""
-
-#: ../src/timezone_names.c:327
-msgid "Europe/Bratislava"
-msgstr ""
-
-#: ../src/timezone_names.c:328
-msgid "Europe/Brussels"
-msgstr ""
-
-#: ../src/timezone_names.c:329
-msgid "Europe/Bucharest"
-msgstr ""
-
-#: ../src/timezone_names.c:330
-msgid "Europe/Budapest"
-msgstr ""
-
-#: ../src/timezone_names.c:331
-msgid "Europe/Chisinau"
-msgstr ""
-
-#: ../src/timezone_names.c:332
-msgid "Europe/Copenhagen"
-msgstr ""
-
-#: ../src/timezone_names.c:333
-msgid "Europe/Dublin"
-msgstr ""
-
-#: ../src/timezone_names.c:334
-msgid "Europe/Gibraltar"
-msgstr ""
-
-#: ../src/timezone_names.c:335
-msgid "Europe/Helsinki"
-msgstr ""
-
-#: ../src/timezone_names.c:336
-msgid "Europe/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:337
-msgid "Europe/Kaliningrad"
-msgstr ""
-
-#: ../src/timezone_names.c:338
-msgid "Europe/Kiev"
-msgstr ""
-
-#: ../src/timezone_names.c:339
-msgid "Europe/Lisbon"
-msgstr ""
-
-#: ../src/timezone_names.c:340
-msgid "Europe/Ljubljana"
-msgstr ""
-
-#: ../src/timezone_names.c:341
-msgid "Europe/London"
-msgstr ""
-
-#: ../src/timezone_names.c:342
-msgid "Europe/Luxembourg"
-msgstr ""
-
-#: ../src/timezone_names.c:343
-msgid "Europe/Madrid"
-msgstr ""
-
-#: ../src/timezone_names.c:344
-msgid "Europe/Malta"
-msgstr ""
-
-#: ../src/timezone_names.c:345
-msgid "Europe/Minsk"
-msgstr ""
-
-#: ../src/timezone_names.c:346
-msgid "Europe/Monaco"
-msgstr ""
-
-#: ../src/timezone_names.c:347
-msgid "Europe/Moscow"
-msgstr ""
-
-#: ../src/timezone_names.c:348
-msgid "Europe/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:349
-msgid "Europe/Oslo"
-msgstr ""
-
-#: ../src/timezone_names.c:350
-msgid "Europe/Paris"
-msgstr ""
-
-#: ../src/timezone_names.c:351
-msgid "Europe/Prague"
-msgstr ""
-
-#: ../src/timezone_names.c:352
-msgid "Europe/Riga"
-msgstr ""
-
-#: ../src/timezone_names.c:353
-msgid "Europe/Rome"
-msgstr ""
-
-#: ../src/timezone_names.c:354
-msgid "Europe/Samara"
-msgstr ""
-
-#: ../src/timezone_names.c:355
-msgid "Europe/San_Marino"
-msgstr ""
-
-#: ../src/timezone_names.c:356
-msgid "Europe/Sarajevo"
-msgstr ""
-
-#: ../src/timezone_names.c:357
-msgid "Europe/Simferopol"
-msgstr ""
-
-#: ../src/timezone_names.c:358
-msgid "Europe/Skopje"
-msgstr ""
-
-#: ../src/timezone_names.c:359
-msgid "Europe/Sofia"
-msgstr ""
-
-#: ../src/timezone_names.c:360
-msgid "Europe/Stockholm"
-msgstr ""
-
-#: ../src/timezone_names.c:361
-msgid "Europe/Tallinn"
-msgstr ""
-
-#: ../src/timezone_names.c:362
-msgid "Europe/Tirane"
-msgstr ""
-
-#: ../src/timezone_names.c:363
-msgid "Europe/Uzhgorod"
-msgstr ""
-
-#: ../src/timezone_names.c:364
-msgid "Europe/Vaduz"
-msgstr ""
-
-#: ../src/timezone_names.c:365
-msgid "Europe/Vatican"
-msgstr ""
-
-#: ../src/timezone_names.c:366
-msgid "Europe/Vienna"
-msgstr ""
-
-#: ../src/timezone_names.c:367
-msgid "Europe/Vilnius"
-msgstr ""
-
-#: ../src/timezone_names.c:368
-msgid "Europe/Warsaw"
-msgstr ""
-
-#: ../src/timezone_names.c:369
-msgid "Europe/Zagreb"
-msgstr ""
-
-#: ../src/timezone_names.c:370
-msgid "Europe/Zaporozhye"
-msgstr ""
-
-#: ../src/timezone_names.c:371
-msgid "Europe/Zurich"
-msgstr ""
-
-#: ../src/timezone_names.c:372
-msgid "Indian"
-msgstr ""
-
-#: ../src/timezone_names.c:373
-msgid "Indian/Antananarivo"
-msgstr ""
-
-#: ../src/timezone_names.c:374
-msgid "Indian/Chagos"
-msgstr ""
-
-#: ../src/timezone_names.c:375
-msgid "Indian/Christmas"
-msgstr ""
-
-#: ../src/timezone_names.c:376
-msgid "Indian/Cocos"
-msgstr ""
-
-#: ../src/timezone_names.c:377
-msgid "Indian/Comoro"
-msgstr ""
-
-#: ../src/timezone_names.c:378
-msgid "Indian/Kerguelen"
-msgstr ""
-
-#: ../src/timezone_names.c:379
-msgid "Indian/Mahe"
-msgstr ""
-
-#: ../src/timezone_names.c:380
-msgid "Indian/Maldives"
-msgstr ""
-
-#: ../src/timezone_names.c:381
-msgid "Indian/Mauritius"
-msgstr ""
-
-#: ../src/timezone_names.c:382
-msgid "Indian/Mayotte"
-msgstr ""
-
-#: ../src/timezone_names.c:383
-msgid "Indian/Reunion"
-msgstr ""
-
-#: ../src/timezone_names.c:384
-msgid "Pacific"
-msgstr ""
-
-#: ../src/timezone_names.c:385
-msgid "Pacific/Apia"
-msgstr ""
-
-#: ../src/timezone_names.c:386
-msgid "Pacific/Auckland"
-msgstr ""
-
-#: ../src/timezone_names.c:387
-msgid "Pacific/Chatham"
-msgstr ""
-
-#: ../src/timezone_names.c:388
-msgid "Pacific/Easter"
-msgstr ""
-
-#: ../src/timezone_names.c:389
-msgid "Pacific/Efate"
-msgstr ""
-
-#: ../src/timezone_names.c:390
-msgid "Pacific/Enderbury"
-msgstr ""
-
-#: ../src/timezone_names.c:391
-msgid "Pacific/Fakaofo"
-msgstr ""
-
-#: ../src/timezone_names.c:392
-msgid "Pacific/Fiji"
-msgstr ""
-
-#: ../src/timezone_names.c:393
-msgid "Pacific/Funafuti"
-msgstr ""
-
-#: ../src/timezone_names.c:394
-msgid "Pacific/Galapagos"
-msgstr ""
-
-#: ../src/timezone_names.c:395
-msgid "Pacific/Gambier"
-msgstr ""
-
-#: ../src/timezone_names.c:396
-msgid "Pacific/Guadalcanal"
-msgstr ""
-
-#: ../src/timezone_names.c:397
-msgid "Pacific/Guam"
-msgstr ""
-
-#: ../src/timezone_names.c:398
-msgid "Pacific/Honolulu"
-msgstr ""
-
-#: ../src/timezone_names.c:399
-msgid "Pacific/Johnston"
-msgstr ""
-
-#: ../src/timezone_names.c:400
-msgid "Pacific/Kiritimati"
-msgstr ""
-
-#: ../src/timezone_names.c:401
-msgid "Pacific/Kosrae"
-msgstr ""
-
-#: ../src/timezone_names.c:402
-msgid "Pacific/Kwajalein"
-msgstr ""
-
-#: ../src/timezone_names.c:403
-msgid "Pacific/Majuro"
-msgstr ""
-
-#: ../src/timezone_names.c:404
-msgid "Pacific/Marquesas"
-msgstr ""
-
-#: ../src/timezone_names.c:405
-msgid "Pacific/Midway"
-msgstr ""
-
-#: ../src/timezone_names.c:406
-msgid "Pacific/Nauru"
-msgstr ""
-
-#: ../src/timezone_names.c:407
-msgid "Pacific/Niue"
-msgstr ""
-
-#: ../src/timezone_names.c:408
-msgid "Pacific/Norfolk"
-msgstr ""
-
-#: ../src/timezone_names.c:409
-msgid "Pacific/Noumea"
-msgstr ""
-
-#: ../src/timezone_names.c:410
-msgid "Pacific/Pago_Pago"
-msgstr ""
-
-#: ../src/timezone_names.c:411
-msgid "Pacific/Palau"
-msgstr ""
-
-#: ../src/timezone_names.c:412
-msgid "Pacific/Pitcairn"
-msgstr ""
-
-#: ../src/timezone_names.c:413
-msgid "Pacific/Ponape"
-msgstr ""
-
-#: ../src/timezone_names.c:414
-msgid "Pacific/Port_Moresby"
-msgstr ""
-
-#: ../src/timezone_names.c:415
-msgid "Pacific/Rarotonga"
-msgstr ""
-
-#: ../src/timezone_names.c:416
-msgid "Pacific/Saipan"
-msgstr ""
-
-#: ../src/timezone_names.c:417
-msgid "Pacific/Tahiti"
-msgstr ""
-
-#: ../src/timezone_names.c:418
-msgid "Pacific/Tarawa"
-msgstr ""
-
-#: ../src/timezone_names.c:419
-msgid "Pacific/Tongatapu"
-msgstr ""
-
-#: ../src/timezone_names.c:420
-msgid "Pacific/Truk"
-msgstr ""
-
-#: ../src/timezone_names.c:421
-msgid "Pacific/Wake"
-msgstr ""
-
-#: ../src/timezone_names.c:422
-msgid "Pacific/Wallis"
-msgstr ""
-
-#: ../src/timezone_names.c:423
-msgid "Pacific/Yap"
-msgstr ""
-
-#: ../src/tray_icon.c:469
-msgid "New appointment"
-msgstr "Randevuya nû"
-
-#: ../src/tray_icon.c:485
-msgid "About Orage"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-msgid "Orage Panel Clock"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-msgid "Show time and date?"
-msgstr ""
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Salname"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Vebijêrk"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Vebijêrk"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr ""
-
-#: ../xfcalendar.desktop.in.h:2
-#, fuzzy
-msgid "Desktop calendar"
-msgstr "Der barê Xfsalname"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "Salname"
-
-#~ msgid "Contributor"
-#~ msgstr "Yên alîkarî kirine"
-
-#~ msgid "Warning"
-#~ msgstr "Hişyar"
-
-#, fuzzy
-#~ msgid "Select always today"
-#~ msgstr "Îro _hilbijêre"
-
-#, fuzzy
-#~ msgid "Modify Preferences"
-#~ msgstr "Vebijêrk"
-
-#~ msgid "Core developer"
-#~ msgstr "Afirandêrên bingehî"
-
-#~ msgid "Save (Ctrl+s)"
-#~ msgstr "Tomar bike (Ctrl+s)"
-
-#~ msgid "Previous day (Ctrl+p)"
-#~ msgstr "Do (Ctrl+p)"
-
-#~ msgid "Today (Alt+Home)"
-#~ msgstr "Îro (Alt+Home)"
-
-#~ msgid "Next day (Ctrl+n)"
-#~ msgstr "Roja pêş (Ctrl+n)"
-
-#~ msgid "Close (Ctrl+w)"
-#~ msgstr "Bigire (Ctrl+w)"
-
-#~ msgid "Clear (Ctrl+l)"
-#~ msgstr "Pakij bike (Ctrl+l)"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Tu dê her agahiya \n"
-#~ "girêdayî vê dîrokê tune bikî."
-
-#~ msgid "_Preferences"
-#~ msgstr "_Vebijêrk"
-
-#~ msgid "_About"
-#~ msgstr "_Der barê"
-
-#~ msgid "This should not happen"
-#~ msgstr "Pêwîst e ev nebe"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Nikare MCS client channel biafirîne"
-
-#~ msgid "Couldn't find pixmap file: %s"
-#~ msgstr "Dosiya pixmap nehat dîtin: %s"
diff -Nru orage-4.8.3/po/LINGUAS orage-4.12.1/po/LINGUAS
--- orage-4.8.3/po/LINGUAS	2011-11-24 09:58:21.000000000 +0000
+++ orage-4.12.1/po/LINGUAS	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-am ar ast az be bg bn_IN ca cs da de dz el en_AU en_GB eo es et eu fa fi fr gl gu he hi hr hu hy id it ja ka kk ko ku lt lv mk mr ms nb nl pa pl pt pt_BR ro ru si sk sq sv ta tr ug uk ur ur_PK vi zh_CN zh_TW
diff -Nru orage-4.8.3/po/lt.po orage-4.12.1/po/lt.po
--- orage-4.8.3/po/lt.po	2012-01-03 12:01:06.000000000 +0000
+++ orage-4.12.1/po/lt.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,28 +1,48 @@
-# Lithuanian translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Mantas Zapolskas <mantaz@users.sf.net>, 2004.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2012
+# Mantas Zapolskas <mantaz@users.sf.net>, 2004
+# Moo, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2005-09-14 01:05+0900\n"
-"Last-Translator: Mantas Zapolskas <mantaz@users.sf.net>\n"
-"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2015-04-09 21:47+0000\n"
+"Last-Translator: Moo\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/xfce-apps/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr ""
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr ""
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr ""
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr ""
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr ""
+msgstr "Iškeliamas pasaulio laiko langas..."
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
-msgstr ""
+msgstr "Iškelti pasaulio laiko lango nepavyko"
 
 #. ********** timezone tooltip **********
 #: ../globaltime/globaltime.c:277
@@ -30,113 +50,116 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
+msgstr "%s\npaspauskite norėdami keisti laikrodį"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
-msgstr ""
+msgstr "Vietinis laikas"
 
 #: ../globaltime/globaltime.c:464
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
+msgstr "mygtukas 1 nustatymų keitimui\nmygtukas 2 laikrodžių laiko keitimui"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
-msgstr ""
+msgstr "pakeiskite norėdami pakeisti valandą"
 
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
+msgstr "pakeiskite norėdami pakeisti minutę. Norėdami pakeisti tik 1 minutę, paspauskite rodyklę su mygtuku 2."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
-msgstr ""
+msgstr "NAUJAS"
 
 #: ../globaltime/gt_prefs.c:289
 msgid "NEW COPY"
-msgstr ""
+msgstr "NAUJA KOPIJA"
 
 #: ../globaltime/gt_prefs.c:310
 msgid "Not possible to delete the last clock."
-msgstr ""
+msgstr "Ištrinti paskutinio laikrodžio neįmanoma."
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
-msgstr ""
+msgstr "atnaujinti šį laikrodį"
 
 #: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
 msgid "add new empty clock"
-msgstr ""
+msgstr "pridėti naują tuščią laikrodį"
 
 #: ../globaltime/gt_prefs.c:526
 msgid "add new clock using this clock as model"
-msgstr ""
+msgstr "pridėti naują laikrodį naudojant šį laikrodį kaip šabloną"
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
-msgstr ""
+msgstr "ištrinti šį laikrodį"
 
 #: ../globaltime/gt_prefs.c:539
 msgid "move this clock first"
-msgstr ""
+msgstr "šį laikrodį perkelti pirmiausia"
 
 #: ../globaltime/gt_prefs.c:544
 msgid "move this clock left"
-msgstr ""
+msgstr "perkelti šį laikrodį į kairę"
 
 #: ../globaltime/gt_prefs.c:549
 msgid "move this clock right"
-msgstr ""
+msgstr "perkelti šį laikrodį į kairę"
 
 #: ../globaltime/gt_prefs.c:554
 msgid "move this clock last"
-msgstr ""
+msgstr "perkelti šį laikrodį į galą"
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
-msgstr ""
+msgstr "šiam laikrodžiui nustatyti vietinę laiko juostą"
 
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
-msgstr ""
+msgstr "užverti langą ir išeiti"
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "Nustatymai"
+msgstr "Pasaulio laiko nustatymai"
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
 msgid "Clock Parameters"
-msgstr ""
+msgstr "Laikrodžio parametrai"
 
 #: ../globaltime/gt_prefs.c:607
 msgid "Name of the clock:"
-msgstr ""
+msgstr "Laikrodžio pavadinimas:"
 
 #: ../globaltime/gt_prefs.c:613
 msgid "enter name of clock"
-msgstr ""
+msgstr "įveskite laikrodžio pavadinimą"
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
-msgstr ""
+msgstr "Laikrodžio laiko juosta:"
 
 #: ../globaltime/gt_prefs.c:643
 msgid "Text Formatting"
-msgstr ""
+msgstr "Teksto formatavimas"
 
 #. ------------------------background-------------------------
 #: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
 msgid "Background color:"
-msgstr ""
+msgstr "Fono spalva:"
 
 #: ../globaltime/gt_prefs.c:656
 msgid "Click to change background colour for clock"
-msgstr ""
+msgstr "Paspauskite norėdami pakeisti laikrodžio fono spalvą"
 
 #: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
 #: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
@@ -144,213 +167,212 @@
 #: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
 #: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
 msgid "Use default"
-msgstr ""
+msgstr "Naudoti numatytą"
 
 #: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
 #: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
 msgid "Cross this to use default instead of selected value"
-msgstr ""
+msgstr "Pažymėkite norėdami naudoti numatytąjį vietoj pasirinktojo"
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
 msgid "Foreground (=text) color:"
-msgstr ""
+msgstr "Priekinio plano(teksto) spalva:"
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
-msgstr ""
+msgstr "Paspauskite norėdami pakeisti laikrodžio priekinio plano spalvą"
 
 #. ------------------------name font-------------------------
 #: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
 msgid "Font for name of clock:"
-msgstr ""
+msgstr "Laikrodžio pavadinimo šriftas:"
 
 #: ../globaltime/gt_prefs.c:720
 msgid "Click to change font for clock name"
-msgstr ""
+msgstr "Paspauskite norėdami pakeisti laikrodžio pavadinimo šriftą"
 
 #. ------------------------time font-------------------------
 #: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
 msgid "Font for time of clock:"
-msgstr ""
+msgstr "Laikrodžio laiko spalva:"
 
 #: ../globaltime/gt_prefs.c:753
 msgid "Click to change font for clock time"
-msgstr ""
+msgstr "Paspauskite norėdami pakeisti laikrodžio laiko šriftą"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:780
 msgid "Underline name of clock:"
-msgstr ""
+msgstr "Pabrėžtas laikrodžio pavadinimas:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:810
 msgid "Underline time of clock:"
-msgstr ""
+msgstr "Pabrėžtas laikrodžio laikas:"
 
 #: ../globaltime/gt_prefs.c:850
 msgid "Text Default Formatting"
-msgstr ""
+msgstr "Numatytasis teksto formatavimas"
 
 #: ../globaltime/gt_prefs.c:863
 msgid "Click to change default background colour for clocks"
-msgstr ""
+msgstr "Paspauskite norėdami pakeisti numatytąją laikrodžių spalvą"
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
+msgstr "Pažymėkite norėdami naudoti numatytąją spalvą vietoj pasirinktosios"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
-msgstr ""
+msgstr "Paspauskite norėdami pakeisti numatytąją laikrodžių teksto spalvą"
 
 #: ../globaltime/gt_prefs.c:929
 msgid "Click to change default font for clock name"
-msgstr ""
+msgstr "Paspauskite norėdami pakeisti numatytąjį laikrodžių šriftą"
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
+msgstr "Pažymėkite norėdami naudoti numatytąjį šriftą vietoj pasirinktojo"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
-msgstr ""
+msgstr "Paspauskite norėdami pakeisti numatytąjį laikrodžio šriftą"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:990
 msgid "Underline for name of clock:"
-msgstr ""
+msgstr "Pabrėžtas laikrodžio pavadinimas:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:1004
 msgid "Underline for time of clock:"
-msgstr ""
+msgstr "Pabrėžtas laikrodžio pavadinimas:"
 
 #: ../globaltime/gt_prefs.c:1027
-#, fuzzy
 msgid "update preferences"
-msgstr "Nustatymai"
+msgstr "atnaujinti nustatymus"
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "Nustatymai"
+msgstr "Pasaulio laiko nustatymai"
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
-#, fuzzy
 msgid "General Preferences"
-msgstr "Nustatymai"
+msgstr "Bendri nustatymai"
 
 #: ../globaltime/gt_prefs.c:1077
 msgid "Decorations:"
-msgstr ""
+msgstr "Dekoracijos:"
 
 #: ../globaltime/gt_prefs.c:1078
-#, fuzzy
 msgid "Standard"
-msgstr "XF Kalendorius"
+msgstr "Standartinės"
 
 #: ../globaltime/gt_prefs.c:1083
 msgid "Use normal decorations"
-msgstr ""
+msgstr "Naudoti įprastas dekoracijas"
+
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Niekada"
 
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
-msgstr ""
+msgstr "Nerodyti lango dekoracijų (rėmelių)"
 
 #: ../globaltime/gt_prefs.c:1100
 msgid "Clock size:"
-msgstr ""
+msgstr "Laikrodžio dydis:"
 
 #: ../globaltime/gt_prefs.c:1101
 msgid "Equal"
-msgstr ""
+msgstr "Suvienodinti"
 
 #: ../globaltime/gt_prefs.c:1106
 msgid "All clocks have same size"
-msgstr ""
+msgstr "Visų laikrodžių dydis vienodas"
 
 #: ../globaltime/gt_prefs.c:1111
-#, fuzzy
 msgid "Varying"
-msgstr "Perspėjimas"
+msgstr "Kintamas"
 
 #: ../globaltime/gt_prefs.c:1116
 msgid "Clock sizes vary"
-msgstr ""
+msgstr "Laikrodžio dydis keičiasi"
 
 #: ../globaltime/gt_prefs.c:1122
 msgid "Local timezone:"
-msgstr ""
+msgstr "Vietinė laiko juosta:"
 
 #: ../globaltime/timezone_selection.c:101
 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
 msgid " Other"
-msgstr ""
+msgstr " Kita"
 
 #: ../globaltime/timezone_selection.c:156
 #: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
 #, c-format
 msgid "%d hour %d mins"
-msgstr ""
+msgstr "%d valanda %d minutė"
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
 #, c-format
 msgid "%d hour"
-msgstr ""
+msgstr "%d valanda"
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
 #, c-format
 msgid "%d mins"
-msgstr ""
+msgstr "%d min"
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
 msgid "backward"
-msgstr ""
+msgstr "atgal"
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
 msgid "forward"
-msgstr ""
+msgstr "pirmyn"
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
 msgid "not changed"
-msgstr ""
+msgstr "nepakeista"
 
 #: ../globaltime/timezone_selection.c:195
 #: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
 msgid "not changing"
-msgstr ""
+msgstr "nesikeičia"
 
 #. location
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
-msgstr ""
+msgstr "Vieta"
 
 #: ../globaltime/timezone_selection.c:258
 #: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
 msgid "GMT Offset"
-msgstr ""
+msgstr "GMT poslinkis"
 
 #: ../globaltime/timezone_selection.c:264
 #: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
 msgid "Previous/Next Change"
-msgstr ""
+msgstr "Ankstesnis/Sekantis pakeitimas"
 
 #: ../globaltime/timezone_selection.c:269
 #: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
 msgid "Country"
-msgstr ""
+msgstr "Šalis"
 
 #. We are actually setting the g_par parameter. In other words
 #. we are setting the global default timezone for Orage. This is
@@ -363,7 +385,7 @@
 #: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
 #: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
 msgid "Pick timezone"
-msgstr ""
+msgstr "Pasirinkite laiko juostą"
 
 #: ../globaltime/timezone_selection.c:302
 #: ../globaltime/timezone_selection.c:312
@@ -371,7 +393,7 @@
 #: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
 #: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
 msgid "Change mode"
-msgstr ""
+msgstr "Keisti režimą"
 
 #: ../globaltime/timezone_selection.c:303
 #: ../globaltime/timezone_selection.c:313
@@ -382,7 +404,7 @@
 #: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
 #: ../src/timezone_selection.c:379
 msgid "UTC"
-msgstr ""
+msgstr "UTC"
 
 #. NOTE: this exists only if ical timezones are being used
 #: ../globaltime/timezone_selection.c:304
@@ -391,96 +413,110 @@
 #: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
 #: ../src/timezone_selection.c:384
 msgid "floating"
-msgstr ""
+msgstr "slenkantis"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "Nustatymai"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "XF Kalendorius"
+msgstr "Orage pasaulio laikas"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
+msgstr "Rodo įvairių šalių laiką"
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Pasaulio laikas"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
 msgstr ""
 
-#: ../panel-plugin/oc_config.c:224
-msgid "Appearance"
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr ""
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
 msgstr ""
 
+#: ../panel-plugin/oc_config.c:248
+msgid "Appearance"
+msgstr "Išvaizda"
+
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
-msgstr ""
+msgstr "Rodyti _rėmelį"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
-msgstr ""
+msgstr "nustatyti priekinio plano _spalvą:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
-msgstr ""
+msgstr "nustatyti _fono spalvą:"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
-msgstr ""
+msgstr "nustatyti _aukštį:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
+msgstr "Turėkite omeny jog jūs negalite keisti horizontalių skydelių aukščio"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
-msgstr ""
+msgstr "nustatyti _plotį:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
+msgstr "Turėkite omeny jog jūs negalite keisti vertikalių skydelių pločio"
+
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
 msgstr ""
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
-msgstr ""
+msgstr "Laikrodžio parinktys"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
-msgstr ""
+msgstr "laiko juostą nustatyti į:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
-msgstr ""
+msgstr "Eilutė %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
-msgstr ""
+msgstr "Įveskite bet kokį tinkamą „strftime“ funkcijos parametrą."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
-msgstr ""
+msgstr "Paaiškinimas:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
-msgstr ""
+msgstr "po sustabdymo/užmigdymo taisyti laiką"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
+msgstr "Tai padaryti reikia tik jei trumpai užmigdote ar sustabdote(mažiau nei 5 valandom) ir jūsų matomam laikrodį sekundės nerodomos. Tokiomis sąlygomis „Orageclock“ gali rodyti neteisingą laiką, nebent pasirinksite šią parinktį. (Pasirinkus procesoriui bus neleista pertraukti išsaugojimo galimybių.)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -490,14 +526,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
+msgstr "Gauti laikui ši programa naudoja strftime funkciją.\nGalite naudoti bet kurį tinkamą kodą, tokiu formatu koks jums patinka.\nDažni kodai:\n\t%A = savaitės diena\t\t\t%B = mėnesis\n\t%c = data & laikas\t\t%R = valanda ir minutė\n\t%V = savaitės numeris\t\t%Z = naudojama laiko juosta\n\t%H = valandos \t\t\t\t%M = minutės\n\t%X = vietinis laikas\t\t\t%x = vietinė data"
 
-#: ../panel-plugin/oc_config.c:457
-#, fuzzy
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
-msgstr "Nustatymai"
+msgstr "Orage laikrodžio nustatymai"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -506,262 +540,318 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
-msgstr ""
+msgstr "%A %d %B %Y/%V"
 
 #: ../src/about-xfcalendar.c:40
 msgid "Maintainer"
-msgstr ""
+msgstr "Prižiūrėtojas"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "Tvarkykite savo laiką su Xfce4"
+msgstr "Tvarkykite savo laiką su Orage"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
-msgstr ""
+msgstr "Pabaiga"
 
 #: ../src/appointment.c:333
 msgid "Due"
-msgstr ""
+msgstr "Trukmė"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
-msgstr ""
+msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
-msgstr ""
+msgstr "Pasirinkite failą..."
 
 #: ../src/appointment.c:680
 msgid "Sound Files"
-msgstr ""
+msgstr "Garso failai"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
-msgstr ""
+msgstr "Visi failai"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
-msgstr ""
+msgstr "Paskyrimo informacija pakeista."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
+msgstr "Ar norite tęsti?"
+
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Ne, nepalikti"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
 msgstr ""
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
-msgstr ""
+msgstr "Šio paskyrimo pabaiga yra anksčiau nei pradžia."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
+msgstr "Nenustatyta"
+
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Orage numatytasis failas"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
 msgstr ""
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
+msgstr "Šis paskyrimas bus pašalintas visam laikui."
+
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Ne, atšaukti šalinimą"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
 msgstr ""
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Pasirinkite datą"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Šiandien"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
-msgstr ""
+msgstr "Paskyrimas neegzistuoja."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
-msgstr ""
+msgstr "Greičiausiai buvo pašalinta, atnaujinkite savo ekraną."
 
-#: ../src/appointment.c:1995
-#, fuzzy
+#: ../src/appointment.c:2105
 msgid "Current categories"
-msgstr "XF Kalendorius"
+msgstr "Dabartinės kategorijos"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
-msgstr ""
+msgstr "Pridėti naują kategoriją su spalva"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
-msgstr ""
+msgstr "Kategorija:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
-msgstr ""
+msgstr "Spalvų kategorijos - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
-msgstr ""
+msgstr " *** KOPIJA ***"
 
-#: ../src/appointment.c:2353
-#, fuzzy
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
-msgstr "Paskyrimas"
+msgstr "Naujas paskyrimas - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
-msgstr "_Byla"
+msgstr "_Failas"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
-msgstr ""
+msgstr "Išsaugoti _ir užverti"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
-msgstr ""
+msgstr "D_ubliuoti"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
-msgstr ""
+msgstr "Išsaugoti"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
-msgstr ""
+msgstr "Išsaugoti ir užverti"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
-msgstr ""
+msgstr "Grąžinti"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
-msgstr ""
+msgstr "Dubliuoti"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
-msgstr ""
+msgstr "Pašalinti"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
-msgstr ""
+msgstr "Laisvas"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
-msgstr ""
+msgstr "Užimtas"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
-msgstr ""
+msgstr "Bendra"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
-msgstr ""
+msgstr "Tipas"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
-msgstr ""
+msgstr "Įvykis"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
+msgstr "Įvykis kuris kada nors įvyks. Pavyzdžiui:\nSusitikimas, gimtadienis ar TV laida."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-#, fuzzy
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
-msgstr "Šiandien"
+msgstr "Darbas"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
+msgstr "Kažkas ką jūs kažkada turite padaryti. Pavyzdžiui:\nNuplauti mašiną ar išbandyti naują Orage versiją."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
-msgstr ""
+msgstr "Žurnalas"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
+msgstr "Padarykite įrašą jog kažkas įvyko. Pavyzdžiui:\nPasižymėkite jog skambino mama ar kada pirmą kart snigo."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
-msgstr ""
+msgstr "Antraštė"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
-msgstr ""
+msgstr "Visos dienos įvykis"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
-msgstr ""
+msgstr "Pradžia"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
-msgstr ""
+msgstr "Nustatyti      "
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
-msgstr ""
+msgstr "Trukmė"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
-#, fuzzy
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
-msgstr "Šiandien"
+msgstr "diena(-os)"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
-msgstr ""
+msgstr "valanda(-os)"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
-msgstr ""
+msgstr "min"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
-msgstr ""
+msgstr "Prieinamumas"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
-msgstr ""
+msgstr "Baigta"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
-msgstr ""
+msgstr "Atlikta"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
-msgstr ""
+msgstr "Kategorijos"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
+msgstr "Tai speciali kategorija, kuri gali būti naudojama nuspalvoti šį paskyrimą sąrašo rodinyje."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
-msgstr ""
+msgstr "atnaujinti kategorijų spalvas."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
+msgstr "Prioritetas"
+
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
 msgstr ""
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
-msgstr ""
+msgstr "Pastaba"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -770,126 +860,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Šios komandos įsigalios nedelsiant:\n    <D> įterpia dabartinę datą, vietiniu datos formatu\n    <T> įterpia datą ir\n    <DT> įterpia datą ir laiką.\n\nŠios yra pakeičiamos suradus vėliau:\n    <&Ynnnn> yra verčiama į esamus metus minus nnnn.\n(Tai gali būti priminimas apie gimtadienį, pasako kiek žmogui metų.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
-msgstr ""
+msgstr "Prieš pradžią"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
-msgstr ""
+msgstr "Prieš pabaigą"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
-msgstr ""
+msgstr "Po pradžios"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
-msgstr ""
+msgstr "Po pabaigos"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
-msgstr ""
+msgstr "Signalas"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
-msgstr ""
+msgstr "Signalo laikas"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
+msgstr "Kaip dažnai norite girdėti signalą:\n 1) prieš prasidedant įvykiui\n 2) prieš baigiantis darbui\n 3) po darbo pradžios"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
-msgstr ""
+msgstr "Nuolatinis signalas"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
+msgstr "Pasirinkite jei norite jog Orage primintų net tada jei įvykus įvykiui jis nebuvo pažymėtas kaip aktyvus."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
-#, fuzzy
+#: ../src/appointment.c:3064
 msgid "Sound"
-msgstr "Sekmadienį"
+msgstr "Garsas"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
-msgstr ""
+msgstr "Naudoti"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
-msgstr ""
+msgstr "Pasirinkite jei norite girdimo signalo"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
-msgstr ""
+msgstr "Kartoti signalą"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
-msgstr ""
+msgstr "kartą(-us)"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
-msgstr ""
+msgstr "sekundės(-žių) intervalu"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
-msgstr ""
+msgstr "Vaizdinis"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
-msgstr ""
+msgstr "Naudoti Orage langą"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
-msgstr ""
+msgstr "Pasirinkite jei norite Orage lango signalo"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
-msgstr ""
+msgstr "Naudoti pranešimus"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
-msgstr ""
+msgstr "Pasirinkite jei norite pranešimo signalo"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
-msgstr ""
+msgstr "Nustatyti galiojimo laiką"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
-msgstr ""
+msgstr "Pasirinkite jei norite jog pranešimas automatiškai išnyktų"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
-msgstr ""
+msgstr "0 = numatytasis galiojimo laikas"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
-msgstr ""
+msgstr "sekundės"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
-msgstr ""
+msgstr "Užduotis"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
-msgstr ""
+msgstr "Pasirinkite jei norite procedūros ar scenarijaus signalo"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -899,154 +987,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
+msgstr "Visus „escape“ ir kitus simbolius turite įvesti patys.\nŠi eilutė tik proceso įsisavinimui.\nVykdymo metu specialios komandos pakeičiamos:\n\t<&T>  paskyrimo pavadinimas\n\t<&D>  paskyrimo aprašymas\n\t<&AT> signalo laikas\n\t<&ST> paskyrimo pradžios laikas\n\t<&ET> paskyrimo pabaigos laikas"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
-msgstr ""
+msgstr "Išbandykite iškviesdami signalą dabar"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
-msgstr ""
+msgstr "<b>Numatytasis signalas</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
-msgstr ""
+msgstr "Saugoti dabartinius nustatymus kaip numatytąjį signalą"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr ""
+msgstr "Nustatyti dabartinius nustatymus iš numatytojo signalo"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
-msgstr ""
+msgstr "Kasdien"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
-msgstr ""
+msgstr "Kas savaitę"
 
-#: ../src/appointment.c:3176
-#, fuzzy
+#: ../src/appointment.c:3290
 msgid "Monthly"
-msgstr "Pirmadienį"
+msgstr "Kas mėnesį"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
-msgstr ""
+msgstr "Kas metus"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
-msgstr ""
+msgstr "Kas valandą"
 
-#: ../src/appointment.c:3178
-#, fuzzy
+#: ../src/appointment.c:3292
 msgid "Mon"
-msgstr "Pirmadienį"
+msgstr "Pir"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
-msgstr ""
+msgstr "Ant"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
-msgstr ""
+msgstr "Tre"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
-msgstr ""
+msgstr "Ket"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
-msgstr ""
+msgstr "Pen"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
-msgstr ""
+msgstr "Šeš"
 
-#: ../src/appointment.c:3178
-#, fuzzy
+#: ../src/appointment.c:3292
 msgid "Sun"
-msgstr "Sekmadienį"
+msgstr "Sek"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
-msgstr ""
+msgstr "Pasikartojimas"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
-msgstr ""
+msgstr "Sudėtingumas"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
-msgstr ""
+msgstr "Paprasta"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
-msgstr ""
+msgstr "Sudėtinga"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
-msgstr ""
+msgstr "Naudokite jei norite, kad būtų pastoviai kartojama"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
+msgstr "Naudokite šį jei reikia sudėtingų laikų:\n Kiekvieną šeštadienį ir sekmadienį ar \n Kiekvieno mėnesio pirmą antradienį"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
-msgstr ""
+msgstr "Dažnumas"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
-msgstr ""
+msgstr "Kartoti kas"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
-msgstr ""
+msgstr " "
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
+msgstr "Riboti dažnį iki tam tikro intervalo.\n Pavyzdžiui: Kas trečią dieną:\n Dažnis = Kasdien su intervalu = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
-msgstr ""
+msgstr "Riba"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
-msgstr ""
+msgstr "Kartoti amžinai"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
-msgstr ""
+msgstr "Kartoti"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
-msgstr ""
+msgstr "Kartoti iki"
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-#, fuzzy
+#: ../src/appointment.c:3423
 msgid "Weekdays"
-msgstr "Šiandien"
+msgstr "Šiokiadieniais"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
-msgstr ""
+msgstr "Kurią dieną"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1054,176 +1134,208 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
+msgstr "Nurodykite kurią savaitės dieną mėnesiniams ar metiniams įvykiams.\n Pavyzdžiui:\n Kiekvieno mėnesio antrą trečiadienį:\n\tDažnumas = Kas mėnesį,\n\tSavaitės dienos = tikrinti tik trečiadienį,\n\tKuri diena = pasirinkite 2 iš žemiau esančių trečiadienių"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
-msgstr ""
+msgstr "Darbų bazė"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
+msgstr "Darbai reguliariai atsiranda atėjus pradžios laikui ir kartojami nurodytu intervalu, nepaisant to kada jie buvo paskutinį kart baigti"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "Darbų pasikartojimas yra paremtas baigimo laiku ir kartojimo intervalas skaičiuojamas nuo atlikimo laiko. (Turėkite omeny jog neįmanoma nieko pasakyti apie istoriją, nes darbų kartojimasis keičiasi po kiekvieno atlikimo.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
-msgstr ""
+msgstr "Išimtys"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
+msgstr "Pridėkite daugiau išimčių paspausdami žemiau esančias kalendoriaus dienas.\nIšimtis yra išimtis(-) arba įterpimas(+) priklausomai nuo pasirinkimo.\nPašalinkite paspausdami duomenis."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
-msgstr ""
+msgstr "Pridėti išimties datą (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
+msgstr "Išimties dienos yra pilnos dienos kuriomis paskyrimai nevyksta"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
-msgstr ""
+msgstr "Pridėti įterpimo laiką (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
+msgstr "Įterpti laikai turi tą pačią laiko juostą kaip ir pradžios laikas, bet jie gali skirtis"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
-msgstr ""
+msgstr "Veiksmų datos"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
-msgstr ""
+msgstr "R_odymas"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
-msgstr ""
+msgstr "_Eiti"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
-msgstr ""
+msgstr "Nauja"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr ""
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Viena savaite atgal"
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Šiandien"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Viena diena atgal"
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr ""
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Viena diena pirmyn"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Viena savaite pirmyn"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
-msgstr ""
+msgstr "Atnaujinti"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
-msgstr ""
+msgstr "Užverti"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
-msgstr ""
+msgstr "Nežinoma"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
-msgstr ""
+msgstr "       Rodomų dienų"
 
-#: ../src/day-view.c:935
-#, fuzzy
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
-msgstr "XF Kalendorius"
+msgstr "Orage - dienos rodinys"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
-msgstr ""
+msgstr "Visa diena"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
-msgstr ""
+msgstr "Laikas"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
-msgstr ""
+msgstr "Nepasirinkta jokia eilutė"
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
-msgstr ""
+msgstr "Norėdami pasirinkti paspauskite eilutę, tada galėsite ją nukopijuoti."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
+msgstr "Jūs visam laikui pašalinsite visus\npasirinktus paskyrimus."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
 msgstr ""
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Atgal"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Pirmyn"
+
+#: ../src/event-list.c:1189
 msgid "Find"
-msgstr ""
+msgstr "Ieškoti"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
+msgstr "Dienų rodinys"
+
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
 msgstr ""
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
+#: ../src/event-list.c:1240
+msgid "only first repeating"
 msgstr ""
 
-#: ../src/event-list.c:1201
-msgid "Journal entries starting from:"
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
 msgstr ""
 
-#: ../src/event-list.c:1221
-msgid "Search"
+#: ../src/event-list.c:1250
+msgid "also old"
 msgstr ""
 
-#: ../src/event-list.c:1224
-msgid "Search text "
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
 msgstr ""
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1290
+msgid "Journal entries starting from:"
+msgstr "Žurnalo įrašai prasideda nuo:"
+
+#: ../src/event-list.c:1310
+msgid "Search"
+msgstr "Ieškoti"
+
+#: ../src/event-list.c:1313
+msgid "Search text "
+msgstr "Ieškoti teksto"
+
+#: ../src/event-list.c:1378
 msgid "Flags"
-msgstr ""
+msgstr "Gairelės"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
-msgstr ""
+msgstr "Antraštė"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
@@ -1231,2401 +1343,3108 @@
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
 
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr ""
-
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
-msgstr ""
+msgstr "\tPasikartojimas baigėsi, perkeliama į archyvą."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
-msgstr ""
+msgstr "Archyvavimas neįjungtas. Išeinama"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
-msgstr ""
+msgstr "Archyvavimo slenkstis: %d mėnesis(-iai)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr ""
+msgstr "\tArchyvuojami įvykiai, kurie yra senesni nei: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
-msgstr ""
+msgstr "Archyvuojamas uid: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
-msgstr ""
+msgstr "\tVTODO nebaigta; nesuarchyvuota"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr ""
+msgstr "\tPasikartojantis. Pabaigos metai: %04d, mėnuo: %02d, diena: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
-msgstr ""
+msgstr "Archyvavimas baigtas\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
-msgstr ""
+msgstr "Pradedamas archyvo šalinimas."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
-msgstr ""
+msgstr "\tFazė 1: atstatyti pasikartojančius paskyrimus"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
-msgstr ""
+msgstr "\tFazė 2: grąžinti archyvuotus paskyrimus"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
-msgstr ""
+msgstr "Archyvo šalinimas baigtas\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
+msgstr "Numatytasis Orage signalas"
+
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
 msgstr ""
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
+msgid "Created alarm list for foreign file: %s (%s)"
 msgstr ""
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr ""
+
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
+msgstr "\tRasti %d signalai iš kurių %d aktyvūs. (Ieškota tarp %d pasikartojančių signalų.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
-msgstr ""
+msgstr "Pradedamas importavimo failo apdorojimas"
 
 #: ../src/ical-expimp.c:158
 msgid "... Patched DCREATED to be CREATED."
-msgstr ""
+msgstr "... DCREATED pataisytas į CREATED."
 
 #: ../src/ical-expimp.c:197
 msgid "... Patched timezone to Orage format."
-msgstr ""
+msgstr "... Laiko juosta pataisyta į Orage formatą."
 
 #: ../src/ical-expimp.c:206
 msgid "Import file preprocessing done"
+msgstr "Importavimo failo apdorojimas baigtas"
+
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Rastas išorinis failo %s atnaujinimas."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
 msgstr ""
 
-#: ../src/interface.c:284
-#, fuzzy
+#: ../src/interface.c:271
 msgid "Calendar files"
-msgstr "XF Kalendorius"
+msgstr "Kalendoriaus failai"
 
 #: ../src/interface.c:631
 msgid "Current foreign files"
-msgstr ""
+msgstr "Dabartiniai išoriniai failai"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
-msgstr ""
+msgstr "TIK SKAITYMUI"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
-msgstr ""
+msgstr "SKAITYMUI RAŠYMUI"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
+msgstr "***** Išorinių failų nėra *****"
+
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
 msgstr ""
 
-#: ../src/interface.c:974
-msgid "Import/export"
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
 msgstr ""
 
-#: ../src/interface.c:981
-msgid "Import"
+#: ../src/interface.c:697
+msgid "Filename is empty."
 msgstr ""
 
-#: ../src/interface.c:986
-msgid "Read from file:"
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Failas neegzistuoja."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
 msgstr ""
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
+msgid "Import/export"
+msgstr "Importuoti/eksportuoti"
+
+#: ../src/interface.c:972
+msgid "Import"
+msgstr "Importuoti"
+
+#: ../src/interface.c:977
+msgid "Read from file:"
+msgstr "Skaityti iš failo:"
+
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
+msgstr "Failų vardus atskirkite kableliu (,).\n PASTABA: taškas nėra tinkamas simbolis Orage failų varduose."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
-msgstr ""
+msgstr "Eksportuoti"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
-msgstr ""
+msgstr "Rašyti į failą:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
-msgstr "Pasirinkti šiandieną"
+msgstr "Pasirinkti"
 
-#: ../src/interface.c:1037
-#, fuzzy
+#: ../src/interface.c:1028
 msgid "All appointments"
-msgstr "Paskyrimas"
+msgstr "Visi paskyrimai"
 
-#: ../src/interface.c:1050
-#, fuzzy
+#: ../src/interface.c:1041
 msgid "Named appointments: "
-msgstr "Paskyrimas"
+msgstr "Paskyrimai pavadinti:"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
+msgstr "Turėkite omeny jog skaitomi tik pagrindiniai failo paskyrimai.\nArchyvuoti ir išoriniai įvykiai neeksportuojami."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
+msgstr "Turėkite omeny jog skaitomi tik pagrindiniai failo paskyrimai.\nIšoriniai įvykiai neeksportuojami."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
-msgstr ""
+msgstr "Šiuos įvykius galite lengvai nuvilkti iš įvykių sąrašo lango."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
-msgstr ""
+msgstr "Orage paskyrimų UID atskirti kableliais."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
-msgstr ""
+msgstr "Archyvuoti"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
-msgstr ""
+msgstr "Archyvuoti dabar (slenkstis: %d mėnesiai)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
-msgstr ""
+msgstr "Archyvo slenkstį galite pasikeisti parametruose"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
-msgstr ""
+msgstr "Grąžinti archyvą dabar"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
+msgstr "Grąžinti visus archyvuotus įvykius į pagrindinį orage failą\nir pašalinti archyvo failą. Tai naudinga eksportuojant ir\nperkeliant orage paskyrimus į kitą sistemą."
 
-#: ../src/interface.c:1118
-#, fuzzy
+#: ../src/interface.c:1109
 msgid "Orage files"
-msgstr "Nustatymai"
+msgstr "Orage failai"
 
-#: ../src/interface.c:1125
-#, fuzzy
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
-msgstr "XF Kalendorius"
+msgstr "Pagrindinis Orage kalendoriaus failas"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "XF Kalendorius"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Dabartinis failas:"
 
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr ""
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Naujas failas:"
 
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr ""
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Veiksmo parinktys:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
-msgstr ""
+msgstr "Pervadinti"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
+msgstr "Tik vidinio Orage failo pervadinimas.\nIšorinė failų sistema lieka nepaliesta.\nNaujas failas turi būti jau sukurtas."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
-msgstr ""
+msgstr "Kopijuoti"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
+msgstr "Dabartinis failas nukopijuojamas ir lieka nepakeistas, savo senoje vietoje."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
-msgstr ""
+msgstr "Perkelti"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
-msgstr ""
+msgstr "Dabartinis failas perkeliamas ir išnyksta iš senos vietos."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
-msgstr ""
+msgstr "Archyvo failas"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
-msgstr ""
+msgstr "Išoriniai failai"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
-msgstr ""
+msgstr "Pridėti naują išorinį failą"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
-msgstr ""
+msgstr "Išorinis failas:"
 
-#: ../src/interface.c:1284
-msgid "Options"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
 msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
-msgstr ""
+msgstr "Tik skaityti"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Nustatykite jei norite jog Orage niekad nekeistų šio failo.\nTurėkite omeny jog išorinių failų keitimas gali padaryti juos \nnetinkamus originaliam įrankiui, kuris juos sukūrė!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Šis vidinis pavadinimas yra rodomas naudotojui vietoj failo pavadinimo."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
-msgstr ""
+msgstr "Duomenų keitimasis - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
+msgstr "\tTai yra %s versija %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
+msgstr "\tPlatinamas GNU Bendrosios viešosios licencijos versijos sąlygomis.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
+msgstr "\tSukompiliuota su GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
+msgstr "naudojama GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
-msgstr ""
+msgstr "\tImportavimui naudojama DBUS.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
+msgstr "\tDBUS nenaudojama. Importavimas veikia tik dalinai.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
-msgstr ""
+msgstr "\tNaudojama libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
-msgstr ""
+msgstr "\tLibnotify nenaudojama.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
-msgstr ""
+msgstr "\tNaudojamas automatinis archyvavimas.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
-msgstr ""
+msgstr "\tArchyvavimas nenaudojamas.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
-msgstr ""
+msgstr "\tNaudojamas operacinės sistemos paketas libical.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
+msgstr "\tNaudojama vietinė libical versija.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
+msgstr "Naudojimas: orage [parinktys] [failai]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
-msgstr ""
+msgstr "Parinktys:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
+msgstr "--version (-v) \t\tparodo orage versiją\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
+msgstr "--help (-h) \t\tparodo šį tekstą\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
+msgstr "--preferences (-p) \tparodo nustatymų formą\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
+msgstr "--toggle (-t) \t\trodyti/nerodyti orage\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
 msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
+msgstr "--remove-foreign (-r) failas \tpašalinti išorinį failą\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--export (-e) failas [paskyrimas...] \teksportuoja paskyrimus iš Orage į failą\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
-msgstr ""
+msgstr "failai=ical failai įkrovimui į orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
-msgstr ""
+msgstr "\tdbus neįterptas į orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
+msgstr "\tbe dbus [failai] ir išorinio failo parinktys(-a ir -r) gali būti naudojamas tik paleidžiant orage\n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
+msgstr "\nNežinoma parinktis %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
-msgstr ""
+msgstr "_Keistis duomenimis"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
-msgstr ""
+msgstr "K_eisti"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
-msgstr ""
+msgstr "Peržiūrėti pasirinktą _datą"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
-msgstr ""
+msgstr "Peržiūrėti pasirinktą _savaitę"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
-msgstr "Pasirinkti šiandieną"
+msgstr "Pasirinkti š_iandieną"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Nustatymai"
+msgstr "Rodyti _pasaulio laiką"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
-msgstr "_Pagalba"
+msgstr "_Žinynas"
 
-#: ../src/mainbox.c:448
-msgid "Never"
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
 msgstr ""
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr " Vieta: %s\n"
+
+#: ../src/mainbox.c:481
 #, c-format
 msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" Due:\t%s\n"
-" Done:\t%s\n"
+"\n"
 " Note:\n"
 "%s"
+msgstr "\n Pastaba:\n%s"
+
+#: ../src/mainbox.c:489
+msgid "Never"
+msgstr "Niekada"
+
+#: ../src/mainbox.c:495
+#, c-format
+msgid ""
+"Title: %s\n"
+"%s Start:\t%s\n"
+" Due:\t%s\n"
+" Done:\t%s%s"
 msgstr ""
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
-msgstr ""
+msgstr "<b>Darbai:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
-msgstr ""
+msgstr "<b>Įvykiai %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
-msgstr ""
+msgstr "<b>Įvykiai %s - %s:</b>"
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:492
 msgid "Main settings"
-msgstr "Nuostatos"
+msgstr "Pagrindiniai nustatymai"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
-msgstr ""
+msgstr "Laiko juosta"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
-msgstr ""
+msgstr "Visada turėtumėte nustatyti vietinę laiko juostą."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
-msgstr ""
+msgstr "Archyvavimo slenkstis (mėnesiais)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
-msgstr ""
+msgstr "(0 = nearchyvuoti)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
+msgstr "Archyvavimas naudojamas norint sutaupyti vietos ir laiko apdorojant įvykius."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
-msgstr ""
+msgstr "Garso komanda"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
+msgstr "Ši komanda skirta groti signalus su garsu. "
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Nuostatos"
-
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
-msgstr "Uždaryti langą"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Kalendoriaus langas"
 
-#: ../src/parameters.c:618
-msgid "Show borders"
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
 msgstr ""
 
-#: ../src/parameters.c:625
-msgid "Show menu"
-msgstr ""
+#: ../src/parameters.c:609
+msgid "Show borders"
+msgstr "Rodyti rėmelius"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr ""
+#: ../src/parameters.c:614
+msgid "Show menu"
+msgstr "Rodyti meniu"
 
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
-msgstr ""
+msgstr "Rodyti dienų pavadinimus"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
-msgstr ""
+msgstr "Rodyti savaičių numerius"
 
-#: ../src/parameters.c:653
-msgid "Show todo list"
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Rodyti mėnesį ir metus"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
 msgstr ""
 
 #: ../src/parameters.c:660
+msgid "Show todo list"
+msgstr "Rodyti darbų sąrašą"
+
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
-msgstr ""
+msgstr "Kiek dienų bus rodoma įvykių lange"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
-msgstr ""
+msgstr "0 = išvis nerodyti įvykių sąrašo"
+
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Kalendoriaus matomumas"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
-msgstr ""
+msgstr "Rodyti visuose darbastaliuose"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
-msgstr ""
+msgstr "Visada viršuje"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
-msgstr ""
+msgstr "Rodyti užduočių juostoje"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
-msgstr ""
+msgstr "Rodyti pranešimų gaviklyje"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
-msgstr ""
+msgstr "Rodyti sistemos dėkle"
 
-#: ../src/parameters.c:739
-#, fuzzy
+#: ../src/parameters.c:738
 msgid "Calendar start"
-msgstr "XF Kalendorius"
+msgstr "Kalendorių paleisti"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
-msgstr ""
+msgstr "Rodomą"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
-msgstr ""
+msgstr "Slėpiamą"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
-msgstr ""
+msgstr "Sumažintą"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr ""
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "Atveriant kalendoriaus langą"
 
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Uždaryti langą"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
+#: ../src/parameters.c:792
+msgid "Select today's date"
 msgstr "Pasirinkti šiandieną"
 
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr ""
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Pasirinkti anksčiau pasirinktą datą"
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
 msgstr ""
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
-msgstr ""
+msgstr "Dienų rodinys"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
-msgstr ""
+msgstr "Įvykių sąrašas"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Papildomi nustatymai"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
 msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
-msgstr ""
+msgstr "Kiek įvykių sąraše rodyti papildomų dienų"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
+msgstr "Tai yra numatytoji reikšmė, tikrame įvykių sąrašo lange galite ją pakeisti."
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
 msgstr ""
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Dienų rodinio, numatytoji pirmoji diena"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Pirmoji savaitės diena"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Pasirinkta diena"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Naudoti dinaminį sistemos dėklą"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Naudoti dinaminę piktogramą"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Dinaminė piktograma rodo dabartinį mėnesį ir mėnesio dieną."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
-msgstr ""
+msgstr "Naudoti pažadinimo laikmatį"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "Šį laikmatį naudokite jei Orage kyla problemų pabundant po sustabdymo ar užmigdymo. (Pavyzdžiui sistemos dėklas neatsinaujina ar signalai nepasileidžia)"
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
 msgstr ""
 
-#: ../src/parameters.c:938
-#, fuzzy
-msgid "Orage Preferences"
-msgstr "Nustatymai"
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Orage langas"
 
-#: ../src/parameters.c:1050
-msgid "First Orage start. Searching default timezone."
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr ""
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr ""
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr ""
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
 msgstr ""
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1045
+msgid "Orage Preferences"
+msgstr "Orage nustatymai"
+
+#: ../src/parameters.c:1157
+msgid "First Orage start. Searching default timezone."
+msgstr "Pirmas Orage paleidimas. Ieškoma numatytosios laiko juostos."
+
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
-msgstr ""
+msgstr "Numatyta laiko juosta nustatyta %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
-msgstr ""
+msgstr "Numatyta laiko juosta nerasta, nustatykite ją rankiniu būdu."
 
 #: ../src/reminder.c:562
-#, fuzzy
 msgid "Reminder "
 msgstr "Priminimai"
 
 #: ../src/reminder.c:591
 msgid "Open"
-msgstr ""
+msgstr "Atverti"
 
-#: ../src/reminder.c:722
-#, fuzzy
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
-msgstr "Priminimai"
+msgstr "Priminimai - Orage"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Atidėti"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
+msgstr "Priminti po nurodyto laiko"
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
-msgstr ""
+msgstr "Kitas aktyvus signalas:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
+msgstr "\n%02d d %02d h %02d min iki: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
+msgstr "\nAktyvių signalų nerasta"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
-msgstr ""
+msgstr "Afrika"
 
 #: ../src/timezone_names.c:37
 msgid "Africa/Abidjan"
-msgstr ""
+msgstr "Afrika/Abidžanas"
 
 #: ../src/timezone_names.c:38
 msgid "Africa/Accra"
-msgstr ""
+msgstr "Afrika/Akra"
 
 #: ../src/timezone_names.c:39
 msgid "Africa/Addis_Ababa"
-msgstr ""
+msgstr "Afrika/Adis Abeba"
 
 #: ../src/timezone_names.c:40
 msgid "Africa/Algiers"
-msgstr ""
+msgstr "Afrika/Alžyras"
 
 #: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr ""
+msgid "Africa/Asmara"
+msgstr "Afrika/Asmara"
 
 #: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr ""
+msgid "Africa/Asmera"
+msgstr "Afrika/Asmara"
 
 #: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr ""
+msgid "Africa/Bamako"
+msgstr "Afrika/Bamakas"
 
 #: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr ""
+msgid "Africa/Bangui"
+msgstr "Afrika/Bangis"
 
 #: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr ""
+msgid "Africa/Banjul"
+msgstr "Afrika/Bandžulis"
 
 #: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr ""
+msgid "Africa/Bissau"
+msgstr "Afrika/Bisau"
 
 #: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr ""
+msgid "Africa/Blantyre"
+msgstr "Afrika/Blantairas"
 
 #: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr ""
+msgid "Africa/Brazzaville"
+msgstr "Afrika/Brazavilis"
 
 #: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr ""
+msgid "Africa/Bujumbura"
+msgstr "Afrika/Budžumbura"
 
 #: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr ""
+msgid "Africa/Cairo"
+msgstr "Afrika/Kairas"
 
 #: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr ""
+msgid "Africa/Casablanca"
+msgstr "Afrika/Kasablanka"
 
 #: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr ""
+msgid "Africa/Ceuta"
+msgstr "Afrika/Seuta"
 
 #: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr ""
+msgid "Africa/Conakry"
+msgstr "Afrika/Konakris"
 
 #: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr ""
+msgid "Africa/Dakar"
+msgstr "Afrika/Dakaras"
 
 #: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr ""
+msgid "Africa/Dar_es_Salaam"
+msgstr "Afrika/Dar es Salamas"
 
 #: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr ""
+msgid "Africa/Djibouti"
+msgstr "Afrika/Džibutis"
 
 #: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr ""
+msgid "Africa/Douala"
+msgstr "Afrika/Duala"
 
 #: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr ""
+msgid "Africa/El_Aaiun"
+msgstr "Afrika/El Aaiunas"
 
 #: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr ""
+msgid "Africa/Freetown"
+msgstr "Afrika/Fritaunas"
 
 #: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr ""
+msgid "Africa/Gaborone"
+msgstr "Afrika/Gaberonas"
 
 #: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr ""
+msgid "Africa/Harare"
+msgstr "Afrika/Hararė"
 
 #: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr ""
+msgid "Africa/Juba"
+msgstr "Afrika/Džuba"
 
 #: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr ""
+msgid "Africa/Johannesburg"
+msgstr "Afrika/Johanesburgas"
 
 #: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr ""
+msgid "Africa/Kampala"
+msgstr "Afrika/Kampala"
 
 #: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr ""
+msgid "Africa/Khartoum"
+msgstr "Afrika/Chartumas"
 
 #: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr ""
+msgid "Africa/Kigali"
+msgstr "Afrika/Kigalis"
 
 #: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr ""
+msgid "Africa/Kinshasa"
+msgstr "Afrika/Kinšasa"
 
 #: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr ""
+msgid "Africa/Lagos"
+msgstr "Afrika/Lagosas"
 
 #: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr ""
+msgid "Africa/Libreville"
+msgstr "Afrika/Librevilis"
 
 #: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr ""
+msgid "Africa/Lome"
+msgstr "Afrika/Lomė"
 
 #: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr ""
+msgid "Africa/Luanda"
+msgstr "Afrika/Luanda"
 
 #: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr ""
+msgid "Africa/Lubumbashi"
+msgstr "Afrika/Lubumbašis"
 
 #: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr ""
+msgid "Africa/Lusaka"
+msgstr "Afrika/Lusaka"
 
 #: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr ""
+msgid "Africa/Malabo"
+msgstr "Afrika/Malabas"
 
 #: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr ""
+msgid "Africa/Maputo"
+msgstr "Afrika/Maputu"
 
 #: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr ""
+msgid "Africa/Maseru"
+msgstr "Afrika/Maserus"
 
 #: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr ""
+msgid "Africa/Mbabane"
+msgstr "Afrika/Mbabanė"
 
 #: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr ""
+msgid "Africa/Mogadishu"
+msgstr "Afrika/Mogadišas"
 
 #: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr ""
+msgid "Africa/Monrovia"
+msgstr "Afrika/Monrovija"
 
 #: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr ""
+msgid "Africa/Nairobi"
+msgstr "Afrika/Nairobis"
 
 #: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr ""
+msgid "Africa/Ndjamena"
+msgstr "Afrika/Ndžamena"
 
 #: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr ""
+msgid "Africa/Niamey"
+msgstr "Afrika/Niamėjus"
 
 #: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr ""
+msgid "Africa/Nouakchott"
+msgstr "Afrika/Nouakšotas"
 
 #: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr ""
+msgid "Africa/Ouagadougou"
+msgstr "Afrika/Uagadugas"
 
 #: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr ""
+msgid "Africa/Porto-Novo"
+msgstr "Afrika/Porto-Novas"
 
 #: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr ""
+msgid "Africa/Sao_Tome"
+msgstr "Afrika/San Tomė"
 
 #: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr ""
+msgid "Africa/Timbuktu"
+msgstr "Afrika/Timbuktu"
 
 #: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr ""
+msgid "Africa/Tripoli"
+msgstr "Afrika/Tripolis"
 
 #: ../src/timezone_names.c:89
-msgid "America"
-msgstr ""
+msgid "Africa/Tunis"
+msgstr "Afrika/Tunisas"
 
 #: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr ""
+msgid "Africa/Windhoek"
+msgstr "Afrika/Vindhukas"
 
 #: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr ""
+msgid "America"
+msgstr "Amerika"
 
 #: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr ""
+msgid "America/Adak"
+msgstr "Amerika/Adakas"
 
 #: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr ""
+msgid "America/Anchorage"
+msgstr "Amerika/Ankoridžas"
 
 #: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr ""
+msgid "America/Anguilla"
+msgstr "Amerika/Angilija"
 
 #: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr ""
+msgid "America/Antigua"
+msgstr "Amerika/Antigva"
 
 #: ../src/timezone_names.c:96
-msgid "America/Argentina/Catamarca"
-msgstr ""
+msgid "America/Araguaina"
+msgstr "Amerika/Aragvaja"
 
 #: ../src/timezone_names.c:97
-msgid "America/Argentina/Cordoba"
-msgstr ""
+msgid "America/Argentina/Buenos_Aires"
+msgstr "Amerika/Argentina/Buenos Airės"
 
 #: ../src/timezone_names.c:98
-msgid "America/Argentina/Jujuy"
-msgstr ""
+msgid "America/Argentina/Catamarca"
+msgstr "Amerika/Argentina/Katamarka"
 
 #: ../src/timezone_names.c:99
-msgid "America/Argentina/Mendoza"
-msgstr ""
+msgid "America/Argentina/ComodRivadavia"
+msgstr "Amerika/Argentina/KomodRivadavija"
 
 #: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr ""
+msgid "America/Argentina/Cordoba"
+msgstr "Amerika/Argentina/Kordoba"
 
 #: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr ""
+msgid "America/Argentina/Jujuy"
+msgstr "Amerika/Argentina/Žužujus"
 
 #: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr ""
+msgid "America/Argentina/La_Rioja"
+msgstr "Amerika/Argentina/La_Riocha"
 
 #: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr ""
+msgid "America/Argentina/Mendoza"
+msgstr "Amerika/Argentina/Mendosa"
 
 #: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr ""
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "Amerika/Argentina/Rio_Galjegosas"
 
 #: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr ""
+msgid "America/Argentina/Salta"
+msgstr "Amerika/Argentina/Salta"
 
 #: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr ""
+msgid "America/Argentina/San_Juan"
+msgstr "Amerika/Argentina/San_Chuanas"
 
 #: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr ""
+msgid "America/Argentina/San_Luis"
+msgstr "Amerika/Argentina/San_Luisas"
 
 #: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr ""
+msgid "America/Argentina/Tucuman"
+msgstr "Amerika/Argentina/Tukumanas"
 
 #: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr ""
+msgid "America/Argentina/Ushuaia"
+msgstr "Amerika/Argentina/Ušuaja"
 
 #: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr ""
+msgid "America/Aruba"
+msgstr "Amerika/Aruba"
 
 #: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr ""
+msgid "America/Asuncion"
+msgstr "Amerika/Asunsjonas"
 
 #: ../src/timezone_names.c:112
-msgid "America/Catamarca"
+msgid "America/Atikokan"
 msgstr ""
 
 #: ../src/timezone_names.c:113
-msgid "America/Cayenne"
+msgid "America/Atka"
 msgstr ""
 
 #: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr ""
+msgid "America/Bahia"
+msgstr "Amerika/Bahija"
 
 #: ../src/timezone_names.c:115
-msgid "America/Chicago"
+msgid "America/Bahia_Banderas"
 msgstr ""
 
 #: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr ""
+msgid "America/Barbados"
+msgstr "Amerika/Barbadosas"
 
 #: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr ""
+msgid "America/Belem"
+msgstr "Amerika/Belemas"
 
 #: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr ""
+msgid "America/Belize"
+msgstr "Amerika/Belizas"
 
 #: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
+msgid "America/Blanc-Sablon"
 msgstr ""
 
 #: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr ""
+msgid "America/Boa_Vista"
+msgstr "Amerika/Boa Vista"
 
 #: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr ""
+msgid "America/Bogota"
+msgstr "Amerika/Bogota"
 
 #: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr ""
+msgid "America/Boise"
+msgstr "Amerika/Boizis"
 
 #: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr ""
+msgid "America/Buenos_Aires"
+msgstr "Amerika/Buenos Airės"
 
 #: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr ""
+msgid "America/Cambridge_Bay"
+msgstr "Amerika/Keimbridž Bėjus"
 
 #: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr ""
+msgid "America/Campo_Grande"
+msgstr "Amerika/Kampo_Grandė"
 
 #: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr ""
+msgid "America/Cancun"
+msgstr "Amerika/Kankūnas"
 
 #: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr ""
+msgid "America/Caracas"
+msgstr "Amerika/Karakasas"
 
 #: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr ""
+msgid "America/Catamarca"
+msgstr "Amerika/Katamarka"
 
 #: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr ""
+msgid "America/Cayenne"
+msgstr "Amerika/Kajenas"
 
 #: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr ""
+msgid "America/Cayman"
+msgstr "Amerika/Kaimanas"
 
 #: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr ""
+msgid "America/Chicago"
+msgstr "Amerika/Čikaga"
 
 #: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr ""
+msgid "America/Chihuahua"
+msgstr "Amerika/Čichuachuja"
 
 #: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
+msgid "America/Coral_Harbour"
 msgstr ""
 
 #: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr ""
+msgid "America/Cordoba"
+msgstr "Amerika/Kordoba"
 
 #: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr ""
+msgid "America/Costa_Rica"
+msgstr "Amerika/Kosta Rika"
 
 #: ../src/timezone_names.c:136
-msgid "America/Guatemala"
+msgid "America/Creston"
 msgstr ""
 
 #: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr ""
+msgid "America/Cuiaba"
+msgstr "Amerika/Kujaba"
 
 #: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr ""
+msgid "America/Curacao"
+msgstr "Amerika/Kurasao"
 
 #: ../src/timezone_names.c:139
-msgid "America/Halifax"
+msgid "America/Danmarkshavn"
 msgstr ""
 
 #: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr ""
+msgid "America/Dawson"
+msgstr "Amerika/Dausonas"
 
 #: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr ""
+msgid "America/Dawson_Creek"
+msgstr "Amerika/Dauson Krykas"
 
 #: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr ""
+msgid "America/Denver"
+msgstr "Amerika/Denveris"
 
 #: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr ""
+msgid "America/Detroit"
+msgstr "Amerika/Detroitas"
 
 #: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr ""
+msgid "America/Dominica"
+msgstr "Amerika/Dominika"
 
 #: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr ""
+msgid "America/Edmonton"
+msgstr "Amerika/Edmontonas"
 
 #: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
+msgid "America/Ensenada"
 msgstr ""
 
 #: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr ""
+msgid "America/Eirunepe"
+msgstr "Amerika/Eirunepė"
 
 #: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr ""
+msgid "America/El_Salvador"
+msgstr "Amerika/Salvadoras"
 
 #: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr ""
+msgid "America/Fortaleza"
+msgstr "Amerika/Fortaleza"
 
 #: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr ""
+msgid "America/Fort_Wayne"
+msgstr "Amerika/Fort_Veinas"
 
 #: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr ""
+msgid "America/Glace_Bay"
+msgstr "Amerika/Gleis Bėjus"
 
 #: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr ""
+msgid "America/Godthab"
+msgstr "Amerika/Gothobas"
 
 #: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr ""
+msgid "America/Goose_Bay"
+msgstr "Amerika/Gus Bėjus"
 
 #: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr ""
+msgid "America/Grand_Turk"
+msgstr "Amerika/Grand Terkas"
 
 #: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr ""
+msgid "America/Grenada"
+msgstr "Amerika/Grenada"
 
 #: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr ""
+msgid "America/Guadeloupe"
+msgstr "Amerika/Gvadalupė"
 
 #: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr ""
+msgid "America/Guatemala"
+msgstr "Amerika/Gvatemala"
 
 #: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr ""
+msgid "America/Guayaquil"
+msgstr "Amerika/Guajakilis"
 
 #: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr ""
+msgid "America/Guyana"
+msgstr "Amerika/Gajana"
 
 #: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr ""
+msgid "America/Halifax"
+msgstr "Amerika/Halifaksas"
 
 #: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr ""
+msgid "America/Havana"
+msgstr "Amerika/Havana"
 
 #: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr ""
+msgid "America/Hermosillo"
+msgstr "Amerika/Hermosiljas"
 
 #: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr ""
+msgid "America/Indiana/Indianapolis"
+msgstr "Amerika/Indiana/Indianapolis"
 
 #: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr ""
+msgid "America/Indiana/Knox"
+msgstr "Amerika/Indiana/Knoksas"
 
 #: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr ""
+msgid "America/Indiana/Marengo"
+msgstr "Amerika/Indiana/Marengas"
 
 #: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
+msgid "America/Indiana/Petersburg"
 msgstr ""
 
 #: ../src/timezone_names.c:167
-msgid "America/Miquelon"
+msgid "America/Indiana/Tell_City"
 msgstr ""
 
 #: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr ""
+msgid "America/Indiana/Vevay"
+msgstr "Amerika/Indiana/Vevėjus"
 
 #: ../src/timezone_names.c:169
-msgid "America/Montevideo"
+msgid "America/Indiana/Vincennes"
 msgstr ""
 
 #: ../src/timezone_names.c:170
-msgid "America/Montreal"
+msgid "America/Indiana/Winamac"
 msgstr ""
 
 #: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr ""
+msgid "America/Indianapolis"
+msgstr "Amerika/Indianapolis"
 
 #: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr ""
+msgid "America/Inuvik"
+msgstr "Amerika/Inuvikas"
 
 #: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr ""
+msgid "America/Iqaluit"
+msgstr "Amerika/Ikaluitas"
 
 #: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr ""
+msgid "America/Jamaica"
+msgstr "Amerika/Jamaika"
 
 #: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr ""
+msgid "America/Jujuy"
+msgstr "Amerika/Džudžujis"
 
 #: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr ""
+msgid "America/Juneau"
+msgstr "Amerika/Džunas"
 
 #: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr ""
+msgid "America/Kentucky/Louisville"
+msgstr "Amerika/Kentukis/Luisvilis"
 
 #: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr ""
+msgid "America/Kentucky/Monticello"
+msgstr "Amerika/Kentukis/Montičelas"
 
 #: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
+msgid "America/Knox_IN"
 msgstr ""
 
 #: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr ""
+msgid "America/Kralendijk"
+msgstr "Amerika/Kralendeikas"
 
 #: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr ""
+msgid "America/La_Paz"
+msgstr "Amerika/La Pasas"
 
 #: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr ""
+msgid "America/Lima"
+msgstr "Amerika/Lima"
 
 #: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr ""
+msgid "America/Los_Angeles"
+msgstr "Amerika/Los Andželas"
 
 #: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr ""
+msgid "America/Louisville"
+msgstr "Amerika/Luisvilis"
 
 #: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
+msgid "America/Lower_Princes"
 msgstr ""
 
 #: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr ""
+msgid "America/Maceio"
+msgstr "Amerika/Masėjo"
 
 #: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr ""
+msgid "America/Managua"
+msgstr "Amerika/Managva"
 
 #: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr ""
+msgid "America/Manaus"
+msgstr "Amerika/Manausas"
 
 #: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr ""
+msgid "America/Marigot"
+msgstr "Amerika/Marigo"
 
 #: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr ""
+msgid "America/Martinique"
+msgstr "Amerika/Martinika"
 
 #: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr ""
+msgid "America/Matamoros"
+msgstr "Amerika/Matamorosas"
 
 #: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr ""
+msgid "America/Mazatlan"
+msgstr "Amerika/Mazatlanas"
 
 #: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr ""
+msgid "America/Mendoza"
+msgstr "Amerika/Mendoza"
 
 #: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr ""
+msgid "America/Menominee"
+msgstr "Amerika/Menominis"
 
 #: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr ""
+msgid "America/Merida"
+msgstr "Amerika/Merida"
 
 #: ../src/timezone_names.c:196
-msgid "America/St_Johns"
+msgid "America/Metlakatla"
 msgstr ""
 
 #: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr ""
+msgid "America/Mexico_City"
+msgstr "Amerika/Meksiko miestas"
 
 #: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr ""
+msgid "America/Miquelon"
+msgstr "Amerika/Mikelonas"
 
 #: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
+msgid "America/Moncton"
 msgstr ""
 
 #: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr ""
+msgid "America/Monterrey"
+msgstr "Amerika/Monterėjus"
 
 #: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr ""
+msgid "America/Montevideo"
+msgstr "Amerika/Montevidėjas"
 
 #: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr ""
+msgid "America/Montreal"
+msgstr "Amerika/Monrealis"
 
 #: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr ""
+msgid "America/Montserrat"
+msgstr "Amerika/Montseratas"
 
 #: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr ""
+msgid "America/Nassau"
+msgstr "Amerika/Nasau"
 
 #: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr ""
+msgid "America/New_York"
+msgstr "Amerika/Niujorkas"
 
 #: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr ""
+msgid "America/Nipigon"
+msgstr "Amerika/Nipigonas"
 
 #: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr ""
+msgid "America/Nome"
+msgstr "Amerika/Nomas"
 
 #: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
+msgid "America/North_Dakota/Beulah"
 msgstr ""
 
 #: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
+msgid "America/North_Dakota/Center"
 msgstr ""
 
 #: ../src/timezone_names.c:210
-msgid "America/Yakutat"
+msgid "America/North_Dakota/New_Salem"
 msgstr ""
 
 #: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr ""
+msgid "America/Noronha"
+msgstr "Amerika/Noronija"
 
 #: ../src/timezone_names.c:212
-msgid "Antarctica"
+msgid "America/Ojinaga"
 msgstr ""
 
 #: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr ""
+msgid "America/Panama"
+msgstr "Amerika/Panama"
 
 #: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr ""
+msgid "America/Pangnirtung"
+msgstr "Amerika/Pangnirtangas"
 
 #: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr ""
+msgid "America/Paramaribo"
+msgstr "Amerika/Paramaribas"
 
 #: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr ""
+msgid "America/Phoenix"
+msgstr "Amerika/Fyniksas"
 
 #: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr ""
+msgid "America/Port-au-Prince"
+msgstr "Amerika/Port-o-Prensas"
 
 #: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr ""
+msgid "America/Port_of_Spain"
+msgstr "Amerika/Port of Speinas"
 
 #: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
+msgid "America/Porto_Acre"
 msgstr ""
 
 #: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr ""
+msgid "America/Porto_Velho"
+msgstr "Amerika/Porto Veljas"
 
 #: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr ""
+msgid "America/Puerto_Rico"
+msgstr "Amerika/Puerto Rikas"
 
 #: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr ""
+msgid "America/Rainy_River"
+msgstr "Amerika/Rain Riveris"
 
 #: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr ""
+msgid "America/Rankin_Inlet"
+msgstr "Amerika/Rankin Inletas"
 
 #: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr ""
+msgid "America/Recife"
+msgstr "Amerika/Resifė"
 
 #: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr ""
+msgid "America/Regina"
+msgstr "Amerika/Redžaina"
 
 #: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
+msgid "America/Resolute"
 msgstr ""
 
 #: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr ""
+msgid "America/Rio_Branco"
+msgstr "Amerika/Rio Brankas"
 
 #: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr ""
+msgid "America/Rosario"
+msgstr "Amerika/Rosarijas"
 
 #: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
+msgid "America/Santa_Isabel"
 msgstr ""
 
 #: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
+msgid "America/Santarem"
 msgstr ""
 
 #: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr ""
+msgid "America/Santiago"
+msgstr "Amerika/Santjagas"
 
 #: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr ""
+msgid "America/Santo_Domingo"
+msgstr "Amerika/Santo Domingas"
 
 #: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr ""
+msgid "America/Sao_Paulo"
+msgstr "Amerika/San Paulas"
 
 #: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr ""
+msgid "America/Scoresbysund"
+msgstr "Amerika/Skoresbiusūnas"
 
 #: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr ""
+msgid "America/Shiprock"
+msgstr "Amerika/Šiprokas"
 
 #: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
+msgid "America/Sitka"
 msgstr ""
 
 #: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
+msgid "America/St_Barthelemy"
 msgstr ""
 
 #: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr ""
+msgid "America/St_Johns"
+msgstr "Amerika/Šv. Džonas"
 
 #: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr ""
+msgid "America/St_Kitts"
+msgstr "Amerika/Šv. Kitsas"
 
 #: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr ""
+msgid "America/St_Lucia"
+msgstr "Amerika/Šv. Liucija"
 
 #: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr ""
+msgid "America/St_Thomas"
+msgstr "Amerika/Šv. Tomas"
 
 #: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr ""
+msgid "America/St_Vincent"
+msgstr "Amerika/Šv Vincentas"
 
 #: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr ""
+msgid "America/Swift_Current"
+msgstr "Amerika/Svift Karentas"
 
 #: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr ""
+msgid "America/Tegucigalpa"
+msgstr "Amerika/Tegusigalpa"
 
 #: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr ""
+msgid "America/Thule"
+msgstr "Amerika/Tulė"
 
 #: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr ""
+msgid "America/Thunder_Bay"
+msgstr "Amerika/Tander Bėjus"
 
 #: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr ""
+msgid "America/Tijuana"
+msgstr "Amerika/Tichuana"
 
 #: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr ""
+msgid "America/Toronto"
+msgstr "Amerika/Torontas"
 
 #: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr ""
+msgid "America/Tortola"
+msgstr "Amerika/Tortola"
 
 #: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr ""
+msgid "America/Vancouver"
+msgstr "Amerika/Vankuveris"
 
 #: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
+msgid "America/Virgin"
 msgstr ""
 
 #: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr ""
+msgid "America/Whitehorse"
+msgstr "Amerika/Vaithorsas"
 
 #: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr ""
+msgid "America/Winnipeg"
+msgstr "Amerika/Vinipegas"
 
 #: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr ""
+msgid "America/Yakutat"
+msgstr "Amerika/Jakutatas"
 
 #: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr ""
+msgid "America/Yellowknife"
+msgstr "Amerika/Jelounaifas"
 
 #: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr ""
+msgid "Antarctica"
+msgstr "Antarktida"
 
 #: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr ""
+msgid "Antarctica/Casey"
+msgstr "Antarktida/Kasėjus"
 
 #: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr ""
+msgid "Antarctica/Davis"
+msgstr "Antarktida/Davisas"
 
 #: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr ""
+msgid "Antarctica/DumontDUrville"
+msgstr "Antarktida/DumontDUrvilis"
 
 #: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
+msgid "Antarctica/Macquarie"
 msgstr ""
 
 #: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr ""
+msgid "Antarctica/Mawson"
+msgstr "Antarktida/Mausonas"
 
 #: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr ""
+msgid "Antarctica/McMurdo"
+msgstr "Antarktida/MakMurdas"
 
 #: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr ""
+msgid "Antarctica/Palmer"
+msgstr "Antarktida/Palmeris"
 
 #: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
+msgid "Antarctica/Rothera"
 msgstr ""
 
 #: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr ""
+msgid "Antarctica/South_Pole"
+msgstr "Antarktida/Pietų Ašigalis"
 
 #: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr ""
+msgid "Antarctica/Syowa"
+msgstr "Antarktida/Sajova"
 
 #: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr ""
+msgid "Antarctica/Vostok"
+msgstr "Antarktida/Vostokas"
 
 #: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr ""
+msgid "Arctic"
+msgstr "Arktis"
 
 #: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr ""
+msgid "Arctic/Longyearbyen"
+msgstr "Arktis/Longjyrbienas"
 
 #: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr ""
+msgid "Asia"
+msgstr "Azija"
 
 #: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr ""
+msgid "Asia/Aden"
+msgstr "Azija/Adenas"
 
 #: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr ""
+msgid "Asia/Almaty"
+msgstr "Azija/Almata"
 
 #: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr ""
+msgid "Asia/Amman"
+msgstr "Azija/Amanas"
 
 #: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr ""
+msgid "Asia/Anadyr"
+msgstr "Azija/Anadyris"
 
 #: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr ""
+msgid "Asia/Aqtau"
+msgstr "Azija/Aktau"
 
 #: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr ""
+msgid "Asia/Aqtobe"
+msgstr "Azija/Aktiubinskas"
 
 #: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr ""
+msgid "Asia/Ashgabat"
+msgstr "Azija/Ašhabadas"
 
 #: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
+msgid "Asia/Ashkhabad"
 msgstr ""
 
 #: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr ""
+msgid "Asia/Baghdad"
+msgstr "Azija/Bagdadas"
 
 #: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr ""
+msgid "Asia/Bahrain"
+msgstr "Azija/Bahreinas"
 
 #: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr ""
+msgid "Asia/Baku"
+msgstr "Azija/Baku"
 
 #: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr ""
+msgid "Asia/Bangkok"
+msgstr "Azija/Bankokas"
 
 #: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr ""
+msgid "Asia/Beirut"
+msgstr "Azija/Beirutas"
 
 #: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr ""
+msgid "Asia/Bishkek"
+msgstr "Azija/Biškekas"
 
 #: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr ""
+msgid "Asia/Brunei"
+msgstr "Azija/Brunėjus"
 
 #: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr ""
+msgid "Asia/Calcutta"
+msgstr "Azija/Kalkuta"
 
 #: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
+msgid "Asia/Choibalsan"
 msgstr ""
 
 #: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
+msgid "Asia/Chongqing"
 msgstr ""
 
 #: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr ""
+msgid "Asia/Chungking"
+msgstr "Azija/Čongčingas"
 
 #: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr ""
+msgid "Asia/Colombo"
+msgstr "Azija/Kolombas"
 
 #: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
+msgid "Asia/Dacca"
 msgstr ""
 
 #: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr ""
+msgid "Asia/Damascus"
+msgstr "Azija/Damaskas"
 
 #: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr ""
+msgid "Asia/Dhaka"
+msgstr "Azija/Daka"
 
 #: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr ""
+msgid "Asia/Dili"
+msgstr "Azija/Dilis"
 
 #: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr ""
+msgid "Asia/Dubai"
+msgstr "Azija/Dubajus"
 
 #: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr ""
+msgid "Asia/Dushanbe"
+msgstr "Azija/Dušanbė"
 
 #: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr ""
+msgid "Asia/Gaza"
+msgstr "Azija/Gaza"
 
 #: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr ""
+msgid "Asia/Harbin"
+msgstr "Azija/Harbinas"
 
 #: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
+msgid "Asia/Hebron"
 msgstr ""
 
 #: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr ""
+msgid "Asia/Hong_Kong"
+msgstr "Azija/Hongkongas"
 
 #: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
+msgid "Asia/Ho_Chi_Minh"
 msgstr ""
 
 #: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr ""
+msgid "Asia/Hovd"
+msgstr "Azija/Houdas"
 
 #: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr ""
+msgid "Asia/Irkutsk"
+msgstr "Azija/Irkutskas"
 
 #: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr ""
+msgid "Asia/Istanbul"
+msgstr "Azija/Stambulas"
 
 #: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr ""
+msgid "Asia/Jakarta"
+msgstr "Azija/Džakarta"
 
 #: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr ""
+msgid "Asia/Jayapura"
+msgstr "Azija/Džajapūras"
 
 #: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr ""
+msgid "Asia/Jerusalem"
+msgstr "Azija/Jeruzalė"
 
 #: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr ""
+msgid "Asia/Kabul"
+msgstr "Azija/Kabulas"
 
 #: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr ""
+msgid "Asia/Kamchatka"
+msgstr "Azija/Kamčiatka"
 
 #: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr ""
+msgid "Asia/Karachi"
+msgstr "Azija/Karačis"
 
 #: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr ""
+msgid "Asia/Kashgar"
+msgstr "Azija/Kašgaras"
 
 #: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
+msgid "Asia/Kathmandu"
 msgstr ""
 
 #: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr ""
+msgid "Asia/Katmandu"
+msgstr "Azija/Katmandu"
 
 #: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
+msgid "Asia/Khandyga"
 msgstr ""
 
 #: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
+msgid "Asia/Kolkata"
 msgstr ""
 
 #: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr ""
+msgid "Asia/Krasnoyarsk"
+msgstr "Azija/Krasnojarskas"
 
 #: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr ""
+msgid "Asia/Kuala_Lumpur"
+msgstr "Azija/Kvala Lumpūras"
 
 #: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr ""
+msgid "Asia/Kuching"
+msgstr "Azija/Kučingas"
 
 #: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr ""
+msgid "Asia/Kuwait"
+msgstr "Azija/Kuveitas"
 
 #: ../src/timezone_names.c:320
-msgid "Europe"
-msgstr ""
+msgid "Asia/Macao"
+msgstr "Azija/Makao"
 
 #: ../src/timezone_names.c:321
-msgid "Europe/Amsterdam"
+msgid "Asia/Macau"
 msgstr ""
 
 #: ../src/timezone_names.c:322
-msgid "Europe/Andorra"
-msgstr ""
+msgid "Asia/Magadan"
+msgstr "Azija/Magadanas"
 
 #: ../src/timezone_names.c:323
-msgid "Europe/Athens"
+msgid "Asia/Makassar"
 msgstr ""
 
 #: ../src/timezone_names.c:324
-msgid "Europe/Belfast"
-msgstr ""
+msgid "Asia/Manila"
+msgstr "Azija/Manila"
 
 #: ../src/timezone_names.c:325
-msgid "Europe/Belgrade"
-msgstr ""
+msgid "Asia/Muscat"
+msgstr "Azija/Muskatas"
 
 #: ../src/timezone_names.c:326
-msgid "Europe/Berlin"
-msgstr ""
+msgid "Asia/Nicosia"
+msgstr "Azija/Nikosija"
 
 #: ../src/timezone_names.c:327
-msgid "Europe/Bratislava"
+msgid "Asia/Novokuznetsk"
 msgstr ""
 
 #: ../src/timezone_names.c:328
-msgid "Europe/Brussels"
-msgstr ""
+msgid "Asia/Novosibirsk"
+msgstr "Azija/Novosibirskas"
 
 #: ../src/timezone_names.c:329
-msgid "Europe/Bucharest"
-msgstr ""
+msgid "Asia/Omsk"
+msgstr "Azija/Omskas"
 
 #: ../src/timezone_names.c:330
-msgid "Europe/Budapest"
+msgid "Asia/Oral"
 msgstr ""
 
 #: ../src/timezone_names.c:331
-msgid "Europe/Chisinau"
-msgstr ""
+msgid "Asia/Phnom_Penh"
+msgstr "Azija/Pnompenis"
 
 #: ../src/timezone_names.c:332
-msgid "Europe/Copenhagen"
-msgstr ""
+msgid "Asia/Pontianak"
+msgstr "Azija/Pontianakas"
 
 #: ../src/timezone_names.c:333
-msgid "Europe/Dublin"
-msgstr ""
+msgid "Asia/Pyongyang"
+msgstr "Azija/Pchenjanas"
 
 #: ../src/timezone_names.c:334
-msgid "Europe/Gibraltar"
-msgstr ""
+msgid "Asia/Qatar"
+msgstr "Azija/Kataras"
 
 #: ../src/timezone_names.c:335
-msgid "Europe/Helsinki"
+msgid "Asia/Qyzylorda"
 msgstr ""
 
 #: ../src/timezone_names.c:336
-msgid "Europe/Istanbul"
-msgstr ""
+msgid "Asia/Rangoon"
+msgstr "Azija/Rangūnas"
 
 #: ../src/timezone_names.c:337
-msgid "Europe/Kaliningrad"
-msgstr ""
+msgid "Asia/Riyadh"
+msgstr "Azija/Rijadas"
 
 #: ../src/timezone_names.c:338
-msgid "Europe/Kiev"
+msgid "Asia/Riyadh87"
 msgstr ""
 
 #: ../src/timezone_names.c:339
-msgid "Europe/Lisbon"
+msgid "Asia/Riyadh88"
 msgstr ""
 
 #: ../src/timezone_names.c:340
-msgid "Europe/Ljubljana"
+msgid "Asia/Riyadh89"
 msgstr ""
 
 #: ../src/timezone_names.c:341
-msgid "Europe/London"
-msgstr ""
+msgid "Asia/Saigon"
+msgstr "Azija/Saigonas"
 
 #: ../src/timezone_names.c:342
-msgid "Europe/Luxembourg"
+msgid "Asia/Sakhalin"
 msgstr ""
 
 #: ../src/timezone_names.c:343
-msgid "Europe/Madrid"
-msgstr ""
+msgid "Asia/Samarkand"
+msgstr "Azija/Samarkandas"
 
 #: ../src/timezone_names.c:344
-msgid "Europe/Malta"
-msgstr ""
+msgid "Asia/Seoul"
+msgstr "Azija/Seulas"
 
 #: ../src/timezone_names.c:345
-msgid "Europe/Minsk"
-msgstr ""
+msgid "Asia/Shanghai"
+msgstr "Azija/Šanchajus"
 
 #: ../src/timezone_names.c:346
-msgid "Europe/Monaco"
-msgstr ""
+msgid "Asia/Singapore"
+msgstr "Azija/Singapūras"
 
 #: ../src/timezone_names.c:347
-msgid "Europe/Moscow"
-msgstr ""
+msgid "Asia/Taipei"
+msgstr "Azija/Taipėjus"
 
 #: ../src/timezone_names.c:348
-msgid "Europe/Nicosia"
-msgstr ""
+msgid "Asia/Tashkent"
+msgstr "Azija/Taškentas"
 
 #: ../src/timezone_names.c:349
-msgid "Europe/Oslo"
-msgstr ""
+msgid "Asia/Tbilisi"
+msgstr "Azija/Tbilisis"
 
 #: ../src/timezone_names.c:350
-msgid "Europe/Paris"
-msgstr ""
+msgid "Asia/Tehran"
+msgstr "Azija/Teheranas"
 
 #: ../src/timezone_names.c:351
-msgid "Europe/Prague"
-msgstr ""
+msgid "Asia/Tel_Aviv"
+msgstr "Azija/Tel_Avivas"
 
 #: ../src/timezone_names.c:352
-msgid "Europe/Riga"
+msgid "Asia/Thimbu"
 msgstr ""
 
 #: ../src/timezone_names.c:353
-msgid "Europe/Rome"
-msgstr ""
+msgid "Asia/Thimphu"
+msgstr "Azija/Timpu"
 
 #: ../src/timezone_names.c:354
-msgid "Europe/Samara"
-msgstr ""
+msgid "Asia/Tokyo"
+msgstr "Azija/Tokijas"
 
 #: ../src/timezone_names.c:355
-msgid "Europe/San_Marino"
-msgstr ""
+msgid "Asia/Ujung_Pandang"
+msgstr "Azija/Udžungpandangas"
 
 #: ../src/timezone_names.c:356
-msgid "Europe/Sarajevo"
-msgstr ""
+msgid "Asia/Ulaanbaatar"
+msgstr "Azija/Ulan Batoras"
 
 #: ../src/timezone_names.c:357
-msgid "Europe/Simferopol"
+msgid "Asia/Ulan_Bator"
 msgstr ""
 
 #: ../src/timezone_names.c:358
-msgid "Europe/Skopje"
-msgstr ""
+msgid "Asia/Urumqi"
+msgstr "Azija/Urumgis"
 
 #: ../src/timezone_names.c:359
-msgid "Europe/Sofia"
+msgid "Asia/Ust-Nera"
 msgstr ""
 
 #: ../src/timezone_names.c:360
-msgid "Europe/Stockholm"
-msgstr ""
+msgid "Asia/Vientiane"
+msgstr "Azija/Vientianas"
 
 #: ../src/timezone_names.c:361
-msgid "Europe/Tallinn"
-msgstr ""
+msgid "Asia/Vladivostok"
+msgstr "Azija/Vladivostokas"
 
 #: ../src/timezone_names.c:362
-msgid "Europe/Tirane"
-msgstr ""
+msgid "Asia/Yakutsk"
+msgstr "Azija/Jakutskas"
 
 #: ../src/timezone_names.c:363
-msgid "Europe/Uzhgorod"
-msgstr ""
+msgid "Asia/Yekaterinburg"
+msgstr "Azija/Jekaterinburgas"
 
 #: ../src/timezone_names.c:364
-msgid "Europe/Vaduz"
-msgstr ""
+msgid "Asia/Yerevan"
+msgstr "Azija/Jerevanas"
 
 #: ../src/timezone_names.c:365
-msgid "Europe/Vatican"
-msgstr ""
+msgid "Atlantic"
+msgstr "Atlantas"
 
 #: ../src/timezone_names.c:366
-msgid "Europe/Vienna"
-msgstr ""
+msgid "Atlantic/Azores"
+msgstr "Atlantas/Azorai"
 
 #: ../src/timezone_names.c:367
-msgid "Europe/Vilnius"
-msgstr ""
+msgid "Atlantic/Bermuda"
+msgstr "Atlantas/Bermudai"
 
 #: ../src/timezone_names.c:368
-msgid "Europe/Warsaw"
-msgstr ""
+msgid "Atlantic/Canary"
+msgstr "Atlantas/Kanarai"
 
 #: ../src/timezone_names.c:369
-msgid "Europe/Zagreb"
-msgstr ""
+msgid "Atlantic/Cape_Verde"
+msgstr "Atlantas/Žaliasis Kyšulys"
 
 #: ../src/timezone_names.c:370
-msgid "Europe/Zaporozhye"
-msgstr ""
+msgid "Atlantic/Faeroe"
+msgstr "Atlantas/Farerai"
 
 #: ../src/timezone_names.c:371
-msgid "Europe/Zurich"
+msgid "Atlantic/Faroe"
 msgstr ""
 
 #: ../src/timezone_names.c:372
-msgid "Indian"
-msgstr ""
+msgid "Atlantic/Jan_Mayen"
+msgstr "Atlantas/Džan Majenas"
 
 #: ../src/timezone_names.c:373
-msgid "Indian/Antananarivo"
-msgstr ""
+msgid "Atlantic/Madeira"
+msgstr "Atlantas/Madeira"
 
 #: ../src/timezone_names.c:374
-msgid "Indian/Chagos"
-msgstr ""
+msgid "Atlantic/Reykjavik"
+msgstr "Atlantas/Reikjavikas"
 
 #: ../src/timezone_names.c:375
-msgid "Indian/Christmas"
-msgstr ""
+msgid "Atlantic/South_Georgia"
+msgstr "Atlantas/Pietų Džordžija"
 
 #: ../src/timezone_names.c:376
-msgid "Indian/Cocos"
-msgstr ""
+msgid "Atlantic/St_Helena"
+msgstr "Atlantas/Šv. Elenos sala"
 
 #: ../src/timezone_names.c:377
-msgid "Indian/Comoro"
-msgstr ""
+msgid "Atlantic/Stanley"
+msgstr "Atlantas/Stenlis"
 
 #: ../src/timezone_names.c:378
-msgid "Indian/Kerguelen"
-msgstr ""
+msgid "Australia"
+msgstr "Australija"
 
 #: ../src/timezone_names.c:379
-msgid "Indian/Mahe"
-msgstr ""
+msgid "Australia/ACT"
+msgstr "Australija/AST"
 
 #: ../src/timezone_names.c:380
-msgid "Indian/Maldives"
-msgstr ""
+msgid "Australia/Adelaide"
+msgstr "Australia/Adelaidė"
 
 #: ../src/timezone_names.c:381
-msgid "Indian/Mauritius"
-msgstr ""
+msgid "Australia/Brisbane"
+msgstr "Australia/Brisbenas"
 
 #: ../src/timezone_names.c:382
-msgid "Indian/Mayotte"
-msgstr ""
+msgid "Australia/Broken_Hill"
+msgstr "Australia/Broken Hill"
 
 #: ../src/timezone_names.c:383
-msgid "Indian/Reunion"
+msgid "Australia/Currie"
 msgstr ""
 
 #: ../src/timezone_names.c:384
-msgid "Pacific"
-msgstr ""
+msgid "Australia/Darwin"
+msgstr "Australia/Darvinas"
 
 #: ../src/timezone_names.c:385
-msgid "Pacific/Apia"
+msgid "Australia/Eucla"
 msgstr ""
 
 #: ../src/timezone_names.c:386
-msgid "Pacific/Auckland"
-msgstr ""
+msgid "Australia/Hobart"
+msgstr "Australia/Hobartas"
 
 #: ../src/timezone_names.c:387
-msgid "Pacific/Chatham"
-msgstr ""
+msgid "Australia/Lindeman"
+msgstr "Australia/Lindemano sala"
 
 #: ../src/timezone_names.c:388
-msgid "Pacific/Easter"
-msgstr ""
+msgid "Australia/Lord_Howe"
+msgstr "Australia/Lordo Hau sala"
 
 #: ../src/timezone_names.c:389
-msgid "Pacific/Efate"
-msgstr ""
+msgid "Australia/Melbourne"
+msgstr "Australia/Melburnas"
 
 #: ../src/timezone_names.c:390
-msgid "Pacific/Enderbury"
-msgstr ""
+msgid "Australia/Perth"
+msgstr "Australia/Pertas"
 
 #: ../src/timezone_names.c:391
-msgid "Pacific/Fakaofo"
-msgstr ""
+msgid "Australia/Sydney"
+msgstr "Australija/Sidnėjus"
 
 #: ../src/timezone_names.c:392
-msgid "Pacific/Fiji"
-msgstr ""
+msgid "Brazil"
+msgstr "Brazilija"
 
 #: ../src/timezone_names.c:393
-msgid "Pacific/Funafuti"
-msgstr ""
+msgid "Brazil/Acre"
+msgstr "Brazilija/Akrė"
 
 #: ../src/timezone_names.c:394
-msgid "Pacific/Galapagos"
-msgstr ""
+msgid "Brazil/DeNoronha"
+msgstr "Brazilija/De_Noronija"
 
 #: ../src/timezone_names.c:395
-msgid "Pacific/Gambier"
-msgstr ""
+msgid "Brazil/East"
+msgstr "Brazilija/Rytai"
 
 #: ../src/timezone_names.c:396
-msgid "Pacific/Guadalcanal"
-msgstr ""
+msgid "Brazil/West"
+msgstr "Brazilija/Vakarai"
 
 #: ../src/timezone_names.c:397
-msgid "Pacific/Guam"
-msgstr ""
+msgid "Canada"
+msgstr "Kanada"
 
 #: ../src/timezone_names.c:398
-msgid "Pacific/Honolulu"
+msgid "Canada/Atlantic"
 msgstr ""
 
 #: ../src/timezone_names.c:399
-msgid "Pacific/Johnston"
+msgid "Canada/Central"
 msgstr ""
 
 #: ../src/timezone_names.c:400
-msgid "Pacific/Kiritimati"
+msgid "Canada/East-Saskatchewan"
 msgstr ""
 
 #: ../src/timezone_names.c:401
-msgid "Pacific/Kosrae"
+msgid "Canada/Eastern"
 msgstr ""
 
 #: ../src/timezone_names.c:402
-msgid "Pacific/Kwajalein"
+msgid "Canada/Mountain"
 msgstr ""
 
 #: ../src/timezone_names.c:403
-msgid "Pacific/Majuro"
+msgid "Canada/Newfoundland"
 msgstr ""
 
 #: ../src/timezone_names.c:404
-msgid "Pacific/Marquesas"
+msgid "Canada/Pacific"
 msgstr ""
 
 #: ../src/timezone_names.c:405
-msgid "Pacific/Midway"
+msgid "Canada/Saskatchewan"
 msgstr ""
 
 #: ../src/timezone_names.c:406
-msgid "Pacific/Nauru"
+msgid "Canada/Yukon"
 msgstr ""
 
 #: ../src/timezone_names.c:407
-msgid "Pacific/Niue"
-msgstr ""
+msgid "Chile"
+msgstr "Čilė"
 
 #: ../src/timezone_names.c:408
-msgid "Pacific/Norfolk"
+msgid "Chile/Continental"
 msgstr ""
 
 #: ../src/timezone_names.c:409
-msgid "Pacific/Noumea"
+msgid "Chile/EasterIsland"
 msgstr ""
 
 #: ../src/timezone_names.c:410
-msgid "Pacific/Pago_Pago"
+msgid "Etc"
 msgstr ""
 
 #: ../src/timezone_names.c:411
-msgid "Pacific/Palau"
+msgid "Etc/GMT"
 msgstr ""
 
 #: ../src/timezone_names.c:412
-msgid "Pacific/Pitcairn"
+msgid "Etc/GMT+0"
 msgstr ""
 
 #: ../src/timezone_names.c:413
-msgid "Pacific/Ponape"
+msgid "Etc/GMT+1"
 msgstr ""
 
 #: ../src/timezone_names.c:414
-msgid "Pacific/Port_Moresby"
+msgid "Etc/GMT+10"
 msgstr ""
 
 #: ../src/timezone_names.c:415
-msgid "Pacific/Rarotonga"
+msgid "Etc/GMT+11"
 msgstr ""
 
 #: ../src/timezone_names.c:416
-msgid "Pacific/Saipan"
+msgid "Etc/GMT+12"
 msgstr ""
 
 #: ../src/timezone_names.c:417
-msgid "Pacific/Tahiti"
+msgid "Etc/GMT+2"
 msgstr ""
 
 #: ../src/timezone_names.c:418
-msgid "Pacific/Tarawa"
+msgid "Etc/GMT+3"
 msgstr ""
 
 #: ../src/timezone_names.c:419
-msgid "Pacific/Tongatapu"
+msgid "Etc/GMT+4"
 msgstr ""
 
 #: ../src/timezone_names.c:420
-msgid "Pacific/Truk"
+msgid "Etc/GMT+5"
 msgstr ""
 
 #: ../src/timezone_names.c:421
-msgid "Pacific/Wake"
+msgid "Etc/GMT+6"
 msgstr ""
 
 #: ../src/timezone_names.c:422
-msgid "Pacific/Wallis"
+msgid "Etc/GMT+7"
 msgstr ""
 
 #: ../src/timezone_names.c:423
-msgid "Pacific/Yap"
+msgid "Etc/GMT+8"
 msgstr ""
 
-#: ../src/tray_icon.c:469
-#, fuzzy
-msgid "New appointment"
-msgstr "Paskyrimas"
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr ""
 
-#: ../src/tray_icon.c:485
-msgid "About Orage"
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
 msgstr ""
 
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-msgid "Orage Panel Clock"
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
 msgstr ""
 
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-msgid "Show time and date?"
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
 msgstr ""
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-#, fuzzy
-msgid "Calendar"
-msgstr "XF Kalendorius"
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr ""
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Nustatymai"
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr ""
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Nustatymai"
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr ""
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
 msgstr ""
 
-#: ../xfcalendar.desktop.in.h:2
-#, fuzzy
-msgid "Desktop calendar"
-msgstr "Apie Xf Kalendorių"
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr ""
 
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "XF Kalendorius"
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr ""
 
-#~ msgid "Contributor"
-#~ msgstr "Bendradarbis"
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr ""
 
-#~ msgid "Warning"
-#~ msgstr "Perspėjimas"
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Select always today"
-#~ msgstr "Pasirinkti šiandieną"
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr ""
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr ""
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr ""
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr ""
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr ""
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr ""
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr ""
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr ""
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr ""
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr ""
+
+#: ../src/timezone_names.c:446
+msgid "Europe"
+msgstr "Europa"
+
+#: ../src/timezone_names.c:447
+msgid "Europe/Amsterdam"
+msgstr "Europa/Amsterdamas"
+
+#: ../src/timezone_names.c:448
+msgid "Europe/Andorra"
+msgstr "Europa/Andora"
+
+#: ../src/timezone_names.c:449
+msgid "Europe/Athens"
+msgstr "Europa/Atėnai"
+
+#: ../src/timezone_names.c:450
+msgid "Europe/Belfast"
+msgstr "Europa/Belfastas"
+
+#: ../src/timezone_names.c:451
+msgid "Europe/Belgrade"
+msgstr "Europa/Belgradas"
+
+#: ../src/timezone_names.c:452
+msgid "Europe/Berlin"
+msgstr "Europa/Berlynas"
+
+#: ../src/timezone_names.c:453
+msgid "Europe/Bratislava"
+msgstr "Europa/Bratislava"
+
+#: ../src/timezone_names.c:454
+msgid "Europe/Brussels"
+msgstr "Europa/Briuselis"
+
+#: ../src/timezone_names.c:455
+msgid "Europe/Bucharest"
+msgstr "Europa/Bukareštas"
+
+#: ../src/timezone_names.c:456
+msgid "Europe/Budapest"
+msgstr "Europa/Budapeštas"
 
-#, fuzzy
-#~ msgid "Modify Preferences"
-#~ msgstr "Nustatymai"
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Monday"
-#~ msgstr "Šiandien"
+#: ../src/timezone_names.c:458
+msgid "Europe/Chisinau"
+msgstr "Europa/Kišiniovas"
 
-#, fuzzy
-#~ msgid "Tuesday"
-#~ msgstr "Šiandien"
+#: ../src/timezone_names.c:459
+msgid "Europe/Copenhagen"
+msgstr "Europa/Kopenhaga"
 
-#, fuzzy
-#~ msgid "Wednesday"
-#~ msgstr "Šiandien"
+#: ../src/timezone_names.c:460
+msgid "Europe/Dublin"
+msgstr "Europa/Dublinas"
 
-#, fuzzy
-#~ msgid "Thursday"
-#~ msgstr "Šiandien"
+#: ../src/timezone_names.c:461
+msgid "Europe/Gibraltar"
+msgstr "Europa/Gibraltaras"
 
-#, fuzzy
-#~ msgid "Friday"
-#~ msgstr "Šiandien"
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Europa/Gernsis"
 
-#, fuzzy
-#~ msgid "Sunday"
-#~ msgstr "Sekmadienį"
+#: ../src/timezone_names.c:463
+msgid "Europe/Helsinki"
+msgstr "Europa/Helsinkis"
 
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "Šiandien"
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Europa/Meno_Sala"
 
-#, fuzzy
-#~ msgid "Calendar Files"
-#~ msgstr "XF Kalendorius"
+#: ../src/timezone_names.c:465
+msgid "Europe/Istanbul"
+msgstr "Europa/Stambulas"
 
-#, fuzzy
-#~ msgid "Calendar borders"
-#~ msgstr "XF Kalendorius"
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Europa/Džersis"
 
-#~ msgid "Core developer"
-#~ msgstr "Pagrindinis kūrėjas"
+#: ../src/timezone_names.c:467
+msgid "Europe/Kaliningrad"
+msgstr "Europa/Kaliningradas"
 
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Jūs pašalinsite visą informaciją, \n"
-#~ "susijusią su šia diena."
+#: ../src/timezone_names.c:468
+msgid "Europe/Kiev"
+msgstr "Europa/Kijevas"
+
+#: ../src/timezone_names.c:469
+msgid "Europe/Lisbon"
+msgstr "Europa/Lisabona"
+
+#: ../src/timezone_names.c:470
+msgid "Europe/Ljubljana"
+msgstr "Europa/Liubliana"
+
+#: ../src/timezone_names.c:471
+msgid "Europe/London"
+msgstr "Europa/Londonas"
+
+#: ../src/timezone_names.c:472
+msgid "Europe/Luxembourg"
+msgstr "Europa/Liuksemburgas"
+
+#: ../src/timezone_names.c:473
+msgid "Europe/Madrid"
+msgstr "Europa/Madridas"
+
+#: ../src/timezone_names.c:474
+msgid "Europe/Malta"
+msgstr "Europa/Malta"
 
-#~ msgid "Clear"
-#~ msgstr "Išvalyti"
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Europa/Marianhamina"
 
-#~ msgid "This should not happen"
-#~ msgstr "Taip neturėtų įvykti"
+#: ../src/timezone_names.c:476
+msgid "Europe/Minsk"
+msgstr "Europa/Minskas"
+
+#: ../src/timezone_names.c:477
+msgid "Europe/Monaco"
+msgstr "Europa/Monakas"
+
+#: ../src/timezone_names.c:478
+msgid "Europe/Moscow"
+msgstr "Europa/Maskva"
+
+#: ../src/timezone_names.c:479
+msgid "Europe/Nicosia"
+msgstr "Europa/Nikosija"
+
+#: ../src/timezone_names.c:480
+msgid "Europe/Oslo"
+msgstr "Europa/Oslas"
+
+#: ../src/timezone_names.c:481
+msgid "Europe/Paris"
+msgstr "Europa/Paryžius"
+
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Europa/Podgorica"
+
+#: ../src/timezone_names.c:483
+msgid "Europe/Prague"
+msgstr "Europa/Praha"
+
+#: ../src/timezone_names.c:484
+msgid "Europe/Riga"
+msgstr "Europa/Ryga"
+
+#: ../src/timezone_names.c:485
+msgid "Europe/Rome"
+msgstr "Europa/Roma"
+
+#: ../src/timezone_names.c:486
+msgid "Europe/Samara"
+msgstr "Europa/Samara"
 
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Neįmanoma sukurti MCS kliento kanalo"
+#: ../src/timezone_names.c:487
+msgid "Europe/San_Marino"
+msgstr "Europa/San Marinas"
+
+#: ../src/timezone_names.c:488
+msgid "Europe/Sarajevo"
+msgstr "Europa/Sarajevas"
+
+#: ../src/timezone_names.c:489
+msgid "Europe/Simferopol"
+msgstr "Europa/Simferopolis"
+
+#: ../src/timezone_names.c:490
+msgid "Europe/Skopje"
+msgstr "Europa/Skopjė"
+
+#: ../src/timezone_names.c:491
+msgid "Europe/Sofia"
+msgstr "Europa/Sofija"
+
+#: ../src/timezone_names.c:492
+msgid "Europe/Stockholm"
+msgstr "Europa/Stokholmas"
+
+#: ../src/timezone_names.c:493
+msgid "Europe/Tallinn"
+msgstr "Europa/Talinas"
+
+#: ../src/timezone_names.c:494
+msgid "Europe/Tirane"
+msgstr "Europa/Tirana"
+
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Europa/Tiraspolis"
+
+#: ../src/timezone_names.c:496
+msgid "Europe/Uzhgorod"
+msgstr "Europa/Užgorodas"
+
+#: ../src/timezone_names.c:497
+msgid "Europe/Vaduz"
+msgstr "Europa/Vaducas"
+
+#: ../src/timezone_names.c:498
+msgid "Europe/Vatican"
+msgstr "Europa/Vatikanas"
+
+#: ../src/timezone_names.c:499
+msgid "Europe/Vienna"
+msgstr "Europa/Viena"
+
+#: ../src/timezone_names.c:500
+msgid "Europe/Vilnius"
+msgstr "Europa/Vilnius"
+
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Europa/Volgogradas"
+
+#: ../src/timezone_names.c:502
+msgid "Europe/Warsaw"
+msgstr "Europa/Varšuva"
+
+#: ../src/timezone_names.c:503
+msgid "Europe/Zagreb"
+msgstr "Europa/Zagrebas"
+
+#: ../src/timezone_names.c:504
+msgid "Europe/Zaporozhye"
+msgstr "Europa/Zaporožė"
+
+#: ../src/timezone_names.c:505
+msgid "Europe/Zurich"
+msgstr "Europa/Ciurichas"
+
+#: ../src/timezone_names.c:506
+msgid "Indian"
+msgstr "Indija"
+
+#: ../src/timezone_names.c:507
+msgid "Indian/Antananarivo"
+msgstr "Indijos vand./Antananaryvas"
+
+#: ../src/timezone_names.c:508
+msgid "Indian/Chagos"
+msgstr "Indijos vand./Čagosas"
+
+#: ../src/timezone_names.c:509
+msgid "Indian/Christmas"
+msgstr "Indijos vand./Kalėdų sal."
+
+#: ../src/timezone_names.c:510
+msgid "Indian/Cocos"
+msgstr "Indijos vand./Kokoso sal."
+
+#: ../src/timezone_names.c:511
+msgid "Indian/Comoro"
+msgstr "Indijos vand./Komorų sal."
+
+#: ../src/timezone_names.c:512
+msgid "Indian/Kerguelen"
+msgstr "Indijos vand./Kergeleno sal."
+
+#: ../src/timezone_names.c:513
+msgid "Indian/Mahe"
+msgstr "Indijos vand./Mahė"
+
+#: ../src/timezone_names.c:514
+msgid "Indian/Maldives"
+msgstr "Indijos vand./Maldyvai"
+
+#: ../src/timezone_names.c:515
+msgid "Indian/Mauritius"
+msgstr "Indijos vand./Mauricijus"
+
+#: ../src/timezone_names.c:516
+msgid "Indian/Mayotte"
+msgstr "Indijos vand./Majotas"
+
+#: ../src/timezone_names.c:517
+msgid "Indian/Reunion"
+msgstr "Indijos vand./Reunjonas"
+
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr ""
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr ""
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr ""
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr ""
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr ""
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr ""
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr ""
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr ""
+
+#: ../src/timezone_names.c:526
+msgid "Pacific"
+msgstr "Ramusis"
+
+#: ../src/timezone_names.c:527
+msgid "Pacific/Apia"
+msgstr "Ramusis/Apija"
+
+#: ../src/timezone_names.c:528
+msgid "Pacific/Auckland"
+msgstr "Ramusis/Oklendas"
+
+#: ../src/timezone_names.c:529
+msgid "Pacific/Chatham"
+msgstr "Ramusis/Čatemo sal."
+
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr ""
+
+#: ../src/timezone_names.c:531
+msgid "Pacific/Easter"
+msgstr "Ramusis/Velykų sal."
+
+#: ../src/timezone_names.c:532
+msgid "Pacific/Efate"
+msgstr "Ramusis/Efatė"
+
+#: ../src/timezone_names.c:533
+msgid "Pacific/Enderbury"
+msgstr "Ramusis/Enderberi"
+
+#: ../src/timezone_names.c:534
+msgid "Pacific/Fakaofo"
+msgstr "Ramusis/Fakaofo"
+
+#: ../src/timezone_names.c:535
+msgid "Pacific/Fiji"
+msgstr "Ramusis/Fidžis"
+
+#: ../src/timezone_names.c:536
+msgid "Pacific/Funafuti"
+msgstr "Ramusis/Funafutis"
+
+#: ../src/timezone_names.c:537
+msgid "Pacific/Galapagos"
+msgstr "Ramusis/Galapagų sal."
+
+#: ../src/timezone_names.c:538
+msgid "Pacific/Gambier"
+msgstr "Ramusis/Gambjė"
+
+#: ../src/timezone_names.c:539
+msgid "Pacific/Guadalcanal"
+msgstr "Ramusis/Gvadalkanalis"
+
+#: ../src/timezone_names.c:540
+msgid "Pacific/Guam"
+msgstr "Ramusis/Guamo sal."
+
+#: ../src/timezone_names.c:541
+msgid "Pacific/Honolulu"
+msgstr "Ramusis/Honolulu"
+
+#: ../src/timezone_names.c:542
+msgid "Pacific/Johnston"
+msgstr "Ramusis/Džonstonas"
+
+#: ../src/timezone_names.c:543
+msgid "Pacific/Kiritimati"
+msgstr "Ramusis/Kiritimatis"
+
+#: ../src/timezone_names.c:544
+msgid "Pacific/Kosrae"
+msgstr "Ramusis/Kusajės salos"
+
+#: ../src/timezone_names.c:545
+msgid "Pacific/Kwajalein"
+msgstr "Ramusis/Kvadžaleinas"
+
+#: ../src/timezone_names.c:546
+msgid "Pacific/Majuro"
+msgstr "Ramusis/Madžūras"
+
+#: ../src/timezone_names.c:547
+msgid "Pacific/Marquesas"
+msgstr "Ramusis/Markizų sal."
+
+#: ../src/timezone_names.c:548
+msgid "Pacific/Midway"
+msgstr "Ramusis/Midvėjus"
+
+#: ../src/timezone_names.c:549
+msgid "Pacific/Nauru"
+msgstr "Ramusis/Nauru"
+
+#: ../src/timezone_names.c:550
+msgid "Pacific/Niue"
+msgstr "Ramusis/Niujė"
+
+#: ../src/timezone_names.c:551
+msgid "Pacific/Norfolk"
+msgstr "Ramusis/Norfolkas"
+
+#: ../src/timezone_names.c:552
+msgid "Pacific/Noumea"
+msgstr "Ramusis/Numėja"
+
+#: ../src/timezone_names.c:553
+msgid "Pacific/Pago_Pago"
+msgstr "Ramusis/Pago Pago"
+
+#: ../src/timezone_names.c:554
+msgid "Pacific/Palau"
+msgstr "Ramusis/Palau"
+
+#: ../src/timezone_names.c:555
+msgid "Pacific/Pitcairn"
+msgstr "Ramusis/Pitkernas"
+
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr ""
+
+#: ../src/timezone_names.c:557
+msgid "Pacific/Ponape"
+msgstr "Ramusis/Ponpėjus"
+
+#: ../src/timezone_names.c:558
+msgid "Pacific/Port_Moresby"
+msgstr "Ramusis/Port Moresbis"
+
+#: ../src/timezone_names.c:559
+msgid "Pacific/Rarotonga"
+msgstr "Ramusis/Rarotonga"
+
+#: ../src/timezone_names.c:560
+msgid "Pacific/Saipan"
+msgstr "Ramusis/Saipanas"
+
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr ""
+
+#: ../src/timezone_names.c:562
+msgid "Pacific/Tahiti"
+msgstr "Ramusis/Taitis"
+
+#: ../src/timezone_names.c:563
+msgid "Pacific/Tarawa"
+msgstr "Ramusis/Tarava"
+
+#: ../src/timezone_names.c:564
+msgid "Pacific/Tongatapu"
+msgstr "Ramusis/Tongatapu"
+
+#: ../src/timezone_names.c:565
+msgid "Pacific/Truk"
+msgstr "Ramusis/Trukas"
+
+#: ../src/timezone_names.c:566
+msgid "Pacific/Wake"
+msgstr "Ramusis/Veikas"
+
+#: ../src/timezone_names.c:567
+msgid "Pacific/Wallis"
+msgstr "Ramusis/Valis"
+
+#: ../src/timezone_names.c:568
+msgid "Pacific/Yap"
+msgstr "Ramusis/Japas"
+
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr ""
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr ""
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr ""
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr ""
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr ""
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr ""
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr ""
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr ""
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr ""
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr ""
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr ""
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr ""
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr ""
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr ""
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "JAV"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "JAV/Aliaska"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr ""
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "JAV/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr ""
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr ""
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr ""
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "JAV/Havajai"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr ""
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "JAV/Mičiganas"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr ""
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr ""
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr ""
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr ""
+
+#: ../src/tray_icon.c:469
+msgid "New appointment"
+msgstr "Naujas paskyrimas"
+
+#: ../src/tray_icon.c:485
+msgid "About Orage"
+msgstr "Apie Orage"
+
+#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
+msgid "Orage Panel Clock"
+msgstr "Orage skydelio laikrodis"
+
+#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
+msgid "Show time and date?"
+msgstr "Rodyti datą ir laiką?"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
+msgid "Orage preferences"
+msgstr "Orage nustatymai"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr "Xfce4 kalendoriaus programos (Orage) nustatymai"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Orage kalendoriaus nustatymai"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Kalendorius"
+
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr "Orage kalendorius"
+
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Darbalaukio kalendorius"
diff -Nru orage-4.8.3/po/lv.po orage-4.12.1/po/lv.po
--- orage-4.8.3/po/lv.po	2012-01-03 12:01:07.000000000 +0000
+++ orage-4.12.1/po/lv.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,28 +1,24 @@
-# translation of lv.po to Latvian
-# Latvian translations for orage package.
-# Copyright (C) 2003-2007 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-#
-# Rihards Prieditis <rprieditis@inbox.lv>, 2007.
-# Rihards Prieditis <RPrieditis@gmail.com>, 2008.
-# Rihards Prieditis <rprieditis@gmail.com>, 2009.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Rihards Priedītis <rprieditis@gmail.com>, 2009
+# Rihards Prieditis <RPrieditis@gmail.com>, 2008
+# Rihards Prieditis <rprieditis@inbox.lv>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: lv\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2010-03-25 22:30+0100\n"
-"Last-Translator: Rihards Priedītis <rprieditis@gmail.com>\n"
-"Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2013-11-18 18:30+0100\n"
+"PO-Revision-Date: 2013-11-19 15:56+0000\n"
+"Last-Translator: Xfce <transifex@xfce.org>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/xfce/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lv\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2);\n"
-"X-Poedit-Language: Latvian\n"
-"X-Poedit-Country: Latvia\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -38,9 +34,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"uzklikšķiniet, lai mainītu pulksteni"
+msgstr "%s\nuzklikšķiniet, lai mainītu pulksteni"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -50,9 +44,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"poga 1, lai mainītu uzstādījumus \n"
-"poga 2, lai pielāgotu pulksteņa laiku"
+msgstr "poga 1, lai mainītu uzstādījumus \npoga 2, lai pielāgotu pulksteņa laiku"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -61,9 +53,7 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"pielāgot, lai mainītu minūtes. Uzklikšķiniet uz bultas ar pogu 2, lai "
-"mainītu tikai 1 minūti."
+msgstr "pielāgot, lai mainītu minūtes. Uzklikšķiniet uz bultas ar pogu 2, lai mainītu tikai 1 minūti."
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -212,8 +202,7 @@
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
-"Atzīmējiet, ja vēlaties izmantot sistēmas noklusēto krāsu, nevis izvēlēto"
+msgstr "Atzīmējiet, ja vēlaties izmantot sistēmas noklusēto krāsu, nevis izvēlēto"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
@@ -341,7 +330,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2771
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Atrašanās vieta"
@@ -402,18 +391,18 @@
 msgid "floating"
 msgstr "peldošs"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Pasaules laiks"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Orage Pasaules laiks"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "Rādīt pulksteņus no dažādām valstīm"
 
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Pasaules laiks"
+
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
 msgstr "Izskats"
@@ -485,12 +474,7 @@
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Šī opcija, nepieciešama, tikai tad ja veicat īsa termiņa (mazāk par 5 "
-"stundām) iemidzināšanu vai hibernēšanu un jūsu redzamais laiks neiekļauj "
-"sekundes. Zem šī gadījuma iespējams, ka Orage pulkstenis rāda laiku "
-"neprecīzi, ja nav atzīmēta šī opcija. (Atlasot šo, liedz cpu un pārtraukuma "
-"saglabāšanas iespējām darboties.)"
+msgstr "Šī opcija, nepieciešama, tikai tad ja veicat īsa termiņa (mazāk par 5 stundām) iemidzināšanu vai hibernēšanu un jūsu redzamais laiks neiekļauj sekundes. Zem šī gadījuma iespējams, ka Orage pulkstenis rāda laiku neprecīzi, ja nav atzīmēta šī opcija. (Atlasot šo, liedz cpu un pārtraukuma saglabāšanas iespējām darboties.)"
 
 #: ../panel-plugin/oc_config.c:432
 msgid ""
@@ -502,15 +486,7 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Šī programma izmanto strftime funkciju, lai iegūtu laiku.\n"
-"Izmantojiet, jebkādu derīgu kodu Jūsu laika formātam.\n"
-"Biežāk lietotie:\n"
-"\t%A = nedēļas diena\t\t\t%B = mēnesis\n"
-"\t%c = datums & laiks\t\t%R = stunda & minūte\n"
-"\t%V = nedēļas numurs\t\t%Z = izmantotā laikazona\n"
-"\t%H = stunda \t\t\t\t%M = minūte\n"
-"\t%X = vietējais laiks\t\t\t%x = vietējais datums"
+msgstr "Šī programma izmanto strftime funkciju, lai iegūtu laiku.\nIzmantojiet, jebkādu derīgu kodu Jūsu laika formātam.\nBiežāk lietotie:\n\t%A = nedēļas diena\t\t\t%B = mēnesis\n\t%c = datums & laiks\t\t%R = stunda & minūte\n\t%V = nedēļas numurs\t\t%Z = izmantotā laikazona\n\t%H = stunda \t\t\t\t%M = minūte\n\t%X = vietējais laiks\t\t\t%x = vietējais datums"
 
 #: ../panel-plugin/oc_config.c:457
 msgid "Orage clock Preferences"
@@ -525,7 +501,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
@@ -535,14 +511,13 @@
 msgstr "Uzturētājs"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "Pārvaldiet savu laiku ar Xfce4"
+msgstr ""
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2800
 msgid "End"
 msgstr "Beigas"
 
@@ -550,13 +525,13 @@
 msgid "Due"
 msgstr "Kavējas"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Norādiet failu..."
 
@@ -564,227 +539,273 @@
 msgid "Sound Files"
 msgstr "Skaņas fails"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Visus failus"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Tikšanās informācija ir mainīta."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1282 ../src/event-list.c:921
 msgid "Do you want to continue?"
 msgstr "Vēlaties turpināt?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr ""
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr ""
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "Tikšanās beigas ir ātrākās par sākumu."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1918
 msgid "Not set"
 msgstr "Nav uzstādīts"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1220
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1221
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1231
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1232
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1281
 msgid "This appointment will be permanently removed."
 msgstr "Šī tikšanās tiks pilnīgi dzēsta."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1283 ../src/event-list.c:922
+msgid "No, cancel the removal"
+msgstr ""
+
+#: ../src/appointment.c:1284
+msgid "Yes, remove it"
+msgstr ""
+
+#: ../src/appointment.c:1373 ../src/appointment.c:1388 ../src/day-view.c:457
+#: ../src/event-list.c:980
+msgid "Pick the date"
+msgstr "Norādiet datumu"
+
+#: ../src/appointment.c:1375 ../src/appointment.c:1390 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:982 ../src/event-list.c:1132
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Šodien"
+
+#: ../src/appointment.c:1798
 msgid "This appointment does not exist."
 msgstr "Šī tikšanās neeksistē."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1799
 msgid "It was probably removed, please refresh your screen."
 msgstr "Iespējams tika noņemta, lūdzu atsvaidziniet savu ekrānu."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2100
 msgid "Current categories"
 msgstr "Patreizējās kategorijas"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2115
 msgid "Add new category with color"
 msgstr "Pievienot jaunu kategoriju ar krāsu"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2119
 msgid "Category:"
 msgstr "Kategorija:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2150
 msgid "Colors of categories - Orage"
 msgstr "Krāsu kategorijas - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2196
 msgid " *** COPY ***"
 msgstr " *** KOPIJA ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2461
 msgid "New appointment - Orage"
 msgstr "Jauna tikšanās - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2491 ../src/day-view.c:279 ../src/event-list.c:1033
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Fails"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2497
 msgid "Sav_e and close"
 msgstr "Sa_glabāt un aizvērt"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2510 ../src/event-list.c:1039
 msgid "D_uplicate"
 msgstr "D_ublēt"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2697
 msgid "Save"
 msgstr "Saglabāt"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2699
 msgid "Save and close"
 msgstr "Saglabāt un aizvērt"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2704
 msgid "Revert"
 msgstr "Apgriezt"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2706 ../src/event-list.c:1123
 msgid "Duplicate"
 msgstr "Dublēt"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2711 ../src/event-list.c:1125
 msgid "Delete"
 msgstr "Dzēst"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Free"
 msgstr "Brīvs"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Busy"
 msgstr "Aizņemts"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2733
 msgid "General"
 msgstr "Vispārēji"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2739
 msgid "Type "
 msgstr "Tips"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2741 ../src/event-list.c:1176
 msgid "Event"
 msgstr "Notikums"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2744
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Notikums, kas kaut kad notiks. Piemēram:\n"
-"Tikšanās, dzimšanas diena, TV programma."
+msgstr "Notikums, kas kaut kad notiks. Piemēram:\nTikšanās, dzimšanas diena, TV programma."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2747 ../src/event-list.c:1196
 msgid "Todo"
 msgstr "Darāmais"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2750
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Kaut, kas kas kādreiz būtu jāizdara. Piemēram:\n"
-"Nomazgāt mašīnu, vai apskatīt jauno Orage versiju."
+msgstr "Kaut, kas kas kādreiz būtu jāizdara. Piemēram:\nNomazgāt mašīnu, vai apskatīt jauno Orage versiju."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2753 ../src/event-list.c:1209
 msgid "Journal"
 msgstr "Žurnāls"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2757
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Pierakstīt kaut ko, kas noticis. Piemēram:\n"
-"Atzīmēt, ka mamma pazvanīja, vai uzsniga pirmais sniegs."
+msgstr "Pierakstīt kaut ko, kas noticis. Piemēram:\nAtzīmēt, ka mamma pazvanīja, vai uzsniga pirmais sniegs."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2764
 msgid "Title "
 msgstr "Virsraksts"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2779
 msgid "All day event"
 msgstr "Visas dienas notikums"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2785 ../src/appointment.c:3446 ../src/day-view.c:801
 msgid "Start"
 msgstr "Sākums"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2805
 msgid "Set      "
 msgstr "Uzstādīt"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2826
 msgid "Duration"
 msgstr "Ilgums"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2830 ../src/appointment.c:3020 ../src/reminder.c:758
 msgid "days"
 msgstr "dienas"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2832 ../src/appointment.c:3022 ../src/reminder.c:760
 msgid "hours"
 msgstr "stundas"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2834 ../src/appointment.c:3024 ../src/reminder.c:762
 msgid "mins"
 msgstr "min"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2846
 msgid "Availability"
 msgstr "Pieejamība"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2854 ../src/appointment.c:3452
 msgid "Completed"
 msgstr "Pabeigts"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2857
 msgid "Done"
 msgstr "Izdarīts"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2878
 msgid "Categories"
 msgstr "Kategorijas"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2890
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Šī ir īpašā kategorija, kura var tikt izmantota, lai iekrāsotu tikšanos "
-"saraksta skatā."
+msgstr "Šī ir īpašā kategorija, kura var tikt izmantota, lai iekrāsotu tikšanos saraksta skatā."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2895
 msgid "update colors for categories."
 msgstr "atjaunināt krāsas kategorijai."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2901
 msgid "Priority"
 msgstr "Prioritāte"
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2911
 msgid "Note"
 msgstr "Piezīme"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2932
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -793,141 +814,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"Šīs īsas komandas stājas spēka uzreiz:\n"
-"  <D> ievietot patreizējo datumu lokālajā datuma formātā\n"
-"  <T> ievietot laiku un\n"
-"  <DT> ievietot datumu un laiku.\n"
-"\n"
-"Tās ir pārvērstas vēlāk, kad tās ir redzamas:\n"
-"  <&Ynnnn> tiek tulkots, kā patreizējais gads mīnus nnnn.\n"
-"(Tas var tikt izmantot piemēra par dzimšanas dienu atgādinājumiem, lai "
-"pateiktu cik veca ir persona.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Šīs īsas komandas stājas spēka uzreiz:\n  <D> ievietot patreizējo datumu lokālajā datuma formātā\n  <T> ievietot laiku un\n  <DT> ievietot datumu un laiku.\n\nTās ir pārvērstas vēlāk, kad tās ir redzamas:\n  <&Ynnnn> tiek tulkots, kā patreizējais gads mīnus nnnn.\n(Tas var tikt izmantot piemēra par dzimšanas dienu atgādinājumiem, lai pateiktu cik veca ir persona.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before Start"
 msgstr "Pirms sākuma"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before End"
 msgstr "Pirms beigām"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After Start"
 msgstr "Pēc sākums"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After End"
 msgstr "Pēc beigām"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3011
 msgid "Alarm"
 msgstr "Trauksme"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3017
 msgid "Alarm time"
 msgstr "Trauksmes laiks"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3041
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Ja vēlaties trauksmi:\n"
-" 1) pirms notikuma sākuma\n"
-" 2) pirms darītā beigām\n"
-" 3) pēc darītā sākuma"
+msgstr "Ja vēlaties trauksmi:\n 1) pirms notikuma sākuma\n 2) pirms darītā beigām\n 3) pēc darītā sākuma"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3046
 msgid "Persistent alarm"
 msgstr "Nepiekāpīga trauksme"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3048
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Atlasiet, ja vēlaties, lai Orage atgādina pat tad, kad tas nebija aktīvs, "
-"kad notika trauksme."
+msgstr "Atlasiet, ja vēlaties, lai Orage atgādina pat tad, kad tas nebija aktīvs, kad notika trauksme."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3057
 msgid "Sound"
 msgstr "Skaņa"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3061 ../src/appointment.c:3181
 msgid "Use"
 msgstr "Izmantot"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3063
 msgid "Select this if you want audible alarm"
 msgstr "Izvēlaties šo, ja vēlaties skaņas trauksmi"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3080
 msgid "Repeat alarm sound"
 msgstr "Atkārtot trauksmes signālu"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3096 ../src/appointment.c:3395
 msgid "times"
 msgstr "reizes"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3112
 msgid "sec interval"
 msgstr "sekunžu intervāls"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3122
 msgid "Visual"
 msgstr "Vizuāla"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3126
 msgid "Use Orage window"
 msgstr "Izmantot Orage logu"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3128
 msgid "Select this if you want Orage window alarm"
 msgstr "Izvēlaties šo, ja vēlaties Orage loga trauksmi"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3140
 msgid "Use notification"
 msgstr "Izmantot paziņošanu"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3142
 msgid "Select this if you want notification alarm"
 msgstr "Izvēlaties šo, ja vēlaties paziņojuma trauksmi"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3148
 msgid "Set timeout"
 msgstr "Uzstādīt noildzi"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3150
 msgid "Select this if you want notification to expire automatically"
-msgstr ""
-"Izvēlaties šo, ja vēlaties, lai paziņošanas termiņš izbeidzas automātiski"
+msgstr "Izvēlaties šo, ja vēlaties, lai paziņošanas termiņš izbeidzas automātiski"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3161
 msgid "0 = system default expiration time"
 msgstr "0 = sistēmas noklusētais izbeigšanās laiks"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3166
 msgid "seconds"
 msgstr "sekundes"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3177
 msgid "Procedure"
 msgstr "Procedūra"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3183
 msgid "Select this if you want procedure or script alarm"
 msgstr "Atlasiet šo, ja vēlaties procedūras vai skripta trauksmi"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3189
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -939,154 +943,148 @@
 "\t<&ET> appointment end time"
 msgstr ""
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3201
 msgid "Test this alarm by raising it now"
 msgstr "Pārbaudīt šo trauksmi izsaucot to"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3208
 msgid "<b>Default alarm</b>"
 msgstr "<b>Noklusētā trauksme</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3216
 msgid "Store current settings as default alarm"
 msgstr "Glabāt patreizējos uzstādījumus, kā trauksmes noklusētos"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3221
 msgid "Set current settings from default alarm"
 msgstr "Uzstādīt patreizējos uzstādījumus no noklusētās trauksmes"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "None"
 msgstr "Nekas"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Daily"
 msgstr "Katru dienu"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Weekly"
 msgstr "Katru nedēļu"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Monthly"
 msgstr "Katru mēnesi"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Yearly"
 msgstr "Katru gadu"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Hourly"
 msgstr ""
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Mon"
 msgstr "P"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Tue"
 msgstr "O"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Wed"
 msgstr "T"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Thu"
 msgstr "C"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Fri"
 msgstr "Pk"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sat"
 msgstr "S"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sun"
 msgstr "Sv"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3290
 msgid "Recurrence"
 msgstr "Atkārtošanās"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3296
 msgid "Complexity"
 msgstr "Sarežģītība"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3299
 msgid "Basic"
 msgstr "Pamata"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3305
 msgid "Advanced"
 msgstr "Paplašināta"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3309
 msgid "Use this if you want regular repeating event"
 msgstr "Izmantojiet, ja Jūs vēlaties notikumu atkārtot regulāri"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3311
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Izmantojiet, ja Jums nepieciešams sarežģīts laiks:\n"
-" Katru Sestdienu un Svētdienu vai \n"
-" Katra mēneša pirmo Ceturdienu"
+msgstr "Izmantojiet, ja Jums nepieciešams sarežģīts laiks:\n Katru Sestdienu un Svētdienu vai \n Katra mēneša pirmo Ceturdienu"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3317
 msgid "Frequency"
 msgstr "Biežums"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3323
 msgid "Each"
 msgstr "Katrs"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3330
 msgid "occurrence"
 msgstr "gadījums"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3334
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Ierobežot biežumu līdz noteiktam intervālam.\n"
-" Piemēram: Katru trešo dienu:\n"
-" Biežums = Katru dienu un Intervāls = 3 "
+msgstr "Ierobežot biežumu līdz noteiktam intervālam.\n Piemēram: Katru trešo dienu:\n Biežums = Katru dienu un Intervāls = 3 "
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3379
 msgid "Limit"
 msgstr "Ierobežot"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3381
 msgid "Repeat forever"
 msgstr "Atkārtot nepārtraukti"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3387
 msgid "Repeat "
 msgstr "Atkārtot"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3403
 msgid "Repeat until "
 msgstr "Atkārtot līdz"
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3416
 msgid "Weekdays"
 msgstr "Nedēļas diena"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3428
 msgid "Which day"
 msgstr "Kuru dienu"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3436
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1094,125 +1092,108 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Norādiet nedēļas dienu, priekš ik mēneša un ik gada notikumiem.\n"
-"Piemēram:\n"
-" Otrā Trešdiena, katru mēnesi:\n"
-"\tBiežums = Katru mēnesi,\n"
-"\tNedēļas diena = atzīmēt tikai Trešdienu,\n"
-"\tKuru dienu = atzīmēt 2 no cipariem zem Trešdienas"
+msgstr "Norādiet nedēļas dienu, priekš ik mēneša un ik gada notikumiem.\nPiemēram:\n Otrā Trešdiena, katru mēnesi:\n\tBiežums = Katru mēnesi,\n\tNedēļas diena = atzīmēt tikai Trešdienu,\n\tKuru dienu = atzīmēt 2 no cipariem zem Trešdienas"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3443
 msgid "TODO base"
 msgstr "Darāmā bāze"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3456
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"Darāmais atkārtojas regulāri sākot no sākum laika un atkārtojoties pēc katra "
-"intervāla neatkarīgi, no tā kad tas tika pabeigts"
+msgstr "Darāmais atkārtojas regulāri sākot no sākum laika un atkārtojoties pēc katra intervāla neatkarīgi, no tā kad tas tika pabeigts"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3458
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"Darāmajā atkārtošanas ir balstīta uz pabeigto laiku un atkārtojas pēc "
-"intervāla skaita no pēdējā pabeigtā laika.\n"
-"(Atceraties, ka jūs nevarat pateikt neko par darāmā vēsturi, jo atkārtošanās "
-"bāze mainās pēc katras pabeigšanās.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "Darāmajā atkārtošanas ir balstīta uz pabeigto laiku un atkārtojas pēc intervāla skaita no pēdējā pabeigtā laika.\n(Atceraties, ka jūs nevarat pateikt neko par darāmā vēsturi, jo atkārtošanās bāze mainās pēc katras pabeigšanās.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3464
 msgid "Exceptions"
 msgstr "Izņēmumi"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3477
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"Pievienot vēl izņēmuma datumus, klikšķinot uz kalendāra dienām zemāk.\n"
-"Izņēmumi ir vai nu izņemšana (-) vai iekļaušana (+) atkarība no atlases.\n"
-"Noņemiet klikšķinot uz datuma."
+msgstr "Pievienot vēl izņēmuma datumus, klikšķinot uz kalendāra dienām zemāk.\nIzņēmumi ir vai nu izņemšana (-) vai iekļaušana (+) atkarība no atlases.\nNoņemiet klikšķinot uz datuma."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3482
 msgid "Add excluded date (-)"
 msgstr "Pievienot izņemamos datumus (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3484
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr "Izņemt dienas, kuras ir pilnas un kur šī tikšanās nenotiek"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3490
 msgid "Add included time (+)"
 msgstr "Pievienot iekļauto laiku (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3492
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"Iekļautie laiki var būt ar tādu pašu laika zonu, kā sākuma laiks, bet var "
-"būt arī ar citu laiku"
+msgstr "Iekļautie laiki var būt ar tādu pašu laika zonu, kā sākuma laiks, bet var būt arī ar citu laiku"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3509
 msgid "Action dates"
 msgstr "Darbības datumi"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1056 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Skats"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1075
 msgid "_Go"
 msgstr "_Aiziet"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1121
 msgid "New"
 msgstr "Jauns"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Atpakaļ"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr ""
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Šodien"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Uz priekšu"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
+
+#: ../src/day-view.c:395 ../src/event-list.c:1139
 msgid "Refresh"
 msgstr "Atsvaidzināt"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1146 ../src/interface.c:834
 msgid "Close"
 msgstr "Aizvērt"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Nezināms"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "      Skaits dienām, ko rādīt"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - dienas skats"
 
@@ -1221,166 +1202,166 @@
 msgid "All day"
 msgstr "Visu dienu"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:583 ../src/event-list.c:1292
 msgid "Time"
 msgstr "Laiks"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:751
 msgid "No rows have been selected."
 msgstr "Neviena rinda nav atlasīta"
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:752
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Uzklikšķiniet uz rindas, lai to atlasītu, tad varat kopēt."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:920
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
+msgstr "Jūs izdzēsīsiet pilnīgi visas\nizvēlētās tikšanās."
+
+#: ../src/event-list.c:923
+msgid "Yes, remove them"
 msgstr ""
-"Jūs izdzēsīsiet pilnīgi visas\n"
-"izvēlētās tikšanās."
 
 #: ../src/event-list.c:1130
+msgid "Back"
+msgstr "Atpakaļ"
+
+#: ../src/event-list.c:1134
+msgid "Forward"
+msgstr "Uz priekšu"
+
+#: ../src/event-list.c:1141
 msgid "Find"
 msgstr "Atrast"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1148
 msgid "Dayview"
 msgstr "Dienas skats"
 
-#: ../src/event-list.c:1170
+#: ../src/event-list.c:1181
 msgid "Extra days to show "
 msgstr "Papildus rādāmās dienas"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1212
 msgid "Journal entries starting from:"
 msgstr "Žurnāla ieraksti sākot no:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1232
 msgid "Search"
 msgstr "Meklēt"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1235
 msgid "Search text "
 msgstr "Meklēt tekstu"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1300
 msgid "Flags"
 msgstr "Karodziņi"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1308
 msgid "Title"
 msgstr "Virsraksts"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1334
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
-"Veiciet dubultklišķi, lai rediģētu līniju.\n"
-"\n"
-"Spēkā esošie karodziņi:\n"
-"\t 1. Trauksme: n=izslēgt trauksmi\n"
-"\t\tA=vizuāla Trauksme S=arī Skaņas trauksme\n"
-"\t 2. Atkārtošana: n=neatkārtot\n"
-"\t\t D=Katru dienu W=Katru nedēļu M=Katru mēnesi Y=Katru gadu\n"
-"\t 3. Tips: f=brīvs B=Aizņemts\n"
-" \t 4. Atrašanās failā: \n"
-"\t\tO=Orag A=Arhīvs F=Ārzemju\n"
-"\t 5 Tikšanās tips:\n"
-"\t\tE=Notikums T=Darbu saraksts J=Žurnāls"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Norādiet datumu"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tAtkārtošanās beidzās, pārvietoju uz arhīva failu."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Arhivēšana nav ieslēgta. Iziešana"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Arhīva slieksnis: %d mēneši(-sis)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tArhivēšanas notikumi, kuri ir vecāki par: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Arhivēšanas uid: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tVTODO nav pabeigts; netiek arhivēts"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tAtkārtojas. Beigu gads: %04d, mēnesis: %02d, diena: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Arhivēšana pabeigta\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Sāku arhīva noņemšanu."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tFāze 1: atcelt atkārtojošās tikšanās"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tFāze 2: atgriezt arhivētās tikšanās"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Arhīva noņemšana pabeigta\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Orage noklusētā trauksme"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
+msgid "Created alarm list for foreign file: %s (%s)"
 msgstr ""
-"Veidot trauksmes sarakstu: Pievienotas %d trauksmes. Apstrādāti %d notikumi."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr ""
+
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tAtradu %d trauksmes, no kurām %d ir aktīvas. (Meklēt %d atkārtojošās "
-"trauksmes.)"
+msgstr "\tAtradu %d trauksmes, no kurām %d ir aktīvas. (Meklēt %d atkārtojošās trauksmes.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1398,7 +1379,16 @@
 msgid "Import file preprocessing done"
 msgstr "Pabeigta importa faila pirmapstrāde"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Kalendāra failus"
 
@@ -1406,622 +1396,667 @@
 msgid "Current foreign files"
 msgstr "Esošie ārzemju faili"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "TIKAI LASĪT"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "TIKAI RAKSTĪT"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Nav ārzemju failu *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr ""
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Imports/eksports"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Imports"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Lasīt no faila:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Atdalīt faila nosaukumus ar komatu (,).\n"
-" PIEZĪME: komats, nav derīgs faila nosaukums priekš Orage."
+msgstr "Atdalīt faila nosaukumus ar komatu (,).\n PIEZĪME: komats, nav derīgs faila nosaukums priekš Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Eksports"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Rakstīt failā:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Atlasiet"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Visas tikšanās"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Nosauktās tikšanās:"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Tikai galvenie faila tikšanās tiek lasītas.\n"
-"Arhivētie un ārzemju notikumu netiek eksportēti."
+msgstr "Tikai galvenie faila tikšanās tiek lasītas.\nArhivētie un ārzemju notikumu netiek eksportēti."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Tikai galvenie faila tikšanās tiek lasītas.\n"
-"Ārzemju notikumi netiek eksportēti."
+msgstr "Tikai galvenie faila tikšanās tiek lasītas.\nĀrzemju notikumi netiek eksportēti."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "Jūs varat viegli vilkt šos no notikuma-saraksta loga."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "Orage tikšanās UID tiek atdalīti ar komatu."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Arhīvs"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Arhīvs tagad (slieksnis: %d mēnešus)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Jūs varat mainīt arhīva slieksni iekš parametriem"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Atgriezt arhīvu tagad"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Atgriezt visus arhivētos notikumus iekš galvenā orage faila un dzēst arhīva "
-"failu.\n"
-"Šis ir noderīgi, piemēram, kad veicat eksportu un pārvietojat orage\n"
-"tikšanās uz citu sistēmu."
+msgstr "Atgriezt visus arhivētos notikumus iekš galvenā orage faila un dzēst arhīva failu.\nŠis ir noderīgi, piemēram, kad veicat eksportu un pārvietojat orage\ntikšanās uz citu sistēmu."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Orage fails"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Orage galvenais kalendāra fails"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Esošais fails"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Jauns fails"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Darbības opcijas"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Pārdēvēt"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Tikai Orage iekšējo failu pārdēvēšana.\n"
-"Netiek aizskarti ārējās failu sistēmas.\n"
-"Jaunajam failam ir jāeksistē."
+msgstr "Tikai Orage iekšējo failu pārdēvēšana.\nNetiek aizskarti ārējās failu sistēmas.\nJaunajam failam ir jāeksistē."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Kopēt"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr "Esošais fails ir nokopēts un paliek nemodificēts vecajā vietā."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Pārvietot"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "Esošais fails ir pārvietots un pazudis no vecās vietas."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Arhīva fails"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Ārzemju fails"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Pievienot jaunu ārzemju failu"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Ārzemju fails:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Uzstādījumi"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Tikai lasīt"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Uzstādiet šo, ja vēlaties, lai Orage nekad nemainītu šo failu.\n"
-"Piezīme, modificējot ārzemju failus, var padarīt viņus ne-saderīgus ar rīku, "
-"kurš izveidoja šos failus!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Uzstādiet šo, ja vēlaties, lai Orage nekad nemainītu šo failu.\nPiezīme, modificējot ārzemju failus, var padarīt viņus ne-saderīgus ar rīku, kurš izveidoja šos failus!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Apmaiņas dati - Orage"
 
-#: ../src/main.c:268
-#, fuzzy, c-format
+#: ../src/main.c:275
+#, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
 msgstr ""
-"\tŠī %s versija %s priekš Xfce %s\n"
-"\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tIzplatīts zem GNU General Public License noteikumiem.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tKompilēts pret GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "Izmanto GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tIzmanto DBUS priekš importa.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tNeizmanto DBUS. Imports strādā tikai daļēji.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tIzmantoju libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tNeizmantoju libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tIzmanto automātisko arhivēšanu.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tNeizmanto arhivēšanu.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tIzmanto operētājsistēmas paciņu libical.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tIzmanto Orage lokālo libical versiju.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Lietojums: orage [opcijas] [faili]\n"
-"\n"
+msgstr "Lietojums: orage [opcijas] [faili]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Uzstādījumi:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tuzrāda orage versiju\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tizdrukā šo tekstu\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \tparāda uzstādījumu formu\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\tpadara orage redzemu/neredzemu\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) fails [RW] \tpievieno ārzemju failu\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) fails \tdzēšs ārzemju failu\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
 msgstr ""
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "files=ical failus, kurus ielādēt orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tdbus nav iekļaut orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tbez dbus [faili] un ārzemju faila opcijas (-a & -r) var tikt izmantotas "
-"tikai sāknējot orage \n"
+msgstr "\tbez dbus [faili] un ārzemju faila opcijas (-a & -r) var tikt izmantotas tikai sāknējot orage \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Nezināma opcija %s\n"
-"\n"
+msgstr "\nNezināma opcija %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Apmaiņas dati"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Rediģēt"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Apskatīt izvēlēto _datumu"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Apskatīt atlasīto _nedēļu"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Norādiet š_odienu"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Pasaules laiks"
+msgstr ""
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Palīdzība"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr ""
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr ""
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr ""
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Nekad"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
-"Virsraksts: %s\n"
-" Sākt:\t%s\n"
-" Beigt:\t%s\n"
-" Piezīme:\n"
-"%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
-"Virsraksts: %s\n"
-" Sākt:\t%s\n"
-" Beigt:\t%s\n"
-" Piezīme:\n"
-"%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Darīt:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Notikumi priekš %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>Notikumi priekš %s - %s:</b>"
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:486
 msgid "Main settings"
-msgstr "Galvenie uzstādījumi"
+msgstr ""
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:492
 msgid "Timezone"
 msgstr "Laika zona"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:507
 msgid "You should always define your local timezone."
 msgstr "Vienmēr vajadzētu definēt vietējo laika zonu."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:515
 msgid "Archive threshold (months)"
 msgstr "Arhīva slieksnis (mēneši)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:525
 msgid "(0 = no archiving)"
 msgstr "(0 = nearhivēt)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:528
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Arhivēšana tiek izmantota, lai samazinu laiku un vietu, kad darbojas ar "
-"notikumiem."
+msgstr "Arhivēšana tiek izmantota, lai samazinu laiku un vietu, kad darbojas ar notikumiem."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:536
 msgid "Sound command"
 msgstr "Skaņas komanda"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:551
 msgid "This command is given to shell to make sound in alarms."
 msgstr "Komanda tiek izsniegta čaulai, lai rada trauksmes skaņu."
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Rādīt"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Kalendāra galvenais logs"
+#: ../src/parameters.c:590
+msgid "Calendar window"
+msgstr ""
+
+#: ../src/parameters.c:597
+msgid "Calendar visual details"
+msgstr ""
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:603
 msgid "Show borders"
 msgstr "Rādīt robežas"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:608
 msgid "Show menu"
 msgstr "Rādīt izvēlni"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Rādīt mēnesi un dienu"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:616
 msgid "Show day names"
 msgstr "Rādīt dienas nosaukumus"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:621
 msgid "Show week numbers"
 msgstr "Rādīt nedēļas kārtas numuru"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:629
+msgid "Show month and year"
+msgstr "Rādīt mēnesi un dienu"
+
+#: ../src/parameters.c:649
+msgid "Calendar info boxes"
+msgstr ""
+
+#: ../src/parameters.c:654
 msgid "Show todo list"
 msgstr "Rādīt darba sarakstu"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:661
 msgid "Number of days to show in event window"
 msgstr "Dienu skaits, ko rādīt notikumu logā"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:667
 msgid "0 = do not show event list at all"
 msgstr "0 = nerādīt notikumu sarakstu vispār"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:680
+msgid "Calendar visibility"
+msgstr ""
+
+#: ../src/parameters.c:685
 msgid "Show on all desktops"
 msgstr ""
 
-#: ../src/parameters.c:683
-#, fuzzy
+#: ../src/parameters.c:690
 msgid "Keep on top"
-msgstr "Vienmēr virspusē"
+msgstr ""
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:698
 msgid "Show in taskbar"
 msgstr "Rādīt uzdevumjoslā"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:703
 msgid "Show in pager"
 msgstr "Rādīt peidžerī"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:711
 msgid "Show in systray"
 msgstr "Rādīt sistēmas joslā"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:732
 msgid "Calendar start"
 msgstr "Palaist kalendāru"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:737
 msgid "Show"
 msgstr "Parādīt"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:749
 msgid "Hide"
 msgstr "Paslēpt"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:761
 msgid "Minimized"
 msgstr "Minimizēt"
 
-#: ../src/parameters.c:793
-#, fuzzy
-msgid "Extra settings"
-msgstr "Papildus uzstādījumi"
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Kalendāra galvenais logs"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "Norādiet š_odienu"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:781
+msgid "On calendar window open"
 msgstr ""
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "Izmantot dinamiskās joslas ikonas"
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "Izmantot dinamiskās ikonas"
+#: ../src/parameters.c:786
+msgid "Select today's date"
+msgstr ""
 
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "Dinamiskās ikonas rada pašreizējo mēnesi un mēneša dienu."
+#: ../src/parameters.c:799
+msgid "Select previously selected date"
+msgstr ""
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Galvenā kalendāra dubultklikšķis rāda"
+#: ../src/parameters.c:817
+msgid "Calendar day double click shows"
+msgstr ""
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:822
 msgid "Days view"
 msgstr "Dienas skats"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:834
 msgid "Event list"
 msgstr "Notikumu saraksts"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr "Notikumu saraksta logs"
+#: ../src/parameters.c:856
+msgid "Extra settings"
+msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:863
+msgid "Event list window extra days"
+msgstr ""
+
+#: ../src/parameters.c:868
 msgid "Number of extra days to show in event list"
 msgstr "Papildus dienu skaits, kuru rādīt notikumu sarakstā"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:876
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
+msgstr "Tā ir tikai noklusēta vērtība, kuru varat mainīt aktuālajā notikumu saraksta logā."
+
+#: ../src/parameters.c:886
+msgid "Day view window default first day"
+msgstr ""
+
+#: ../src/parameters.c:891
+msgid "First day of week"
+msgstr ""
+
+#: ../src/parameters.c:904
+msgid "Selected day"
 msgstr ""
-"Tā ir tikai noklusēta vērtība, kuru varat mainīt aktuālajā notikumu saraksta "
-"logā."
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:922
+msgid "Use dynamic tray icon"
+msgstr "Izmantot dinamiskās joslas ikonas"
+
+#: ../src/parameters.c:927
+msgid "Use dynamic icon"
+msgstr "Izmantot dinamiskās ikonas"
+
+#: ../src/parameters.c:933
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Dinamiskās ikonas rada pašreizējo mēnesi un mēneša dienu."
+
+#: ../src/parameters.c:941 ../src/parameters.c:946
 msgid "Use wakeup timer"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:952
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:961
+msgid "Foreign file default visual alarm"
+msgstr ""
+
+#: ../src/parameters.c:966
+msgid "Orage window"
+msgstr ""
+
+#: ../src/parameters.c:979
+msgid "Notify notification"
+msgstr ""
+
+#: ../src/parameters.c:997
+msgid "Always quit when asked to close"
+msgstr ""
+
+#: ../src/parameters.c:1002
+msgid "Always quit"
+msgstr ""
+
+#: ../src/parameters.c:1008
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr ""
+
+#: ../src/parameters.c:1024
 msgid "Orage Preferences"
 msgstr "Orage uzstādījumi"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1136
 msgid "First Orage start. Searching default timezone."
 msgstr "Pirmā Orage palaišanās. Meklēju noklusēto laika zonu."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1155
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Noklusētā laika zonu uzstādīta uz %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1158
 msgid "Default timezone not found, please, set it manually."
 msgstr "Noklusēta laika zona nav atrasta, lūdzu norādiet manuāli."
 
@@ -2033,40 +2068,35 @@
 msgid "Open"
 msgstr "Atvērt"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Atgādinātājs - Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr ""
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "Atgādināt man atkal pēc norādītā laika"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr "Nospiediet<Izpildīt>, lai man atgādinātu pēc norādītā laika:"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Nākošā aktīvā trauksme:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d d %02d h %02d min līdz: %s"
+msgstr "\n%02d d %02d h %02d min līdz: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Netika atrastas aktīvas trauksmes"
+msgstr "\nNetika atrastas aktīvas trauksmes"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -3637,203 +3667,26 @@
 msgstr "Rādīt datumu un laiku?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Kalendārs"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Orage kalendāra uzstādījumi"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Orage uzstādījumi"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Uzstādījumi Xfce 4 kalendāra lietotnei (Orage)"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Darbavirsmas kalendārs"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Orage kalendāra uzstādījumi"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Kalendārs"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Orage kalendārs"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Virsraksts: %s\n"
-#~ " Sākt:\t%s\n"
-#~ " Kavēts:\t%s\n"
-#~ " Padarīts:\t%s\n"
-#~ "Piezīme:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Jums jāievada visas rakstzīmes, to skaitā pārtraukuma, pašam.\n"
-#~ " Šī virkne tiks nodota tālāk izpildei čaulai"
-
-#~ msgid "Orage clock"
-#~ msgstr "Orage pulkstenis"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Sākotnējais izveidotājs, aizgājušais uzturētājs"
-
-#~ msgid "Contributor"
-#~ msgstr "Atbalstītājs"
-
-#~ msgid "Info"
-#~ msgstr "Informācija"
-
-#~ msgid "Warning"
-#~ msgstr "Uzmanību"
-
-#~ msgid "Error"
-#~ msgstr "Kļūda"
-
-#~ msgid "Set sticked"
-#~ msgstr "Pielīmēt"
-
-#~ msgid "Select always today"
-#~ msgstr "Vienmēr izvēlēties šodienu"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Kad rāda galveno kalendāru, uzstādiet norādi uz iepriekšējo atlasīto "
-#~ "dienu vai vienmēr uz šodienu."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Beigu laika pielāgošanas režīms"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Sāknēju laika pielāgošanas režīmu"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "pielāgot, lai mainītu minūtēs"
-
-#~ msgid "Vary"
-#~ msgstr "Dažāds"
-
-#~ msgid "Select timezone"
-#~ msgstr "Uzstādīt laika zonu"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Modificēt pulksteni"
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "ievadiet pulksteņa laika zonu,\n"
-#~ "(=derīga jebkura TZ vērtība)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Mainīt uzstādījumus"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Ievadiet vietējo laika zonu. (to izmanto, lai rādītu, vai laiks ir "
-#~ "iepriekšējais(-) vai nākamais(+), pievienojot +/- aiz laika)"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr ""
-#~ "Uzstādiet jebkādu derīgu laika zonas (=TZ) vērtību vai norādiet no "
-#~ "saraksta."
-
-#~ msgid "show line _1:"
-#~ msgstr "rādīt līniju _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "rādīt līniju _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "rādīt līniju _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Rekvizīti"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Neizdevās palaist \"orage -p\""
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> ievietot esošo datumu, lokālā datuma formātā.\n"
-#~ "<T> ievietot laiku un\n"
-#~ "<DT> ievietot datumu un laiku."
-
-#~ msgid "Show event list"
-#~ msgstr "Rādīt notikumu sarakstu"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = izmantot statisku ikonu)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Dinamiska ikona, kura rāda dienas un mēnešus. Redzama tikai sistēmas "
-#~ "joslā. Ja sistēmas josla ir par mazu dinamiskai ikonai, Orage automātiski "
-#~ "pārslēdzas atpakaļ uz statisko ikonu."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Kalendāra uzstādījumi"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Xfce 4 kalendāra uzstādījumi"
-
-#~ msgid ""
-#~ "Set this if you want to make sure that this file is never modified by "
-#~ "Orage."
-#~ msgstr "Uzstādiet šo, ja vēlaties, lai šo failu Orage nekad nemaina"
-
-#~ msgid "Not defined"
-#~ msgstr "Nav definēts"
-
-#~ msgid "Monday"
-#~ msgstr "Pirmdiena"
-
-#~ msgid "Tuesday"
-#~ msgstr "Otrdiena"
-
-#~ msgid "Wednesday"
-#~ msgstr "Trešdiena"
-
-#~ msgid "Thursday"
-#~ msgstr "Ceturdiena"
-
-#~ msgid "Friday"
-#~ msgstr "Piektdiena"
-
-#~ msgid "Saturday"
-#~ msgstr "Sestdiena"
-
-#~ msgid "Sunday"
-#~ msgstr "Svētdiena"
-
-#~ msgid "Ical week start day"
-#~ msgstr "Ical nedēļa sākšanās diena"
-
-#~ msgid ""
-#~ "This is used in some weekly repeating appointment rules. Just set it to "
-#~ "the start day of the week for your country and forget it."
-#~ msgstr ""
-#~ "Lieto dažos iknedēļas tikšanās noteikumos. Uzstādiet pirmo darba dienu "
-#~ "jūsu valsti un aizmirstiet par to."
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Darbavirsmas kalendārs"
diff -Nru orage-4.8.3/po/Makefile.in.in orage-4.12.1/po/Makefile.in.in
--- orage-4.8.3/po/Makefile.in.in	2012-01-04 12:52:40.000000000 +0000
+++ orage-4.12.1/po/Makefile.in.in	2015-04-10 10:26:46.000000000 +0000
@@ -50,8 +50,8 @@
 XGETTEXT = @XGETTEXT@ $(XGETTEXT_ARGS)
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+MSGMERGE = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
 
 ALL_LINGUAS = @ALL_LINGUAS@
 
@@ -74,15 +74,20 @@
 .SUFFIXES:
 .SUFFIXES: .po .pox .gmo .mo .msg .cat
 
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
+INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
+INTLTOOL__v_MSGFMT_0 = @echo "  MSGFMT" $@;
+
 .po.pox:
 	$(MAKE) $(GETTEXT_PACKAGE).pot
 	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
 
 .po.mo:
-	$(MSGFMT) -o $@ $<
+	$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
 
 .po.gmo:
-	file=`echo $* | sed 's,.*/,,'`.gmo \
+	$(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
 	  && rm -f $$file && $(GMSGFMT) -o $$file $<
 
 .po.cat:
diff -Nru orage-4.8.3/po/mk.po orage-4.12.1/po/mk.po
--- orage-4.8.3/po/mk.po	2012-01-03 12:01:07.000000000 +0000
+++ orage-4.12.1/po/mk.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,3765 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Vlatko Trajkov <trajokvvlatko@yahoo.com>, 2006.
-msgid ""
-msgstr ""
-"Project-Id-Version: orage 4.4.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2006-12-24 01:15+0100\n"
-"Last-Translator: Vlatko Trajkov <trajokvvlatko@yahoo.com>\n"
-"Language-Team: Macedonian <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: mk\n"
-
-#: ../globaltime/globaltime.c:100
-msgid "Raising GlobalTime window..."
-msgstr ""
-
-#: ../globaltime/globaltime.c:102
-msgid "GlobalTime window raise failed"
-msgstr ""
-
-#. ********** timezone tooltip **********
-#: ../globaltime/globaltime.c:277
-#, c-format
-msgid ""
-"%s\n"
-"click to modify clock"
-msgstr ""
-
-#: ../globaltime/globaltime.c:386
-#, fuzzy
-msgid "Localtime"
-msgstr "Локација"
-
-#: ../globaltime/globaltime.c:464
-msgid ""
-"button 1 to change preferences \n"
-"button 2 to adjust time of clocks"
-msgstr ""
-
-#: ../globaltime/globaltime.c:480
-msgid "adjust to change hour"
-msgstr ""
-
-#: ../globaltime/globaltime.c:496
-msgid ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
-msgid "NEW"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:289
-msgid "NEW COPY"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:310
-msgid "Not possible to delete the last clock."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:516
-msgid "update this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
-msgid "add new empty clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:526
-msgid "add new clock using this clock as model"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:531
-msgid "delete this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:539
-msgid "move this clock first"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:544
-msgid "move this clock left"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:549
-msgid "move this clock right"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:554
-msgid "move this clock last"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:562
-msgid "set the timezone of this clock to be local timezone"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
-msgid "close window and exit"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:590
-#, fuzzy
-msgid "Globaltime preferences "
-msgstr "Параметри за Orage"
-
-#. -----------------------HEADING-------------------------------------------
-#: ../globaltime/gt_prefs.c:603
-msgid "Clock Parameters"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:607
-msgid "Name of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:613
-#, fuzzy
-msgid "enter name of clock"
-msgstr "Orage часовник"
-
-#: ../globaltime/gt_prefs.c:616
-msgid "Timezone of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:643
-msgid "Text Formatting"
-msgstr ""
-
-#. ------------------------background-------------------------
-#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
-#, fuzzy
-msgid "Background color:"
-msgstr "поставете _позадинска боја:"
-
-#: ../globaltime/gt_prefs.c:656
-msgid "Click to change background colour for clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
-#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
-#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
-#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
-#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
-#, fuzzy
-msgid "Use default"
-msgstr "Стандарден аларм на Orage"
-
-#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
-#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
-#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
-msgid "Cross this to use default instead of selected value"
-msgstr ""
-
-#. ------------------------foreground-------------------------
-#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
-#, fuzzy
-msgid "Foreground (=text) color:"
-msgstr "Поставете предна _боја:"
-
-#: ../globaltime/gt_prefs.c:688
-msgid "Click to change foreground colour for clock"
-msgstr ""
-
-#. ------------------------name font-------------------------
-#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
-msgid "Font for name of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:720
-msgid "Click to change font for clock name"
-msgstr ""
-
-#. ------------------------time font-------------------------
-#: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
-msgid "Font for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:753
-msgid "Click to change font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:780
-msgid "Underline name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:810
-msgid "Underline time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:850
-msgid "Text Default Formatting"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:863
-msgid "Click to change default background colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
-msgid "Cross this to use system default instead of selected color"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:896
-msgid "Click to change default text colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:929
-msgid "Click to change default font for clock name"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
-msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:963
-msgid "Click to change default font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:990
-msgid "Underline for name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:1004
-msgid "Underline for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1027
-#, fuzzy
-msgid "update preferences"
-msgstr "Параметри за Orage"
-
-#: ../globaltime/gt_prefs.c:1062
-#, fuzzy
-msgid "Globaltime Preferences"
-msgstr "Параметри за Orage"
-
-#. -----------------------HEADING--------------------------------------
-#: ../globaltime/gt_prefs.c:1073
-#, fuzzy
-msgid "General Preferences"
-msgstr "Параметри за Orage"
-
-#: ../globaltime/gt_prefs.c:1077
-#, fuzzy
-msgid "Decorations:"
-msgstr "Времетраење"
-
-#: ../globaltime/gt_prefs.c:1078
-#, fuzzy
-msgid "Standard"
-msgstr "Календар"
-
-#: ../globaltime/gt_prefs.c:1083
-msgid "Use normal decorations"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1094
-msgid "Do not show window decorations (borders)"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1100
-#, fuzzy
-msgid "Clock size:"
-msgstr "Затвори"
-
-#: ../globaltime/gt_prefs.c:1101
-msgid "Equal"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1106
-msgid "All clocks have same size"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1111
-#, fuzzy
-msgid "Varying"
-msgstr "Предупредување"
-
-#: ../globaltime/gt_prefs.c:1116
-msgid "Clock sizes vary"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1122
-#, fuzzy
-msgid "Local timezone:"
-msgstr "Изберете локална временска зона"
-
-#: ../globaltime/timezone_selection.c:101
-#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
-msgid " Other"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:156
-#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
-#, c-format
-msgid "%d hour %d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:159
-#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, fuzzy, c-format
-msgid "%d hour"
-msgstr "часови"
-
-#: ../globaltime/timezone_selection.c:161
-#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, fuzzy, c-format
-msgid "%d mins"
-msgstr "минути"
-
-#: ../globaltime/timezone_selection.c:167
-#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
-msgid "backward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:170
-#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-#, fuzzy
-msgid "forward"
-msgstr "Напред"
-
-#: ../globaltime/timezone_selection.c:194
-#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
-msgid "not changed"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:195
-#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
-msgid "not changing"
-msgstr ""
-
-#. location
-#: ../globaltime/timezone_selection.c:247
-#: ../globaltime/timezone_selection.c:252
-#: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
-#: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
-msgid "Location"
-msgstr "Локација"
-
-#: ../globaltime/timezone_selection.c:258
-#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
-msgid "GMT Offset"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:264
-#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
-msgid "Previous/Next Change"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:269
-#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
-msgid "Country"
-msgstr ""
-
-#. We are actually setting the g_par parameter. In other words
-#. we are setting the global default timezone for Orage. This is
-#. done very seldom and we do not want to allow "floating" here.
-#. This test is ugly, but it is not worth an extra parameter.
-#. this is normal appointment
-#: ../globaltime/timezone_selection.c:299
-#: ../globaltime/timezone_selection.c:309
-#: ../panel-plugin/timezone_selection.c:300
-#: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
-#: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
-msgid "Pick timezone"
-msgstr "Изберете временска зона"
-
-#: ../globaltime/timezone_selection.c:302
-#: ../globaltime/timezone_selection.c:312
-#: ../panel-plugin/timezone_selection.c:303
-#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
-#: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
-msgid "Change mode"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:303
-#: ../globaltime/timezone_selection.c:313
-#: ../globaltime/timezone_selection.c:352
-#: ../panel-plugin/timezone_selection.c:304
-#: ../panel-plugin/timezone_selection.c:314
-#: ../panel-plugin/timezone_selection.c:353 ../src/timezone_selection.c:320
-#: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
-#: ../src/timezone_selection.c:379
-msgid "UTC"
-msgstr "UTC"
-
-#. NOTE: this exists only if ical timezones are being used
-#: ../globaltime/timezone_selection.c:304
-#: ../globaltime/timezone_selection.c:357
-#: ../panel-plugin/timezone_selection.c:305
-#: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
-#: ../src/timezone_selection.c:384
-msgid "floating"
-msgstr "лебдење"
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "Локација"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
-msgid "Orage Globaltime"
-msgstr "Календар"
-
-#: ../globaltime/globaltime.desktop.in.h:3
-msgid "Show clocks from different countries"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:224
-msgid "Appearance"
-msgstr "Изглед"
-
-#. show frame
-#: ../panel-plugin/oc_config.c:229
-msgid "Show _frame"
-msgstr "Покажи рамка"
-
-#. foreground color
-#: ../panel-plugin/oc_config.c:239
-msgid "set foreground _color:"
-msgstr "Поставете предна _боја:"
-
-#. background color
-#: ../panel-plugin/oc_config.c:253
-msgid "set _background color:"
-msgstr "поставете _позадинска боја:"
-
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
-msgid "set _height:"
-msgstr "поставете _висина:"
-
-#: ../panel-plugin/oc_config.c:277
-msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:282
-msgid "set _width:"
-msgstr "поставете _ширина:"
-
-#: ../panel-plugin/oc_config.c:293
-msgid "Note that you can not change the width of vertical panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:316
-msgid "Clock Options"
-msgstr "Опции за часовникот"
-
-#. timezone
-#: ../panel-plugin/oc_config.c:326
-msgid "set timezone to:"
-msgstr "поставете ја временската зон за:"
-
-#: ../panel-plugin/oc_config.c:347
-#, c-format
-msgid "Line %d:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:357
-msgid "Enter any valid strftime function parameter."
-msgstr "Внесете валиден параметар за функцијата strftime."
-
-#. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
-msgid "Tooltip:"
-msgstr "Совет:"
-
-#. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
-msgid "fix time after suspend/hibernate"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:415
-msgid ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:432
-msgid ""
-"This program uses strftime function to get time.\n"
-"Use any valid code to get time in the format you prefer.\n"
-"Some common codes are:\n"
-"\t%A = weekday\t\t\t%B = month\n"
-"\t%c = date & time\t\t%R = hour & minute\n"
-"\t%V = week number\t\t%Z = timezone in use\n"
-"\t%H = hours \t\t\t\t%M = minute\n"
-"\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Оваа програма ја користи функијата strftime·за да го добие времето.\n"
-"Користи некој валиден код за да го добиеш времето во формат што "
-"претпочиташ.\n"
-"Некои општи кодови се:\n"
-"\t%A·=·ден во недела\t\t\t%B·=·месец\n"
-"\t%c·=·дата·&·час\t\t%R·=·час·&·минута\n"
-"\t%V·=·број на недела\t\t%Z·=·временска зона која се користи\n"
-"\t%H·=·часови·\t\t\t\t%M·=·минута\n"
-"\t%X·=·локално време\t\t\t%x·=·локална дата"
-
-#: ../panel-plugin/oc_config.c:457
-#, fuzzy
-msgid "Orage clock Preferences"
-msgstr "Параметри за Orage"
-
-#. no lines yet
-#. TRANSLATORS: Use format characters from strftime(3)
-#. * to get the proper string for your locale.
-#. * I used these:
-#. * %A  : full weekday name
-#. * %d  : day of the month
-#. * %B  : full month name
-#. * %Y  : four digit year
-#. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
-msgid "%A %d %B %Y/%V"
-msgstr "%A %d %B %Y/%V"
-
-#: ../src/about-xfcalendar.c:40
-msgid "Maintainer"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:47
-#, fuzzy
-msgid "Manage your time with Orage"
-msgstr "Поставете го времето со Xfce4"
-
-#. if (gtk_toggle_button_get_active(
-#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
-#. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
-msgid "End"
-msgstr "Крај"
-
-#: ../src/appointment.c:333
-#, fuzzy
-msgid "Due"
-msgstr "Вто"
-
-#: ../src/appointment.c:493 ../src/mainbox.c:783
-msgid "Orage"
-msgstr "Orage"
-
-#. to avoid timing problems when updating entry
-#. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
-msgid "Select a file..."
-msgstr "Изберете датотека"
-
-#: ../src/appointment.c:680
-msgid "Sound Files"
-msgstr "Датотеки за звук"
-
-#: ../src/appointment.c:687 ../src/interface.c:290
-msgid "All Files"
-msgstr "Сите Датотеки"
-
-#: ../src/appointment.c:739
-msgid "The appointment information has been modified."
-msgstr "Информациите за состанокот беа променети"
-
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
-msgid "Do you want to continue?"
-msgstr "Дали сакате да продолжите"
-
-#: ../src/appointment.c:767
-msgid "The end of this appointment is earlier than the beginning."
-msgstr "Крајот на состанокот е порано од неговиот почеток."
-
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-#, fuzzy
-msgid "Not set"
-msgstr "Белешка"
-
-#: ../src/appointment.c:1193
-msgid "This appointment will be permanently removed."
-msgstr "Состанокот ќе биде трајно избришан."
-
-#: ../src/appointment.c:1692
-#, fuzzy
-msgid "This appointment does not exist."
-msgstr "Состанокот ќе биде трајно избришан."
-
-#: ../src/appointment.c:1693
-msgid "It was probably removed, please refresh your screen."
-msgstr ""
-
-#: ../src/appointment.c:1995
-#, fuzzy
-msgid "Current categories"
-msgstr "Датотеки на календарот"
-
-#: ../src/appointment.c:2010
-msgid "Add new category with color"
-msgstr ""
-
-#: ../src/appointment.c:2014
-msgid "Category:"
-msgstr ""
-
-#: ../src/appointment.c:2045
-msgid "Colors of categories - Orage"
-msgstr ""
-
-#: ../src/appointment.c:2092
-msgid " *** COPY ***"
-msgstr ""
-
-#: ../src/appointment.c:2353
-msgid "New appointment - Orage"
-msgstr "Нов состанок - Orage"
-
-#. File menu stuff
-#. ********* File menu *********
-#. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
-msgid "_File"
-msgstr "_Датотека"
-
-#: ../src/appointment.c:2388
-msgid "Sav_e and close"
-msgstr "С_ними и затвори"
-
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
-msgid "D_uplicate"
-msgstr "Дуплирај"
-
-#: ../src/appointment.c:2589
-msgid "Save"
-msgstr "Сними"
-
-#: ../src/appointment.c:2591
-msgid "Save and close"
-msgstr "Сними и затвори"
-
-#: ../src/appointment.c:2596
-msgid "Revert"
-msgstr "Врати"
-
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
-msgid "Duplicate"
-msgstr "Дуплирај"
-
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
-msgid "Delete"
-msgstr "Избриши"
-
-#: ../src/appointment.c:2621
-msgid "Free"
-msgstr "Слободен"
-
-#: ../src/appointment.c:2621
-msgid "Busy"
-msgstr "Зафатен"
-
-#: ../src/appointment.c:2625
-msgid "General"
-msgstr "Општо"
-
-#. type
-#: ../src/appointment.c:2631
-msgid "Type "
-msgstr ""
-
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
-msgid "Event"
-msgstr ""
-
-#: ../src/appointment.c:2636
-msgid ""
-"Event that will happen sometime. For example:\n"
-"Meeting or birthday or TV show."
-msgstr ""
-
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-#, fuzzy
-msgid "Todo"
-msgstr "Денес"
-
-#: ../src/appointment.c:2642
-msgid ""
-"Something that you should do sometime. For example:\n"
-"Wash your car or test new version of Orage."
-msgstr ""
-
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
-msgid "Journal"
-msgstr ""
-
-#: ../src/appointment.c:2649
-msgid ""
-"Make a note that something happened. For example:\n"
-"Remark that your mother called or first snow came."
-msgstr ""
-
-#. title
-#: ../src/appointment.c:2656
-msgid "Title "
-msgstr "Наслов"
-
-#: ../src/appointment.c:2671
-msgid "All day event"
-msgstr "Целодневен настан"
-
-#. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
-msgid "Start"
-msgstr "Старт"
-
-#: ../src/appointment.c:2697
-msgid "Set      "
-msgstr ""
-
-#: ../src/appointment.c:2718
-msgid "Duration"
-msgstr "Времетраење"
-
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
-msgid "days"
-msgstr "денови"
-
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
-msgid "hours"
-msgstr "часови"
-
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
-msgid "mins"
-msgstr "минути"
-
-#. Availability (only for EVENT)
-#: ../src/appointment.c:2738
-msgid "Availability"
-msgstr "Достапност"
-
-#. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
-#, fuzzy
-msgid "Completed"
-msgstr "Комплексност"
-
-#: ../src/appointment.c:2749
-#, fuzzy
-msgid "Done"
-msgstr "Ништо"
-
-#. categories
-#: ../src/appointment.c:2770
-msgid "Categories"
-msgstr ""
-
-#: ../src/appointment.c:2782
-msgid ""
-"This is special category, which can be used to color this appointment in "
-"list views."
-msgstr ""
-
-#: ../src/appointment.c:2787
-msgid "update colors for categories."
-msgstr ""
-
-#. priority
-#: ../src/appointment.c:2793
-msgid "Priority"
-msgstr ""
-
-#. note
-#: ../src/appointment.c:2803
-msgid "Note"
-msgstr "Белешка"
-
-#: ../src/appointment.c:2824
-msgid ""
-"These shorthand commands take effect immediately:\n"
-"    <D> inserts current date in local date format\n"
-"    <T> inserts time and\n"
-"    <DT> inserts date and time.\n"
-"\n"
-"These are converted only later when they are seen:\n"
-"    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before Start"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before End"
-msgstr ""
-
-#: ../src/appointment.c:2896
-#, fuzzy
-msgid "After Start"
-msgstr "Старт"
-
-#: ../src/appointment.c:2896
-msgid "After End"
-msgstr ""
-
-#: ../src/appointment.c:2903
-msgid "Alarm"
-msgstr "Аларм"
-
-#. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-#, fuzzy
-msgid "Alarm time"
-msgstr "Аларм"
-
-#: ../src/appointment.c:2933
-msgid ""
-"Often you want to get alarm:\n"
-" 1) before Event start\n"
-" 2) before Todo end\n"
-" 3) after Todo start"
-msgstr ""
-
-#: ../src/appointment.c:2938
-msgid "Persistent alarm"
-msgstr ""
-
-#: ../src/appointment.c:2940
-msgid ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
-msgstr ""
-
-#. **** Audio Alarm ****
-#: ../src/appointment.c:2949
-msgid "Sound"
-msgstr "Звук"
-
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
-msgid "Use"
-msgstr ""
-
-#: ../src/appointment.c:2955
-msgid "Select this if you want audible alarm"
-msgstr ""
-
-#: ../src/appointment.c:2972
-msgid "Repeat alarm sound"
-msgstr "Повтори го звукот од алармот"
-
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
-msgid "times"
-msgstr "пати"
-
-#: ../src/appointment.c:3004
-#, fuzzy
-msgid "sec interval"
-msgstr "Интервал"
-
-#. **** Display Alarm ****
-#: ../src/appointment.c:3014
-msgid "Visual"
-msgstr ""
-
-#: ../src/appointment.c:3018
-msgid "Use Orage window"
-msgstr ""
-
-#: ../src/appointment.c:3020
-msgid "Select this if you want Orage window alarm"
-msgstr ""
-
-#: ../src/appointment.c:3032
-msgid "Use notification"
-msgstr ""
-
-#: ../src/appointment.c:3034
-msgid "Select this if you want notification alarm"
-msgstr ""
-
-#: ../src/appointment.c:3040
-#, fuzzy
-msgid "Set timeout"
-msgstr "Изберете временска зона"
-
-#: ../src/appointment.c:3043
-msgid "Select this if you want notification to expire automatically"
-msgstr ""
-
-#: ../src/appointment.c:3054
-msgid "0 = system default expiration time"
-msgstr ""
-
-#: ../src/appointment.c:3059
-msgid "seconds"
-msgstr ""
-
-#. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
-#, fuzzy
-msgid "Procedure"
-msgstr "Својства"
-
-#: ../src/appointment.c:3076
-#, fuzzy
-msgid "Select this if you want procedure or script alarm"
-msgstr "Употребете го ова ако сакате стандардно повторување"
-
-#: ../src/appointment.c:3082
-msgid ""
-"You must enter all escape etc characters yourself.\n"
-"This string is just given to shell to process.\n"
-"The following special commands are replaced at run time:\n"
-"\t<&T>  appointment title\n"
-"\t<&D>  appointment description\n"
-"\t<&AT> alarm time\n"
-"\t<&ST> appointment start time\n"
-"\t<&ET> appointment end time"
-msgstr ""
-
-#: ../src/appointment.c:3094
-msgid "Test this alarm by raising it now"
-msgstr ""
-
-#: ../src/appointment.c:3101
-#, fuzzy
-msgid "<b>Default alarm</b>"
-msgstr "Стандарден аларм на Orage"
-
-#: ../src/appointment.c:3109
-msgid "Store current settings as default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3114
-msgid "Set current settings from default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Ништо"
-
-#: ../src/appointment.c:3176
-msgid "Daily"
-msgstr "Дневно"
-
-#: ../src/appointment.c:3176
-msgid "Weekly"
-msgstr "Неделно"
-
-#: ../src/appointment.c:3176
-msgid "Monthly"
-msgstr "Месечно"
-
-#: ../src/appointment.c:3176
-msgid "Yearly"
-msgstr "Годишно"
-
-#: ../src/appointment.c:3176
-msgid "Hourly"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Mon"
-msgstr "Пон"
-
-#: ../src/appointment.c:3178
-msgid "Tue"
-msgstr "Вто"
-
-#: ../src/appointment.c:3178
-msgid "Wed"
-msgstr "Сре"
-
-#: ../src/appointment.c:3178
-msgid "Thu"
-msgstr "Чет"
-
-#: ../src/appointment.c:3178
-msgid "Fri"
-msgstr "Пет"
-
-#: ../src/appointment.c:3178
-msgid "Sat"
-msgstr "Саб"
-
-#: ../src/appointment.c:3178
-msgid "Sun"
-msgstr "Нед"
-
-#: ../src/appointment.c:3183
-msgid "Recurrence"
-msgstr "Повторување"
-
-#. complexity
-#: ../src/appointment.c:3189
-msgid "Complexity"
-msgstr "Комплексност"
-
-#: ../src/appointment.c:3192
-msgid "Basic"
-msgstr "Основно"
-
-#: ../src/appointment.c:3198
-msgid "Advanced"
-msgstr "Напредно"
-
-#: ../src/appointment.c:3202
-msgid "Use this if you want regular repeating event"
-msgstr "Употребете го ова ако сакате стандардно повторување"
-
-#: ../src/appointment.c:3204
-#, fuzzy
-msgid ""
-"Use this if you need complex times like:\n"
-" Every Saturday and Sunday or \n"
-" First Tuesday every month"
-msgstr ""
-"Употребете го ова ако сакате да користете комплексни пригази за време како:\n"
-" Секоја втора недела или \n"
-" Секоја сабота и Недела или \n"
-" Првиот вторник секој месец"
-
-#. frequency
-#: ../src/appointment.c:3211
-msgid "Frequency"
-msgstr "Честота"
-
-#: ../src/appointment.c:3217
-msgid "Each"
-msgstr "Секој"
-
-#: ../src/appointment.c:3224
-msgid "occurrence"
-msgstr "појавување"
-
-#: ../src/appointment.c:3228
-#, fuzzy
-msgid ""
-"Limit frequency to certain interval.\n"
-" For example: Every third day:\n"
-" Frequency = Daily and Interval = 3"
-msgstr ""
-"Ограничена честота на одредени интервали. Пр.: \n"
-" Секој трет ден: Честота = Дневно и Интервал = 3"
-
-#: ../src/appointment.c:3274
-msgid "Limit"
-msgstr "Ограничување"
-
-#: ../src/appointment.c:3276
-msgid "Repeat forever"
-msgstr "Повторувај засекогаш"
-
-#: ../src/appointment.c:3282
-msgid "Repeat "
-msgstr "Повторувај"
-
-#: ../src/appointment.c:3298
-msgid "Repeat until "
-msgstr "Повторувај до "
-
-#. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-msgid "Weekdays"
-msgstr "Викенди"
-
-#: ../src/appointment.c:3323
-msgid "Which day"
-msgstr "Кој ден"
-
-#: ../src/appointment.c:3331
-msgid ""
-"Specify which weekday for monthly and yearly events.\n"
-" For example:\n"
-" Second Wednesday each month:\n"
-"\tFrequency = Monthly,\n"
-"\tWeekdays = check only Wednesday,\n"
-"\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Одредете кои викенди за месечни и годишни настани.\n"
-"Пр.: \n"
-"Втора среда секој месец:\n"
-"\tЧестота = Месечно,\n"
-"\tВикенди = обележи само среда\n"
-"\tКој ден = изберете 2 од бројот под среда"
-
-#. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
-msgid "TODO base"
-msgstr ""
-
-#: ../src/appointment.c:3352
-msgid ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
-msgstr ""
-
-#: ../src/appointment.c:3354
-msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-
-#. exceptions
-#: ../src/appointment.c:3361
-#, fuzzy
-msgid "Exceptions"
-msgstr "Опции за часовникот"
-
-#: ../src/appointment.c:3374
-msgid ""
-"Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
-"Remove by clicking the data."
-msgstr ""
-
-#: ../src/appointment.c:3379
-msgid "Add excluded date (-)"
-msgstr ""
-
-#: ../src/appointment.c:3381
-msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-
-#: ../src/appointment.c:3387
-msgid "Add included time (+)"
-msgstr ""
-
-#: ../src/appointment.c:3389
-msgid ""
-"Included times have same timezone than start time, but they may have "
-"different time"
-msgstr ""
-
-#. calendars showing the action days
-#: ../src/appointment.c:3406
-msgid "Action dates"
-msgstr ""
-
-#. ********* View menu *********
-#. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
-msgid "_View"
-msgstr "_Поглед"
-
-#. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
-msgid "_Go"
-msgstr "_Оди"
-
-#: ../src/day-view.c:319 ../src/event-list.c:1110
-msgid "New"
-msgstr "Нов"
-
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Назад"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Денес"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Напред"
-
-#: ../src/day-view.c:333 ../src/event-list.c:1128
-msgid "Refresh"
-msgstr "Освежи"
-
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
-msgid "Close"
-msgstr "Затвори"
-
-#: ../src/day-view.c:454
-msgid "Unknown"
-msgstr ""
-
-#: ../src/day-view.c:704
-msgid "       Number of days to show"
-msgstr ""
-
-#: ../src/day-view.c:935
-#, fuzzy
-msgid "Orage - day view"
-msgstr "Календар"
-
-#. date only appointment
-#: ../src/event-list.c:190
-msgid "All day"
-msgstr "Цел ден"
-
-#: ../src/event-list.c:580 ../src/event-list.c:1281
-msgid "Time"
-msgstr "Време"
-
-#: ../src/event-list.c:748
-msgid "No rows have been selected."
-msgstr ""
-
-#: ../src/event-list.c:749
-msgid "Click a row to select it and after that you can copy it."
-msgstr ""
-
-#: ../src/event-list.c:918
-msgid ""
-"You will permanently remove all\n"
-"selected appointments."
-msgstr ""
-
-#: ../src/event-list.c:1130
-msgid "Find"
-msgstr ""
-
-#: ../src/event-list.c:1137
-msgid "Dayview"
-msgstr ""
-
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr ""
-
-#: ../src/event-list.c:1201
-msgid "Journal entries starting from:"
-msgstr ""
-
-#: ../src/event-list.c:1221
-#, fuzzy
-msgid "Search"
-msgstr "Секој"
-
-#: ../src/event-list.c:1224
-msgid "Search text "
-msgstr ""
-
-#: ../src/event-list.c:1289
-msgid "Flags"
-msgstr "Обележувачи"
-
-#: ../src/event-list.c:1297
-msgid "Title"
-msgstr "Наслов"
-
-#: ../src/event-list.c:1323
-#, fuzzy
-msgid ""
-"Double click line to edit it.\n"
-"\n"
-"Flags in order:\n"
-"\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
-"\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
-"\t 3. Type: f=free B=Busy\n"
-"\t 4. Located in file:\n"
-"\t\tO=Orage A=Archive F=Foreign\n"
-"\t 5. Appointment type:\n"
-"\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Кликнете два пати на линијата за нејзино уредување\n"
-"\n"
-"Обележувачи по ред:\n"
-"\t 1. Аларм: n=нема аларм\n"
-"\t\tA=визуелен аларм S=исто така звучен аларм\n"
-"\t 2. Повторување: n=нема повторување\n"
-"\t\t D=Дневно W=Неделно M=Месечно Y=Годишно\n"
-"\t 3. Тип: f=слободен B=зафатен"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Изберете ја датата"
-
-#. remove since it has ended
-#: ../src/ical-archive.c:267
-msgid "\tRecur ended, moving to archive file."
-msgstr ""
-
-#: ../src/ical-archive.c:329
-msgid "Archiving not enabled. Exiting"
-msgstr ""
-
-#: ../src/ical-archive.c:347
-#, fuzzy, c-format
-msgid "Archiving threshold: %d month(s)"
-msgstr "Архивски праг"
-
-#. yy mon day
-#: ../src/ical-archive.c:350
-#, c-format
-msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr ""
-
-#: ../src/ical-archive.c:377
-#, fuzzy, c-format
-msgid "Archiving uid: %s"
-msgstr "Архиви"
-
-#. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
-msgid "\tVTODO not complete; not archived"
-msgstr ""
-
-#. it is recurrent event
-#: ../src/ical-archive.c:388
-#, c-format
-msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr ""
-
-#: ../src/ical-archive.c:405
-#, fuzzy
-msgid "Archiving done\n"
-msgstr "Архиви"
-
-#. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
-#, fuzzy
-msgid "Starting archive removal."
-msgstr "Архивски праг"
-
-#: ../src/ical-archive.c:422
-msgid "\tPHASE 1: reset recurring appointments"
-msgstr ""
-
-#. PHASE 2: go through archive file and add everything back to base orage.
-#. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
-msgid "\tPHASE 2: return archived appointments"
-msgstr ""
-
-#: ../src/ical-archive.c:470
-#, fuzzy
-msgid "Archive removal done\n"
-msgstr "Архивски праг"
-
-#: ../src/ical-code.c:932
-msgid "Orage default alarm"
-msgstr "Стандарден аларм на Orage"
-
-#: ../src/ical-code.c:3115
-#, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-
-#: ../src/ical-code.c:3117
-#, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-
-#: ../src/ical-expimp.c:123
-msgid "Starting import file preprocessing"
-msgstr ""
-
-#: ../src/ical-expimp.c:158
-msgid "... Patched DCREATED to be CREATED."
-msgstr ""
-
-#: ../src/ical-expimp.c:197
-msgid "... Patched timezone to Orage format."
-msgstr ""
-
-#: ../src/ical-expimp.c:206
-msgid "Import file preprocessing done"
-msgstr ""
-
-#: ../src/interface.c:284
-msgid "Calendar files"
-msgstr "Датотеки на календарот"
-
-#: ../src/interface.c:631
-msgid "Current foreign files"
-msgstr ""
-
-#: ../src/interface.c:643
-msgid "READ ONLY"
-msgstr ""
-
-#: ../src/interface.c:645
-msgid "READ WRITE"
-msgstr ""
-
-#: ../src/interface.c:663
-msgid "***** No foreign files *****"
-msgstr ""
-
-#: ../src/interface.c:974
-msgid "Import/export"
-msgstr ""
-
-#: ../src/interface.c:981
-msgid "Import"
-msgstr ""
-
-#: ../src/interface.c:986
-msgid "Read from file:"
-msgstr ""
-
-#: ../src/interface.c:1003
-msgid ""
-"Separate filenames with comma(,).\n"
-" NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-
-#: ../src/interface.c:1008
-msgid "Export"
-msgstr ""
-
-#: ../src/interface.c:1013
-#, fuzzy
-msgid "Write to file:"
-msgstr "Архивска датотека"
-
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
-msgid "Select"
-msgstr "Избриши"
-
-#: ../src/interface.c:1037
-#, fuzzy
-msgid "All appointments"
-msgstr "Нов состанок"
-
-#: ../src/interface.c:1050
-#, fuzzy
-msgid "Named appointments: "
-msgstr "Нов состанок"
-
-#: ../src/interface.c:1062
-msgid ""
-"Note that only main file appointments are read.\n"
-"Archived and Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1065
-msgid ""
-"Note that only main file appointments are read.\n"
-"Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1068
-msgid "You can easily drag these from event-list window."
-msgstr ""
-
-#: ../src/interface.c:1070
-msgid "Orage appointment UIDs separated by commas."
-msgstr ""
-
-#: ../src/interface.c:1076
-#, fuzzy
-msgid "Archive"
-msgstr "Архиви"
-
-#: ../src/interface.c:1084
-#, fuzzy, c-format
-msgid "Archive now (threshold: %d months)"
-msgstr "Архивски праг"
-
-#: ../src/interface.c:1094
-msgid "You can change archive threshold in parameters"
-msgstr ""
-
-#: ../src/interface.c:1101
-msgid "Revert archive now"
-msgstr ""
-
-#: ../src/interface.c:1107
-msgid ""
-"Return all archived events into main orage file and remove arch file.\n"
-"This is useful for example when doing export and moving orage\n"
-"appointments to another system."
-msgstr ""
-
-#: ../src/interface.c:1118
-#, fuzzy
-msgid "Orage files"
-msgstr "Параметри за Orage"
-
-#: ../src/interface.c:1125
-#, fuzzy
-msgid "Orage main calendar file"
-msgstr "Датотеки на календарот"
-
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "Датотеки на календарот"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-#, fuzzy
-msgid "New file"
-msgstr "Архивска датотека"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr ""
-
-#: ../src/interface.c:1156 ../src/interface.c:1222
-msgid "Rename"
-msgstr ""
-
-#: ../src/interface.c:1160
-msgid ""
-"Orage internal file rename only.\n"
-"Does not touch external filesystem at all.\n"
-"New file must exist."
-msgstr ""
-
-#: ../src/interface.c:1164 ../src/interface.c:1227
-msgid "Copy"
-msgstr ""
-
-#: ../src/interface.c:1168
-msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-
-#: ../src/interface.c:1172 ../src/interface.c:1232
-msgid "Move"
-msgstr ""
-
-#: ../src/interface.c:1176
-msgid "Current file is moved and vanishes from the old place."
-msgstr ""
-
-#: ../src/interface.c:1190
-msgid "Archive file"
-msgstr "Архивска датотека"
-
-#: ../src/interface.c:1254
-msgid "Foreign files"
-msgstr ""
-
-#: ../src/interface.c:1261
-msgid "Add new foreign file"
-msgstr ""
-
-#: ../src/interface.c:1266
-msgid "Foreign file:"
-msgstr ""
-
-#: ../src/interface.c:1284
-#, fuzzy
-msgid "Options"
-msgstr "Опции за часовникот"
-
-#: ../src/interface.c:1286
-msgid "Read only"
-msgstr ""
-
-#: ../src/interface.c:1294
-msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-
-#: ../src/interface.c:1308
-msgid "Exchange data - Orage"
-msgstr ""
-
-#: ../src/main.c:268
-#, c-format
-msgid ""
-"\tThis is %s version %s\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:270
-#, c-format
-msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
-
-#: ../src/main.c:271
-#, c-format
-msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
-
-#: ../src/main.c:273
-#, c-format
-msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
-
-#: ../src/main.c:276
-#, c-format
-msgid "\tUsing DBUS for import.\n"
-msgstr ""
-
-#: ../src/main.c:278
-#, c-format
-msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
-
-#: ../src/main.c:281
-#, c-format
-msgid "\tUsing libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:283
-#, c-format
-msgid "\tNot using libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:286
-#, c-format
-msgid "\tUsing automatic archiving.\n"
-msgstr ""
-
-#: ../src/main.c:288
-#, c-format
-msgid "\tNot using archiving.\n"
-msgstr ""
-
-#: ../src/main.c:291
-#, c-format
-msgid "\tUsing operating system package libical.\n"
-msgstr ""
-
-#: ../src/main.c:293
-#, c-format
-msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
-
-#: ../src/main.c:306
-#, c-format
-msgid ""
-"Usage: orage [options] [files]\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:307
-#, fuzzy, c-format
-msgid "Options:\n"
-msgstr "Опции за часовникот"
-
-#: ../src/main.c:308
-#, c-format
-msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
-
-#: ../src/main.c:309
-#, c-format
-msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
-
-#: ../src/main.c:310
-#, c-format
-msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
-
-#: ../src/main.c:311
-#, c-format
-msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
-
-#: ../src/main.c:312
-#, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:313
-#, c-format
-msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:314
-#, c-format
-msgid ""
-"--export (-e) file [appointment...] \texport appointments from Orage to "
-"file\n"
-msgstr ""
-
-#: ../src/main.c:316
-#, c-format
-msgid "files=ical files to load into orage\n"
-msgstr ""
-
-#: ../src/main.c:318
-#, c-format
-msgid "\tdbus not included in orage. \n"
-msgstr ""
-
-#: ../src/main.c:319
-#, c-format
-msgid ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
-msgstr ""
-
-#: ../src/main.c:511
-#, c-format
-msgid ""
-"\n"
-"Unknown option %s\n"
-"\n"
-msgstr ""
-
-#: ../src/mainbox.c:287
-msgid "_Exchange data"
-msgstr ""
-
-#. Edit menu
-#: ../src/mainbox.c:298
-msgid "_Edit"
-msgstr "_Уреди"
-
-#: ../src/mainbox.c:308
-msgid "View selected _date"
-msgstr "Прикажи ја избраната _дата"
-
-#: ../src/mainbox.c:311
-#, fuzzy
-msgid "View selected _week"
-msgstr "Прикажи ја избраната _дата"
-
-#: ../src/mainbox.c:317
-msgid "Select _Today"
-msgstr "Изберете _денес"
-
-#: ../src/mainbox.c:323
-#, fuzzy
-msgid "Show _Globaltime"
-msgstr "Локација"
-
-#. Help menu
-#: ../src/mainbox.c:327
-msgid "_Help"
-msgstr "_Помош"
-
-#: ../src/mainbox.c:448
-#, fuzzy
-msgid "Never"
-msgstr "никогаш"
-
-#: ../src/mainbox.c:453
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:460
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:546
-msgid "<b>To do:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:582
-#, c-format
-msgid "<b>Events for %s:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:593
-#, c-format
-msgid "<b>Events for %s - %s:</b>"
-msgstr ""
-
-#: ../src/parameters.c:522
-#, fuzzy
-msgid "Main settings"
-msgstr "Поставувања за календарот"
-
-#: ../src/parameters.c:528
-msgid "Timezone"
-msgstr "Временска зона"
-
-#: ../src/parameters.c:543
-msgid "You should always define your local timezone."
-msgstr ""
-
-#: ../src/parameters.c:552
-#, fuzzy
-msgid "Archive threshold (months)"
-msgstr "Архивски праг"
-
-#: ../src/parameters.c:562
-msgid "(0 = no archiving)"
-msgstr ""
-
-#: ../src/parameters.c:565
-msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-
-#: ../src/parameters.c:574
-msgid "Sound command"
-msgstr ""
-
-#: ../src/parameters.c:589
-msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Прикажани"
-
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
-msgstr "Прозорец на календарот"
-
-#: ../src/parameters.c:618
-#, fuzzy
-msgid "Show borders"
-msgstr "Покажи рамка"
-
-#: ../src/parameters.c:625
-#, fuzzy
-msgid "Show menu"
-msgstr "Покажи рамка"
-
-#: ../src/parameters.c:632
-#, fuzzy
-msgid "Show month and year"
-msgstr "Покажи во pager"
-
-#: ../src/parameters.c:639
-#, fuzzy
-msgid "Show day names"
-msgstr "Покажи рамка"
-
-#: ../src/parameters.c:646
-#, fuzzy
-msgid "Show week numbers"
-msgstr "Покажи рамка"
-
-#: ../src/parameters.c:653
-#, fuzzy
-msgid "Show todo list"
-msgstr "Покажи рамка"
-
-#: ../src/parameters.c:660
-msgid "Number of days to show in event window"
-msgstr ""
-
-#: ../src/parameters.c:666
-msgid "0 = do not show event list at all"
-msgstr ""
-
-#: ../src/parameters.c:676
-msgid "Show on all desktops"
-msgstr ""
-
-#: ../src/parameters.c:683
-#, fuzzy
-msgid "Keep on top"
-msgstr "поставете ја временската зон за:"
-
-#: ../src/parameters.c:690
-msgid "Show in taskbar"
-msgstr "Покажи во статусната лента"
-
-#: ../src/parameters.c:697
-msgid "Show in pager"
-msgstr "Покажи во pager"
-
-#: ../src/parameters.c:704
-msgid "Show in systray"
-msgstr "Покажи во системската лента"
-
-#: ../src/parameters.c:739
-msgid "Calendar start"
-msgstr "Почеток на календарот"
-
-#: ../src/parameters.c:744
-msgid "Show"
-msgstr "Покажи"
-
-#: ../src/parameters.c:756
-msgid "Hide"
-msgstr "Скриј"
-
-#: ../src/parameters.c:768
-msgid "Minimized"
-msgstr "Минимизирај"
-
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr ""
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Прозорец на календарот"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "Изберете _денес"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr ""
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
-
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr ""
-
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr ""
-
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr ""
-
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr ""
-
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
-
-#: ../src/parameters.c:921
-msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-
-#: ../src/parameters.c:938
-msgid "Orage Preferences"
-msgstr "Параметри за Orage"
-
-#: ../src/parameters.c:1050
-msgid "First Orage start. Searching default timezone."
-msgstr ""
-
-#: ../src/parameters.c:1069
-#, fuzzy, c-format
-msgid "Default timezone set to %s."
-msgstr "поставете ја временската зон за:"
-
-#: ../src/parameters.c:1072
-msgid "Default timezone not found, please, set it manually."
-msgstr ""
-
-#: ../src/reminder.c:562
-msgid "Reminder "
-msgstr "Потсетник "
-
-#: ../src/reminder.c:591
-msgid "Open"
-msgstr ""
-
-#: ../src/reminder.c:722
-#, fuzzy
-msgid "Reminder - Orage"
-msgstr "Потсетник "
-
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
-
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-
-#: ../src/reminder.c:1099
-msgid "Next active alarms:"
-msgstr "Следени активни аларми:"
-
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
-#, c-format
-msgid ""
-"\n"
-"%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d д %02d ч %02d мин. до: %s"
-
-#: ../src/reminder.c:1166
-#, c-format
-msgid ""
-"\n"
-"No active alarms found"
-msgstr ""
-"\n"
-"Не беа пронајдени активни аларми"
-
-#: ../src/timezone_names.c:36
-msgid "Africa"
-msgstr "Africa"
-
-#: ../src/timezone_names.c:37
-msgid "Africa/Abidjan"
-msgstr "Africa/Абиџан"
-
-#: ../src/timezone_names.c:38
-msgid "Africa/Accra"
-msgstr "Africa/Акра"
-
-#: ../src/timezone_names.c:39
-msgid "Africa/Addis_Ababa"
-msgstr "Africa/Адис Абеба"
-
-#: ../src/timezone_names.c:40
-msgid "Africa/Algiers"
-msgstr "Africa/Алжир"
-
-#: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr "Africa/Асмера"
-
-#: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr "Africa/Бамако"
-
-#: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr "Africa/Bangui"
-
-#: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr "Africa/Banjul"
-
-#: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr "Africa/Bissau"
-
-#: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr "Africa/Blantyre"
-
-#: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr "Africa/Brazzaville"
-
-#: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr "Africa/Bujumbura"
-
-#: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr "Africa/Cairo"
-
-#: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr "Africa/Casablanca"
-
-#: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr "Africa/Ceuta"
-
-#: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr "Africa/Conakry"
-
-#: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr "Africa/Dakar"
-
-#: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr "Africa/Dar_es_Salaam"
-
-#: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr "Africa/Djibouti"
-
-#: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr "Africa/Douala"
-
-#: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr "Africa/El_Aaiun"
-
-#: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr "Africa/Freetown"
-
-#: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr "Africa/Gaborone"
-
-#: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr "Africa/Harare"
-
-#: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr "Africa/Johannesburg"
-
-#: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr "Africa/Kampala"
-
-#: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr "Africa/Khartoum"
-
-#: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr "Africa/Kigali"
-
-#: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr "Africa/Kinshasa"
-
-#: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr "Africa/Lagos"
-
-#: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr "Africa/Libreville"
-
-#: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr "Africa/Lome"
-
-#: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr "Africa/Luanda"
-
-#: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr "Africa/Lubumbashi"
-
-#: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr "Africa/Lusaka"
-
-#: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr "Africa/Malabo"
-
-#: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr "Africa/Maputo"
-
-#: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr "Africa/Maseru"
-
-#: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr "Africa/Mbabane"
-
-#: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr "Africa/Mogadishu"
-
-#: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr "Africa/Monrovia"
-
-#: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr "Africa/Nairobi"
-
-#: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr "Africa/Ndjamena"
-
-#: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr "Africa/Niamey"
-
-#: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr "Africa/Nouakchott"
-
-#: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr "Africa/Ouagadougou"
-
-#: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr "Africa/Porto-Novo"
-
-#: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr "Africa/Sao_Tome"
-
-#: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr "Africa/Timbuktu"
-
-#: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr "Africa/Tripoli"
-
-#: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr "Africa/Tunis"
-
-#: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr "Africa/Windhoek"
-
-#: ../src/timezone_names.c:89
-msgid "America"
-msgstr "America"
-
-#: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr "America/Adak"
-
-#: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr "America/Anchorage"
-
-#: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr "America/Anguilla"
-
-#: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr "America/Antigua"
-
-#: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr "America/Araguaina"
-
-#: ../src/timezone_names.c:95
-#, fuzzy
-msgid "America/Argentina/Buenos_Aires"
-msgstr "America/Buenos_Aires"
-
-#: ../src/timezone_names.c:96
-#, fuzzy
-msgid "America/Argentina/Catamarca"
-msgstr "America/Catamarca"
-
-#: ../src/timezone_names.c:97
-#, fuzzy
-msgid "America/Argentina/Cordoba"
-msgstr "America/Cordoba"
-
-#: ../src/timezone_names.c:98
-#, fuzzy
-msgid "America/Argentina/Jujuy"
-msgstr "America/Jujuy"
-
-#: ../src/timezone_names.c:99
-#, fuzzy
-msgid "America/Argentina/Mendoza"
-msgstr "America/Mendoza"
-
-#: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr "America/Aruba"
-
-#: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr "America/Asuncion"
-
-#: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr "America/Barbados"
-
-#: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr "America/Belem"
-
-#: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr "America/Belize"
-
-#: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr "America/Boa_Vista"
-
-#: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr "America/Bogota"
-
-#: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr "America/Boise"
-
-#: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr "America/Buenos_Aires"
-
-#: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr "America/Cambridge_Bay"
-
-#: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr "America/Cancun"
-
-#: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr "America/Caracas"
-
-#: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr "America/Catamarca"
-
-#: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr "America/Cayenne"
-
-#: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr "America/Cayman"
-
-#: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr "America/Chicago"
-
-#: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr "America/Chihuahua"
-
-#: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr "America/Cordoba"
-
-#: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr "America/Costa_Rica"
-
-#: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr "America/Cuiaba"
-
-#: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr "America/Curacao"
-
-#: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr "America/Dawson"
-
-#: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr "America/Dawson_Creek"
-
-#: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr "America/Denver"
-
-#: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr "America/Detroit"
-
-#: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr "America/Dominica"
-
-#: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr "America/Edmonton"
-
-#: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr "America/Eirunepe"
-
-#: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr "America/El_Salvador"
-
-#: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr "America/Fortaleza"
-
-#: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr "America/Glace_Bay"
-
-#: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr "America/Godthab"
-
-#: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr "America/Goose_Bay"
-
-#: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr "America/Grand_Turk"
-
-#: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr "America/Grenada"
-
-#: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr "America/Guadeloupe"
-
-#: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr "America/Guatemala"
-
-#: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr "America/Guayaquil"
-
-#: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr "America/Guyana"
-
-#: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr "America/Halifax"
-
-#: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr "America/Havana"
-
-#: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr "America/Hermosillo"
-
-#: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr "America/Indiana/Indianapolis"
-
-#: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr "America/Indiana/Knox"
-
-#: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr "America/Indiana/Marengo"
-
-#: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr "America/Indiana/Vevay"
-
-#: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr "America/Indianapolis"
-
-#: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr "America/Inuvik"
-
-#: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr "America/Iqaluit"
-
-#: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr "America/Jamaica"
-
-#: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr "America/Jujuy"
-
-#: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr "America/Juneau"
-
-#: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr "America/Kentucky/Louisville"
-
-#: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr "America/Kentucky/Monticello"
-
-#: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr "America/La_Paz"
-
-#: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr "America/Lima"
-
-#: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr "America/Los_Angeles"
-
-#: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr "America/Louisville"
-
-#: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr "America/Maceio"
-
-#: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr "America/Managua"
-
-#: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr "America/Manaus"
-
-#: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr "America/Martinique"
-
-#: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr "America/Mazatlan"
-
-#: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr "America/Mendoza"
-
-#: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr "America/Menominee"
-
-#: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr ""
-
-#: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr ""
-
-#: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr ""
-
-#: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr ""
-
-#: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr ""
-
-#: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr ""
-
-#: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr ""
-
-#: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr ""
-
-#: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr ""
-
-#: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr ""
-
-#: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr ""
-
-#: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr ""
-
-#: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr ""
-
-#: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr ""
-
-#: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr ""
-
-#: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr ""
-
-#: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr ""
-
-#: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr ""
-
-#: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr ""
-
-#: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr ""
-
-#: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr ""
-
-#: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr ""
-
-#: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr ""
-
-#: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr ""
-
-#: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr ""
-
-#: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr ""
-
-#: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr ""
-
-#: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr ""
-
-#: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr ""
-
-#: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr ""
-
-#: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr ""
-
-#: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr ""
-
-#: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr ""
-
-#: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr ""
-
-#: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr ""
-
-#: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr ""
-
-#: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr ""
-
-#: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr ""
-
-#: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr ""
-
-#: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr ""
-
-#: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr ""
-
-#: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr ""
-
-#: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr ""
-
-#: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr ""
-
-#: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr ""
-
-#: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr ""
-
-#: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr ""
-
-#: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr ""
-
-#: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr ""
-
-#: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr ""
-
-#: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr ""
-
-#: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr ""
-
-#: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr ""
-
-#: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr ""
-
-#: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr ""
-
-#: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr ""
-
-#: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr ""
-
-#: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr ""
-
-#: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr ""
-
-#: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr ""
-
-#: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr ""
-
-#: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr ""
-
-#: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr ""
-
-#: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr ""
-
-#: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr ""
-
-#: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr ""
-
-#: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr ""
-
-#: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr ""
-
-#: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr ""
-
-#: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr ""
-
-#: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr ""
-
-#: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr ""
-
-#: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr ""
-
-#: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr ""
-
-#: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr ""
-
-#: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr ""
-
-#: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr ""
-
-#: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr ""
-
-#: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr ""
-
-#: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr ""
-
-#: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr ""
-
-#: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr ""
-
-#: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr ""
-
-#: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr ""
-
-#: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr ""
-
-#: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr ""
-
-#: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr ""
-
-#: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr ""
-
-#: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr ""
-
-#: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr ""
-
-#: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr ""
-
-#: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr ""
-
-#: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr ""
-
-#: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr ""
-
-#: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr ""
-
-#: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr ""
-
-#: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr ""
-
-#: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr ""
-
-#: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr ""
-
-#: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr ""
-
-#: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr ""
-
-#: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr ""
-
-#: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr ""
-
-#: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr ""
-
-#: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr ""
-
-#: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr ""
-
-#: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr ""
-
-#: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr ""
-
-#: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr ""
-
-#: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr ""
-
-#: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr ""
-
-#: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr ""
-
-#: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr ""
-
-#: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr ""
-
-#: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr ""
-
-#: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr ""
-
-#: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr ""
-
-#: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr ""
-
-#: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr ""
-
-#: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr ""
-
-#: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr ""
-
-#: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr ""
-
-#: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr ""
-
-#: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr ""
-
-#: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr ""
-
-#: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr ""
-
-#: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr ""
-
-#: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr ""
-
-#: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr ""
-
-#: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr ""
-
-#: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr ""
-
-#: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr ""
-
-#: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr ""
-
-#: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr ""
-
-#: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr ""
-
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr ""
-
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr ""
-
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr ""
-
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr ""
-
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr ""
-
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr ""
-
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr ""
-
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr ""
-
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr ""
-
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr ""
-
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr ""
-
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr ""
-
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr ""
-
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr ""
-
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr ""
-
-#: ../src/timezone_names.c:320
-msgid "Europe"
-msgstr ""
-
-#: ../src/timezone_names.c:321
-msgid "Europe/Amsterdam"
-msgstr ""
-
-#: ../src/timezone_names.c:322
-msgid "Europe/Andorra"
-msgstr ""
-
-#: ../src/timezone_names.c:323
-msgid "Europe/Athens"
-msgstr ""
-
-#: ../src/timezone_names.c:324
-msgid "Europe/Belfast"
-msgstr ""
-
-#: ../src/timezone_names.c:325
-msgid "Europe/Belgrade"
-msgstr ""
-
-#: ../src/timezone_names.c:326
-msgid "Europe/Berlin"
-msgstr ""
-
-#: ../src/timezone_names.c:327
-msgid "Europe/Bratislava"
-msgstr ""
-
-#: ../src/timezone_names.c:328
-msgid "Europe/Brussels"
-msgstr ""
-
-#: ../src/timezone_names.c:329
-msgid "Europe/Bucharest"
-msgstr ""
-
-#: ../src/timezone_names.c:330
-msgid "Europe/Budapest"
-msgstr ""
-
-#: ../src/timezone_names.c:331
-msgid "Europe/Chisinau"
-msgstr ""
-
-#: ../src/timezone_names.c:332
-msgid "Europe/Copenhagen"
-msgstr ""
-
-#: ../src/timezone_names.c:333
-msgid "Europe/Dublin"
-msgstr ""
-
-#: ../src/timezone_names.c:334
-msgid "Europe/Gibraltar"
-msgstr ""
-
-#: ../src/timezone_names.c:335
-msgid "Europe/Helsinki"
-msgstr ""
-
-#: ../src/timezone_names.c:336
-msgid "Europe/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:337
-msgid "Europe/Kaliningrad"
-msgstr ""
-
-#: ../src/timezone_names.c:338
-msgid "Europe/Kiev"
-msgstr ""
-
-#: ../src/timezone_names.c:339
-msgid "Europe/Lisbon"
-msgstr ""
-
-#: ../src/timezone_names.c:340
-msgid "Europe/Ljubljana"
-msgstr ""
-
-#: ../src/timezone_names.c:341
-msgid "Europe/London"
-msgstr ""
-
-#: ../src/timezone_names.c:342
-msgid "Europe/Luxembourg"
-msgstr ""
-
-#: ../src/timezone_names.c:343
-msgid "Europe/Madrid"
-msgstr ""
-
-#: ../src/timezone_names.c:344
-msgid "Europe/Malta"
-msgstr ""
-
-#: ../src/timezone_names.c:345
-msgid "Europe/Minsk"
-msgstr ""
-
-#: ../src/timezone_names.c:346
-msgid "Europe/Monaco"
-msgstr ""
-
-#: ../src/timezone_names.c:347
-msgid "Europe/Moscow"
-msgstr ""
-
-#: ../src/timezone_names.c:348
-msgid "Europe/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:349
-msgid "Europe/Oslo"
-msgstr ""
-
-#: ../src/timezone_names.c:350
-msgid "Europe/Paris"
-msgstr ""
-
-#: ../src/timezone_names.c:351
-msgid "Europe/Prague"
-msgstr ""
-
-#: ../src/timezone_names.c:352
-msgid "Europe/Riga"
-msgstr ""
-
-#: ../src/timezone_names.c:353
-msgid "Europe/Rome"
-msgstr ""
-
-#: ../src/timezone_names.c:354
-msgid "Europe/Samara"
-msgstr ""
-
-#: ../src/timezone_names.c:355
-msgid "Europe/San_Marino"
-msgstr ""
-
-#: ../src/timezone_names.c:356
-msgid "Europe/Sarajevo"
-msgstr ""
-
-#: ../src/timezone_names.c:357
-msgid "Europe/Simferopol"
-msgstr ""
-
-#: ../src/timezone_names.c:358
-msgid "Europe/Skopje"
-msgstr ""
-
-#: ../src/timezone_names.c:359
-msgid "Europe/Sofia"
-msgstr ""
-
-#: ../src/timezone_names.c:360
-msgid "Europe/Stockholm"
-msgstr ""
-
-#: ../src/timezone_names.c:361
-msgid "Europe/Tallinn"
-msgstr ""
-
-#: ../src/timezone_names.c:362
-msgid "Europe/Tirane"
-msgstr ""
-
-#: ../src/timezone_names.c:363
-msgid "Europe/Uzhgorod"
-msgstr ""
-
-#: ../src/timezone_names.c:364
-msgid "Europe/Vaduz"
-msgstr ""
-
-#: ../src/timezone_names.c:365
-msgid "Europe/Vatican"
-msgstr ""
-
-#: ../src/timezone_names.c:366
-msgid "Europe/Vienna"
-msgstr ""
-
-#: ../src/timezone_names.c:367
-msgid "Europe/Vilnius"
-msgstr ""
-
-#: ../src/timezone_names.c:368
-msgid "Europe/Warsaw"
-msgstr ""
-
-#: ../src/timezone_names.c:369
-msgid "Europe/Zagreb"
-msgstr ""
-
-#: ../src/timezone_names.c:370
-msgid "Europe/Zaporozhye"
-msgstr ""
-
-#: ../src/timezone_names.c:371
-msgid "Europe/Zurich"
-msgstr ""
-
-#: ../src/timezone_names.c:372
-msgid "Indian"
-msgstr ""
-
-#: ../src/timezone_names.c:373
-msgid "Indian/Antananarivo"
-msgstr ""
-
-#: ../src/timezone_names.c:374
-msgid "Indian/Chagos"
-msgstr ""
-
-#: ../src/timezone_names.c:375
-msgid "Indian/Christmas"
-msgstr ""
-
-#: ../src/timezone_names.c:376
-msgid "Indian/Cocos"
-msgstr ""
-
-#: ../src/timezone_names.c:377
-msgid "Indian/Comoro"
-msgstr ""
-
-#: ../src/timezone_names.c:378
-msgid "Indian/Kerguelen"
-msgstr ""
-
-#: ../src/timezone_names.c:379
-msgid "Indian/Mahe"
-msgstr ""
-
-#: ../src/timezone_names.c:380
-msgid "Indian/Maldives"
-msgstr ""
-
-#: ../src/timezone_names.c:381
-msgid "Indian/Mauritius"
-msgstr ""
-
-#: ../src/timezone_names.c:382
-msgid "Indian/Mayotte"
-msgstr ""
-
-#: ../src/timezone_names.c:383
-msgid "Indian/Reunion"
-msgstr ""
-
-#: ../src/timezone_names.c:384
-msgid "Pacific"
-msgstr ""
-
-#: ../src/timezone_names.c:385
-msgid "Pacific/Apia"
-msgstr ""
-
-#: ../src/timezone_names.c:386
-msgid "Pacific/Auckland"
-msgstr ""
-
-#: ../src/timezone_names.c:387
-msgid "Pacific/Chatham"
-msgstr ""
-
-#: ../src/timezone_names.c:388
-msgid "Pacific/Easter"
-msgstr ""
-
-#: ../src/timezone_names.c:389
-msgid "Pacific/Efate"
-msgstr ""
-
-#: ../src/timezone_names.c:390
-msgid "Pacific/Enderbury"
-msgstr ""
-
-#: ../src/timezone_names.c:391
-msgid "Pacific/Fakaofo"
-msgstr ""
-
-#: ../src/timezone_names.c:392
-msgid "Pacific/Fiji"
-msgstr ""
-
-#: ../src/timezone_names.c:393
-msgid "Pacific/Funafuti"
-msgstr ""
-
-#: ../src/timezone_names.c:394
-msgid "Pacific/Galapagos"
-msgstr ""
-
-#: ../src/timezone_names.c:395
-msgid "Pacific/Gambier"
-msgstr ""
-
-#: ../src/timezone_names.c:396
-msgid "Pacific/Guadalcanal"
-msgstr ""
-
-#: ../src/timezone_names.c:397
-msgid "Pacific/Guam"
-msgstr ""
-
-#: ../src/timezone_names.c:398
-msgid "Pacific/Honolulu"
-msgstr ""
-
-#: ../src/timezone_names.c:399
-msgid "Pacific/Johnston"
-msgstr ""
-
-#: ../src/timezone_names.c:400
-msgid "Pacific/Kiritimati"
-msgstr ""
-
-#: ../src/timezone_names.c:401
-msgid "Pacific/Kosrae"
-msgstr ""
-
-#: ../src/timezone_names.c:402
-msgid "Pacific/Kwajalein"
-msgstr ""
-
-#: ../src/timezone_names.c:403
-msgid "Pacific/Majuro"
-msgstr ""
-
-#: ../src/timezone_names.c:404
-msgid "Pacific/Marquesas"
-msgstr ""
-
-#: ../src/timezone_names.c:405
-msgid "Pacific/Midway"
-msgstr ""
-
-#: ../src/timezone_names.c:406
-msgid "Pacific/Nauru"
-msgstr ""
-
-#: ../src/timezone_names.c:407
-msgid "Pacific/Niue"
-msgstr ""
-
-#: ../src/timezone_names.c:408
-msgid "Pacific/Norfolk"
-msgstr ""
-
-#: ../src/timezone_names.c:409
-msgid "Pacific/Noumea"
-msgstr ""
-
-#: ../src/timezone_names.c:410
-msgid "Pacific/Pago_Pago"
-msgstr ""
-
-#: ../src/timezone_names.c:411
-msgid "Pacific/Palau"
-msgstr ""
-
-#: ../src/timezone_names.c:412
-msgid "Pacific/Pitcairn"
-msgstr ""
-
-#: ../src/timezone_names.c:413
-msgid "Pacific/Ponape"
-msgstr ""
-
-#: ../src/timezone_names.c:414
-msgid "Pacific/Port_Moresby"
-msgstr ""
-
-#: ../src/timezone_names.c:415
-msgid "Pacific/Rarotonga"
-msgstr ""
-
-#: ../src/timezone_names.c:416
-msgid "Pacific/Saipan"
-msgstr ""
-
-#: ../src/timezone_names.c:417
-msgid "Pacific/Tahiti"
-msgstr ""
-
-#: ../src/timezone_names.c:418
-msgid "Pacific/Tarawa"
-msgstr ""
-
-#: ../src/timezone_names.c:419
-msgid "Pacific/Tongatapu"
-msgstr ""
-
-#: ../src/timezone_names.c:420
-msgid "Pacific/Truk"
-msgstr ""
-
-#: ../src/timezone_names.c:421
-msgid "Pacific/Wake"
-msgstr ""
-
-#: ../src/timezone_names.c:422
-msgid "Pacific/Wallis"
-msgstr ""
-
-#: ../src/timezone_names.c:423
-msgid "Pacific/Yap"
-msgstr ""
-
-#: ../src/tray_icon.c:469
-msgid "New appointment"
-msgstr "Нов состанок"
-
-#: ../src/tray_icon.c:485
-msgid "About Orage"
-msgstr "За Orage"
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
-msgid "Orage Panel Clock"
-msgstr "Часовник Orage"
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
-msgid "Show time and date?"
-msgstr "Колку се времето и датата?"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Календар"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Параметри за Orage"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Параметри за Orage"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Поставувања за календар апликацијата за Xfce 4"
-
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Календар на работната површина"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "Календар"
-
-#~ msgid "Orage clock"
-#~ msgstr "Orage часовник"
-
-#~ msgid "Contributor"
-#~ msgstr "Придонесувач"
-
-#~ msgid "Warning"
-#~ msgstr "Предупредување"
-
-#~ msgid "Display"
-#~ msgstr "Приказ"
-
-#, fuzzy
-#~ msgid "Select always today"
-#~ msgstr "Изберете _денес"
-
-#, fuzzy
-#~ msgid "Vary"
-#~ msgstr "Годишно"
-
-#~ msgid "Select timezone"
-#~ msgstr "Изберете временска зона"
-
-#, fuzzy
-#~ msgid "Modify Preferences"
-#~ msgstr "Параметри за Orage"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr "Поставете (=TZ) вредност или изберете една од листата."
-
-#~ msgid "show line _1:"
-#~ msgstr "покажи ја линијата _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "покажи ја линијата _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "покажи ја линијата _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Својства"
-
-#, fuzzy
-#~ msgid "Show event list"
-#~ msgstr "Покажи во системската лента"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Xfce 4 поставувања за календар"
-
-#, fuzzy
-#~ msgid "Monday"
-#~ msgstr "Денес"
-
-#, fuzzy
-#~ msgid "Tuesday"
-#~ msgstr "Денес"
-
-#, fuzzy
-#~ msgid "Wednesday"
-#~ msgstr "Викенди"
-
-#, fuzzy
-#~ msgid "Thursday"
-#~ msgstr "Денес"
-
-#, fuzzy
-#~ msgid "Friday"
-#~ msgstr "Пет"
-
-#, fuzzy
-#~ msgid "Sunday"
-#~ msgstr "Звук"
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "денови"
-
-#, fuzzy
-#~ msgid "normal"
-#~ msgstr "Општо"
-
-#~ msgid "Calendar borders"
-#~ msgstr "Граници за календарот"
-
-#~ msgid "Hidden"
-#~ msgstr "Скриени"
-
-#~ msgid "3 months"
-#~ msgstr "3 месеци"
-
-#~ msgid "6 months"
-#~ msgstr "6 месеци"
-
-#~ msgid "1 year"
-#~ msgstr "1 година"
-
-#~ msgid "Application"
-#~ msgstr "Апликација"
-
-#~ msgid "Button Label|Orage"
-#~ msgstr "Ознака за копче|Orage"
-
-#~ msgid "Core developer"
-#~ msgstr "Развивач на јадрото"
-
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%m/%d/%Y"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Ќе ги избришите сите информации \n"
-#~ "поврзани со оваа дата."
-
-#~ msgid "Clear"
-#~ msgstr "Исчисти"
-
-#~ msgid "uid"
-#~ msgstr "uid"
-
-#~ msgid "This should not happen"
-#~ msgstr "Ова не треба да се случи"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Не може да се направи MCS клиент канал"
-
-#~ msgid "Open archive file..."
-#~ msgstr "Отвори архивска датотека..."
-
-#~ msgid "Close archive file"
-#~ msgstr "Затвори архивска датотека"
diff -Nru orage-4.8.3/po/mr.po orage-4.12.1/po/mr.po
--- orage-4.8.3/po/mr.po	2012-01-03 12:01:07.000000000 +0000
+++ orage-4.12.1/po/mr.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,3649 +0,0 @@
-# Marathi Translation of orage.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Pallavi Nikam <pallavi_edu@rediffmail.com>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2005-09-14 01:06+0900\n"
-"Last-Translator: Pallavi Nikam <pallavi_edu@rediffmail.com>\n"
-"Language-Team: Marathi <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: mr\n"
-"X-Generator: KBabel 1.9\n"
-
-#: ../globaltime/globaltime.c:100
-msgid "Raising GlobalTime window..."
-msgstr ""
-
-#: ../globaltime/globaltime.c:102
-msgid "GlobalTime window raise failed"
-msgstr ""
-
-#. ********** timezone tooltip **********
-#: ../globaltime/globaltime.c:277
-#, c-format
-msgid ""
-"%s\n"
-"click to modify clock"
-msgstr ""
-
-#: ../globaltime/globaltime.c:386
-msgid "Localtime"
-msgstr ""
-
-#: ../globaltime/globaltime.c:464
-msgid ""
-"button 1 to change preferences \n"
-"button 2 to adjust time of clocks"
-msgstr ""
-
-#: ../globaltime/globaltime.c:480
-msgid "adjust to change hour"
-msgstr ""
-
-#: ../globaltime/globaltime.c:496
-msgid ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
-msgid "NEW"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:289
-msgid "NEW COPY"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:310
-msgid "Not possible to delete the last clock."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:516
-msgid "update this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
-msgid "add new empty clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:526
-msgid "add new clock using this clock as model"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:531
-msgid "delete this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:539
-msgid "move this clock first"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:544
-msgid "move this clock left"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:549
-msgid "move this clock right"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:554
-msgid "move this clock last"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:562
-msgid "set the timezone of this clock to be local timezone"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
-msgid "close window and exit"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:590
-#, fuzzy
-msgid "Globaltime preferences "
-msgstr "प्राधाण्य"
-
-#. -----------------------HEADING-------------------------------------------
-#: ../globaltime/gt_prefs.c:603
-msgid "Clock Parameters"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:607
-msgid "Name of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:613
-msgid "enter name of clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:616
-msgid "Timezone of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:643
-msgid "Text Formatting"
-msgstr ""
-
-#. ------------------------background-------------------------
-#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
-msgid "Background color:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:656
-msgid "Click to change background colour for clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
-#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
-#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
-#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
-#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
-msgid "Use default"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
-#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
-#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
-msgid "Cross this to use default instead of selected value"
-msgstr ""
-
-#. ------------------------foreground-------------------------
-#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
-msgid "Foreground (=text) color:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:688
-msgid "Click to change foreground colour for clock"
-msgstr ""
-
-#. ------------------------name font-------------------------
-#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
-msgid "Font for name of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:720
-msgid "Click to change font for clock name"
-msgstr ""
-
-#. ------------------------time font-------------------------
-#: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
-msgid "Font for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:753
-msgid "Click to change font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:780
-msgid "Underline name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:810
-msgid "Underline time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:850
-msgid "Text Default Formatting"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:863
-msgid "Click to change default background colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
-msgid "Cross this to use system default instead of selected color"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:896
-msgid "Click to change default text colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:929
-msgid "Click to change default font for clock name"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
-msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:963
-msgid "Click to change default font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:990
-msgid "Underline for name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:1004
-msgid "Underline for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1027
-#, fuzzy
-msgid "update preferences"
-msgstr "प्राधाण्य"
-
-#: ../globaltime/gt_prefs.c:1062
-#, fuzzy
-msgid "Globaltime Preferences"
-msgstr "प्राधाण्य"
-
-#. -----------------------HEADING--------------------------------------
-#: ../globaltime/gt_prefs.c:1073
-#, fuzzy
-msgid "General Preferences"
-msgstr "प्राधाण्य"
-
-#: ../globaltime/gt_prefs.c:1077
-msgid "Decorations:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1078
-#, fuzzy
-msgid "Standard"
-msgstr "दिनदर्शिका"
-
-#: ../globaltime/gt_prefs.c:1083
-msgid "Use normal decorations"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1094
-msgid "Do not show window decorations (borders)"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1100
-msgid "Clock size:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1101
-msgid "Equal"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1106
-msgid "All clocks have same size"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1111
-#, fuzzy
-msgid "Varying"
-msgstr "इशारा"
-
-#: ../globaltime/gt_prefs.c:1116
-msgid "Clock sizes vary"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1122
-msgid "Local timezone:"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:101
-#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
-msgid " Other"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:156
-#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
-#, c-format
-msgid "%d hour %d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:159
-#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, c-format
-msgid "%d hour"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:161
-#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, c-format
-msgid "%d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:167
-#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
-msgid "backward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:170
-#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-msgid "forward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:194
-#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
-msgid "not changed"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:195
-#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
-msgid "not changing"
-msgstr ""
-
-#. location
-#: ../globaltime/timezone_selection.c:247
-#: ../globaltime/timezone_selection.c:252
-#: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
-#: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
-msgid "Location"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:258
-#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
-msgid "GMT Offset"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:264
-#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
-msgid "Previous/Next Change"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:269
-#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
-msgid "Country"
-msgstr ""
-
-#. We are actually setting the g_par parameter. In other words
-#. we are setting the global default timezone for Orage. This is
-#. done very seldom and we do not want to allow "floating" here.
-#. This test is ugly, but it is not worth an extra parameter.
-#. this is normal appointment
-#: ../globaltime/timezone_selection.c:299
-#: ../globaltime/timezone_selection.c:309
-#: ../panel-plugin/timezone_selection.c:300
-#: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
-#: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
-msgid "Pick timezone"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:302
-#: ../globaltime/timezone_selection.c:312
-#: ../panel-plugin/timezone_selection.c:303
-#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
-#: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
-msgid "Change mode"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:303
-#: ../globaltime/timezone_selection.c:313
-#: ../globaltime/timezone_selection.c:352
-#: ../panel-plugin/timezone_selection.c:304
-#: ../panel-plugin/timezone_selection.c:314
-#: ../panel-plugin/timezone_selection.c:353 ../src/timezone_selection.c:320
-#: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
-#: ../src/timezone_selection.c:379
-msgid "UTC"
-msgstr ""
-
-#. NOTE: this exists only if ical timezones are being used
-#: ../globaltime/timezone_selection.c:304
-#: ../globaltime/timezone_selection.c:357
-#: ../panel-plugin/timezone_selection.c:305
-#: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
-#: ../src/timezone_selection.c:384
-msgid "floating"
-msgstr ""
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "प्राधाण्य"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
-msgid "Orage Globaltime"
-msgstr "दिनदर्शिका"
-
-#: ../globaltime/globaltime.desktop.in.h:3
-msgid "Show clocks from different countries"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:224
-msgid "Appearance"
-msgstr ""
-
-#. show frame
-#: ../panel-plugin/oc_config.c:229
-msgid "Show _frame"
-msgstr ""
-
-#. foreground color
-#: ../panel-plugin/oc_config.c:239
-msgid "set foreground _color:"
-msgstr ""
-
-#. background color
-#: ../panel-plugin/oc_config.c:253
-msgid "set _background color:"
-msgstr ""
-
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
-msgid "set _height:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:277
-msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:282
-msgid "set _width:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:293
-msgid "Note that you can not change the width of vertical panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:316
-msgid "Clock Options"
-msgstr ""
-
-#. timezone
-#: ../panel-plugin/oc_config.c:326
-msgid "set timezone to:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:347
-#, c-format
-msgid "Line %d:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:357
-msgid "Enter any valid strftime function parameter."
-msgstr ""
-
-#. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
-msgid "Tooltip:"
-msgstr ""
-
-#. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
-msgid "fix time after suspend/hibernate"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:415
-msgid ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:432
-msgid ""
-"This program uses strftime function to get time.\n"
-"Use any valid code to get time in the format you prefer.\n"
-"Some common codes are:\n"
-"\t%A = weekday\t\t\t%B = month\n"
-"\t%c = date & time\t\t%R = hour & minute\n"
-"\t%V = week number\t\t%Z = timezone in use\n"
-"\t%H = hours \t\t\t\t%M = minute\n"
-"\t%X = local time\t\t\t%x = local date"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:457
-#, fuzzy
-msgid "Orage clock Preferences"
-msgstr "प्राधाण्य"
-
-#. no lines yet
-#. TRANSLATORS: Use format characters from strftime(3)
-#. * to get the proper string for your locale.
-#. * I used these:
-#. * %A  : full weekday name
-#. * %d  : day of the month
-#. * %B  : full month name
-#. * %Y  : four digit year
-#. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
-msgid "%A %d %B %Y/%V"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:40
-msgid "Maintainer"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:47
-#, fuzzy
-msgid "Manage your time with Orage"
-msgstr "Xfce4 बरोबर तुमच्या वेऴेची व्यवस्था करा"
-
-#. if (gtk_toggle_button_get_active(
-#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
-#. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
-msgid "End"
-msgstr ""
-
-#: ../src/appointment.c:333
-msgid "Due"
-msgstr ""
-
-#: ../src/appointment.c:493 ../src/mainbox.c:783
-msgid "Orage"
-msgstr ""
-
-#. to avoid timing problems when updating entry
-#. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
-msgid "Select a file..."
-msgstr ""
-
-#: ../src/appointment.c:680
-msgid "Sound Files"
-msgstr ""
-
-#: ../src/appointment.c:687 ../src/interface.c:290
-msgid "All Files"
-msgstr ""
-
-#: ../src/appointment.c:739
-#, fuzzy
-msgid "The appointment information has been modified."
-msgstr ""
-"\n"
-" माहीती बदलेली आहे.\n"
-" तुम्हास पूढे चालू ठेवावयाचे आहे का?\n"
-
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
-msgid "Do you want to continue?"
-msgstr ""
-
-#: ../src/appointment.c:767
-msgid "The end of this appointment is earlier than the beginning."
-msgstr ""
-
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-msgid "Not set"
-msgstr ""
-
-#: ../src/appointment.c:1193
-msgid "This appointment will be permanently removed."
-msgstr ""
-
-#: ../src/appointment.c:1692
-msgid "This appointment does not exist."
-msgstr ""
-
-#: ../src/appointment.c:1693
-msgid "It was probably removed, please refresh your screen."
-msgstr ""
-
-#: ../src/appointment.c:1995
-#, fuzzy
-msgid "Current categories"
-msgstr "दिनदर्शिका"
-
-#: ../src/appointment.c:2010
-msgid "Add new category with color"
-msgstr ""
-
-#: ../src/appointment.c:2014
-msgid "Category:"
-msgstr ""
-
-#: ../src/appointment.c:2045
-msgid "Colors of categories - Orage"
-msgstr ""
-
-#: ../src/appointment.c:2092
-msgid " *** COPY ***"
-msgstr ""
-
-#: ../src/appointment.c:2353
-#, fuzzy
-msgid "New appointment - Orage"
-msgstr "नेमणूक"
-
-#. File menu stuff
-#. ********* File menu *********
-#. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
-msgid "_File"
-msgstr "फाईल (_F)"
-
-#: ../src/appointment.c:2388
-msgid "Sav_e and close"
-msgstr ""
-
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
-msgid "D_uplicate"
-msgstr ""
-
-#: ../src/appointment.c:2589
-msgid "Save"
-msgstr ""
-
-#: ../src/appointment.c:2591
-msgid "Save and close"
-msgstr ""
-
-#: ../src/appointment.c:2596
-msgid "Revert"
-msgstr ""
-
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
-msgid "Duplicate"
-msgstr ""
-
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
-msgid "Delete"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Free"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Busy"
-msgstr ""
-
-#: ../src/appointment.c:2625
-msgid "General"
-msgstr ""
-
-#. type
-#: ../src/appointment.c:2631
-msgid "Type "
-msgstr ""
-
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
-msgid "Event"
-msgstr ""
-
-#: ../src/appointment.c:2636
-msgid ""
-"Event that will happen sometime. For example:\n"
-"Meeting or birthday or TV show."
-msgstr ""
-
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-#, fuzzy
-msgid "Todo"
-msgstr "आज"
-
-#: ../src/appointment.c:2642
-msgid ""
-"Something that you should do sometime. For example:\n"
-"Wash your car or test new version of Orage."
-msgstr ""
-
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
-msgid "Journal"
-msgstr ""
-
-#: ../src/appointment.c:2649
-msgid ""
-"Make a note that something happened. For example:\n"
-"Remark that your mother called or first snow came."
-msgstr ""
-
-#. title
-#: ../src/appointment.c:2656
-msgid "Title "
-msgstr ""
-
-#: ../src/appointment.c:2671
-msgid "All day event"
-msgstr ""
-
-#. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
-msgid "Start"
-msgstr ""
-
-#: ../src/appointment.c:2697
-msgid "Set      "
-msgstr ""
-
-#: ../src/appointment.c:2718
-msgid "Duration"
-msgstr ""
-
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
-#, fuzzy
-msgid "days"
-msgstr "आज"
-
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
-msgid "hours"
-msgstr ""
-
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
-msgid "mins"
-msgstr ""
-
-#. Availability (only for EVENT)
-#: ../src/appointment.c:2738
-msgid "Availability"
-msgstr ""
-
-#. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
-msgid "Completed"
-msgstr ""
-
-#: ../src/appointment.c:2749
-msgid "Done"
-msgstr ""
-
-#. categories
-#: ../src/appointment.c:2770
-msgid "Categories"
-msgstr ""
-
-#: ../src/appointment.c:2782
-msgid ""
-"This is special category, which can be used to color this appointment in "
-"list views."
-msgstr ""
-
-#: ../src/appointment.c:2787
-msgid "update colors for categories."
-msgstr ""
-
-#. priority
-#: ../src/appointment.c:2793
-msgid "Priority"
-msgstr ""
-
-#. note
-#: ../src/appointment.c:2803
-msgid "Note"
-msgstr ""
-
-#: ../src/appointment.c:2824
-msgid ""
-"These shorthand commands take effect immediately:\n"
-"    <D> inserts current date in local date format\n"
-"    <T> inserts time and\n"
-"    <DT> inserts date and time.\n"
-"\n"
-"These are converted only later when they are seen:\n"
-"    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before Start"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before End"
-msgstr ""
-
-#: ../src/appointment.c:2896
-msgid "After Start"
-msgstr ""
-
-#: ../src/appointment.c:2896
-msgid "After End"
-msgstr ""
-
-#: ../src/appointment.c:2903
-msgid "Alarm"
-msgstr ""
-
-#. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-msgid "Alarm time"
-msgstr ""
-
-#: ../src/appointment.c:2933
-msgid ""
-"Often you want to get alarm:\n"
-" 1) before Event start\n"
-" 2) before Todo end\n"
-" 3) after Todo start"
-msgstr ""
-
-#: ../src/appointment.c:2938
-msgid "Persistent alarm"
-msgstr ""
-
-#: ../src/appointment.c:2940
-msgid ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
-msgstr ""
-
-#. **** Audio Alarm ****
-#: ../src/appointment.c:2949
-msgid "Sound"
-msgstr ""
-
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
-msgid "Use"
-msgstr ""
-
-#: ../src/appointment.c:2955
-msgid "Select this if you want audible alarm"
-msgstr ""
-
-#: ../src/appointment.c:2972
-msgid "Repeat alarm sound"
-msgstr ""
-
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
-msgid "times"
-msgstr ""
-
-#: ../src/appointment.c:3004
-msgid "sec interval"
-msgstr ""
-
-#. **** Display Alarm ****
-#: ../src/appointment.c:3014
-msgid "Visual"
-msgstr ""
-
-#: ../src/appointment.c:3018
-msgid "Use Orage window"
-msgstr ""
-
-#: ../src/appointment.c:3020
-msgid "Select this if you want Orage window alarm"
-msgstr ""
-
-#: ../src/appointment.c:3032
-msgid "Use notification"
-msgstr ""
-
-#: ../src/appointment.c:3034
-msgid "Select this if you want notification alarm"
-msgstr ""
-
-#: ../src/appointment.c:3040
-msgid "Set timeout"
-msgstr ""
-
-#: ../src/appointment.c:3043
-msgid "Select this if you want notification to expire automatically"
-msgstr ""
-
-#: ../src/appointment.c:3054
-msgid "0 = system default expiration time"
-msgstr ""
-
-#: ../src/appointment.c:3059
-msgid "seconds"
-msgstr ""
-
-#. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
-msgid "Procedure"
-msgstr ""
-
-#: ../src/appointment.c:3076
-msgid "Select this if you want procedure or script alarm"
-msgstr ""
-
-#: ../src/appointment.c:3082
-msgid ""
-"You must enter all escape etc characters yourself.\n"
-"This string is just given to shell to process.\n"
-"The following special commands are replaced at run time:\n"
-"\t<&T>  appointment title\n"
-"\t<&D>  appointment description\n"
-"\t<&AT> alarm time\n"
-"\t<&ST> appointment start time\n"
-"\t<&ET> appointment end time"
-msgstr ""
-
-#: ../src/appointment.c:3094
-msgid "Test this alarm by raising it now"
-msgstr ""
-
-#: ../src/appointment.c:3101
-msgid "<b>Default alarm</b>"
-msgstr ""
-
-#: ../src/appointment.c:3109
-msgid "Store current settings as default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3114
-msgid "Set current settings from default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Daily"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Weekly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Monthly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Yearly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Hourly"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Mon"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Tue"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Wed"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Thu"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Fri"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Sat"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Sun"
-msgstr ""
-
-#: ../src/appointment.c:3183
-msgid "Recurrence"
-msgstr ""
-
-#. complexity
-#: ../src/appointment.c:3189
-msgid "Complexity"
-msgstr ""
-
-#: ../src/appointment.c:3192
-msgid "Basic"
-msgstr ""
-
-#: ../src/appointment.c:3198
-msgid "Advanced"
-msgstr ""
-
-#: ../src/appointment.c:3202
-msgid "Use this if you want regular repeating event"
-msgstr ""
-
-#: ../src/appointment.c:3204
-msgid ""
-"Use this if you need complex times like:\n"
-" Every Saturday and Sunday or \n"
-" First Tuesday every month"
-msgstr ""
-
-#. frequency
-#: ../src/appointment.c:3211
-msgid "Frequency"
-msgstr ""
-
-#: ../src/appointment.c:3217
-msgid "Each"
-msgstr ""
-
-#: ../src/appointment.c:3224
-msgid "occurrence"
-msgstr ""
-
-#: ../src/appointment.c:3228
-msgid ""
-"Limit frequency to certain interval.\n"
-" For example: Every third day:\n"
-" Frequency = Daily and Interval = 3"
-msgstr ""
-
-#: ../src/appointment.c:3274
-msgid "Limit"
-msgstr ""
-
-#: ../src/appointment.c:3276
-msgid "Repeat forever"
-msgstr ""
-
-#: ../src/appointment.c:3282
-msgid "Repeat "
-msgstr ""
-
-#: ../src/appointment.c:3298
-msgid "Repeat until "
-msgstr ""
-
-#. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-#, fuzzy
-msgid "Weekdays"
-msgstr "आज"
-
-#: ../src/appointment.c:3323
-msgid "Which day"
-msgstr ""
-
-#: ../src/appointment.c:3331
-msgid ""
-"Specify which weekday for monthly and yearly events.\n"
-" For example:\n"
-" Second Wednesday each month:\n"
-"\tFrequency = Monthly,\n"
-"\tWeekdays = check only Wednesday,\n"
-"\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-
-#. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
-msgid "TODO base"
-msgstr ""
-
-#: ../src/appointment.c:3352
-msgid ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
-msgstr ""
-
-#: ../src/appointment.c:3354
-msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-
-#. exceptions
-#: ../src/appointment.c:3361
-msgid "Exceptions"
-msgstr ""
-
-#: ../src/appointment.c:3374
-msgid ""
-"Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
-"Remove by clicking the data."
-msgstr ""
-
-#: ../src/appointment.c:3379
-msgid "Add excluded date (-)"
-msgstr ""
-
-#: ../src/appointment.c:3381
-msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-
-#: ../src/appointment.c:3387
-msgid "Add included time (+)"
-msgstr ""
-
-#: ../src/appointment.c:3389
-msgid ""
-"Included times have same timezone than start time, but they may have "
-"different time"
-msgstr ""
-
-#. calendars showing the action days
-#: ../src/appointment.c:3406
-msgid "Action dates"
-msgstr ""
-
-#. ********* View menu *********
-#. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
-msgid "_View"
-msgstr ""
-
-#. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
-msgid "_Go"
-msgstr ""
-
-#: ../src/day-view.c:319 ../src/event-list.c:1110
-msgid "New"
-msgstr ""
-
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr ""
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "आज"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr ""
-
-#: ../src/day-view.c:333 ../src/event-list.c:1128
-msgid "Refresh"
-msgstr ""
-
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
-msgid "Close"
-msgstr ""
-
-#: ../src/day-view.c:454
-msgid "Unknown"
-msgstr ""
-
-#: ../src/day-view.c:704
-msgid "       Number of days to show"
-msgstr ""
-
-#: ../src/day-view.c:935
-#, fuzzy
-msgid "Orage - day view"
-msgstr "दिनदर्शिका"
-
-#. date only appointment
-#: ../src/event-list.c:190
-msgid "All day"
-msgstr ""
-
-#: ../src/event-list.c:580 ../src/event-list.c:1281
-msgid "Time"
-msgstr ""
-
-#: ../src/event-list.c:748
-msgid "No rows have been selected."
-msgstr ""
-
-#: ../src/event-list.c:749
-msgid "Click a row to select it and after that you can copy it."
-msgstr ""
-
-#: ../src/event-list.c:918
-msgid ""
-"You will permanently remove all\n"
-"selected appointments."
-msgstr ""
-
-#: ../src/event-list.c:1130
-msgid "Find"
-msgstr ""
-
-#: ../src/event-list.c:1137
-msgid "Dayview"
-msgstr ""
-
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr ""
-
-#: ../src/event-list.c:1201
-msgid "Journal entries starting from:"
-msgstr ""
-
-#: ../src/event-list.c:1221
-msgid "Search"
-msgstr ""
-
-#: ../src/event-list.c:1224
-msgid "Search text "
-msgstr ""
-
-#: ../src/event-list.c:1289
-msgid "Flags"
-msgstr ""
-
-#: ../src/event-list.c:1297
-msgid "Title"
-msgstr ""
-
-#: ../src/event-list.c:1323
-msgid ""
-"Double click line to edit it.\n"
-"\n"
-"Flags in order:\n"
-"\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
-"\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
-"\t 3. Type: f=free B=Busy\n"
-"\t 4. Located in file:\n"
-"\t\tO=Orage A=Archive F=Foreign\n"
-"\t 5. Appointment type:\n"
-"\t\tE=Event T=Todo J=Journal"
-msgstr ""
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr ""
-
-#. remove since it has ended
-#: ../src/ical-archive.c:267
-msgid "\tRecur ended, moving to archive file."
-msgstr ""
-
-#: ../src/ical-archive.c:329
-msgid "Archiving not enabled. Exiting"
-msgstr ""
-
-#: ../src/ical-archive.c:347
-#, c-format
-msgid "Archiving threshold: %d month(s)"
-msgstr ""
-
-#. yy mon day
-#: ../src/ical-archive.c:350
-#, c-format
-msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr ""
-
-#: ../src/ical-archive.c:377
-#, c-format
-msgid "Archiving uid: %s"
-msgstr ""
-
-#. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
-msgid "\tVTODO not complete; not archived"
-msgstr ""
-
-#. it is recurrent event
-#: ../src/ical-archive.c:388
-#, c-format
-msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr ""
-
-#: ../src/ical-archive.c:405
-msgid "Archiving done\n"
-msgstr ""
-
-#. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
-msgid "Starting archive removal."
-msgstr ""
-
-#: ../src/ical-archive.c:422
-msgid "\tPHASE 1: reset recurring appointments"
-msgstr ""
-
-#. PHASE 2: go through archive file and add everything back to base orage.
-#. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
-msgid "\tPHASE 2: return archived appointments"
-msgstr ""
-
-#: ../src/ical-archive.c:470
-msgid "Archive removal done\n"
-msgstr ""
-
-#: ../src/ical-code.c:932
-msgid "Orage default alarm"
-msgstr ""
-
-#: ../src/ical-code.c:3115
-#, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-
-#: ../src/ical-code.c:3117
-#, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-
-#: ../src/ical-expimp.c:123
-msgid "Starting import file preprocessing"
-msgstr ""
-
-#: ../src/ical-expimp.c:158
-msgid "... Patched DCREATED to be CREATED."
-msgstr ""
-
-#: ../src/ical-expimp.c:197
-msgid "... Patched timezone to Orage format."
-msgstr ""
-
-#: ../src/ical-expimp.c:206
-msgid "Import file preprocessing done"
-msgstr ""
-
-#: ../src/interface.c:284
-#, fuzzy
-msgid "Calendar files"
-msgstr "दिनदर्शिका"
-
-#: ../src/interface.c:631
-msgid "Current foreign files"
-msgstr ""
-
-#: ../src/interface.c:643
-msgid "READ ONLY"
-msgstr ""
-
-#: ../src/interface.c:645
-msgid "READ WRITE"
-msgstr ""
-
-#: ../src/interface.c:663
-msgid "***** No foreign files *****"
-msgstr ""
-
-#: ../src/interface.c:974
-msgid "Import/export"
-msgstr ""
-
-#: ../src/interface.c:981
-msgid "Import"
-msgstr ""
-
-#: ../src/interface.c:986
-msgid "Read from file:"
-msgstr ""
-
-#: ../src/interface.c:1003
-msgid ""
-"Separate filenames with comma(,).\n"
-" NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-
-#: ../src/interface.c:1008
-msgid "Export"
-msgstr ""
-
-#: ../src/interface.c:1013
-msgid "Write to file:"
-msgstr ""
-
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
-msgid "Select"
-msgstr "आज निवडा (_T)"
-
-#: ../src/interface.c:1037
-#, fuzzy
-msgid "All appointments"
-msgstr "नेमणूक"
-
-#: ../src/interface.c:1050
-#, fuzzy
-msgid "Named appointments: "
-msgstr "नेमणूक"
-
-#: ../src/interface.c:1062
-msgid ""
-"Note that only main file appointments are read.\n"
-"Archived and Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1065
-msgid ""
-"Note that only main file appointments are read.\n"
-"Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1068
-msgid "You can easily drag these from event-list window."
-msgstr ""
-
-#: ../src/interface.c:1070
-msgid "Orage appointment UIDs separated by commas."
-msgstr ""
-
-#: ../src/interface.c:1076
-msgid "Archive"
-msgstr ""
-
-#: ../src/interface.c:1084
-#, c-format
-msgid "Archive now (threshold: %d months)"
-msgstr ""
-
-#: ../src/interface.c:1094
-msgid "You can change archive threshold in parameters"
-msgstr ""
-
-#: ../src/interface.c:1101
-msgid "Revert archive now"
-msgstr ""
-
-#: ../src/interface.c:1107
-msgid ""
-"Return all archived events into main orage file and remove arch file.\n"
-"This is useful for example when doing export and moving orage\n"
-"appointments to another system."
-msgstr ""
-
-#: ../src/interface.c:1118
-#, fuzzy
-msgid "Orage files"
-msgstr "प्राधाण्य"
-
-#: ../src/interface.c:1125
-#, fuzzy
-msgid "Orage main calendar file"
-msgstr "दिनदर्शिका"
-
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "दिनदर्शिका"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr ""
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr ""
-
-#: ../src/interface.c:1156 ../src/interface.c:1222
-msgid "Rename"
-msgstr ""
-
-#: ../src/interface.c:1160
-msgid ""
-"Orage internal file rename only.\n"
-"Does not touch external filesystem at all.\n"
-"New file must exist."
-msgstr ""
-
-#: ../src/interface.c:1164 ../src/interface.c:1227
-msgid "Copy"
-msgstr ""
-
-#: ../src/interface.c:1168
-msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-
-#: ../src/interface.c:1172 ../src/interface.c:1232
-msgid "Move"
-msgstr ""
-
-#: ../src/interface.c:1176
-msgid "Current file is moved and vanishes from the old place."
-msgstr ""
-
-#: ../src/interface.c:1190
-msgid "Archive file"
-msgstr ""
-
-#: ../src/interface.c:1254
-msgid "Foreign files"
-msgstr ""
-
-#: ../src/interface.c:1261
-msgid "Add new foreign file"
-msgstr ""
-
-#: ../src/interface.c:1266
-msgid "Foreign file:"
-msgstr ""
-
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr ""
-
-#: ../src/interface.c:1286
-msgid "Read only"
-msgstr ""
-
-#: ../src/interface.c:1294
-msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-
-#: ../src/interface.c:1308
-msgid "Exchange data - Orage"
-msgstr ""
-
-#: ../src/main.c:268
-#, c-format
-msgid ""
-"\tThis is %s version %s\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:270
-#, c-format
-msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
-
-#: ../src/main.c:271
-#, c-format
-msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
-
-#: ../src/main.c:273
-#, c-format
-msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
-
-#: ../src/main.c:276
-#, c-format
-msgid "\tUsing DBUS for import.\n"
-msgstr ""
-
-#: ../src/main.c:278
-#, c-format
-msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
-
-#: ../src/main.c:281
-#, c-format
-msgid "\tUsing libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:283
-#, c-format
-msgid "\tNot using libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:286
-#, c-format
-msgid "\tUsing automatic archiving.\n"
-msgstr ""
-
-#: ../src/main.c:288
-#, c-format
-msgid "\tNot using archiving.\n"
-msgstr ""
-
-#: ../src/main.c:291
-#, c-format
-msgid "\tUsing operating system package libical.\n"
-msgstr ""
-
-#: ../src/main.c:293
-#, c-format
-msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
-
-#: ../src/main.c:306
-#, c-format
-msgid ""
-"Usage: orage [options] [files]\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:307
-#, c-format
-msgid "Options:\n"
-msgstr ""
-
-#: ../src/main.c:308
-#, c-format
-msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
-
-#: ../src/main.c:309
-#, c-format
-msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
-
-#: ../src/main.c:310
-#, c-format
-msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
-
-#: ../src/main.c:311
-#, c-format
-msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
-
-#: ../src/main.c:312
-#, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:313
-#, c-format
-msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:314
-#, c-format
-msgid ""
-"--export (-e) file [appointment...] \texport appointments from Orage to "
-"file\n"
-msgstr ""
-
-#: ../src/main.c:316
-#, c-format
-msgid "files=ical files to load into orage\n"
-msgstr ""
-
-#: ../src/main.c:318
-#, c-format
-msgid "\tdbus not included in orage. \n"
-msgstr ""
-
-#: ../src/main.c:319
-#, c-format
-msgid ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
-msgstr ""
-
-#: ../src/main.c:511
-#, c-format
-msgid ""
-"\n"
-"Unknown option %s\n"
-"\n"
-msgstr ""
-
-#: ../src/mainbox.c:287
-msgid "_Exchange data"
-msgstr ""
-
-#. Edit menu
-#: ../src/mainbox.c:298
-msgid "_Edit"
-msgstr ""
-
-#: ../src/mainbox.c:308
-msgid "View selected _date"
-msgstr ""
-
-#: ../src/mainbox.c:311
-msgid "View selected _week"
-msgstr ""
-
-#: ../src/mainbox.c:317
-msgid "Select _Today"
-msgstr "आज निवडा (_T)"
-
-#: ../src/mainbox.c:323
-#, fuzzy
-msgid "Show _Globaltime"
-msgstr "प्राधाण्य"
-
-#. Help menu
-#: ../src/mainbox.c:327
-msgid "_Help"
-msgstr "मदत (_H)"
-
-#: ../src/mainbox.c:448
-msgid "Never"
-msgstr ""
-
-#: ../src/mainbox.c:453
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:460
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:546
-msgid "<b>To do:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:582
-#, c-format
-msgid "<b>Events for %s:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:593
-#, c-format
-msgid "<b>Events for %s - %s:</b>"
-msgstr ""
-
-#: ../src/parameters.c:522
-#, fuzzy
-msgid "Main settings"
-msgstr "दिनदर्शिकेची रचना"
-
-#: ../src/parameters.c:528
-msgid "Timezone"
-msgstr ""
-
-#: ../src/parameters.c:543
-msgid "You should always define your local timezone."
-msgstr ""
-
-#: ../src/parameters.c:552
-msgid "Archive threshold (months)"
-msgstr ""
-
-#: ../src/parameters.c:562
-msgid "(0 = no archiving)"
-msgstr ""
-
-#: ../src/parameters.c:565
-msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-
-#: ../src/parameters.c:574
-msgid "Sound command"
-msgstr ""
-
-#: ../src/parameters.c:589
-msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "दिनदर्शिकेची रचना"
-
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
-msgstr "बंद विंण्डो (_C)"
-
-#: ../src/parameters.c:618
-msgid "Show borders"
-msgstr ""
-
-#: ../src/parameters.c:625
-#, fuzzy
-msgid "Show menu"
-msgstr "प्रदर्शन"
-
-#: ../src/parameters.c:632
-#, fuzzy
-msgid "Show month and year"
-msgstr "यात दाखवा..."
-
-#: ../src/parameters.c:639
-#, fuzzy
-msgid "Show day names"
-msgstr "प्रदर्शन"
-
-#: ../src/parameters.c:646
-#, fuzzy
-msgid "Show week numbers"
-msgstr "प्रदर्शन"
-
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr ""
-
-#: ../src/parameters.c:660
-msgid "Number of days to show in event window"
-msgstr ""
-
-#: ../src/parameters.c:666
-msgid "0 = do not show event list at all"
-msgstr ""
-
-#: ../src/parameters.c:676
-msgid "Show on all desktops"
-msgstr ""
-
-#: ../src/parameters.c:683
-msgid "Keep on top"
-msgstr ""
-
-#: ../src/parameters.c:690
-#, fuzzy
-msgid "Show in taskbar"
-msgstr "यात दाखवा..."
-
-#: ../src/parameters.c:697
-#, fuzzy
-msgid "Show in pager"
-msgstr "यात दाखवा..."
-
-#: ../src/parameters.c:704
-#, fuzzy
-msgid "Show in systray"
-msgstr "यात दाखवा..."
-
-#: ../src/parameters.c:739
-#, fuzzy
-msgid "Calendar start"
-msgstr "दिनदर्शिका"
-
-#: ../src/parameters.c:744
-msgid "Show"
-msgstr "प्रदर्शन"
-
-#: ../src/parameters.c:756
-msgid "Hide"
-msgstr "लपविणे"
-
-#: ../src/parameters.c:768
-msgid "Minimized"
-msgstr ""
-
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr ""
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "बंद विंण्डो (_C)"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "आज निवडा (_T)"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr ""
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
-
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr ""
-
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr ""
-
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr ""
-
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr ""
-
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
-
-#: ../src/parameters.c:921
-msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-
-#: ../src/parameters.c:938
-#, fuzzy
-msgid "Orage Preferences"
-msgstr "प्राधाण्य"
-
-#: ../src/parameters.c:1050
-msgid "First Orage start. Searching default timezone."
-msgstr ""
-
-#: ../src/parameters.c:1069
-#, c-format
-msgid "Default timezone set to %s."
-msgstr ""
-
-#: ../src/parameters.c:1072
-msgid "Default timezone not found, please, set it manually."
-msgstr ""
-
-#: ../src/reminder.c:562
-#, fuzzy
-msgid "Reminder "
-msgstr "आठवणे"
-
-#: ../src/reminder.c:591
-msgid "Open"
-msgstr ""
-
-#: ../src/reminder.c:722
-#, fuzzy
-msgid "Reminder - Orage"
-msgstr "आठवणे"
-
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
-
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-
-#: ../src/reminder.c:1099
-msgid "Next active alarms:"
-msgstr ""
-
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
-#, c-format
-msgid ""
-"\n"
-"%02d d %02d h %02d min to: %s"
-msgstr ""
-
-#: ../src/reminder.c:1166
-#, c-format
-msgid ""
-"\n"
-"No active alarms found"
-msgstr ""
-
-#: ../src/timezone_names.c:36
-msgid "Africa"
-msgstr ""
-
-#: ../src/timezone_names.c:37
-msgid "Africa/Abidjan"
-msgstr ""
-
-#: ../src/timezone_names.c:38
-msgid "Africa/Accra"
-msgstr ""
-
-#: ../src/timezone_names.c:39
-msgid "Africa/Addis_Ababa"
-msgstr ""
-
-#: ../src/timezone_names.c:40
-msgid "Africa/Algiers"
-msgstr ""
-
-#: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr ""
-
-#: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr ""
-
-#: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr ""
-
-#: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr ""
-
-#: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr ""
-
-#: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr ""
-
-#: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr ""
-
-#: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr ""
-
-#: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr ""
-
-#: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr ""
-
-#: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr ""
-
-#: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr ""
-
-#: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr ""
-
-#: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr ""
-
-#: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr ""
-
-#: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr ""
-
-#: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr ""
-
-#: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr ""
-
-#: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr ""
-
-#: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr ""
-
-#: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr ""
-
-#: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr ""
-
-#: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr ""
-
-#: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr ""
-
-#: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr ""
-
-#: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr ""
-
-#: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr ""
-
-#: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr ""
-
-#: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr ""
-
-#: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr ""
-
-#: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr ""
-
-#: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr ""
-
-#: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr ""
-
-#: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr ""
-
-#: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr ""
-
-#: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr ""
-
-#: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr ""
-
-#: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr ""
-
-#: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr ""
-
-#: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr ""
-
-#: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr ""
-
-#: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr ""
-
-#: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr ""
-
-#: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr ""
-
-#: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr ""
-
-#: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr ""
-
-#: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr ""
-
-#: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr ""
-
-#: ../src/timezone_names.c:89
-msgid "America"
-msgstr ""
-
-#: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr ""
-
-#: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr ""
-
-#: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr ""
-
-#: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr ""
-
-#: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr ""
-
-#: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:96
-msgid "America/Argentina/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:97
-msgid "America/Argentina/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:98
-msgid "America/Argentina/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:99
-msgid "America/Argentina/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr ""
-
-#: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr ""
-
-#: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr ""
-
-#: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr ""
-
-#: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr ""
-
-#: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr ""
-
-#: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr ""
-
-#: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr ""
-
-#: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr ""
-
-#: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr ""
-
-#: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr ""
-
-#: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr ""
-
-#: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr ""
-
-#: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr ""
-
-#: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr ""
-
-#: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr ""
-
-#: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr ""
-
-#: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr ""
-
-#: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr ""
-
-#: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr ""
-
-#: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr ""
-
-#: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr ""
-
-#: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr ""
-
-#: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr ""
-
-#: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr ""
-
-#: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr ""
-
-#: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr ""
-
-#: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr ""
-
-#: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr ""
-
-#: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr ""
-
-#: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr ""
-
-#: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr ""
-
-#: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr ""
-
-#: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr ""
-
-#: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr ""
-
-#: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr ""
-
-#: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr ""
-
-#: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr ""
-
-#: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr ""
-
-#: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr ""
-
-#: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr ""
-
-#: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr ""
-
-#: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr ""
-
-#: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr ""
-
-#: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr ""
-
-#: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr ""
-
-#: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr ""
-
-#: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr ""
-
-#: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr ""
-
-#: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr ""
-
-#: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr ""
-
-#: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr ""
-
-#: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr ""
-
-#: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr ""
-
-#: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr ""
-
-#: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr ""
-
-#: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr ""
-
-#: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr ""
-
-#: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr ""
-
-#: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr ""
-
-#: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr ""
-
-#: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr ""
-
-#: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr ""
-
-#: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr ""
-
-#: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr ""
-
-#: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr ""
-
-#: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr ""
-
-#: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr ""
-
-#: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr ""
-
-#: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr ""
-
-#: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr ""
-
-#: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr ""
-
-#: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr ""
-
-#: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr ""
-
-#: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr ""
-
-#: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr ""
-
-#: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr ""
-
-#: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr ""
-
-#: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr ""
-
-#: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr ""
-
-#: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr ""
-
-#: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr ""
-
-#: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr ""
-
-#: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr ""
-
-#: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr ""
-
-#: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr ""
-
-#: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr ""
-
-#: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr ""
-
-#: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr ""
-
-#: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr ""
-
-#: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr ""
-
-#: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr ""
-
-#: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr ""
-
-#: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr ""
-
-#: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr ""
-
-#: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr ""
-
-#: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr ""
-
-#: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr ""
-
-#: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr ""
-
-#: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr ""
-
-#: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr ""
-
-#: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr ""
-
-#: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr ""
-
-#: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr ""
-
-#: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr ""
-
-#: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr ""
-
-#: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr ""
-
-#: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr ""
-
-#: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr ""
-
-#: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr ""
-
-#: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr ""
-
-#: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr ""
-
-#: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr ""
-
-#: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr ""
-
-#: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr ""
-
-#: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr ""
-
-#: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr ""
-
-#: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr ""
-
-#: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr ""
-
-#: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr ""
-
-#: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr ""
-
-#: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr ""
-
-#: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr ""
-
-#: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr ""
-
-#: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr ""
-
-#: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr ""
-
-#: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr ""
-
-#: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr ""
-
-#: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr ""
-
-#: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr ""
-
-#: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr ""
-
-#: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr ""
-
-#: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr ""
-
-#: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr ""
-
-#: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr ""
-
-#: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr ""
-
-#: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr ""
-
-#: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr ""
-
-#: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr ""
-
-#: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr ""
-
-#: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr ""
-
-#: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr ""
-
-#: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr ""
-
-#: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr ""
-
-#: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr ""
-
-#: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr ""
-
-#: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr ""
-
-#: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr ""
-
-#: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr ""
-
-#: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr ""
-
-#: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr ""
-
-#: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr ""
-
-#: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr ""
-
-#: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr ""
-
-#: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr ""
-
-#: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr ""
-
-#: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr ""
-
-#: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr ""
-
-#: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr ""
-
-#: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr ""
-
-#: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr ""
-
-#: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr ""
-
-#: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr ""
-
-#: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr ""
-
-#: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr ""
-
-#: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr ""
-
-#: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr ""
-
-#: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr ""
-
-#: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr ""
-
-#: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr ""
-
-#: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr ""
-
-#: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr ""
-
-#: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr ""
-
-#: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr ""
-
-#: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr ""
-
-#: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr ""
-
-#: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr ""
-
-#: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr ""
-
-#: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr ""
-
-#: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr ""
-
-#: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr ""
-
-#: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr ""
-
-#: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr ""
-
-#: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr ""
-
-#: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr ""
-
-#: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr ""
-
-#: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr ""
-
-#: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr ""
-
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr ""
-
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr ""
-
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr ""
-
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr ""
-
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr ""
-
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr ""
-
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr ""
-
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr ""
-
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr ""
-
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr ""
-
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr ""
-
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr ""
-
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr ""
-
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr ""
-
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr ""
-
-#: ../src/timezone_names.c:320
-msgid "Europe"
-msgstr ""
-
-#: ../src/timezone_names.c:321
-msgid "Europe/Amsterdam"
-msgstr ""
-
-#: ../src/timezone_names.c:322
-msgid "Europe/Andorra"
-msgstr ""
-
-#: ../src/timezone_names.c:323
-msgid "Europe/Athens"
-msgstr ""
-
-#: ../src/timezone_names.c:324
-msgid "Europe/Belfast"
-msgstr ""
-
-#: ../src/timezone_names.c:325
-msgid "Europe/Belgrade"
-msgstr ""
-
-#: ../src/timezone_names.c:326
-msgid "Europe/Berlin"
-msgstr ""
-
-#: ../src/timezone_names.c:327
-msgid "Europe/Bratislava"
-msgstr ""
-
-#: ../src/timezone_names.c:328
-msgid "Europe/Brussels"
-msgstr ""
-
-#: ../src/timezone_names.c:329
-msgid "Europe/Bucharest"
-msgstr ""
-
-#: ../src/timezone_names.c:330
-msgid "Europe/Budapest"
-msgstr ""
-
-#: ../src/timezone_names.c:331
-msgid "Europe/Chisinau"
-msgstr ""
-
-#: ../src/timezone_names.c:332
-msgid "Europe/Copenhagen"
-msgstr ""
-
-#: ../src/timezone_names.c:333
-msgid "Europe/Dublin"
-msgstr ""
-
-#: ../src/timezone_names.c:334
-msgid "Europe/Gibraltar"
-msgstr ""
-
-#: ../src/timezone_names.c:335
-msgid "Europe/Helsinki"
-msgstr ""
-
-#: ../src/timezone_names.c:336
-msgid "Europe/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:337
-msgid "Europe/Kaliningrad"
-msgstr ""
-
-#: ../src/timezone_names.c:338
-msgid "Europe/Kiev"
-msgstr ""
-
-#: ../src/timezone_names.c:339
-msgid "Europe/Lisbon"
-msgstr ""
-
-#: ../src/timezone_names.c:340
-msgid "Europe/Ljubljana"
-msgstr ""
-
-#: ../src/timezone_names.c:341
-msgid "Europe/London"
-msgstr ""
-
-#: ../src/timezone_names.c:342
-msgid "Europe/Luxembourg"
-msgstr ""
-
-#: ../src/timezone_names.c:343
-msgid "Europe/Madrid"
-msgstr ""
-
-#: ../src/timezone_names.c:344
-msgid "Europe/Malta"
-msgstr ""
-
-#: ../src/timezone_names.c:345
-msgid "Europe/Minsk"
-msgstr ""
-
-#: ../src/timezone_names.c:346
-msgid "Europe/Monaco"
-msgstr ""
-
-#: ../src/timezone_names.c:347
-msgid "Europe/Moscow"
-msgstr ""
-
-#: ../src/timezone_names.c:348
-msgid "Europe/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:349
-msgid "Europe/Oslo"
-msgstr ""
-
-#: ../src/timezone_names.c:350
-msgid "Europe/Paris"
-msgstr ""
-
-#: ../src/timezone_names.c:351
-msgid "Europe/Prague"
-msgstr ""
-
-#: ../src/timezone_names.c:352
-msgid "Europe/Riga"
-msgstr ""
-
-#: ../src/timezone_names.c:353
-msgid "Europe/Rome"
-msgstr ""
-
-#: ../src/timezone_names.c:354
-msgid "Europe/Samara"
-msgstr ""
-
-#: ../src/timezone_names.c:355
-msgid "Europe/San_Marino"
-msgstr ""
-
-#: ../src/timezone_names.c:356
-msgid "Europe/Sarajevo"
-msgstr ""
-
-#: ../src/timezone_names.c:357
-msgid "Europe/Simferopol"
-msgstr ""
-
-#: ../src/timezone_names.c:358
-msgid "Europe/Skopje"
-msgstr ""
-
-#: ../src/timezone_names.c:359
-msgid "Europe/Sofia"
-msgstr ""
-
-#: ../src/timezone_names.c:360
-msgid "Europe/Stockholm"
-msgstr ""
-
-#: ../src/timezone_names.c:361
-msgid "Europe/Tallinn"
-msgstr ""
-
-#: ../src/timezone_names.c:362
-msgid "Europe/Tirane"
-msgstr ""
-
-#: ../src/timezone_names.c:363
-msgid "Europe/Uzhgorod"
-msgstr ""
-
-#: ../src/timezone_names.c:364
-msgid "Europe/Vaduz"
-msgstr ""
-
-#: ../src/timezone_names.c:365
-msgid "Europe/Vatican"
-msgstr ""
-
-#: ../src/timezone_names.c:366
-msgid "Europe/Vienna"
-msgstr ""
-
-#: ../src/timezone_names.c:367
-msgid "Europe/Vilnius"
-msgstr ""
-
-#: ../src/timezone_names.c:368
-msgid "Europe/Warsaw"
-msgstr ""
-
-#: ../src/timezone_names.c:369
-msgid "Europe/Zagreb"
-msgstr ""
-
-#: ../src/timezone_names.c:370
-msgid "Europe/Zaporozhye"
-msgstr ""
-
-#: ../src/timezone_names.c:371
-msgid "Europe/Zurich"
-msgstr ""
-
-#: ../src/timezone_names.c:372
-msgid "Indian"
-msgstr ""
-
-#: ../src/timezone_names.c:373
-msgid "Indian/Antananarivo"
-msgstr ""
-
-#: ../src/timezone_names.c:374
-msgid "Indian/Chagos"
-msgstr ""
-
-#: ../src/timezone_names.c:375
-msgid "Indian/Christmas"
-msgstr ""
-
-#: ../src/timezone_names.c:376
-msgid "Indian/Cocos"
-msgstr ""
-
-#: ../src/timezone_names.c:377
-msgid "Indian/Comoro"
-msgstr ""
-
-#: ../src/timezone_names.c:378
-msgid "Indian/Kerguelen"
-msgstr ""
-
-#: ../src/timezone_names.c:379
-msgid "Indian/Mahe"
-msgstr ""
-
-#: ../src/timezone_names.c:380
-msgid "Indian/Maldives"
-msgstr ""
-
-#: ../src/timezone_names.c:381
-msgid "Indian/Mauritius"
-msgstr ""
-
-#: ../src/timezone_names.c:382
-msgid "Indian/Mayotte"
-msgstr ""
-
-#: ../src/timezone_names.c:383
-msgid "Indian/Reunion"
-msgstr ""
-
-#: ../src/timezone_names.c:384
-msgid "Pacific"
-msgstr ""
-
-#: ../src/timezone_names.c:385
-msgid "Pacific/Apia"
-msgstr ""
-
-#: ../src/timezone_names.c:386
-msgid "Pacific/Auckland"
-msgstr ""
-
-#: ../src/timezone_names.c:387
-msgid "Pacific/Chatham"
-msgstr ""
-
-#: ../src/timezone_names.c:388
-msgid "Pacific/Easter"
-msgstr ""
-
-#: ../src/timezone_names.c:389
-msgid "Pacific/Efate"
-msgstr ""
-
-#: ../src/timezone_names.c:390
-msgid "Pacific/Enderbury"
-msgstr ""
-
-#: ../src/timezone_names.c:391
-msgid "Pacific/Fakaofo"
-msgstr ""
-
-#: ../src/timezone_names.c:392
-msgid "Pacific/Fiji"
-msgstr ""
-
-#: ../src/timezone_names.c:393
-msgid "Pacific/Funafuti"
-msgstr ""
-
-#: ../src/timezone_names.c:394
-msgid "Pacific/Galapagos"
-msgstr ""
-
-#: ../src/timezone_names.c:395
-msgid "Pacific/Gambier"
-msgstr ""
-
-#: ../src/timezone_names.c:396
-msgid "Pacific/Guadalcanal"
-msgstr ""
-
-#: ../src/timezone_names.c:397
-msgid "Pacific/Guam"
-msgstr ""
-
-#: ../src/timezone_names.c:398
-msgid "Pacific/Honolulu"
-msgstr ""
-
-#: ../src/timezone_names.c:399
-msgid "Pacific/Johnston"
-msgstr ""
-
-#: ../src/timezone_names.c:400
-msgid "Pacific/Kiritimati"
-msgstr ""
-
-#: ../src/timezone_names.c:401
-msgid "Pacific/Kosrae"
-msgstr ""
-
-#: ../src/timezone_names.c:402
-msgid "Pacific/Kwajalein"
-msgstr ""
-
-#: ../src/timezone_names.c:403
-msgid "Pacific/Majuro"
-msgstr ""
-
-#: ../src/timezone_names.c:404
-msgid "Pacific/Marquesas"
-msgstr ""
-
-#: ../src/timezone_names.c:405
-msgid "Pacific/Midway"
-msgstr ""
-
-#: ../src/timezone_names.c:406
-msgid "Pacific/Nauru"
-msgstr ""
-
-#: ../src/timezone_names.c:407
-msgid "Pacific/Niue"
-msgstr ""
-
-#: ../src/timezone_names.c:408
-msgid "Pacific/Norfolk"
-msgstr ""
-
-#: ../src/timezone_names.c:409
-msgid "Pacific/Noumea"
-msgstr ""
-
-#: ../src/timezone_names.c:410
-msgid "Pacific/Pago_Pago"
-msgstr ""
-
-#: ../src/timezone_names.c:411
-msgid "Pacific/Palau"
-msgstr ""
-
-#: ../src/timezone_names.c:412
-msgid "Pacific/Pitcairn"
-msgstr ""
-
-#: ../src/timezone_names.c:413
-msgid "Pacific/Ponape"
-msgstr ""
-
-#: ../src/timezone_names.c:414
-msgid "Pacific/Port_Moresby"
-msgstr ""
-
-#: ../src/timezone_names.c:415
-msgid "Pacific/Rarotonga"
-msgstr ""
-
-#: ../src/timezone_names.c:416
-msgid "Pacific/Saipan"
-msgstr ""
-
-#: ../src/timezone_names.c:417
-msgid "Pacific/Tahiti"
-msgstr ""
-
-#: ../src/timezone_names.c:418
-msgid "Pacific/Tarawa"
-msgstr ""
-
-#: ../src/timezone_names.c:419
-msgid "Pacific/Tongatapu"
-msgstr ""
-
-#: ../src/timezone_names.c:420
-msgid "Pacific/Truk"
-msgstr ""
-
-#: ../src/timezone_names.c:421
-msgid "Pacific/Wake"
-msgstr ""
-
-#: ../src/timezone_names.c:422
-msgid "Pacific/Wallis"
-msgstr ""
-
-#: ../src/timezone_names.c:423
-msgid "Pacific/Yap"
-msgstr ""
-
-#: ../src/tray_icon.c:469
-#, fuzzy
-msgid "New appointment"
-msgstr "नेमणूक"
-
-#: ../src/tray_icon.c:485
-msgid "About Orage"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-msgid "Orage Panel Clock"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
-msgid "Show time and date?"
-msgstr "यात दाखवा..."
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "दिनदर्शिका"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "प्राधाण्य"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "प्राधाण्य"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Xfce 4 दिनदर्शिका अर्जाची रचना"
-
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "डेस्कॉप दिनदर्शिका"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "दिनदर्शिका"
-
-#~ msgid "Contributor"
-#~ msgstr "पल्लवी"
-
-#~ msgid "Warning"
-#~ msgstr "इशारा"
-
-#, fuzzy
-#~ msgid "Select always today"
-#~ msgstr "आज निवडा (_T)"
-
-#, fuzzy
-#~ msgid "Modify Preferences"
-#~ msgstr "प्राधाण्य"
-
-#, fuzzy
-#~ msgid "Show event list"
-#~ msgstr "यात दाखवा..."
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Xfce 4 दिनदर्शिकेची रचना"
-
-#, fuzzy
-#~ msgid "Monday"
-#~ msgstr "आज"
-
-#, fuzzy
-#~ msgid "Tuesday"
-#~ msgstr "आज"
-
-#, fuzzy
-#~ msgid "Wednesday"
-#~ msgstr "आज"
-
-#, fuzzy
-#~ msgid "Thursday"
-#~ msgstr "आज"
-
-#, fuzzy
-#~ msgid "Friday"
-#~ msgstr "आज"
-
-#, fuzzy
-#~ msgid "Sunday"
-#~ msgstr "आज"
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "आज"
-
-#, fuzzy
-#~ msgid "Calendar Files"
-#~ msgstr "दिनदर्शिका"
-
-#, fuzzy
-#~ msgid "Calendar borders"
-#~ msgstr "दिनदर्शिका"
-
-#, fuzzy
-#~ msgid "Hidden"
-#~ msgstr "लपविणे"
-
-#~ msgid "Core developer"
-#~ msgstr "मुख्य निर्माता"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr "या दिवसाशी संबधीत असलेली माहीती काढूण टाका."
-
-#, fuzzy
-#~ msgid "Clear"
-#~ msgstr "दिनदर्शिका"
-
-#~ msgid "This should not happen"
-#~ msgstr "असे घडावयास नाही पाहिजे"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "MCS क्लाइअण्ट चॅनेल तयार करु शकत नाही"
diff -Nru orage-4.8.3/po/ms.po orage-4.12.1/po/ms.po
--- orage-4.8.3/po/ms.po	2012-01-03 12:01:07.000000000 +0000
+++ orage-4.12.1/po/ms.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,28 +1,46 @@
-# Malay translations for orage package .
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Harun Musa <mharun@gmx.net>, 2003.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# abuyop <abuyop@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2005-09-14 01:08+0900\n"
-"Last-Translator: Harun Musa <mharun@gmx.net>\n"
-"Language-Team: Malay <translation-team-ms@list.sourceforge.net>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2014-09-24 15:05+0000\n"
+"Last-Translator: abuyop <abuyop@gmail.com>\n"
+"Language-Team: Malay (http://www.transifex.com/projects/p/xfce-apps/language/ms/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ms\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "tiada garis bawah"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "tunggal"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "dubel"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "rendah"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr ""
+msgstr "Menaikkan tetingkap GlobalTime.."
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
-msgstr ""
+msgstr "Naikkan tetingkap GlobalTime gagal"
 
 #. ********** timezone tooltip **********
 #: ../globaltime/globaltime.c:277
@@ -30,113 +48,116 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
+msgstr "%s\nklik untuk ubahsuai jam"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
-msgstr ""
+msgstr "Localtime"
 
 #: ../globaltime/globaltime.c:464
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
+msgstr "butang 1 untuk ubah keutamaan \nbutang 2 untuk laras masa jam"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
-msgstr ""
+msgstr "laras untuk ubah jam"
 
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
+msgstr "laras untuk ubah minit. Klik anak panah dengan butang 2 untuk ubah hanya 1 minit."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Masa Sejagat"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
-msgstr ""
+msgstr "BAHARU"
 
 #: ../globaltime/gt_prefs.c:289
 msgid "NEW COPY"
-msgstr ""
+msgstr "SALINAN BAHARU"
 
 #: ../globaltime/gt_prefs.c:310
 msgid "Not possible to delete the last clock."
-msgstr ""
+msgstr "Mustahil dapat memadam jam terakhir."
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
-msgstr ""
+msgstr "kemaskini jam ini"
 
 #: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
 msgid "add new empty clock"
-msgstr ""
+msgstr "dan jam kosong baharu"
 
 #: ../globaltime/gt_prefs.c:526
 msgid "add new clock using this clock as model"
-msgstr ""
+msgstr "tambah jam baharu menggunakan jam ini sebagai model"
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
-msgstr ""
+msgstr "padam jam ini"
 
 #: ../globaltime/gt_prefs.c:539
 msgid "move this clock first"
-msgstr ""
+msgstr "alih jam ini dahulu"
 
 #: ../globaltime/gt_prefs.c:544
 msgid "move this clock left"
-msgstr ""
+msgstr "alih jam ini ke kiri"
 
 #: ../globaltime/gt_prefs.c:549
 msgid "move this clock right"
-msgstr ""
+msgstr "alih jam ini ke kanan"
 
 #: ../globaltime/gt_prefs.c:554
 msgid "move this clock last"
-msgstr ""
+msgstr "alih jam ini paling akhir"
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
-msgstr ""
+msgstr "tetapkan zon waktu jam ini menjadi zon waktu setempat"
 
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
-msgstr ""
+msgstr "tutup tetingkap dan keluar"
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "Keutamaan"
+msgstr "Keutamaan Globaltime "
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
 msgid "Clock Parameters"
-msgstr ""
+msgstr "Parameter Jam"
 
 #: ../globaltime/gt_prefs.c:607
 msgid "Name of the clock:"
-msgstr ""
+msgstr "Nama jam:"
 
 #: ../globaltime/gt_prefs.c:613
 msgid "enter name of clock"
-msgstr ""
+msgstr "masukkan nama jam"
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
-msgstr ""
+msgstr "Zon waktu jam:"
 
 #: ../globaltime/gt_prefs.c:643
 msgid "Text Formatting"
-msgstr ""
+msgstr "Pemformatan Teks"
 
 #. ------------------------background-------------------------
 #: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
 msgid "Background color:"
-msgstr ""
+msgstr "Warna latar belakang:"
 
 #: ../globaltime/gt_prefs.c:656
 msgid "Click to change background colour for clock"
-msgstr ""
+msgstr "Klik untuk ubah warna latar belakang jam"
 
 #: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
 #: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
@@ -144,213 +165,212 @@
 #: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
 #: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
 msgid "Use default"
-msgstr ""
+msgstr "Guna lalai"
 
 #: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
 #: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
 msgid "Cross this to use default instead of selected value"
-msgstr ""
+msgstr "Silang ini untuk guna lalai selain dari nilai terpilih"
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
 msgid "Foreground (=text) color:"
-msgstr ""
+msgstr "Warna (=text) latar hadapan:"
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
-msgstr ""
+msgstr "Klik untuk ubah warna latar hadapan jam"
 
 #. ------------------------name font-------------------------
 #: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
 msgid "Font for name of clock:"
-msgstr ""
+msgstr "Fon untuk nama jam:"
 
 #: ../globaltime/gt_prefs.c:720
 msgid "Click to change font for clock name"
-msgstr ""
+msgstr "Klik untuk ubah fon untuk nama jam"
 
 #. ------------------------time font-------------------------
 #: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
 msgid "Font for time of clock:"
-msgstr ""
+msgstr "Fon untuk masa jam:"
 
 #: ../globaltime/gt_prefs.c:753
 msgid "Click to change font for clock time"
-msgstr ""
+msgstr "Klik untuk ubah fon bagi masa jam"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:780
 msgid "Underline name of clock:"
-msgstr ""
+msgstr "Nama bergaris bawah jam:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:810
 msgid "Underline time of clock:"
-msgstr ""
+msgstr "Masa bergaris bawah jam:"
 
 #: ../globaltime/gt_prefs.c:850
 msgid "Text Default Formatting"
-msgstr ""
+msgstr "Pemformatan Lalai Teks"
 
 #: ../globaltime/gt_prefs.c:863
 msgid "Click to change default background colour for clocks"
-msgstr ""
+msgstr "Klik untuk ubah warna latar belakang lalai jam"
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
+msgstr "Silang ini untuk guna lalai sistem selain dari warna terpilih"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
-msgstr ""
+msgstr "Klik untuk ubah warna teks lalai bagi jam"
 
 #: ../globaltime/gt_prefs.c:929
 msgid "Click to change default font for clock name"
-msgstr ""
+msgstr "Klik untuk ubah fon lalai bagi nama jam"
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
+msgstr "Silang ini untuk guna fon lalai sistem selain dari fon terpilih"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
-msgstr ""
+msgstr "Klik untuk ubah fon lalai bagi masa jam"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:990
 msgid "Underline for name of clock:"
-msgstr ""
+msgstr "Garis bawahkan nama jama:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:1004
 msgid "Underline for time of clock:"
-msgstr ""
+msgstr "Garis bawahkan masa jam:"
 
 #: ../globaltime/gt_prefs.c:1027
-#, fuzzy
 msgid "update preferences"
-msgstr "Keutamaan"
+msgstr "Keutamaan kemaskini"
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "Keutamaan"
+msgstr "Keutamaan Globaltime"
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
-#, fuzzy
 msgid "General Preferences"
-msgstr "Keutamaan"
+msgstr "Keutamaan Am"
 
 #: ../globaltime/gt_prefs.c:1077
 msgid "Decorations:"
-msgstr ""
+msgstr "Hiasan:"
 
 #: ../globaltime/gt_prefs.c:1078
-#, fuzzy
 msgid "Standard"
-msgstr "XFCalendar"
+msgstr "Piawai"
 
 #: ../globaltime/gt_prefs.c:1083
 msgid "Use normal decorations"
-msgstr ""
+msgstr "Guna hiasan biasa"
+
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Tiada"
 
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
-msgstr ""
+msgstr "Jangan tunjuk hiasan tetingkap (sempadan)"
 
 #: ../globaltime/gt_prefs.c:1100
 msgid "Clock size:"
-msgstr ""
+msgstr "Saiz jam:"
 
 #: ../globaltime/gt_prefs.c:1101
 msgid "Equal"
-msgstr ""
+msgstr "Sama"
 
 #: ../globaltime/gt_prefs.c:1106
 msgid "All clocks have same size"
-msgstr ""
+msgstr "Semua jam mempunyai saiz yang sama"
 
 #: ../globaltime/gt_prefs.c:1111
-#, fuzzy
 msgid "Varying"
-msgstr "Amaran"
+msgstr "Berbeza"
 
 #: ../globaltime/gt_prefs.c:1116
 msgid "Clock sizes vary"
-msgstr ""
+msgstr "Saiz jam berbeza"
 
 #: ../globaltime/gt_prefs.c:1122
 msgid "Local timezone:"
-msgstr ""
+msgstr "Zon waktu setempat:"
 
 #: ../globaltime/timezone_selection.c:101
 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
 msgid " Other"
-msgstr ""
+msgstr "Lain-lain"
 
 #: ../globaltime/timezone_selection.c:156
 #: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
 #, c-format
 msgid "%d hour %d mins"
-msgstr ""
+msgstr "%d jam %d min"
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
 #, c-format
 msgid "%d hour"
-msgstr ""
+msgstr "%d jam"
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
 #, c-format
 msgid "%d mins"
-msgstr ""
+msgstr "%d min"
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
 msgid "backward"
-msgstr ""
+msgstr "undur"
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
 msgid "forward"
-msgstr ""
+msgstr "maju"
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
 msgid "not changed"
-msgstr ""
+msgstr "tidak diubah"
 
 #: ../globaltime/timezone_selection.c:195
 #: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
 msgid "not changing"
-msgstr ""
+msgstr "tidak berubah"
 
 #. location
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
-msgstr ""
+msgstr "Lokasi"
 
 #: ../globaltime/timezone_selection.c:258
 #: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
 msgid "GMT Offset"
-msgstr ""
+msgstr "Ofset GMT"
 
 #: ../globaltime/timezone_selection.c:264
 #: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
 msgid "Previous/Next Change"
-msgstr ""
+msgstr "Perubahan Terdahulu/Berikutnya"
 
 #: ../globaltime/timezone_selection.c:269
 #: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
 msgid "Country"
-msgstr ""
+msgstr "Negara"
 
 #. We are actually setting the g_par parameter. In other words
 #. we are setting the global default timezone for Orage. This is
@@ -363,7 +383,7 @@
 #: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
 #: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
 msgid "Pick timezone"
-msgstr ""
+msgstr "Ambil zon waktu"
 
 #: ../globaltime/timezone_selection.c:302
 #: ../globaltime/timezone_selection.c:312
@@ -371,7 +391,7 @@
 #: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
 #: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
 msgid "Change mode"
-msgstr ""
+msgstr "Ubah mod"
 
 #: ../globaltime/timezone_selection.c:303
 #: ../globaltime/timezone_selection.c:313
@@ -382,7 +402,7 @@
 #: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
 #: ../src/timezone_selection.c:379
 msgid "UTC"
-msgstr ""
+msgstr "UTC"
 
 #. NOTE: this exists only if ical timezones are being used
 #: ../globaltime/timezone_selection.c:304
@@ -391,96 +411,110 @@
 #: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
 #: ../src/timezone_selection.c:384
 msgid "floating"
-msgstr ""
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "Keutamaan"
+msgstr "terapung"
 
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "XFCalendar"
+msgstr "Orage Globaltime"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
-msgstr ""
+msgstr "Tunjuk jam dari negara lain"
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Globaltime"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Tiada putaran"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Putar kiri"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Putar kanan"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
-msgstr ""
+msgstr "Penampilan"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
-msgstr ""
+msgstr "Tunjuk _bingkai"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
-msgstr ""
+msgstr "tetapkan _warna latar hadapan:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
-msgstr ""
+msgstr "tetapkan warna _latar belakang:"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
-msgstr ""
+msgstr "tetapkan _tinggi:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
+msgstr "Perhatian anda tidak boleh ubah ketinggian panel mengufuk"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
-msgstr ""
+msgstr "tetapkan _lebar:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
-msgstr ""
+msgstr "Perhatian anda tidak boleh ubah lebar panel"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Tunjuk baris secara mene_gak"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
-msgstr ""
+msgstr "Pilihan Jam"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
-msgstr ""
+msgstr "tetapkan zon waktu pada:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
-msgstr ""
+msgstr "Baris %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
-msgstr ""
+msgstr "Masukkan mana-mana parameter fungsi strftime."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
-msgstr ""
+msgstr "Tip Alat:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
-msgstr ""
+msgstr "baiki masa selepas tangguh/hibernasi"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
+msgstr "Anda hanya perlukan ini jika anda buat tangguh atau hibernasi jangka pendek (kurang dari 5 jam) dan masa tampak anda tidak sertakan saat. Dibawah syarat ini adalah mungkin jam Orage tunjukkan masa tidak tepat melainkan anda memilih ini. (Pemilihan ini menghalang cpu dan menyampuk penyimpanan fitur dari berfungsi.)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -490,14 +524,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
+msgstr "Program ini gunakan fungsi strftime untuk dapatkan masa.\nGuna mana-mana kod sah dibawah untuk dapat masa dalam format\nyang anda sukar. Beberapa kod tersebut adalah:\n\t%A = hari kerja\t\t\t%B = bulan\n\t%c = tarikh & masa\t\t%R = jam & minit\n\t%V = bilangan minggu\t%Z = zon waktu yang diguna\n\t%H = jam \t\t\t\t%M = minit\n\t%X = masa setempat\t\t%x = tarikh setempat"
 
-#: ../panel-plugin/oc_config.c:457
-#, fuzzy
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
-msgstr "Keutamaan"
+msgstr "Keutamaan jam Orage"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -506,261 +538,318 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
-msgstr ""
+msgstr "%A %d %B %Y/%V"
 
 #: ../src/about-xfcalendar.c:40
 msgid "Maintainer"
-msgstr ""
+msgstr "Penyelenggara"
 
 #: ../src/about-xfcalendar.c:47
 msgid "Manage your time with Orage"
-msgstr ""
+msgstr "Urus masa anda dengan Orage"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
-msgstr ""
+msgstr "Tamat"
 
 #: ../src/appointment.c:333
 msgid "Due"
-msgstr ""
+msgstr "Luput"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
-msgstr ""
+msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
-msgstr ""
+msgstr "Pilih satu fail..."
 
 #: ../src/appointment.c:680
 msgid "Sound Files"
-msgstr ""
+msgstr "Fail Bunyi"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
-msgstr ""
+msgstr "Semua Fail"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
-msgstr ""
+msgstr "Maklumat temujanji telah diubahsuai."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
-msgstr ""
+msgstr "Anda mahu teruskan?"
+
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Tidak, jangan tinggalkan"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Ya, abai pengubahsuaian dan tinggalkan"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
-msgstr ""
+msgstr "Penamatan temujanji ini lebih awal dari permulaannya."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
-msgstr ""
+msgstr "Tidak ditetapkan"
+
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Tambah temujanji baharu ke fail ini."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Fail lalai Orage"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Tambahan temujanji gagal."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Ralat berlaku bila menambah temujanji. Cari lagi perincian dari fail log."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Kemaskini temujanji gagal."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Cari lagi perincian dari fail log. (Mungkin fail telah dikemaskini secara luaran dari Orage?)"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
-msgstr ""
+msgstr "Temujanji ini akan dibuang secara kekal."
+
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Tidak, batalkan pembuangan"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Ya, buang ia"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Ambil tarikh"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Hari ini"
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
-msgstr ""
+msgstr "Temujanji ini tidak wujud."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
-msgstr ""
+msgstr "Ia berkemungkinan telah dibuang, sila segar semula skrin anda."
 
-#: ../src/appointment.c:1995
-#, fuzzy
+#: ../src/appointment.c:2105
 msgid "Current categories"
-msgstr "XFCalendar"
+msgstr "Kategori semasa"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
-msgstr ""
+msgstr "Tambah kategori baharu dengan warna"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
-msgstr ""
+msgstr "Kategori:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
-msgstr ""
+msgstr "Warna kategori - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
-msgstr ""
+msgstr " *** SALIN ***"
 
-#: ../src/appointment.c:2353
-#, fuzzy
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
-msgstr "Temujanji"
+msgstr "Temujanji baharu - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Fail"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
-msgstr ""
+msgstr "S_iman dan tutup"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
-msgstr ""
+msgstr "G_anda Duakan"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
-msgstr ""
+msgstr "Simpan"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
-msgstr ""
+msgstr "Simpan dan tutup"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
-msgstr ""
+msgstr "Kembali"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
-msgstr ""
+msgstr "Ganda Duakan"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
-msgstr ""
+msgstr "Padam"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
-msgstr ""
+msgstr "Lapang"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
-msgstr ""
+msgstr "Sibuk"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
-msgstr ""
+msgstr "Am"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
-msgstr ""
+msgstr "Jenis"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
-msgstr ""
+msgstr "Peristiwa"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
+msgstr "Peristiwa yang berlaku kadang-kala. Contohnya:\nPertemuan atau hari lahir atau rancangan TV."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-#, fuzzy
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
-msgstr "Hari ini"
+msgstr "Todo"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
+msgstr "Kadangkala anda hendak membuat sesuatu. Contohnya:\nCuci kereta anda atau uji versi baharu Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
-msgstr ""
+msgstr "Jurnal"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
+msgstr "Buat nota perkara yang berlaku. Contohnya:\nCatat pesanan ibu anda atau bila banjir berlaku."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
-msgstr ""
+msgstr "Tajuk"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
-msgstr ""
+msgstr "Semua peristiwa dala sehari"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
-msgstr ""
+msgstr "Mula"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
-msgstr ""
+msgstr "Tetapkan"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
-msgstr ""
+msgstr "Jangkamasa"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
-#, fuzzy
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
-msgstr "Hari ini"
+msgstr "hari"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
-msgstr ""
+msgstr "jam"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
-msgstr ""
+msgstr "minit"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
-msgstr ""
+msgstr "Kebolehsediaan"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
-msgstr ""
+msgstr "Selesai"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
-msgstr ""
+msgstr "Selesai"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
-msgstr ""
+msgstr "Kategori"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
+msgstr "Ini adalah kategori khas, yang boleh digunakan untuk warnakan temujanji ini dalam paparan senarai."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
-msgstr ""
+msgstr "kemaskini warna untuk kategori."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
-msgstr ""
+msgstr "Keutamaan"
+
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "JIka anda tetapkan ini pada 8 atau lebih, temujanji TIDAK ditunjukkan dalam\ntetingkap senarai. Anda boleh guna fitur untuk unclutter tetingkap senarai anda, tetapi ia menjadi lebih sukar mencari temujanji ini.\n(Penggera akan tetap dipicu seperti biasa.)\n(Terdapat beberapa parameter tidak didokumen supaya anda dapat mengubah had lalai 8.)"
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
-msgstr ""
+msgstr "Perhatian"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -769,126 +858,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Perintah singkatan ini akan berkesan serta-merta:\n    <D> sisip tarikh dalam format tarikh setempat\n    <T> sisip masa dan\n    <DT> sisip tarikh dan masa.\n\nIa hanya ditukar kemudian bila kelihatan:\n    <&Ynnnn> diterjemah ke  tahun semasa ditolak dengan nnnn.\n(Ia boleh digunakan seperti dalam peringatan hari lahir untuk memberitahu usia seseorang pada waktu tersebut.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
-msgstr ""
+msgstr "Sebelum Mula"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
-msgstr ""
+msgstr "Sebelum Tamat"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
-msgstr ""
+msgstr "Selepas Mula"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
-msgstr ""
+msgstr "Selepas Tamat"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
-msgstr ""
+msgstr "Penggera"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
-msgstr ""
+msgstr "Masa penggera"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
+msgstr "Kekerapan anda mahukan penggera:\n1) sebelum Peristiwa bermula\n2) sebelum Agenda berakhir\n3) selepas Agenda bermula"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
-msgstr ""
+msgstr "Pengulangan penggera"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
+msgstr "Pilih ini jika anda mahu Orage mengingatkan anda walaupun ia tidak diaktifkan bila penggera berlaku."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
-#, fuzzy
+#: ../src/appointment.c:3064
 msgid "Sound"
-msgstr "Ahad"
+msgstr "Bunyi"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
-msgstr ""
+msgstr "Guna"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
-msgstr ""
+msgstr "Pilih ini jika anda mahu penggera boleh dengar"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
-msgstr ""
+msgstr "Ulang bunyi penggera"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
-msgstr ""
+msgstr "kekerapan"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
-msgstr ""
+msgstr "sela saat"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
-msgstr ""
+msgstr "Visual"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
-msgstr ""
+msgstr "Guna Tetingkap Orage"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
-msgstr ""
+msgstr "Pilih ini jika anda mahu penggera tetingkap Orage"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
-msgstr ""
+msgstr "Guna pemberitahuan"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
-msgstr ""
+msgstr "Pilih ini jika anda mahu penggera pemberitahuan"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
-msgstr ""
+msgstr "Tetapkan had masa tamat"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
-msgstr ""
+msgstr "Pilih ini jika anda mahu pemberitahuan telah luput secara automatik"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
-msgstr ""
+msgstr "0 = masa peluputan lalai sistem"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
-msgstr ""
+msgstr "saat"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
-msgstr ""
+msgstr "Prosedur"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
-msgstr ""
+msgstr "Pilih ini jika anda mahu prosedur atau penggera skrip"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -898,154 +985,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
+msgstr "Anda mesti masukkan semua aksara escape secara sendirian.\nRentetan ini hanya diberi ke shell untuk diproses.\nPerintah khas tersebut diganti pada masa jalan:\n\t<&T>  tajuk temujanji\n\t<&D>  keterangan temujanji\n\t<&AT> masa penggera\n\t<&ST> masa mula temujanji\n\t<&ET> masa tamat temujanji"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
-msgstr ""
+msgstr "Uji penggera ini dengan menghidupkannya sekarang"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
-msgstr ""
+msgstr "<b>Penggera lalai</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
-msgstr ""
+msgstr "Simpan tetapan semasa sebagai penggera lalai"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr ""
+msgstr "Tetapkan tetapan semasa dari penggera lalai"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
-msgstr ""
+msgstr "Harian"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
-msgstr ""
+msgstr "Mingguan"
 
-#: ../src/appointment.c:3176
-#, fuzzy
+#: ../src/appointment.c:3290
 msgid "Monthly"
-msgstr "Isnin"
+msgstr "Bulanan"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
-msgstr ""
+msgstr "Tahunan"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
-msgstr ""
+msgstr "Jam"
 
-#: ../src/appointment.c:3178
-#, fuzzy
+#: ../src/appointment.c:3292
 msgid "Mon"
-msgstr "Isnin"
+msgstr "Isn"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
-msgstr ""
+msgstr "Sel"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
-msgstr ""
+msgstr "Rab"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
-msgstr ""
+msgstr "Kha"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
-msgstr ""
+msgstr "Jum"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
-msgstr ""
+msgstr "Sab"
 
-#: ../src/appointment.c:3178
-#, fuzzy
+#: ../src/appointment.c:3292
 msgid "Sun"
-msgstr "Ahad"
+msgstr "Ahd"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
-msgstr ""
+msgstr "Pengulangan"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
-msgstr ""
+msgstr "Kekompleksan"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
-msgstr ""
+msgstr "Asas"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
-msgstr ""
+msgstr "Lanjutan"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
-msgstr ""
+msgstr "Guna ini jika anda mahu peristiwa pengulangan biasa"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
+msgstr "Guna ini jika anda mahu masa kompleks seperti:\nSetiap Sabtu dan Ahad atau\nKhamis pertama setiap bulan"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
-msgstr ""
+msgstr "Kekerapan"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
-msgstr ""
+msgstr "Setiap"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
-msgstr ""
+msgstr "kemunculan"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
+msgstr "Hadkan kekerapan bagi sela tertentu.\nContohnya: Setiap hari ketiga:\nKekerapan = Harian dan Sela = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
-msgstr ""
+msgstr "Had"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
-msgstr ""
+msgstr "Ulang selamanya"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
-msgstr ""
+msgstr "Ulang"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
-msgstr ""
+msgstr "Ulang sehingga"
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-#, fuzzy
+#: ../src/appointment.c:3423
 msgid "Weekdays"
-msgstr "Hari ini"
+msgstr "Hari kerja"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
-msgstr ""
+msgstr "Hari yang mana?"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1053,2573 +1132,3317 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
+msgstr "Nyatakan hari kerja yang manakah untuk peristiwa bulanan dan tahunan.\n Contohnya:\n Rabu kedua setiap bulan:\n\tKekerapan = Bulanan,\n\tHari kerja = hanya tanda hari Rabu,\n\tHari kejadian = pilih 2 dari nombor dibawah hari Rabu"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
-msgstr ""
+msgstr "TODO dasar"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
+msgstr "TODO mucul semula secara kerap bermula pada masa mula dan berulang setiap sela tidak kira bila ia terakhir selesai"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "TODO mucul semula secara kerap bermula pada masa mula dan berulang setiap sela tidak kira bila ia terakhir selesai.\n(Perhatian anda tidak boleh beritahu apa-apa mengenai sejarah TODO kerana kemunculan semula dasar berubah setiap kali selesai.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
-msgstr ""
+msgstr "Pengecualian"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
+msgstr "Tambah lagi tarikh pengecualian dengan mengklik hari kalendar dibawah.\nPengecualian sama ada penyishan(-) or perangkuman(+) yang bergantung pada pemilihan.\nBuang dengan mengklik data."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
-msgstr ""
+msgstr "Tambah tarikh pengecualian (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
+msgstr "Hari dikecualikan adalah hari dimana temujanji tidak dibuat"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
-msgstr ""
+msgstr "Tambah masa disertakan (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
+msgstr "Masa disertakan mempunyai zon waktu yang serupa dengan masa mula, tetapi ia mempunyai masa yang berbeza"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
-msgstr ""
+msgstr "Tarikh tindakan"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
-msgstr ""
+msgstr "_Lihat"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
-msgstr ""
+msgstr "_Pergi"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
-msgstr ""
+msgstr "Baharu"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr ""
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Undur satu minggu"
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Hari ini"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Undur satu hari"
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr ""
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Maju satu hari"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Maju satu minggu"
+
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
-msgstr ""
+msgstr "Segar semula"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
-msgstr ""
+msgstr "Tutup"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
-msgstr ""
+msgstr "Tidak diketahui"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
-msgstr ""
+msgstr "Bilangan hari yang ditunjukkan"
 
-#: ../src/day-view.c:935
-#, fuzzy
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
-msgstr "XFCalendar"
+msgstr "Orage - paparan hari"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
-msgstr ""
+msgstr "Semua hari"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
-msgstr ""
+msgstr "Masa"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
-msgstr ""
+msgstr "Tiada baris telah dipilih."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
-msgstr ""
+msgstr "Klik baris untuk memilihnya dan selepas anda menyalinnya."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
+msgstr "Anda akan buang semua temujanji\nterpilih secara kekal."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Ya, buang temujanji"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Undur"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Maju"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1189
 msgid "Find"
-msgstr ""
+msgstr "Cari"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
-msgstr ""
+msgstr "Paparan Hari"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr ""
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Hari tambahan untuk ditunjuk:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "hanya pengulangan pertama"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Tanda ini jika anda mahu lihat peristiwa pengulangan pertama. Secara lalai semuanya ditunjukkan.\nPerhatian ia juga menunjukkan semua tindakan segera.\nPerhatian peristiwa berulang mungkin muncul lebih awal dalam senarai kerana kemunculan pertama disenaraikan."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "juga yang lama"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Tanda ini jika anda mahu lihat peristiwa lama. Ia hanya boleh dipilih selepas 'hnaya pengulangan pertama' dibenarkan untuk mengelakkan senarai menjadi terlalu panjang.\nPerhatian pemilihan hari tambahan masih ditakrif jika temujanji lebih baharu tersenarai'."
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
-msgstr ""
+msgstr "Masukan jurnal bermula dari:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
-msgstr ""
+msgstr "Gelintar"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
-msgstr ""
+msgstr "Gelintar teks"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
-msgstr ""
+msgstr "Bendera"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
-msgstr ""
+msgstr "Tajuk"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr ""
+msgstr "Dwi-klik pada baris untuk menyuntingnya.\n\nBenderakan dalam tertib:\n\t 1. Penggera: n=tiada penggera\n\t\t A=Penggera ditetapkan P=Penggera tekal ditetapkan\n\t 2. Pengulangan: n=tiada pengulangan\n\t\t H=Jam D=Harian W=Mingguan M=Bulanan Y=Tahunan\n\t 3. Jenis: f=lapang B=Sibuk\n\t 4. Terletak dalam fail:\n\t\tO=Orage A=Arkib F=Asing\n\t 5. Jenis temujanji:\n\t\tE=Peristiwa T=Agenda J=Jurnal"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
-msgstr ""
+msgstr "\tUlangan semula berakhir, beralih ke fail arkib."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
-msgstr ""
+msgstr "Pengarkiban tidak dibenarkan. Keluar"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
-msgstr ""
+msgstr "Ambang pengarkiban: %d bulan(s)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr ""
+msgstr "\tPeristiwa berarkib, yang lebih lama dari: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
-msgstr ""
+msgstr "Uid berarkib: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
-msgstr ""
+msgstr "\tVTODO tidak selesai; tidak diarkib"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr ""
+msgstr "\tBerulang. Hujung tahun: %04d, bulan: %02d, hari: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
-msgstr ""
+msgstr "Pengarkiban selesai\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
-msgstr ""
+msgstr "Memulakan pembuangan arkib"
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
-msgstr ""
+msgstr "\tFASA 1: tetap semula temujanji yang berulang"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
-msgstr ""
+msgstr "\tFASA 2: kembalikan temujanji berarkib"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
-msgstr ""
+msgstr "Pembuangan arkib selesai\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
-msgstr ""
+msgstr "Penggera lalai Orage"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Senarai penggera dicipta untuk fail Orage utama:"
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Senarai penggera dicipta untuk fail asing: %s (%s)"
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\t%d penggera ditambah. %d peristiwa diproses."
+
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
+msgstr "\tTemui %d penggera yang mana %d adalah aktif. (Menggelintar %d penggera berulang.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
-msgstr ""
+msgstr "Memulakan pra-pemprosesan fail"
 
 #: ../src/ical-expimp.c:158
 msgid "... Patched DCREATED to be CREATED."
-msgstr ""
+msgstr "... DCREATED tampalan yang DICIPTA."
 
 #: ../src/ical-expimp.c:197
 msgid "... Patched timezone to Orage format."
-msgstr ""
+msgstr "... Zon waktu ditampal ke format Orage."
 
 #: ../src/ical-expimp.c:206
 msgid "Import file preprocessing done"
-msgstr ""
+msgstr "Import fail pra-pemproses selesai"
+
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Temui kemaskini luaran pada fail %s."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Menyegar semula penggera dan kalendar kerana kemaskini fail luaran."
 
-#: ../src/interface.c:284
-#, fuzzy
+#: ../src/interface.c:271
 msgid "Calendar files"
-msgstr "XFCalendar"
+msgstr "Fail kalendar"
 
 #: ../src/interface.c:631
 msgid "Current foreign files"
-msgstr ""
+msgstr "Fail asing semasa"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
-msgstr ""
+msgstr "BACA SAHAJA"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
-msgstr ""
+msgstr "BACA TULIS"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
-msgstr ""
+msgstr "***** Tiada fail asing *****"
+
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Penambahan fail asing gagal"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage hanys dapat kendali 10 fail asing. Had dicapai."
 
-#: ../src/interface.c:974
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Nama fail kosong."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Nama kosong."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Fail tidak wujud."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Nama fail serupa telah wujud dalam Orage."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Nama serupa telah wujud dalam Orage."
+
+#: ../src/interface.c:965
 msgid "Import/export"
-msgstr ""
+msgstr "Import/eksport"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
-msgstr ""
+msgstr "Import"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
-msgstr ""
+msgstr "Baca dari fail:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
+msgstr "Asing nama fail dengan tanda koma(,).\nPERHATIAN: tanda koma bukanlah aksara sah dalam nama fail untuk Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
-msgstr ""
+msgstr "Eksport"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
-msgstr ""
+msgstr "Tulis ke fail:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
-msgstr "Pilih Hari ini"
+msgstr "Pilih"
 
-#: ../src/interface.c:1037
-#, fuzzy
+#: ../src/interface.c:1028
 msgid "All appointments"
-msgstr "Temujanji"
+msgstr "Semua temujanji"
 
-#: ../src/interface.c:1050
-#, fuzzy
+#: ../src/interface.c:1041
 msgid "Named appointments: "
-msgstr "Temujanji"
+msgstr "Temujanji bernama:"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
+msgstr "Perhatian hanya temujanji fail utama dibaca.\nPeristiwa berarkib dan asing tidak dieksport."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
+msgstr "Perhatian hanya temujanji fail utama dibaca.\nPeristiwa asing tidak dieksport."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
-msgstr ""
+msgstr "Anda boleh seret dengan mudah dari tetingkap senarai-peristiwa."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
-msgstr ""
+msgstr "UID temujanji Orage diasing dengan tanda koma."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
-msgstr ""
+msgstr "Arkib"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
-msgstr ""
+msgstr "Arkib sekarang (ambang: %d bulan)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
-msgstr ""
+msgstr "Anda boleh ubah ambang arkib dalam parameter"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
-msgstr ""
+msgstr "Kembalikan arkib sekarang"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
+msgstr "Kembalikan semua peristiwa berarkib ke dalam fail utama orage dan\nbuang fail arch. Ia berguna contohnya bila mengeksport dan\nmengalih temujanji orage ke sistem lain."
 
-#: ../src/interface.c:1118
-#, fuzzy
+#: ../src/interface.c:1109
 msgid "Orage files"
-msgstr "Keutamaan"
+msgstr "Fail orage"
 
-#: ../src/interface.c:1125
-#, fuzzy
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
-msgstr "XFCalendar"
+msgstr "Fail kalendar utama Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "XFCalendar"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Fail semasa:"
 
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr ""
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Fail baharu:"
 
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr ""
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Pilihan tindakan:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
-msgstr ""
+msgstr "Nama Semula"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
+msgstr "Nama semula fail dalam Orage sahaja.\nJangan sentuh sistem fail luaran langsung.\nFail baharu mesti wujud."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
-msgstr ""
+msgstr "Salin"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
+msgstr "Fail semasa disalin dan kekal tidak diubahsuai dalam tempat lama."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
-msgstr ""
+msgstr "Alih"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
-msgstr ""
+msgstr "Fail semasa dialih dan hilang dari tempat lama."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
-msgstr ""
+msgstr "Fail arkib"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
-msgstr ""
+msgstr "Fail asing"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
-msgstr ""
+msgstr "Tambah fail asing baharu"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
-msgstr ""
+msgstr "Fail asing:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr ""
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Nama tampak:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
-msgstr ""
+msgstr "Baca sahaja"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Tetapkan ini jika anda mahu pastikan fail ini tidak sesekali diubahsuai oleh Orage.\nPerhatian mengubahsuai fail asing menjadikannya tidak serasi dengan alat asal, ditempat asal mereka!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Nama dalam ini dipapar kepada pengguna selain dari nama fail."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
-msgstr ""
+msgstr "Data pertukaran - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
+msgstr "\tIni adalah %s versi %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
+msgstr "\tDikeluarkan dibawah terma GNU General Public License.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
+msgstr "\tDikompil dengan GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
+msgstr "menggunakan GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
-msgstr ""
+msgstr "\tMenggunakan DBUS untuk import.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
+msgstr "\tTidak menggunakan DBUS. Import hanya berfungsi separa.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
-msgstr ""
+msgstr "\tMenggunakan libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
-msgstr ""
+msgstr "\tTidak menggunakan libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
-msgstr ""
+msgstr "\tMenggunakan pengarkiban automatik.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
-msgstr ""
+msgstr "\tTidak menggunakan pengarkiban.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
-msgstr ""
+msgstr "\tMenggunakan pakej sistem pengoperasian libical.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
+msgstr "\tMenggunakan versi setempat libical Orage.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
+msgstr "Penggunaan: orage [options] [files]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
-msgstr ""
+msgstr "Pilihan:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
+msgstr "--version (-v) \t\ttunjuk versi orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
+msgstr "--help (-h) \t\tcetak teks ini\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
+msgstr "--preferences (-p) \ttunjuk bentuk keutamaan\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
+msgstr "--toggle (-t) \t\tjadikan orage tampak/tersembunyi\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) file [RW] [name] \ttambah fail asing\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
+msgstr "--remove-foreign (-r) file \tbuang fail asing\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--export (-e) file [appointment...] \teksport temujanji dari Orage ke fail\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
-msgstr ""
+msgstr "files=ical fail yang dimuatkan ke dalam orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
-msgstr ""
+msgstr "\tdbus tidak disertakan dalam orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
+msgstr "\ttanpa dbus [files] dan fail asing options(-a & -r) hanya boleh digunakan bila memulakan orage \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
+msgstr "\nPilihn %s tidak diketahui\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
-msgstr ""
+msgstr "Data p_ertukaran"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
-msgstr ""
+msgstr "_Sunting"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
-msgstr ""
+msgstr "Lihat _tarikh dipilih"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
-msgstr ""
+msgstr "Lihat _minggu dipilih"
 
-#: ../src/mainbox.c:317
-#, fuzzy
+#: ../src/mainbox.c:335
 msgid "Select _Today"
-msgstr "Pilih Hari ini"
+msgstr "Pilih _Hari Ini"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Keutamaan"
+msgstr "Tunjuk _Globaltime"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Bantuan"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Tiada tajuk ditakrif"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr " Lokasi: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n Perhatian:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
-msgstr ""
+msgstr "Tidak sesekali"
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:495
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
+" Done:\t%s%s"
+msgstr "Tajuk: %s\n%s Mula:\t%s\n Luput:\t%s\n Selesai:\t%s%s"
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Tajuk: %s\n%s Mula:\t%s\n Tamat:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
-msgstr ""
+msgstr "<b>Agenda:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
-msgstr ""
+msgstr "<b>Peristiwa untuk %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
-msgstr ""
+msgstr "<b>Peristiwa untuk %s - %s:</b>"
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:492
 msgid "Main settings"
-msgstr "Tetapan"
+msgstr "Tetapan utama"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
-msgstr ""
+msgstr "Zon waktu"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
-msgstr ""
+msgstr "Anda seharusnya sentiasa takrif zon waktu setempat anda."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
-msgstr ""
+msgstr "Ambang arkib (bulan)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
-msgstr ""
+msgstr "(0 = tiada pengarkiban)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
+msgstr "Pengarkiban digunakan untuk menjimatkan masa dan ruang bila mengendali peristiwa."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
-msgstr ""
+msgstr "Perintah bunyi"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
+msgstr "Perintah ini diberi pada shell untuk membuat bunyi dalam penggera."
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Tetapan"
-
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
-msgstr "Tutup tetingkap"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Tetingkap kalendar"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Perincian visual kalendar"
+
+#: ../src/parameters.c:609
 msgid "Show borders"
-msgstr ""
+msgstr "Tunjuk sempadan"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
-msgstr ""
-
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr ""
+msgstr "Tunjuk menu"
 
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
-msgstr ""
+msgstr "Tunjuk nama hari"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
-msgstr ""
+msgstr "Tunjuk bilangan minggu"
 
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr ""
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Tunjuk bulan dan tahun"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Kotak maklumat kalendar"
 
 #: ../src/parameters.c:660
+msgid "Show todo list"
+msgstr "Tunjuk senarai todo"
+
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
-msgstr ""
+msgstr "Bilangan hari yang ditunjuk dalam tetingkap peristiwa"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
-msgstr ""
+msgstr "0 = jangan tunjuk senarai peristiwa langsung"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Ketampakan kalendar"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
-msgstr ""
+msgstr "Tunjuk dalam semua desktop"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
-msgstr ""
+msgstr "Kekal diatas"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
-msgstr ""
+msgstr "Tunjuk dalam palang tugas"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
-msgstr ""
+msgstr "Tunjuk dalam penghalaman"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
-msgstr ""
+msgstr "Tunjuk dalam talam sistem"
 
-#: ../src/parameters.c:739
-#, fuzzy
+#: ../src/parameters.c:738
 msgid "Calendar start"
-msgstr "XFCalendar"
+msgstr "Kalendar mula"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
-msgstr ""
+msgstr "Tunjuk"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
-msgstr ""
+msgstr "Sembunyi"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
-msgstr ""
-
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr ""
+msgstr "Diminimumkan"
 
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Tutup tetingkap"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "Pilih Hari ini"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "Bila tetingkap kalendar dibuka"
 
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Pilih tarikh hari ini"
 
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr ""
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Pilih tarikh terpilih sebelum ini"
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Dwi-klik hari kalendar tunjuk"
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
-msgstr ""
+msgstr "Paparan hari"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
-msgstr ""
+msgstr "Senarai peristiwa"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr ""
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Tetapan tambahan"
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Tetingkap senarai peristiwa"
+
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
-msgstr ""
+msgstr "Bilangan hari tambahan untuk tunjuk dalam senarai peristiwa"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
-msgstr ""
+msgstr "Ini hanyalah nilai lalai, anda boleh ubah ia dalam tetingkap senarai peristiwa sebenar."
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Hanya tunjuk peristiwa pengulangan pertama"
 
-#: ../src/parameters.c:921
-msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Hari pertama lalai tetingkap paparan hari"
 
-#: ../src/parameters.c:938
-#, fuzzy
-msgid "Orage Preferences"
-msgstr "Keutamaan"
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Hari pertama minggu"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Hari terpilih"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Guna ikon talam dinamik"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Guna ikon dinamik"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Ikon dinamik tunjuk bulan dan hari semasa dalam sebulan."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
+msgid "Use wakeup timer"
+msgstr "Guna pemasa bangun tidur"
+
+#: ../src/parameters.c:973
+msgid ""
+"Use this timer if Orage has problems waking up properly after suspend or "
+"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "Guna pemasa ini jika Orage menghadapi masalah bangun dengan baik selepas ditangguh atau dihibernasi. (Contohnya ikon talam tidak disegar semula atau penggera tidak dipicu.)"
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Penggera visual lalai fail asing"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Tetingkap Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Maklum pemberitahuan"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Sentiasa keluar bila ditanya untuk tutup"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Sentiasa keluar"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Secara lalai Orage sentiasa terbuka di belakang bila ditanya untuk ditutup. Pilihan ini mengubah Orage untuk keluar dan tidak sesekali berada dibelakang bila ia ditanya untuk tutup."
+
+#: ../src/parameters.c:1045
+msgid "Orage Preferences"
+msgstr "Keutamaan Orage"
+
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
-msgstr ""
+msgstr "Pertama kali Orage bermula. Menggelintar zon waktu lalai."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
-msgstr ""
+msgstr "Zon waktu lalai ditetapkan ke %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
-msgstr ""
+msgstr "Zon waktu lalai tidak ditemui, sila, tetapkannya secara manual."
 
 #: ../src/reminder.c:562
-#, fuzzy
 msgid "Reminder "
 msgstr "Peringatan"
 
 #: ../src/reminder.c:591
 msgid "Open"
-msgstr ""
+msgstr "Buka"
 
-#: ../src/reminder.c:722
-#, fuzzy
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
-msgstr "Peringatan"
+msgstr "Peringatan - Orage"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Tunda"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
+msgstr "Ingatkan saya lagi selepas masa dinyatakan"
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
-msgstr ""
+msgstr "Penggera aktif berikutnya:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
+msgstr "\n%02d h %02d j %02d min pada: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
+msgstr "\nTiada penggera aktif ditemui"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
-msgstr ""
+msgstr "Afika"
 
 #: ../src/timezone_names.c:37
 msgid "Africa/Abidjan"
-msgstr ""
+msgstr "Afrika/Abidjan"
 
 #: ../src/timezone_names.c:38
 msgid "Africa/Accra"
-msgstr ""
+msgstr "Afrika/Accra"
 
 #: ../src/timezone_names.c:39
 msgid "Africa/Addis_Ababa"
-msgstr ""
+msgstr "Afrika/Addis_Ababa"
 
 #: ../src/timezone_names.c:40
 msgid "Africa/Algiers"
-msgstr ""
+msgstr "Afrika/Algiers"
 
 #: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr ""
+msgid "Africa/Asmara"
+msgstr "Afrika/Asmara"
 
 #: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr ""
+msgid "Africa/Asmera"
+msgstr "Afrika/Asmera"
 
 #: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr ""
+msgid "Africa/Bamako"
+msgstr "Afrika/Bamako"
 
 #: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr ""
+msgid "Africa/Bangui"
+msgstr "Afrika/Bangui"
 
 #: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr ""
+msgid "Africa/Banjul"
+msgstr "Afrika/Banjul"
 
 #: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr ""
+msgid "Africa/Bissau"
+msgstr "Afrika/Bissau"
 
 #: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr ""
+msgid "Africa/Blantyre"
+msgstr "Afrika/Blantyre"
 
 #: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr ""
+msgid "Africa/Brazzaville"
+msgstr "Afrika/Brazzaville"
 
 #: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr ""
+msgid "Africa/Bujumbura"
+msgstr "Afrika/Bujumbura"
 
 #: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr ""
+msgid "Africa/Cairo"
+msgstr "Afrika/Kaherah"
 
 #: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr ""
+msgid "Africa/Casablanca"
+msgstr "Afrika/Casablanca"
 
 #: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr ""
+msgid "Africa/Ceuta"
+msgstr "Afrika/Ceuta"
 
 #: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr ""
+msgid "Africa/Conakry"
+msgstr "Afrika/Conakry"
 
 #: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr ""
+msgid "Africa/Dakar"
+msgstr "Afrika/Dakar"
 
 #: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr ""
+msgid "Africa/Dar_es_Salaam"
+msgstr "Afrika/Darul_Salam"
 
 #: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr ""
+msgid "Africa/Djibouti"
+msgstr "Afrika/Djibouti"
 
 #: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr ""
+msgid "Africa/Douala"
+msgstr "Afrika/Douala"
 
 #: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr ""
+msgid "Africa/El_Aaiun"
+msgstr "Afrika/El_Aaiun"
 
 #: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr ""
+msgid "Africa/Freetown"
+msgstr "Afrika/Freetown"
 
 #: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr ""
+msgid "Africa/Gaborone"
+msgstr "Afrika/Gaborone"
 
 #: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr ""
+msgid "Africa/Harare"
+msgstr "Afrika/Harare"
 
 #: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr ""
+msgid "Africa/Juba"
+msgstr "Afrika/Juba"
 
 #: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr ""
+msgid "Africa/Johannesburg"
+msgstr "Afrika/Johannesburg"
 
 #: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr ""
+msgid "Africa/Kampala"
+msgstr "Afrika/Kampala"
 
 #: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr ""
+msgid "Africa/Khartoum"
+msgstr "Afrika/Khartoum"
 
 #: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr ""
+msgid "Africa/Kigali"
+msgstr "Afrika/Kigali"
 
 #: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr ""
+msgid "Africa/Kinshasa"
+msgstr "Afrika/Kinshasa"
 
 #: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr ""
+msgid "Africa/Lagos"
+msgstr "Afrika/Lagos"
 
 #: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr ""
+msgid "Africa/Libreville"
+msgstr "Afrika/Libreville"
 
 #: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr ""
+msgid "Africa/Lome"
+msgstr "Afrika/Lome"
 
 #: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr ""
+msgid "Africa/Luanda"
+msgstr "Afrika/Luanda"
 
 #: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr ""
+msgid "Africa/Lubumbashi"
+msgstr "Afrika/Lubumbashi"
 
 #: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr ""
+msgid "Africa/Lusaka"
+msgstr "Afrika/Lusaka"
 
 #: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr ""
+msgid "Africa/Malabo"
+msgstr "Afrika/Malabo"
 
 #: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr ""
+msgid "Africa/Maputo"
+msgstr "Afrika/Maputo"
 
 #: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr ""
+msgid "Africa/Maseru"
+msgstr "Afrika/Maseru"
 
 #: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr ""
+msgid "Africa/Mbabane"
+msgstr "Afrika/Mbabane"
 
 #: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr ""
+msgid "Africa/Mogadishu"
+msgstr "Afrika/Mogadishu"
 
 #: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr ""
+msgid "Africa/Monrovia"
+msgstr "Afrika/Monrovia"
 
 #: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr ""
+msgid "Africa/Nairobi"
+msgstr "Afrika/Nairobi"
 
 #: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr ""
+msgid "Africa/Ndjamena"
+msgstr "Afrika/Ndjamena"
 
 #: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr ""
+msgid "Africa/Niamey"
+msgstr "Afrika/Niamey"
 
 #: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr ""
+msgid "Africa/Nouakchott"
+msgstr "Afrika/Nouakchott"
 
 #: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr ""
+msgid "Africa/Ouagadougou"
+msgstr "Afrika/Ouagadougou"
 
 #: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr ""
+msgid "Africa/Porto-Novo"
+msgstr "Afrika/Porto-Novo"
 
 #: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr ""
+msgid "Africa/Sao_Tome"
+msgstr "Afrika/Sao_Tome"
 
 #: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr ""
+msgid "Africa/Timbuktu"
+msgstr "Afrika/Timbuktu"
 
 #: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr ""
+msgid "Africa/Tripoli"
+msgstr "Afrika/Tripoli"
 
 #: ../src/timezone_names.c:89
-msgid "America"
-msgstr ""
+msgid "Africa/Tunis"
+msgstr "Afrika/Tunis"
 
 #: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr ""
+msgid "Africa/Windhoek"
+msgstr "Afrika/Windhoek"
 
 #: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr ""
+msgid "America"
+msgstr "Amerika"
 
 #: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr ""
+msgid "America/Adak"
+msgstr "Amerika/Adak"
 
 #: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr ""
+msgid "America/Anchorage"
+msgstr "Amerika/Anchorage"
 
 #: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr ""
+msgid "America/Anguilla"
+msgstr "Amerika/Anguilla"
 
 #: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr ""
+msgid "America/Antigua"
+msgstr "Amerika/Antigua"
 
 #: ../src/timezone_names.c:96
-msgid "America/Argentina/Catamarca"
-msgstr ""
+msgid "America/Araguaina"
+msgstr "Amerika/Araguaina"
 
 #: ../src/timezone_names.c:97
-msgid "America/Argentina/Cordoba"
-msgstr ""
+msgid "America/Argentina/Buenos_Aires"
+msgstr "Amerika/Argentina/Buenos_Aires"
 
 #: ../src/timezone_names.c:98
-msgid "America/Argentina/Jujuy"
-msgstr ""
+msgid "America/Argentina/Catamarca"
+msgstr "Amerika/Argentina/Catamarca"
 
 #: ../src/timezone_names.c:99
-msgid "America/Argentina/Mendoza"
-msgstr ""
+msgid "America/Argentina/ComodRivadavia"
+msgstr "Amerika/Argentina/ComodRivadavia"
 
 #: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr ""
+msgid "America/Argentina/Cordoba"
+msgstr "Amerika/Argentina/Cordoba"
 
 #: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr ""
+msgid "America/Argentina/Jujuy"
+msgstr "Amerika/Argentina/Jujuy"
 
 #: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr ""
+msgid "America/Argentina/La_Rioja"
+msgstr "Amerika/Argentina/La_Rioja"
 
 #: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr ""
+msgid "America/Argentina/Mendoza"
+msgstr "Amerika/Argentina/Mendoza"
 
 #: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr ""
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "Amerika/Argentina/Rio_Gallegos"
 
 #: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr ""
+msgid "America/Argentina/Salta"
+msgstr "Amerika/Argentina/Salta"
 
 #: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr ""
+msgid "America/Argentina/San_Juan"
+msgstr "Amerika/Argentina/San_Juan"
 
 #: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr ""
+msgid "America/Argentina/San_Luis"
+msgstr "Amerika/Argentina/San_Luis"
 
 #: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr ""
+msgid "America/Argentina/Tucuman"
+msgstr "Amerika/Argentina/Tucuman"
 
 #: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr ""
+msgid "America/Argentina/Ushuaia"
+msgstr "Amerika/Argentina/Ushuaia"
 
 #: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr ""
+msgid "America/Aruba"
+msgstr "Amerika/Aruba"
 
 #: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr ""
+msgid "America/Asuncion"
+msgstr "Amerika/Asuncion"
 
 #: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr ""
+msgid "America/Atikokan"
+msgstr "Amerika/Atikokan"
 
 #: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr ""
+msgid "America/Atka"
+msgstr "Amerika/Atka"
 
 #: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr ""
+msgid "America/Bahia"
+msgstr "Amerika/Bahia"
 
 #: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr ""
+msgid "America/Bahia_Banderas"
+msgstr "Amerika/Bahia_Banderas"
 
 #: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr ""
+msgid "America/Barbados"
+msgstr "Amerika/Barbados"
 
 #: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr ""
+msgid "America/Belem"
+msgstr "Amerika/Belem"
 
 #: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr ""
+msgid "America/Belize"
+msgstr "Amerika/Belize"
 
 #: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr ""
+msgid "America/Blanc-Sablon"
+msgstr "Amerika/Blanc-Sablon"
 
 #: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr ""
+msgid "America/Boa_Vista"
+msgstr "Amerika/Boa_Vista"
 
 #: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr ""
+msgid "America/Bogota"
+msgstr "Amerika/Bogota"
 
 #: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr ""
+msgid "America/Boise"
+msgstr "Amerika/Boise"
 
 #: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr ""
+msgid "America/Buenos_Aires"
+msgstr "Amerika/Buenos_Aires"
 
 #: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr ""
+msgid "America/Cambridge_Bay"
+msgstr "Amerika/Cambridge_Bay"
 
 #: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr ""
+msgid "America/Campo_Grande"
+msgstr "Amerika/Campo_Grande"
 
 #: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr ""
+msgid "America/Cancun"
+msgstr "Amerika/Cancun"
 
 #: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr ""
+msgid "America/Caracas"
+msgstr "Amerika/Caracas"
 
 #: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr ""
+msgid "America/Catamarca"
+msgstr "Amerika/Catamarca"
 
 #: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr ""
+msgid "America/Cayenne"
+msgstr "Amerika/Cayenne"
 
 #: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr ""
+msgid "America/Cayman"
+msgstr "Amerika/Cayman"
 
 #: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr ""
+msgid "America/Chicago"
+msgstr "Amerika/Chicago"
 
 #: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr ""
+msgid "America/Chihuahua"
+msgstr "Amerika/Chihuahua"
 
 #: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr ""
+msgid "America/Coral_Harbour"
+msgstr "Amerika/Coral_Harbour"
 
 #: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr ""
+msgid "America/Cordoba"
+msgstr "Amerika/Cordoba"
 
 #: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr ""
+msgid "America/Costa_Rica"
+msgstr "Amerika/Costa_Rica"
 
 #: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr ""
+msgid "America/Creston"
+msgstr "Amerika/Creston"
 
 #: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr ""
+msgid "America/Cuiaba"
+msgstr "Amerika/Cuiaba"
 
 #: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr ""
+msgid "America/Curacao"
+msgstr "Amerika/Curacao"
 
 #: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr ""
+msgid "America/Danmarkshavn"
+msgstr "Amerika/Danmarkshavn"
 
 #: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr ""
+msgid "America/Dawson"
+msgstr "Amerika/Dawson"
 
 #: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr ""
+msgid "America/Dawson_Creek"
+msgstr "Amerika/Dawson_Creek"
 
 #: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr ""
+msgid "America/Denver"
+msgstr "Amerika/Denver"
 
 #: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr ""
+msgid "America/Detroit"
+msgstr "Amerika/Detroit"
 
 #: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr ""
+msgid "America/Dominica"
+msgstr "Amerika/Dominica"
 
 #: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr ""
+msgid "America/Edmonton"
+msgstr "Amerika/Edmonton"
 
 #: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr ""
+msgid "America/Ensenada"
+msgstr "Amerika/Ensenada"
 
 #: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr ""
+msgid "America/Eirunepe"
+msgstr "Amerika/Eirunepe"
 
 #: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr ""
+msgid "America/El_Salvador"
+msgstr "Amerika/El_Salvador"
 
 #: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr ""
+msgid "America/Fortaleza"
+msgstr "Amerika/Fortaleza"
 
 #: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr ""
+msgid "America/Fort_Wayne"
+msgstr "Amerika/Fort_Wayne"
 
 #: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr ""
+msgid "America/Glace_Bay"
+msgstr "Amerika/Glace_Bay"
 
 #: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr ""
+msgid "America/Godthab"
+msgstr "Amerika/Godthab"
 
 #: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr ""
+msgid "America/Goose_Bay"
+msgstr "Amerika/Goose_Bay"
 
 #: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr ""
+msgid "America/Grand_Turk"
+msgstr "Amerika/Grand_Turk"
 
 #: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr ""
+msgid "America/Grenada"
+msgstr "Amerika/Grenada"
 
 #: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr ""
+msgid "America/Guadeloupe"
+msgstr "Amerika/Guadeloupe"
 
 #: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr ""
+msgid "America/Guatemala"
+msgstr "Amerika/Guatemala"
 
 #: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr ""
+msgid "America/Guayaquil"
+msgstr "Amerika/Guayaquil"
 
 #: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr ""
+msgid "America/Guyana"
+msgstr "Amerika/Guyana"
 
 #: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr ""
+msgid "America/Halifax"
+msgstr "Amerika/Halifax"
 
 #: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr ""
+msgid "America/Havana"
+msgstr "Amerika/Havana"
 
 #: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr ""
+msgid "America/Hermosillo"
+msgstr "Amerika/Hermosillo"
 
 #: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr ""
+msgid "America/Indiana/Indianapolis"
+msgstr "Amerika/Indiana/Indianapolis"
 
 #: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr ""
+msgid "America/Indiana/Knox"
+msgstr "Amerika/Indiana/Knox"
 
 #: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr ""
+msgid "America/Indiana/Marengo"
+msgstr "Amerika/Indiana/Marengo"
 
 #: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr ""
+msgid "America/Indiana/Petersburg"
+msgstr "Amerika/Indiana/Petersburg"
 
 #: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr ""
+msgid "America/Indiana/Tell_City"
+msgstr "Amerika/Indiana/Tell_City"
 
 #: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr ""
+msgid "America/Indiana/Vevay"
+msgstr "Amerika/Indiana/Vevay"
 
 #: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr ""
+msgid "America/Indiana/Vincennes"
+msgstr "Amerika/Indiana/Vincennes"
 
 #: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr ""
+msgid "America/Indiana/Winamac"
+msgstr "Amerika/Indiana/Winamac"
 
 #: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr ""
+msgid "America/Indianapolis"
+msgstr "Amerika/Indianapolis"
 
 #: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr ""
+msgid "America/Inuvik"
+msgstr "Amerika/Inuvik"
 
 #: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr ""
+msgid "America/Iqaluit"
+msgstr "Amerika/Iqaluit"
 
 #: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr ""
+msgid "America/Jamaica"
+msgstr "Amerika/Jamaica"
 
 #: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr ""
+msgid "America/Jujuy"
+msgstr "Amerika/Jujuy"
 
 #: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr ""
+msgid "America/Juneau"
+msgstr "Amerika/Juneau"
 
 #: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr ""
+msgid "America/Kentucky/Louisville"
+msgstr "Amerika/Kentucky/Louisville"
 
 #: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr ""
+msgid "America/Kentucky/Monticello"
+msgstr "Amerika/Kentucky/Monticello"
 
 #: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr ""
+msgid "America/Knox_IN"
+msgstr "Amerika/Knox_IN"
 
 #: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr ""
+msgid "America/Kralendijk"
+msgstr "Amerika/Kralendijk"
 
 #: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr ""
+msgid "America/La_Paz"
+msgstr "Amerika/La_Paz"
 
 #: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr ""
+msgid "America/Lima"
+msgstr "Amerika/Lima"
 
 #: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr ""
+msgid "America/Los_Angeles"
+msgstr "Amerika/Los_Angeles"
 
 #: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr ""
+msgid "America/Louisville"
+msgstr "Amerika/Louisville"
 
 #: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr ""
+msgid "America/Lower_Princes"
+msgstr "Amerika/Lower_Princes"
 
 #: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr ""
+msgid "America/Maceio"
+msgstr "Amerika/Maceio"
 
 #: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr ""
+msgid "America/Managua"
+msgstr "Amerika/Managua"
 
 #: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr ""
+msgid "America/Manaus"
+msgstr "Amerika/Manaus"
 
 #: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr ""
+msgid "America/Marigot"
+msgstr "Amerika/Marigot"
 
 #: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr ""
+msgid "America/Martinique"
+msgstr "Amerika/Martinique"
 
 #: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr ""
+msgid "America/Matamoros"
+msgstr "Amerika/Matamoros"
 
 #: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr ""
+msgid "America/Mazatlan"
+msgstr "Amerika/Mazatlan"
 
 #: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr ""
+msgid "America/Mendoza"
+msgstr "Amerika/Mendoza"
 
 #: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr ""
+msgid "America/Menominee"
+msgstr "Amerika/Menominee"
 
 #: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr ""
+msgid "America/Merida"
+msgstr "Amerika/Merida"
 
 #: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr ""
+msgid "America/Metlakatla"
+msgstr "Amerika/Metlakatla"
 
 #: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr ""
+msgid "America/Mexico_City"
+msgstr "Amerika/Mexico_City"
 
 #: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr ""
+msgid "America/Miquelon"
+msgstr "Amerika/Miquelon"
 
 #: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr ""
+msgid "America/Moncton"
+msgstr "Amerika/Moncton"
 
 #: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr ""
+msgid "America/Monterrey"
+msgstr "Amerika/Monterrey"
 
 #: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr ""
+msgid "America/Montevideo"
+msgstr "Amerika/Montevideo"
 
 #: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr ""
+msgid "America/Montreal"
+msgstr "Amerika/Montreal"
 
 #: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr ""
+msgid "America/Montserrat"
+msgstr "Amerika/Montserrat"
 
 #: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr ""
+msgid "America/Nassau"
+msgstr "Amerika/Nassau"
 
 #: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr ""
+msgid "America/New_York"
+msgstr "Amerika/New_York"
 
 #: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr ""
+msgid "America/Nipigon"
+msgstr "Amerika/Nipigon"
 
 #: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr ""
+msgid "America/Nome"
+msgstr "Amerika/Nome"
 
 #: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr ""
+msgid "America/North_Dakota/Beulah"
+msgstr "Amerika/North_Dakota/Beulah"
 
 #: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr ""
+msgid "America/North_Dakota/Center"
+msgstr "Amerika/North_Dakota/Tengah"
 
 #: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr ""
+msgid "America/North_Dakota/New_Salem"
+msgstr "Amerika/North_Dakota/New_Salem"
 
 #: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr ""
+msgid "America/Noronha"
+msgstr "Amerika/Noronha"
 
 #: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr ""
+msgid "America/Ojinaga"
+msgstr "Amerika/Ojinaga"
 
 #: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr ""
+msgid "America/Panama"
+msgstr "Amerika/Panama"
 
 #: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr ""
+msgid "America/Pangnirtung"
+msgstr "Amerika/Pangnirtung"
 
 #: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr ""
+msgid "America/Paramaribo"
+msgstr "Amerika/Paramaribo"
 
 #: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr ""
+msgid "America/Phoenix"
+msgstr "Amerika/Phoenix"
 
 #: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr ""
+msgid "America/Port-au-Prince"
+msgstr "Amerika/Port-au-Prince"
 
 #: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr ""
+msgid "America/Port_of_Spain"
+msgstr "Amerika/Port_of_Spain"
 
 #: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr ""
+msgid "America/Porto_Acre"
+msgstr "Amerika/Porto_Acre"
 
 #: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr ""
+msgid "America/Porto_Velho"
+msgstr "Amerika/Porto_Velho"
 
 #: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr ""
+msgid "America/Puerto_Rico"
+msgstr "Amerika/Puerto_Rico"
 
 #: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr ""
+msgid "America/Rainy_River"
+msgstr "Amerika/Rainy_River"
 
 #: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr ""
+msgid "America/Rankin_Inlet"
+msgstr "Amerika/Rankin_Inlet"
 
 #: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr ""
+msgid "America/Recife"
+msgstr "Amerika/Recife"
 
 #: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr ""
+msgid "America/Regina"
+msgstr "Amerika/Regina"
 
 #: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr ""
+msgid "America/Resolute"
+msgstr "Amerika/Resolute"
 
 #: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr ""
+msgid "America/Rio_Branco"
+msgstr "Amerika/Rio_Branco"
 
 #: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr ""
+msgid "America/Rosario"
+msgstr "Amerika/Rosario"
 
 #: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr ""
+msgid "America/Santa_Isabel"
+msgstr "Amerika/Santa_Isabel"
 
 #: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr ""
+msgid "America/Santarem"
+msgstr "Amerika/Santarem"
 
 #: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr ""
+msgid "America/Santiago"
+msgstr "Amerika/Santiago"
 
 #: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr ""
+msgid "America/Santo_Domingo"
+msgstr "Amerika/Santo_Domingo"
 
 #: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr ""
+msgid "America/Sao_Paulo"
+msgstr "Amerika/Sao_Paulo"
 
 #: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr ""
+msgid "America/Scoresbysund"
+msgstr "Amerika/Scoresbysund"
 
 #: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr ""
+msgid "America/Shiprock"
+msgstr "Amerika/Shiprock"
 
 #: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr ""
+msgid "America/Sitka"
+msgstr "Amerika/Sitka"
 
 #: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr ""
+msgid "America/St_Barthelemy"
+msgstr "Amerika/St_Barthelemy"
 
 #: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr ""
+msgid "America/St_Johns"
+msgstr "Amerika/St_Johns"
 
 #: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr ""
+msgid "America/St_Kitts"
+msgstr "Amerika/St_Kitts"
 
 #: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr ""
+msgid "America/St_Lucia"
+msgstr "Amerika/St_Lucia"
 
 #: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr ""
+msgid "America/St_Thomas"
+msgstr "Amerika/St_Thomas"
 
 #: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr ""
+msgid "America/St_Vincent"
+msgstr "Amerika/St_Vincent"
 
 #: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr ""
+msgid "America/Swift_Current"
+msgstr "Amerika/Swift_Current"
 
 #: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr ""
+msgid "America/Tegucigalpa"
+msgstr "Amerika/Tegucigalpa"
 
 #: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr ""
+msgid "America/Thule"
+msgstr "Amerika/Thule"
 
 #: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr ""
+msgid "America/Thunder_Bay"
+msgstr "Amerika/Thunder_Bay"
 
 #: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr ""
+msgid "America/Tijuana"
+msgstr "Amerika/Tijuana"
 
 #: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr ""
+msgid "America/Toronto"
+msgstr "Amerika/Toronto"
 
 #: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr ""
+msgid "America/Tortola"
+msgstr "Amerika/Tortola"
 
 #: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr ""
+msgid "America/Vancouver"
+msgstr "Amerika/Vancouver"
 
 #: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr ""
+msgid "America/Virgin"
+msgstr "Amerika/Virgin"
 
 #: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr ""
+msgid "America/Whitehorse"
+msgstr "Amerika/Whitehorse"
 
 #: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr ""
+msgid "America/Winnipeg"
+msgstr "Amerika/Winnipeg"
 
 #: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr ""
+msgid "America/Yakutat"
+msgstr "Amerika/Yakutat"
 
 #: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr ""
+msgid "America/Yellowknife"
+msgstr "Amerika/Yellowknife"
 
 #: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr ""
+msgid "Antarctica"
+msgstr "Antartika"
 
 #: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr ""
+msgid "Antarctica/Casey"
+msgstr "Antarctica/Casey"
 
 #: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr ""
+msgid "Antarctica/Davis"
+msgstr "Antarctica/Davis"
 
 #: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr ""
+msgid "Antarctica/DumontDUrville"
+msgstr "Antarctica/DumontDUrville"
 
 #: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr ""
+msgid "Antarctica/Macquarie"
+msgstr "Antarctica/Macquarie"
 
 #: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr ""
+msgid "Antarctica/Mawson"
+msgstr "Antarctica/Mawson"
 
 #: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr ""
+msgid "Antarctica/McMurdo"
+msgstr "Antarctica/McMurdo"
 
 #: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr ""
+msgid "Antarctica/Palmer"
+msgstr "Antarctica/Palmer"
 
 #: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr ""
+msgid "Antarctica/Rothera"
+msgstr "Antarctica/Rothera"
 
 #: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr ""
+msgid "Antarctica/South_Pole"
+msgstr "Antartika/Kutub_Selatan"
 
 #: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr ""
+msgid "Antarctica/Syowa"
+msgstr "Antarctica/Syowa"
 
 #: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr ""
+msgid "Antarctica/Vostok"
+msgstr "Antarctica/Vostok"
 
 #: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr ""
+msgid "Arctic"
+msgstr "Arctik"
 
 #: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr ""
+msgid "Arctic/Longyearbyen"
+msgstr "Arctik/Longyearbyen"
 
 #: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr ""
+msgid "Asia"
+msgstr "Asia"
 
 #: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr ""
+msgid "Asia/Aden"
+msgstr "Asia/Aden"
 
 #: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr ""
+msgid "Asia/Almaty"
+msgstr "Asia/Almaty"
 
 #: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr ""
+msgid "Asia/Amman"
+msgstr "Asia/Amman"
 
 #: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr ""
+msgid "Asia/Anadyr"
+msgstr "Asia/Anadyr"
 
 #: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr ""
+msgid "Asia/Aqtau"
+msgstr "Asia/Aqtau"
 
 #: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr ""
+msgid "Asia/Aqtobe"
+msgstr "Asia/Aqtobe"
 
 #: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr ""
+msgid "Asia/Ashgabat"
+msgstr "Asia/Ashgabat"
 
 #: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr ""
+msgid "Asia/Ashkhabad"
+msgstr "Asia/Ashkhabad"
 
 #: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr ""
+msgid "Asia/Baghdad"
+msgstr "Asia/Baghdad"
 
 #: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr ""
+msgid "Asia/Bahrain"
+msgstr "Asia/Bahrain"
 
 #: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr ""
+msgid "Asia/Baku"
+msgstr "Asia/Baku"
 
 #: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr ""
+msgid "Asia/Bangkok"
+msgstr "Asia/Bangkok"
 
 #: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr ""
+msgid "Asia/Beirut"
+msgstr "Asia/Beirut"
 
 #: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr ""
+msgid "Asia/Bishkek"
+msgstr "Asia/Bishkek"
 
 #: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr ""
+msgid "Asia/Brunei"
+msgstr "Asia/Brunei"
 
 #: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr ""
+msgid "Asia/Calcutta"
+msgstr "Asia/Calcutta"
 
 #: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr ""
+msgid "Asia/Choibalsan"
+msgstr "Asia/Choibalsan"
 
 #: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr ""
+msgid "Asia/Chongqing"
+msgstr "Asia/Chongqing"
 
 #: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr ""
+msgid "Asia/Chungking"
+msgstr "Asia/Chungking"
 
 #: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr ""
+msgid "Asia/Colombo"
+msgstr "Asia/Colombo"
 
 #: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr ""
+msgid "Asia/Dacca"
+msgstr "Asia/Dacca"
 
 #: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr ""
+msgid "Asia/Damascus"
+msgstr "Asia/Damascus"
 
 #: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr ""
+msgid "Asia/Dhaka"
+msgstr "Asia/Dhaka"
 
 #: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr ""
+msgid "Asia/Dili"
+msgstr "Asia/Dili"
 
 #: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr ""
+msgid "Asia/Dubai"
+msgstr "Asia/Dubai"
 
 #: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr ""
+msgid "Asia/Dushanbe"
+msgstr "Asia/Dushanbe"
 
 #: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr ""
+msgid "Asia/Gaza"
+msgstr "Asia/Gaza"
 
 #: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr ""
+msgid "Asia/Harbin"
+msgstr "Asia/Harbin"
 
 #: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr ""
+msgid "Asia/Hebron"
+msgstr "Asia/Hebron"
 
 #: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr ""
+msgid "Asia/Hong_Kong"
+msgstr "Asia/Hong_Kong"
 
 #: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr ""
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Asia/Ho_Chi_Minh"
 
 #: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr ""
+msgid "Asia/Hovd"
+msgstr "Asia/Hovd"
 
 #: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr ""
+msgid "Asia/Irkutsk"
+msgstr "Asia/Irkutsk"
 
 #: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr ""
+msgid "Asia/Istanbul"
+msgstr "Asia/Istanbul"
 
 #: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr ""
+msgid "Asia/Jakarta"
+msgstr "Asia/Jakarta"
 
 #: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr ""
+msgid "Asia/Jayapura"
+msgstr "Asia/Jayapura"
 
 #: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr ""
+msgid "Asia/Jerusalem"
+msgstr "Asia/Jerusalem"
 
 #: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr ""
+msgid "Asia/Kabul"
+msgstr "Asia/Kabul"
 
 #: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr ""
+msgid "Asia/Kamchatka"
+msgstr "Asia/Kamchatka"
 
 #: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr ""
+msgid "Asia/Karachi"
+msgstr "Asia/Karachi"
 
 #: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr ""
+msgid "Asia/Kashgar"
+msgstr "Asia/Kashgar"
 
 #: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr ""
+msgid "Asia/Kathmandu"
+msgstr "Asia/Kathmandu"
 
 #: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr ""
+msgid "Asia/Katmandu"
+msgstr "Asia/Katmandu"
 
 #: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr ""
+msgid "Asia/Khandyga"
+msgstr "Asia/Khandyga"
 
 #: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr ""
+msgid "Asia/Kolkata"
+msgstr "Asia/Kolkata"
 
 #: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr ""
+msgid "Asia/Krasnoyarsk"
+msgstr "Asia/Krasnoyarsk"
 
 #: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr ""
+msgid "Asia/Kuala_Lumpur"
+msgstr "Asia/Kuala_Lumpur"
 
 #: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr ""
+msgid "Asia/Kuching"
+msgstr "Asia/Kuching"
 
 #: ../src/timezone_names.c:319
+msgid "Asia/Kuwait"
+msgstr "Asia/Kuwait"
+
+#: ../src/timezone_names.c:320
+msgid "Asia/Macao"
+msgstr "Asia/Macao"
+
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Asia/Macau"
+
+#: ../src/timezone_names.c:322
+msgid "Asia/Magadan"
+msgstr "Asia/Magadan"
+
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Asia/Makassar"
+
+#: ../src/timezone_names.c:324
+msgid "Asia/Manila"
+msgstr "Asia/Manila"
+
+#: ../src/timezone_names.c:325
+msgid "Asia/Muscat"
+msgstr "Asia/Muscat"
+
+#: ../src/timezone_names.c:326
+msgid "Asia/Nicosia"
+msgstr "Asia/Nicosia"
+
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Asia/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
+msgid "Asia/Novosibirsk"
+msgstr "Asia/Novosibirsk"
+
+#: ../src/timezone_names.c:329
+msgid "Asia/Omsk"
+msgstr "Asia/Omsk"
+
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Asia/Oral"
+
+#: ../src/timezone_names.c:331
+msgid "Asia/Phnom_Penh"
+msgstr "Asia/Phnom_Penh"
+
+#: ../src/timezone_names.c:332
+msgid "Asia/Pontianak"
+msgstr "Asia/Pontianak"
+
+#: ../src/timezone_names.c:333
+msgid "Asia/Pyongyang"
+msgstr "Asia/Pyongyang"
+
+#: ../src/timezone_names.c:334
+msgid "Asia/Qatar"
+msgstr "Asia/Qatar"
+
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Asia/Qyzylorda"
+
+#: ../src/timezone_names.c:336
+msgid "Asia/Rangoon"
+msgstr "Asia/Rangoon"
+
+#: ../src/timezone_names.c:337
+msgid "Asia/Riyadh"
+msgstr "Asia/Riyadh"
+
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Asia/Riyadh87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Asia/Riyadh88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Asia/Riyadh89"
+
+#: ../src/timezone_names.c:341
+msgid "Asia/Saigon"
+msgstr "Asia/Saigon"
+
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Asia/Sakhalin"
+
+#: ../src/timezone_names.c:343
+msgid "Asia/Samarkand"
+msgstr "Asia/Samarkand"
+
+#: ../src/timezone_names.c:344
+msgid "Asia/Seoul"
+msgstr "Asia/Seoul"
+
+#: ../src/timezone_names.c:345
+msgid "Asia/Shanghai"
+msgstr "Asia/Shanghai"
+
+#: ../src/timezone_names.c:346
+msgid "Asia/Singapore"
+msgstr "Asia/Singapura"
+
+#: ../src/timezone_names.c:347
+msgid "Asia/Taipei"
+msgstr "Asia/Taipei"
+
+#: ../src/timezone_names.c:348
+msgid "Asia/Tashkent"
+msgstr "Asia/Tashkent"
+
+#: ../src/timezone_names.c:349
+msgid "Asia/Tbilisi"
+msgstr "Asia/Tbilisi"
+
+#: ../src/timezone_names.c:350
+msgid "Asia/Tehran"
+msgstr "Asia/Tehran"
+
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Asia/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Asia/Thimbu"
+
+#: ../src/timezone_names.c:353
+msgid "Asia/Thimphu"
+msgstr "Asia/Thimphu"
+
+#: ../src/timezone_names.c:354
+msgid "Asia/Tokyo"
+msgstr "Asia/Tokyo"
+
+#: ../src/timezone_names.c:355
+msgid "Asia/Ujung_Pandang"
+msgstr "Asia/Ujung_Pandang"
+
+#: ../src/timezone_names.c:356
+msgid "Asia/Ulaanbaatar"
+msgstr "Asia/Ulaanbaatar"
+
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Asia/Ulan_Bator"
+
+#: ../src/timezone_names.c:358
+msgid "Asia/Urumqi"
+msgstr "Asia/Urumqi"
+
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Asia/Ust-Nera"
+
+#: ../src/timezone_names.c:360
+msgid "Asia/Vientiane"
+msgstr "Asia/Vientiane"
+
+#: ../src/timezone_names.c:361
+msgid "Asia/Vladivostok"
+msgstr "Asia/Vladivostok"
+
+#: ../src/timezone_names.c:362
+msgid "Asia/Yakutsk"
+msgstr "Asia/Yakutsk"
+
+#: ../src/timezone_names.c:363
+msgid "Asia/Yekaterinburg"
+msgstr "Asia/Yekaterinburg"
+
+#: ../src/timezone_names.c:364
+msgid "Asia/Yerevan"
+msgstr "Asia/Yerevan"
+
+#: ../src/timezone_names.c:365
+msgid "Atlantic"
+msgstr "Atlantik"
+
+#: ../src/timezone_names.c:366
+msgid "Atlantic/Azores"
+msgstr "Atlantik/Azores"
+
+#: ../src/timezone_names.c:367
+msgid "Atlantic/Bermuda"
+msgstr "Atlantik/Bermuda"
+
+#: ../src/timezone_names.c:368
+msgid "Atlantic/Canary"
+msgstr "Atlantik/Canary"
+
+#: ../src/timezone_names.c:369
+msgid "Atlantic/Cape_Verde"
+msgstr "Atlantik/Cape_Verde"
+
+#: ../src/timezone_names.c:370
+msgid "Atlantic/Faeroe"
+msgstr "Atlantik/Faeroe"
+
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlantik/Faroe"
+
+#: ../src/timezone_names.c:372
+msgid "Atlantic/Jan_Mayen"
+msgstr "Atlantik/Jan_Mayen"
+
+#: ../src/timezone_names.c:373
+msgid "Atlantic/Madeira"
+msgstr "Atlantik/Madeira"
+
+#: ../src/timezone_names.c:374
+msgid "Atlantic/Reykjavik"
+msgstr "Atlantik/Reykjavik"
+
+#: ../src/timezone_names.c:375
+msgid "Atlantic/South_Georgia"
+msgstr "Atlantik/Georgia_Selatan"
+
+#: ../src/timezone_names.c:376
+msgid "Atlantic/St_Helena"
+msgstr "Atlantik/St_Helena"
+
+#: ../src/timezone_names.c:377
+msgid "Atlantic/Stanley"
+msgstr "Atlantik/Stanley"
+
+#: ../src/timezone_names.c:378
+msgid "Australia"
+msgstr "Australia"
+
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Australia/ACT"
+
+#: ../src/timezone_names.c:380
+msgid "Australia/Adelaide"
+msgstr "Australia/Adelaide"
+
+#: ../src/timezone_names.c:381
+msgid "Australia/Brisbane"
+msgstr "Australia/Brisbane"
+
+#: ../src/timezone_names.c:382
+msgid "Australia/Broken_Hill"
+msgstr "Australia/Broken_Hill"
+
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Australia/Currie"
+
+#: ../src/timezone_names.c:384
+msgid "Australia/Darwin"
+msgstr "Australia/Darwin"
+
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Australia/Eucla"
+
+#: ../src/timezone_names.c:386
+msgid "Australia/Hobart"
+msgstr "Australia/Hobart"
+
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr "Australia/Lindeman"
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr "Australia/Lord_Howe"
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "Australia/Melbourne"
+
+#: ../src/timezone_names.c:390
+msgid "Australia/Perth"
+msgstr "Australia/Perth"
+
+#: ../src/timezone_names.c:391
 msgid "Australia/Sydney"
-msgstr ""
+msgstr "Australia/Sydney"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brazil"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brazil/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brazil/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brazil/Timur"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brazil/Barat"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Kanada/Atlantik"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Kanada/Tengah"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Kanada/Saskatchewan-Timur"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Kanada/Timur"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Kanada/Pergunungan"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Kanada/Newfoundland"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Kanada/Pasifik"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Kanada/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Kanada/Yukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Chile"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Chile/Continental"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Chile/EasterIsland"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Universal"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Zulu"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
-msgstr ""
+msgstr "Eropah"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
-msgstr ""
+msgstr "Eropah/Amsterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
-msgstr ""
+msgstr "Eropah/Andorra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
-msgstr ""
+msgstr "Eropah/Athens"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
-msgstr ""
+msgstr "Eropah/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
-msgstr ""
+msgstr "Eropah/Belgrade"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
-msgstr ""
+msgstr "Eropah/Berlin"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
-msgstr ""
+msgstr "Eropah/Bratislava"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
-msgstr ""
+msgstr "Eropah/Brussels"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
-msgstr ""
+msgstr "Eropah/Bucharest"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
-msgstr ""
+msgstr "Eropah/Budapest"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Eropah/Busingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
-msgstr ""
+msgstr "Eropah/Chisinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
-msgstr ""
+msgstr "Eropah/Copenhagen"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
-msgstr ""
+msgstr "Eropah/Dublin"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
-msgstr ""
+msgstr "Eropah/Gibraltar"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Eropah/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
-msgstr ""
+msgstr "Eropah/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Eropah/Isle_of_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
-msgstr ""
+msgstr "Eropah/Istanbul"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Eropah/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
-msgstr ""
+msgstr "Eropah/Kaliningrad"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
-msgstr ""
+msgstr "Eropah/Kiev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
-msgstr ""
+msgstr "Eropah/Lisbon"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
-msgstr ""
+msgstr "Eropah/Ljubljana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
-msgstr ""
+msgstr "Eropah/London"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
-msgstr ""
+msgstr "Eropah/Luxembourg"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
-msgstr ""
+msgstr "Eropah/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
-msgstr ""
+msgstr "Eropah/Malta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Eropah/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
-msgstr ""
+msgstr "Eropah/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
-msgstr ""
+msgstr "Eropah/Monaco"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
-msgstr ""
+msgstr "Eropah/Moscow"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
-msgstr ""
+msgstr "Eropah/Nicosia"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
-msgstr ""
+msgstr "Eropah/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
-msgstr ""
+msgstr "Eropah/Paris"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Eropah/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
-msgstr ""
+msgstr "Eropah/Prague"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
-msgstr ""
+msgstr "Eropah/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
-msgstr ""
+msgstr "Eropah/Rome"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
-msgstr ""
+msgstr "Eropah/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
-msgstr ""
+msgstr "Eropah/San_Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
-msgstr ""
+msgstr "Eropah/Sarajevo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
-msgstr ""
+msgstr "Eropah/Simferopol"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
-msgstr ""
+msgstr "Eropah/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
-msgstr ""
+msgstr "Eropah/Sofia"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
-msgstr ""
+msgstr "Eropah/Stockholm"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
-msgstr ""
+msgstr "Eropah/Tallinn"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
-msgstr ""
+msgstr "Eropah/Tirane"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Eropah/Tiraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
-msgstr ""
+msgstr "Eropah/Uzhgorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
-msgstr ""
+msgstr "Eropah/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
-msgstr ""
+msgstr "Eropah/Vatican"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
-msgstr ""
+msgstr "Eropah/Vienna"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
-msgstr ""
+msgstr "Eropah/Vilnius"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Eropah/Volgograd"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
-msgstr ""
+msgstr "Eropah/Warsaw"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
-msgstr ""
+msgstr "Eropah/Zagreb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
-msgstr ""
+msgstr "Eropah/Zaporozhye"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
-msgstr ""
+msgstr "Eropah/Zurich"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
-msgstr ""
+msgstr "Indian"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
-msgstr ""
+msgstr "Indian/Antananarivo"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
-msgstr ""
+msgstr "Indian/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
-msgstr ""
+msgstr "Indian/Christmas"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
-msgstr ""
+msgstr "Indian/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
-msgstr ""
+msgstr "Indian/Comoro"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
-msgstr ""
+msgstr "Indian/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
-msgstr ""
+msgstr "Indian/Mahe"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
-msgstr ""
+msgstr "Indian/Maldives"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
-msgstr ""
+msgstr "Indian/Mauritius"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
-msgstr ""
+msgstr "Indian/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
-msgstr ""
+msgstr "Indian/Reunion"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Mexico"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Mexico/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Mexico/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Mexico/Umum"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "TimurBarat"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "TimurBarat/Riyad87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "TimurBarat/Riyad88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "TimurBarat/Riyad89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
-msgstr ""
+msgstr "Pasifik"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
-msgstr ""
+msgstr "Pasifik/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
-msgstr ""
+msgstr "Pasifik/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
-msgstr ""
+msgstr "Pasifik/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Pasifik/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
-msgstr ""
+msgstr "Pasifik/Easter"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
-msgstr ""
+msgstr "Pasifik/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
-msgstr ""
+msgstr "Pasifik/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
-msgstr ""
+msgstr "Pasifik/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
-msgstr ""
+msgstr "Pasifik/Fiji"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
-msgstr ""
+msgstr "Pasifik/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
-msgstr ""
+msgstr "Pasifik/Galapagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
-msgstr ""
+msgstr "Pasifik/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
-msgstr ""
+msgstr "Pasifik/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
-msgstr ""
+msgstr "Pasifik/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
-msgstr ""
+msgstr "Pasifik/Honolulu"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
-msgstr ""
+msgstr "Pasifik/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
-msgstr ""
+msgstr "Pasifik/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
-msgstr ""
+msgstr "Pasifik/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
-msgstr ""
+msgstr "Pasifik/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
-msgstr ""
+msgstr "Pasifik/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
-msgstr ""
+msgstr "Pasifik/Marquesas"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
-msgstr ""
+msgstr "Pasifik/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
-msgstr ""
+msgstr "Pasifik/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
-msgstr ""
+msgstr "Pasifik/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
-msgstr ""
+msgstr "Pasifik/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
-msgstr ""
+msgstr "Pasifik/Noumea"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
-msgstr ""
+msgstr "Pasifik/Pago_Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
-msgstr ""
+msgstr "Pasifik/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
-msgstr ""
+msgstr "Pasifik/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Pasifik/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
-msgstr ""
+msgstr "Pasifik/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
-msgstr ""
+msgstr "Pasifik/Port_Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
-msgstr ""
+msgstr "Pasifik/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
-msgstr ""
+msgstr "Pasifik/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pasifik/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
-msgstr ""
+msgstr "Pasifik/Tahiti"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
-msgstr ""
+msgstr "Pasifik/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
-msgstr ""
+msgstr "Pasifik/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
-msgstr ""
+msgstr "Pasifik/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
-msgstr ""
+msgstr "Pasifik/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
-msgstr ""
+msgstr "Pasifik/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
-msgstr ""
+msgstr "Pasifik/Yap"
+
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "AS"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "AS/Alaska"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "AS/Aleutian"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "AS/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "AS/Tengah"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "AS/Barat"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "AS/Indiana-Timur"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "AS/Hawaii"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "AS/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "AS/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "AS/Pergunungan"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "AS/Pasifik"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "AS/Pasifik-Baru"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "AS/Samoa"
 
 #: ../src/tray_icon.c:469
-#, fuzzy
 msgid "New appointment"
-msgstr "Temujanji"
+msgstr "Temujanji baharu"
 
 #: ../src/tray_icon.c:485
 msgid "About Orage"
-msgstr ""
+msgstr "Perihal Orage"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
 msgid "Orage Panel Clock"
-msgstr ""
+msgstr "Jam Panel Orage"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
 msgid "Show time and date?"
-msgstr ""
+msgstr "Tunjuk masa dan tarikh?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-#, fuzzy
-msgid "Calendar"
-msgstr "XFCalendar"
+msgid "Orage preferences"
+msgstr "Keutamaan Orage"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Keutamaan"
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr "Tetapan untuk Aplikasi Kalendar Xfce 4 (Orage)"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Keutamaan"
+msgid "Orage Calendar Preferences"
+msgstr "Keutamaan Kalendar Orage"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr ""
-
-#: ../xfcalendar.desktop.in.h:2
-#, fuzzy
-msgid "Desktop calendar"
-msgstr "Perihal XFCalendar"
-
 #: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "XFCalendar"
-
-#~ msgid "Warning"
-#~ msgstr "Amaran"
-
-#, fuzzy
-#~ msgid "Select always today"
-#~ msgstr "Pilih Hari ini"
-
-#, fuzzy
-#~ msgid "Modify Preferences"
-#~ msgstr "Keutamaan"
-
-#, fuzzy
-#~ msgid "Monday"
-#~ msgstr "Hari ini"
-
-#, fuzzy
-#~ msgid "Tuesday"
-#~ msgstr "Hari ini"
-
-#, fuzzy
-#~ msgid "Wednesday"
-#~ msgstr "Hari ini"
-
-#, fuzzy
-#~ msgid "Thursday"
-#~ msgstr "Hari ini"
-
-#, fuzzy
-#~ msgid "Friday"
-#~ msgstr "Hari ini"
-
-#, fuzzy
-#~ msgid "Sunday"
-#~ msgstr "Ahad"
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "Hari ini"
-
-#, fuzzy
-#~ msgid "Calendar Files"
-#~ msgstr "XFCalendar"
-
-#, fuzzy
-#~ msgid "Calendar borders"
-#~ msgstr "XFCalendar"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Anda akan menyahkan semua maklumat \n"
-#~ "berkaitan dengan tarikh ini."
-
-#~ msgid "Clear"
-#~ msgstr "Semula"
+msgid "Calendar"
+msgstr "Kalendar"
 
-#~ msgid "This should not happen"
-#~ msgstr "Ini tidak sepatutnya berlaku"
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr "Kalendar Orage"
 
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Tak boleh cipta saluran klien MCS"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Kalendar desktop"
diff -Nru orage-4.8.3/po/nb.po orage-4.12.1/po/nb.po
--- orage-4.8.3/po/nb.po	2012-01-03 12:01:07.000000000 +0000
+++ orage-4.12.1/po/nb.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,23 +1,44 @@
-# Norwegian Bokmal translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Eskild Hustvedt <zerodogg@skolelinux.no>, 2005.
-# Terje Uriasnrud <ter@operamail.com>, 2007.
-# Christian Lomsdalen <christian@vindstille.net>, 2007.
-# Terje Uriansrud <terje@uriansrud.net>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Allan Nordhøy <comradekingu@gmail.com>, 2014-2015
+# Christian Lomsdalen <christian@vindstille.net>, 2007
+# Eskild Hustvedt <zerodogg@skolelinux.no>, 2005
+# Harald <haarektrans@gmail.com>, 2014
+# Ronny K. M. Olufsen <ronny@olufsen.org>, 2013
+# Terje Uriansrud <terje@uriansrud.net>, 2010
+# Terje Uriasnrud <ter@operamail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2005-08-17 20:43+0900\n"
-"Last-Translator: Terje Uriansrud <terje@uriansrud.net>\n"
-"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2015-02-21 15:26+0000\n"
+"Last-Translator: Allan Nordhøy <comradekingu@gmail.com>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/xfce-apps/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "ingen underlinje"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "enkel"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "dobbel"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "lav"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -33,9 +54,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"Klikk for å endre klokken"
+msgstr "%s\nKlikk for å endre klokken"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -45,9 +64,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"Knapp 1 for å endre innstillinger \n"
-"Knapp 2 for å justere klokketid"
+msgstr "Knapp 1 for å endre innstillinger \nKnapp 2 for å justere klokketid"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -56,9 +73,11 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"juster for å endre minutt. Klikk pilene med knapp 2 for å endre med ett "
-"minutt"
+msgstr "juster for å endre minutt. Klikk pilene med knapp 2 for å endre med ett minutt"
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Verdensomspennende tid"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -219,9 +238,7 @@
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"Kryss av denne for å bruke systemforvalgt skrifttype istedenfor valgt "
-"skrifttype"
+msgstr "Kryss av denne for å bruke systemforvalgt skrifttype istedenfor valgt skrifttype"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -262,6 +279,10 @@
 msgid "Use normal decorations"
 msgstr "Bruk normale dekorasjoner"
 
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Ingen"
+
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
 msgstr "Ikke vis vindusdekorasjoner (rammer)"
@@ -301,7 +322,6 @@
 msgid "%d hour %d mins"
 msgstr "%d timer %d min"
 
-# c-format
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
 #, c-format
@@ -338,7 +358,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Plassering"
@@ -399,96 +419,108 @@
 msgid "floating"
 msgstr "flytende"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Globaltid"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Orage Globaltid"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "Vis klokker fra forskjellige land"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Globaltid"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Ingen rotering"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Roter til venstre"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Roter til høyre"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "Utseende"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
 msgstr "Vis _ramme"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
 msgstr "Sett _forgrunnsfarge"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
 msgstr "Sett _bakgrunnsfarge"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
 msgstr "Sett _høyde"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
 msgstr "Merk at du ikke kan endre høyden til horisontale paneler"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
 msgstr "Sett _bredde"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
 msgstr "Merk at du ikke kan endre bredden til vertikale paneler"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Vis linjer _vertikalt"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "Klokkeinnstillinger"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
 msgstr "Sett tidssone til:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "Linje %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
 msgstr "Angi gyldig parameter til 'strftime' funksjonen."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
 msgstr "Verktøytips:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
 msgstr "korriger tid etter hvile/dvale-modus"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Du trenger bare dette hvis du setter maskinen i hvile/dvale-modus(mindre enn "
-"5 timer) og synlig tid ikke inkluderer sekunder. Under disse omstendighetene "
-"er det mulig at klokken viser tiden feil hvis dette ikke er aktivert. (Ved å "
-"velge denne hindres prosessor og avbruddslagring fra å fungere)"
+msgstr "Du trenger bare dette hvis du setter maskinen i hvile/dvale-modus(mindre enn 5 timer) og synlig tid ikke inkluderer sekunder. Under disse omstendighetene er det mulig at klokken viser tiden feil hvis dette ikke er aktivert. (Ved å velge denne hindres prosessor og avbruddslagring fra å fungere)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -498,21 +530,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Dette programmet bruker 'strftime' funksjonen for å formatere dato og tid.\n"
-"Angi gyldige koder for å vise tid/klokkeslett slik du ønsker.\n"
-"Noen vanlige koder er:\n"
-"\t%A = ukedag\t\t\t%B = måned\n"
-"\t%c = dato og tid\t\t%R = timer og minutter\n"
-"\t%V = ukenummer\t\t%Z = tidssone\n"
-"\t%H = timer \t\t\t\t%M = minutter\n"
-"\t%X = lokal tid\t\t\t%x = lokal dato"
+msgstr "Dette programmet bruker 'strftime' funksjonen for å formatere dato og tid.\nAngi gyldige koder for å vise tid/klokkeslett slik du ønsker.\nNoen vanlige koder er:\n\t%A = ukedag\t\t\t%B = måned\n\t%c = dato og tid\t\t%R = timer og minutter\n\t%V = ukenummer\t\t%Z = tidssone\n\t%H = timer \t\t\t\t%M = minutter\n\t%X = lokal tid\t\t\t%x = lokal dato"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
 msgstr "Orage Klokkeinnstillinger"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -521,8 +544,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y / %V"
 
@@ -531,14 +553,13 @@
 msgstr "Vedlikehold"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "Styr tiden din med Xfce4"
+msgstr "Styr tiden din med Orage"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Slutt"
 
@@ -546,13 +567,13 @@
 msgid "Due"
 msgstr "Forfall"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Velg en fil..."
 
@@ -560,227 +581,281 @@
 msgid "Sound Files"
 msgstr "Lydfiler"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Alle filer"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Avtaleinformasjonen er endret."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "Ønsker du å fortsette?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Nei, ikke forlat"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Ja, ignorer endringer og forlat"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "Denne avtalen slutter før den starter."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "Ikke satt"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Legg til nytt ærend til denne fila."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Orage standardfil"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Tillegg av ærend feilet."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Feil inntraff under tillegg av ærend. Ytterligere detaljer i loggfila."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Oppdatering av ærend feilet."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Ytterligere detaljer i loggfila. (Kanskje fila ble oppdatert uavhengig av Orage?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
 msgstr "Avtalen vil bli slettet."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Nei, avbryt fjerningen"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Ja, fjern"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Velg dato"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "I dag"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "Avtalen eksisterer ikke."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
 msgstr "Det ble sannsynligvis fjernet, vennligst oppdater skjermbildet."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Gjeldende kategorier"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Legg til ny kategori med farge"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Kategori:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Fargekategorier"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr " *** KOPI ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "Ny _avtale"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Fil"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "Lagr_e og lukk"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "D_upliser"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Lagre"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Lagre og lukk"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Tilbakestill"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Dupliser"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Slett"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Frigjør"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Generell"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Type "
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Hendelse som vil skje. For eksempel:\n"
-"Et møte, en bursdag eller et tv-program."
+msgstr "Hendelse som vil skje. For eksempel:\nEt møte, en bursdag eller et tv-program."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "Oppgaver"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Noe du burde gjøre. For eksempel:\n"
-"Vaske bilen din eller teste en ny versjon av Orage."
+msgstr "Noe du burde gjøre. For eksempel:\nVaske bilen din eller teste en ny versjon av Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Journal"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Noter deg et eller annet. For eksempel:\n"
-"Noter at din mor ringte eller at den første snøen denne vinteren kom."
+msgstr "Noter deg et eller annet. For eksempel:\nNoter at din mor ringte eller at den første snøen denne vinteren kom."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Tittel "
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "Heldagsavtale"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Start"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Sett     "
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Varighet"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "dager"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "timer"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "minutter"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Tilgjengelighet"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Fullført"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "Ferdig"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Kategorier"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Dette er en spesiell kategori som kan brukes for å farge denne avtalen "
-"ilistevisning."
+msgstr "Dette er en spesiell kategori som kan brukes for å farge denne avtalen ilistevisning."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "Oppdater farger for kategorier."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "Prioritet"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Vis du velger 8 eller mer, vil avtalen IKKE bli vist på opplistingsvinduene.\nDu kan bruke dette for å rydde opp i dine listevinduer, men det gjør det vanskeligere å finne denne avtalen.\n(Alarmer vil fremdeles fungere som normalt.)\n(Det er et udokumentert parameter sånn at du kan endre den forvalgte grensen på 8.)"
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Merknad"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -789,140 +864,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"Disse hurtigkommandoene oppdateres umiddelbart:\n"
-"    <D> setter inn dagens dato med lokalt datoformat\n"
-"    <T> setter inn klokkeslett og\n"
-"    <DT> setter ikke dato og klokkeslett.\n"
-"\n"
-"Disse konverteres senere når de vises:\n"
-"    <&Ynnnn> oversettes til gjeldende år minus nnnn.\n"
-"(Dette kan for eksempel brukes til bursdagspåminnelser som vil vise alder "
-"for den som har bursdag.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Disse hurtigkommandoene oppdateres umiddelbart:\n    <D> setter inn dagens dato med lokalt datoformat\n    <T> setter inn klokkeslett og\n    <DT> setter ikke dato og klokkeslett.\n\nDisse konverteres senere når de vises:\n    <&Ynnnn> oversettes til gjeldende år minus nnnn.\n(Dette kan for eksempel brukes til bursdagspåminnelser som vil vise alder for den som har bursdag.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "Før start"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "Før slutt"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "Etter start"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "Etter slutt"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Påminnelse"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Påminnelsestidspunkt"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Ofte vil du ha en påminnelse:\n"
-" 1) før hendelsen starter\n"
-" 2) før oppgaver avlsluttes\n"
-" 3) etter oppgaver starter"
+msgstr "Ofte vil du ha en påminnelse:\n 1) før hendelsen starter\n 2) før oppgaver avlsluttes\n 3) etter oppgaver starter"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr "Vedvarende alarm"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Velg dette hvis du vil at Orage skal påminne deg selv om Orage ikke var "
-"aktivt når alarmtidspunktet inntraff"
+msgstr "Velg dette hvis du vil at Orage skal påminne deg selv om Orage ikke var aktivt når alarmtidspunktet inntraff"
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Lyd"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "Bruk"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
 msgstr "Velg denne hvis du ønsker en hørbar påminnelse"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
-msgstr "Gjenta påminnelsen"
+msgstr "Gjenta varslingslyd"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "ganger"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "sekunders intervall"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "Visuell"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Bruk Orage vindu"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
 msgstr "Velg denne hvis du vil ha Orage vindusalarm"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Bruk påminnelse"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
 msgstr "Velg denne hvis du vil ha en påminnelse"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "Sett tidsavbrudd"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
 msgstr "Velg denne hvis du vil at påminnelsen skal automatisk utløpe"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 = Forvalgt system utløpstid"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "sekunder"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Metode"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
 msgstr "Velg denne hvis du vil ha metode eller skript-alarm"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -932,156 +991,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
+msgstr "Du må sette inn alle kontrolltegn selv.\nDenne strengen blir bare sendt til skallet.\nDe følgende spesialkommandoene byttes ut ved kjøring:\n\t<&T>  avtaletittel\n\t<&D>  avtalebeskrivelse\n\t<&AT> alarmtid\n\t<&ST> start-tid for avtale\n\t<&ET> slutt-tid for avtale"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
 msgstr "Test dette varselet"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "<b>Standard påminnelse</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
 msgstr "Lagre gjeldende innstillinger som standard påminnelse"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
 msgstr "Sett gjeldende innstillinger fra standard påminnelse"
 
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Ingen"
-
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Daglig"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Ukentlig"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Månedlig"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Årlig"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
-msgstr ""
+msgstr "Hver time"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Man"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Tir"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Ons"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Tor"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Fre"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "Lør"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "Søn"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Gjentagelse"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Kompleksitet"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Enkel"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Avansert"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "Bruk denne for gjentagende hendelser"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Bruk denne hvis du trenger komplekse oppsett:\n"
-" Hver lørdag og søndag eller \n"
-" Første tirsdag i måneden"
+msgstr "Bruk denne hvis du trenger komplekse oppsett:\n Hver lørdag og søndag eller \n Første tirsdag i måneden"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Frekvens"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Hver"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "forekomst"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Begrens frekvens til bestemt intervall.\n"
-" Eksempel: Hver tredje dag: \n"
-" Frekvens = Daglig og Intervall = 3"
+msgstr "Begrens frekvens til bestemt intervall.\n Eksempel: Hver tredje dag: \n Frekvens = Daglig og Intervall = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Grense"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Gjenta for alltid"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Gjenta"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Gjenta til "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Ukedager"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "Dag"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1089,293 +1138,297 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Angi hvilken ukedag for månedlige og årlige hendelser.\n"
-" Eksempel:\n"
-" Andre onsdag hver måned:\n"
-"\tFrekvens = månedlige,\n"
-"\tUkedager = velg bare onsdag,\n"
-"\tDag = velg verdien 2 under onsdag."
+msgstr "Angi hvilken ukedag for månedlige og årlige hendelser.\n Eksempel:\n Andre onsdag hver måned:\n\tFrekvens = månedlige,\n\tUkedager = velg bare onsdag,\n\tDag = velg verdien 2 under onsdag."
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr "TODO base"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"TODO gjentagende og starter på starttidspunkt og gjentar seg ved hvert "
-"intervall uansett når forrige ble fullført"
+msgstr "TODO gjentagende og starter på starttidspunkt og gjentar seg ved hvert intervall uansett når forrige ble fullført"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"TODO gjentagelser er basert på tid og gjentagelser etter intervall telt fra "
-"forrige fullførte tidspunkt.\n"
-"(Merk at du ikke vet noe om hitorikk for TODO siden gjentagelse basis endret "
-"hvert gang det fullføres.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "TODO gjentagelser er basert på tid og gjentagelser etter intervall telt fra forrige fullførte tidspunkt.\n(Merk at du ikke vet noe om hitorikk for TODO siden gjentagelse basis endret hvert gang det fullføres.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "Unntak"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"Legg til flere dager med unntak ved å klikke kalenderdager under.\n"
-"Unntak er enten eksklusjon(-) eller inkludering(+) avhengig av hva som er "
-"valgt.\n"
-"Fjern ved å klikke på dataene."
+msgstr "Legg til flere dager med unntak ved å klikke kalenderdager under.\nUnntak er enten eksklusjon(-) eller inkludering(+) avhengig av hva som er valgt.\nFjern ved å klikke på dataene."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr "Legg til ekskludert dato (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr "Unntaksdager er fulle dager hvor denne avtalen ikke gjelder"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
 msgstr "Legg til inkludert tid (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"Inkluderte tider har samme tidssone som starttiden, men kan ha et annet "
-"tidspunkt"
+msgstr "Inkluderte tider har samme tidssone som starttiden, men kan ha et annet tidspunkt"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
 msgstr "Hendelsedatoer"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Vis"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "_Gå til"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Ny"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Tilbake"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "I dag"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Fremover"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Tilbake en uke"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Tilbake en dag"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Fremover en dag"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Fremover en uke"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Lukk"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "      Antall dager som vises"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - Dagsvisning"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Hele dagen"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "Ingen rader har blitt valgt."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Klikk på en rad for å velge den og etterpå kan du kopiere den."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"Du vil permanent slette alle valgte \n"
-"avtaler."
+msgstr "Du vil permanent slette alle valgte \navtaler."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Ja, fjern dem"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Tilbake"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Fremover"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Søk"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "Dagsvisning"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Vis ekstra dager "
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Ekstra dager å vise:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "bare første gjentagende"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Merk denne dersom du ønsker kun å se den første gjentagende hendelsen. Som standard vises alle.\nBemerk at dette også viser alle prioriteter.\nBemerk at gjentagende hendelser kan bli vist tidligere i listen ettersom kun den første forekomsten listes."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "også gammel"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Huk av denne hvis du også vil se gamle hendelser. Dette kan bare velges etter at 'bare første gjentagende' er påskrudd for å unngå veldig lange lister.\nMerk at ekstra dager i utvalget fremdeles bestemmer om byere avtaler er opplistet'."
+
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "Journal elementer fra:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Søk"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "Søk tekst "
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Flagg"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Tittel"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Dobbeltklikk linjen for å redigere.\n"
-"\n"
-"Flagg (i rekkefølge):\n"
-"\t 1. Påminnelse: n=ingen påminnelse\n"
-"\t\tA=visuell påminnelse S=også påminnelse med lyd\n"
-"\t 2. Gjentagelse: n=ingen gjentagelse\n"
-"\t\t D=Daglig W=Ukentlig M=Månedlig Y=Årlig\n"
-"\t 3. Type: f=ledig B=Opptatt\n"
-"\t 4. Plassert i fil: O=Orage\n"
-"\t\t  A=Arkiv F=Ekstern\n"
-"\t 5. Avtaletype:\n"
-"\t\tE=Hendelse T=Gjøremål J=Journal"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Velg dato"
+msgstr "Dobbelklikk linje for å redigere den.\n\nFlagg i rekkefølge:\n⇥ 1. Alarm: n=ingen alarm\n⇥⇥ A=Alarm satt P=Persistent alarm satt\n⇥ 2. Gjentagning: n=Ingen gjentagning\n⇥⇥ H=Timevis D=Daglig W=Ukentlig M=Månedlig Y=Årvis\n⇥ 3. Type: f=ledig B=Opptatt\n⇥ 4. I filen:\n⇥⇥O=Orage A=Arkiv F=Fremmed\n⇥ 5. Avtale-type:\n⇥⇥E=Handelse T=Gjøremål J=Journal"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tGjentagelse avsluttet, flytter til arkivfil."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Arkivering ikke aktivert. Avslutter"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Arkiveringsgrense: %d måned(er)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tArkiverer hendelser som er eldre enn %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Arkiverings uid: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tTODO ikke komplett; ikke arkiver"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tGjentagende. Avsluttes år: %04d, måned: %02d, dag: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Arkivering fullført\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Starter arkivsletting."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tFase 1: Resett gjentagende avtaler"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tFase 2: Returner arkiverte avtaler"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Arkivsletting fullført\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Orage standard påminnelse"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Opprettet alarmliste for Orage hovedfil:"
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-"Bygget påminnelsesliste: Lagt til %d påminnelser. Prosessert %d hendelser."
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Opprettet alarmliste for ekstern fil: %s (%s)"
+
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\tLa til %d alarmer. Behandlet %d hendelser."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tFant %d påminnelser hvorav %d er aktive. (Søkte %d gjentagende påminnelser)"
+msgstr "\tFant %d påminnelser hvorav %d er aktive. (Søkte %d gjentagende påminnelser)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1393,7 +1446,16 @@
 msgid "Import file preprocessing done"
 msgstr "Forbehandling av filimportering er ferdig"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Fant ekstern oppdatering på fil %s."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Oppfrisker alarmer og kalender på grunn av oppdatering av ekstern fil."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Kalenderfiler"
 
@@ -1401,620 +1463,670 @@
 msgid "Current foreign files"
 msgstr "Gjeldende eksterne filer"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "KUN LESBAR"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "LES OG SKRIV"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Ingen eksterne filer *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Tillegging av ekstern fil mislyktes"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage kan bare håndtere 10 fremmede filer. Grensen er nådd."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Filnavn er tomt."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Navnefelt er tomt."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Filen finnes ikke."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Samme filnavn finnes allerede i Orage."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Samme navn finnes allerede i Orage."
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Importer/eksporter"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Importer"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Les fra fil:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Skill filnavn med komma(,).\n"
-" NB: Komma er ikke gyldig tegn i filnavn til bruk i Orage."
+msgstr "Skill filnavn med komma(,).\n NB: Komma er ikke gyldig tegn i filnavn til bruk i Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Eksporter"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Skriv til fil:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Velg"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Alle avtaler"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Navngitte avtaler: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Vær oppmerksom på at kun avtaler fra hovedfil leses.\n"
-"Arkiverte og eksterne hendelser eksporteres ikke."
+msgstr "Vær oppmerksom på at kun avtaler fra hovedfil leses.\nArkiverte og eksterne hendelser eksporteres ikke."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Vær oppmerksom på at kun avtaler fra hovedfil leses.\n"
-"Hendelser utenifra eksporteres ikke."
+msgstr "Vær oppmerksom på at kun avtaler fra hovedfil leses.\nHendelser utenifra eksporteres ikke."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "Du kan enkelt dra disse fra hendelseliste-vinduet."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "Orage avtale UID'er separert med komma."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Arkiv"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Arkiver nå (grenseverdi: %d måneder)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Du kan endre grenseverdi i parametrene"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Rull tilbake arkiv nå"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Returner alle arkiverte hendelser til Orage hovedfil og slett arkivfil.\n"
-"Dette er nyttig for eksempel ved eksport og ved flytting av Orage\n"
-"avtaler til et annet system."
+msgstr "Returner alle arkiverte hendelser til Orage hovedfil og slett arkivfil.\nDette er nyttig for eksempel ved eksport og ved flytting av Orage\navtaler til et annet system."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Orage filer"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
-msgstr "Orage kalende hovedfil"
+msgstr "Orage kalender hovedfil"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Gjeldende fil"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Gjeldende fil:"
 
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Ny fil"
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Ny fil:"
 
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Hendelsesopsjoner"
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Handlingsvalg:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Gi nytt navn"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Orage gir nytt navn kun til intern fil.\n"
-"Berører ingen eksterne filsystem overhodet.\n"
-"Ny fil må eksistere."
+msgstr "Orage gir nytt navn kun til intern fil.\nBerører ingen eksterne filsystem overhodet.\nNy fil må eksistere."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Kopier"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr "Gjeldende fil kopieres og forblir urørt på gammel plassering."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Flytt"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "Gjeldende fil flyttes og fjernes fra gammel plassering."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Arkivfil"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Eksterne filer"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Legg til ny ekstern fil"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Ekstern fil:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Innstillinger"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Synlig navn:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Kun lesing"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Sett dette hvis du vil være sikker på at denne filen aldri modifiseres av "
-"Orage.\n"
-"Husk at ved å endre filer fra andre verktøy kan de bli ukompatible med "
-"originalprogrammet!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Sett dette hvis du vil være sikker på at denne filen aldri modifiseres av Orage.\nHusk at ved å endre filer fra andre verktøy kan de bli ukompatible med originalprogrammet!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Dette interne navnet blir vist til brukeren istedenfor filnavnet."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Utveksling av data"
 
-#: ../src/main.c:268
-#, fuzzy, c-format
+#: ../src/main.c:275
+#, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tDette er %s versionen %s for Xfce %s\n"
-"\n"
+msgstr "\tDette er %s versjon %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tUtgitt under betingelsene til GNU General Public License.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tKompilert mot GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "bruker GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tBruker DBUS for import.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tBruker ikke DBUS. Importering funger bare delvis.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tBruker libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tBruker ikke libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tBruker automatisk arkivering.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tIngen arkivering.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tBruker systempakke libical.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tBruker Orage lokal versjon av libical.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Bruk: orage [opsjoner] [filer]\n"
-"\n"
+msgstr "Bruk: orage [opsjoner] [filer]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Opsjoner:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tVis Orage versjon\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tSkriv ut denne teksten\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \tVis innstillingsvindu\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\tGjør Orage synlig/usynlig\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) fil [RW] \tLegg til ekstern fil\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) fil [RW] [name] \tLegg til ekstern fil\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) fil \tSlett ekstern fil\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--export (-e) fil [avtale...] \teksporterer avtaler fra Orage til fil\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "filer=ical filer å laste inn i Orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tDBUS ikke inkludert i Orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tuten DBUS [filer] og eksterne filopsjoner kan (-a & -r) bare brukes ved "
-"oppstart av Orage \n"
+msgstr "\tuten DBUS [filer] og eksterne filopsjoner kan (-a & -r) bare brukes ved oppstart av Orage \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Ukjent opsjon %s\n"
-"\n"
+msgstr "\nUkjent opsjon %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Utveksle data"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Vis valgte _dato"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Vis valgte _uke"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Velg _idag"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Globaltid"
+msgstr "Vis _Global tid"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Ingen tittel definert"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr "Plassering: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\nNotat:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Aldri"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Tittel: %s\n"
-" Start:\t%s\n"
-" Slutt:\t%s\n"
-"Notat:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "Tittel: %s\n%s Start:⇥%s\nFrist:⇥%s\nFerdig:⇥%s%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Tittel: %s\n"
-" Start:\t%s\n"
-" Slutt:\t%s\n"
-"Notat:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Tittel: %s\n%s Start:\t%s\n Slutt:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Oppgaver:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Hendelser for %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>Hendelser for %s - %s:</b>"
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:492
 msgid "Main settings"
-msgstr "Hovedoppsett"
+msgstr "Hovedinnstillinger"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "Du bør alltid definere din lokale tidssone."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "Arkivering grenseverdi (måneder)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = ingen arkivering)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Arkivering brukes for å spare tid og lagringsplass når handlinger håndteres"
+msgstr "Arkivering brukes for å spare tid og lagringsplass når handlinger håndteres"
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Lydkommando"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-"Denne kommandoen gis til skallet for å gi alarmer muligheten til å lage lyd"
+msgstr "Denne kommandoen gis til skallet for å gi alarmer muligheten til å lage lyd"
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Vis"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Kalendervindu"
 
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Kalender hovedvindu"
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Synlige detaljer for kalender"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "Vis ramme"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "Vis meny"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Vis måned og år"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
 msgstr "Vis navn på dag"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
 msgstr "Vis ukenummer"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Vis måned og år"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Kalender infobokser"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "Vis oppgaveliste"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
 msgstr "Antall dager å vise i hendelsesvindu"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
 msgstr "0 = ikke vis hendelsesliste"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Kalendersynlighet"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
-msgstr ""
+msgstr "Vis på alle skrivebord"
 
-#: ../src/parameters.c:683
-#, fuzzy
+#: ../src/parameters.c:696
 msgid "Keep on top"
-msgstr "Sett øverst"
+msgstr "Hold øverst"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "Vis i oppgavelinje"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "Vis i skrivebordsoversikt"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "Vis i systemkurv"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "Kalender Start"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Vis"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Skjul"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Minimert"
 
-#: ../src/parameters.c:793
-#, fuzzy
-msgid "Extra settings"
-msgstr "Ekstra oppsett"
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Kalender hovedvindu"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "Velg _idag"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "Bruk dynamisk systemkurvikon"
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "Bruk dynamisk ikon"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "Dynamisk ikon viser gjeldende måned og dag i måneden."
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Dobbeltklikk i Hovedkalender viser"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "Ved åpning av kalendervinduet"
+
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Velg dato for i dag"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Velg tidligere valgt dato"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Dobbeltklikk av dag i kalender viser"
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
 msgstr "Dagsvisning"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
 msgstr "Hendelsesliste"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr "Hendelseslistevindu"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Ekstra innstillinger"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Hendelsesliste-vindu"
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
 msgstr "Antall ekstra dager å vise i hendelsesliste"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
 msgstr "Dette er standardverdien, du kan endre den i hendelseslistevinduet."
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Vis kun første gjentagende hendelse"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Dagvisningsvinduer begynner som forvalg på første dag"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Første dag i uken"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Valgt dag"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Bruk dynamisk systemkurvikon"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Bruk dynamisk ikon"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Dynamisk ikon viser gjeldende måned og dag i måneden."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
-msgstr ""
+msgstr "Bruk våkne-timer"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
+msgstr "Bruk denne timeren hvis Orage har problemer med å våkne etter dvale. (for eksempel hvis panel-ikonet ikke oppfrisker eller at alarmer ikke starter.)"
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Ukjente filtyper vil som forvalg utløse visuell alarm"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Orage-vindu"
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Merknadsmeddelende"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Alltid avslutt ved forespørsel om lukking"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Alltid avslutt"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Som standard vil Orage holde seg i bakgrunnen ved lukking. Dette valget gjør at Orage aldri holder seg i bakgrunnen ved lukking og avslutter."
+
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Orage Innstillinger"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
 msgstr "Første Orage oppstart. Søker etter standard tidssone."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Sett forvalgt tidssone til %s"
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
 msgstr "Standard tidssone ikke funnet. Må settes manuelt."
 
@@ -2026,40 +2138,35 @@
 msgid "Open"
 msgstr "Åpne"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Påminnelse - Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Utsett"
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "Påminnelse på nytt etter angitt tid"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr "Trykk <Utfør> for ny påminnelse etter angitt tid"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Neste aktive påminnelser:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d d %02d t %02d min til: %s"
+msgstr "\n%02d d %02d t %02d min til: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Ingen aktive påminnelser er funnet"
+msgstr "\nIngen aktive påminnelser er funnet"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2082,1537 +2189,2229 @@
 msgstr "Afrika/Algiers"
 
 #: ../src/timezone_names.c:41
+msgid "Africa/Asmara"
+msgstr "Afrika/Asmara"
+
+#: ../src/timezone_names.c:42
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
-#: ../src/timezone_names.c:42
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "Afrika/Banjul"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "Afrika/Kairo"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "Afrika/Conakry"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_Salaam"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "Afrika/Djibouti"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "Afrika/Douala"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Aaiun"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "Afrika/Freetown"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaborone"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "Afrika/Juba"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johannesburg"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "Afrika/Khartoum"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinshasa"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "Afrika/Libreville"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbashi"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "Afrika/Mogadishu"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovia"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndjamena"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamey"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nouakchott"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ouagadougou"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripoli"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "Afrika/Windhoek"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "Amerika"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "Amerika/Anchorage"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "Amerika/Anguilla"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "Amerika/Antigua"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "Amerika/Araguaina"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "Amerika/Argentina/Buenos_Aires"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "Amerika/Argentina/Catamarca"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "America/Argentina/ComodRivadavia"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "Amerika/Argentina/Cordoba"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "Amerika/Argentina/Jujuy"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "America/Argentina/La_Rioja"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "Amerika/Argentina/Mendoza"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "America/Argentina/Rio_Gallegos"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "Sør-Amerika/Argentina/Salta "
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "America/Argentina/San_Juan"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "America/Argentina/San_Luis"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "America/Argentina/Tucuman"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "America/Argentina/Ushuaia"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "Amerika/Asuncion"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "America/Atikokan"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "America/Atka"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "America/Bahia"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "America/Bahia_Banderas"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "America/Blanc-Sablon"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "Amerika/Boise"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Cambridge_Bay"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "America/Campo_Grande"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "Amerika/Cancun"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "Amerika/Caracas"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "Amerika/Catamarca"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "Amerika/Cayenne"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "Amerika/Cayman"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "Amerika/Chicago"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "Amerika/Chihuahua"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "America/Coral_Harbour"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "Amerika/Cordoba"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "Amerika/Costa_Rica"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "America/Creston"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "Amerika/Cuiaba"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "Amerika/Curacao"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "America/Danmarkshavn"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "Amerika/Dawson"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Dawson_Creek"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "Amerika/Dominica"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "America/Ensenada"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "Amerika/Eirunepe"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "America/Fort_Wayne"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glace_Bay"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "Amerika/Godthab"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "Amerika/Goose_Bay"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grand_Turk"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "Amerika/Guadeloupe"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "Amerika/Guatemala"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "Amerika/Guayaquil"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "Amerika/Guyana"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "Amerika/Halifax"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosillo"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indiana/Indianapolis"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indiana/Knox"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indiana/Marengo"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "Amerika/Indiana/Petersburg"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "America/Indiana/Tell_City"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indiana/Vevay"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "America/Indiana/Vincennes"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "America/Indiana/Winamac"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "Amerika/Indianapolis"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "Amerika/Iqaluit"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "Amerika/Jamaica"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "Amerika/Jujuy"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "Amerika/Juneau"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentucky/Louisville"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentucky/Monticello"
 
-#: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr "Amerika/La_Paz"
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "America/Knox_IN"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "America/Kralendijk"
+
+#: ../src/timezone_names.c:181
+msgid "America/La_Paz"
+msgstr "Amerika/La_Paz"
+
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Angeles"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "Amerika/Louisville"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "America/Lower_Princes"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "Amerika/Maceio"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "Amerika/Managua"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "America/Marigot"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "Amerika/Martinique"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "America/Matamoros"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "Amerika/Mazatlan"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "Amerika/Menominee"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "America/Metlakatla"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "Amerika/Mexico_City"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "Amerika/Miquelon"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "America/Moncton"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "Amerika/Monterrey"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "Amerika/Montserrat"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "Amerika/Nome"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "America/North_Dakota/Beulah"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "America/North_Dakota/Center"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "America/North_Dakota/New_Salem"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "Amerika/Noronha"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "America/Ojinaga"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "Amerika/Phoenix"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Port-au-Prince"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_of_Spain"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "America/Porto_Acre"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "Amerika/Porto_Velho"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Puerto_Rico"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "Amerika/Rainy_River"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Rankin_Inlet"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "Amerika/Recife"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "America/Resolute"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branco"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "America/Rosario"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "America/Santa_Isabel"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "America/Santarem"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "Amerika/Santiago"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo_Domingo"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao_Paulo"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "Amerika/Scoresbysund"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "Amerika/Shiprock"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "America/Sitka"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "America/St_Barthelemy"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "Amerika/St_Johns"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "Amerika/St_Kitts"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "Amerika/St_Lucia"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "Amerika/St_Thomas"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "Amerika/St_Vincent"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "Amerika/Swift_Current"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegucigalpa"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "Amerika/Thule"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Thunder_Bay"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "Amerika/Tijuana"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "Amerika/Toronto"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "Amerika/Vancouver"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "America/Virgin"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "Amerika/Whitehorse"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "Amerika/Winnipeg"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "Amerika/Yakutat"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "Amerika/Yellowknife"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Antarktis"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Antarktis/Casey"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Antarktis/Davis"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktis/DumontDurville"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Antarctica/Macquarie"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Antarktis/Mawson"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Antarktis/McMurdo"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Antarktis/Palmer"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Antarctica/Rothera"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Antarktis/_Sydpolen"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "Antarktis/Syowa"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Antarktis/Vostok"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Arktis"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Arktis/Longearbyen"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Asia"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Asia/Aden"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Asia/Almaty"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Asia/Amman"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Asia/Anadyr"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Asia/Aqtau"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aqtobe"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "Asia/Ashgabat"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Asia/Ashkhabad"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "Asia/Bagdad"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Asia/Bahrain"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Asia/Baku"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Asia/Bishkek"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Asia/Brunei"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Asia/Calcutta"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Asia/Choibalsan"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "Asia/Chongqing"
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "Asia/Chungking"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Asia/Colombo"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Asia/Dacca"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "Asia/Damaskus"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Asia/Dhaka"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Asia/Dubai"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dushanbe"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Asia/Harbin"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Asia/Hebron"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong_Kong"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Asia/Ho_Chi_Minh"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Asia/Hovd"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Asia/Istanbul"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Asia/Jakarta"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Asia/Jerusalem"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamchatka"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Asia/Karachi"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Asia/Kathmandu"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Asia/Katmandu"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Asia/Khandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Asia/Kolkata"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnoyarsk"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala_Lumpur"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Asia/Kuching"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Asia/Macau"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Asia/Makassar"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Asia/Muscat"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Asia/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Asia/Oral"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Asia/Qyzylorda"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangoon"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyadh"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Asia/Riyadh87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Asia/Riyadh88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Asia/Riyadh89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Asia/Sakhalin"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarkand"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Asia/Seoul"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Asia/Singapore"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Asia/Tehran"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Asia/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Asia/Thimbu"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokyo"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung_Pandang"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulaanbaatar"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Asia/Ulan_Bator"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Asia/Ust-Nera"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Asia/Yakutsk"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Atlanteren"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Atlanteren/Azorene"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Atlanteren/Bermuda"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Atlanteren/Kanariøyene"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlanteren/Kapp_Verde"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "Atlanteren/Færøyene"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlantic/Faroe"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlanteren/Jan_Mayen"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "Atlanteren/Madeira"
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
 msgstr "Atlanteren/Reykjavik"
 
-#: ../src/timezone_names.c:306
+#: ../src/timezone_names.c:375
 msgid "Atlantic/South_Georgia"
 msgstr "Atlanteren/South_Georgia"
 
-#: ../src/timezone_names.c:307
+#: ../src/timezone_names.c:376
 msgid "Atlantic/St_Helena"
 msgstr "Atlanteren/St_Helena"
 
-#: ../src/timezone_names.c:308
+#: ../src/timezone_names.c:377
 msgid "Atlantic/Stanley"
 msgstr "Atlanteren/Stanley"
 
-#: ../src/timezone_names.c:309
+#: ../src/timezone_names.c:378
 msgid "Australia"
 msgstr "Australia"
 
-#: ../src/timezone_names.c:310
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Australia/ACT"
+
+#: ../src/timezone_names.c:380
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaide"
 
-#: ../src/timezone_names.c:311
+#: ../src/timezone_names.c:381
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: ../src/timezone_names.c:312
+#: ../src/timezone_names.c:382
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: ../src/timezone_names.c:313
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Australia/Currie"
+
+#: ../src/timezone_names.c:384
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: ../src/timezone_names.c:314
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Australia/Eucla"
+
+#: ../src/timezone_names.c:386
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: ../src/timezone_names.c:315
+#: ../src/timezone_names.c:387
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: ../src/timezone_names.c:316
+#: ../src/timezone_names.c:388
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: ../src/timezone_names.c:317
+#: ../src/timezone_names.c:389
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: ../src/timezone_names.c:318
+#: ../src/timezone_names.c:390
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: ../src/timezone_names.c:319
+#: ../src/timezone_names.c:391
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brasil"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brazil/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brazil/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brasil/Øst"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brasil/Vest"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Canada/Atlantic"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Canada/Central"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Canada/East-Saskatchewan"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Canada/Eastern"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Canada/Mountain"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Canada/Newfoundland"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Canada/Pacific"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Canada/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Canada/Yukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Chile"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Chile/Continental"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Chile/EasterIsland"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Universal"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Zulu"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Europa"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Europa/Athen"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrade"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Europa/Berlin"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Europa/Brussel"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Europa/Bucharest"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Europe/Busingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Europa/København"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Europe/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Europe/Isle_of_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Europe/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisboa"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Europa/London"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxembourg"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Europe/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Europa/Moskva"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Europe/Paris"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Europe/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Europe/Praha"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Europe/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Europa/Stockholm"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Europa/Tirane"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Europe/Tiraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Europa/Vatikanet"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Europa/Wien"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Europe/Volgograd"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "Europa/Warsawa"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "Europa/Zurich"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Indiske_hav"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "Indiske_hav/Antananarivo"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "Indiske_hav/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "Indiske_hav/Christmas"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "Indiske_hav/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "Indiske_hav/Comoro"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "Indiske_hav/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "Indiske_hav/Mahe"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "Indiske_hav/Maldivene"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "Indiske_hav/Mauritius"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "Indiske_hav/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "Indiske_hav/Reunion"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Meksiko"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Mexico/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Mexico/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Mexico/General"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Midtøsten"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Mideast/Riyadh87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Mideast/Riyadh88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Mideast/Riyadh89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Stillehavet"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "Stillehavet/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Stillehavet/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Stillehavet/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Pacific/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "Stillehavet/Easter"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "Stillehavet/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "Stillehavet/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Stillehavet/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "Stillehavet/Fiji"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Stillehavet/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Stillehavet/Galapagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Stillehavet/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "Stillehavet/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Stillehavet/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Stillehavet/Honolulu"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Stillehavet/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "Stillehavet/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "Stillehavet/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "Stillehavet/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Stillehavet/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Stillehavet/Marquesas"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Stillehavet/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Stillehavet/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Stillehavet/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Stillehavet/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "Stillehavet/Noumea"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Stillehavet/Pago_Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Stillehavet/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "Stillehavet/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Pacific/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "Stillehavet/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Stillehavet/Port_Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Stillehavet/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Stillehavet/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pacific/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Stillehavet/Tahiti"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Stillehavet/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Stillehavet/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Stillehavet/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Stillehavet/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Stillehavet/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "Stillehavet/Yap"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "US"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "US/Alaska"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "US/Aleutian"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "US/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "US/Central"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "US/Eastern"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "US/East-Indiana"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "US/Hawaii"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "US/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "US/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "US/Mountain"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "US/Pacific"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "US/Pacific-New"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "US/Samoa"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "Ny avtale"
@@ -3630,79 +4429,26 @@
 msgstr "Hvis tid og dato"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Kalender"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Orage Kalenderinnstillinger"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Orage Innstillinger"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Innstillinger for Xfce 4 Kalenderprogram (Orage)"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Skrivebordskalender"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Orage Kalenderinnstillinger"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Kalender"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Orage Kalender"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Tittel: %s\n"
-#~ " Start:\t%s\n"
-#~ " Slutt:\t%s\n"
-#~ " Ferdig:\t%s\n"
-#~ "Notat:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Du må skrive inn alle omskrivingkarakterer selv (escape characters).\n"
-#~ " Denne verdien gis direkte til et kommandoskjell for å kjøres."
-
-#~ msgid "Orage clock"
-#~ msgstr "Orage klokke"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Opphavsmann til Orage, tidligere vedlikeholder"
-
-#~ msgid "Contributor"
-#~ msgstr "Bidragsyter"
-
-#~ msgid "Info"
-#~ msgstr "Info"
-
-#~ msgid "Warning"
-#~ msgstr "Advarsel"
-
-#~ msgid "Error"
-#~ msgstr "Feil"
-
-#~ msgid "Set sticked"
-#~ msgstr "Sett fast"
-
-#~ msgid "Select always today"
-#~ msgstr "Velg alltid i dag"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Når hovedkalenderen vises, settes markøren enten på sist valgte dato "
-#~ "eller på dagens dato."
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Skrivebordskalender"
diff -Nru orage-4.8.3/po/nl.po orage-4.12.1/po/nl.po
--- orage-4.8.3/po/nl.po	2012-01-05 07:03:03.000000000 +0000
+++ orage-4.12.1/po/nl.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,32 +1,49 @@
-# Dutch translation of the orage package.
-# Copyright (C) The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Jasper Huijsmans <jasper@xfce.org>, 2004.
-# Vincent Tunru <imnotb@gmail.com>, 2006.
-# Stephan Arts <psybsd@gmail.com>, 2006.
-# Pjotr, 2011.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+# Jasper Huijsmans <jasper@xfce.org>, 2004
+# Pjotr <pjotrvertaalt@gmail.com>, 2013-2014
+# Stephan Arts <psybsd@gmail.com>, 2006
+# Vincent Tunru <imnotb@gmail.com>, 2006
 msgid ""
 msgstr ""
-"Project-Id-Version: orage\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2011-09-08 20:23+0200\n"
-"Last-Translator: Pjotr\n"
-"Language-Team: Dutch (Flemish)\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2014-09-28 18:23+0000\n"
+"Last-Translator: Pjotr <pjotrvertaalt@gmail.com>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/xfce-apps/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl (Dutch)\n"
+"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "Geen onderstreping"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "enkel"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "dubbel"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "laag"
+
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr "WereldTijd-venster aan het oproepen..."
+msgstr "WereldTijd-venster aan het verheffen..."
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
-msgstr "Oproepen van WereldTijd-venster is mislukt"
+msgstr "Verheffen van WereldTijd-venster is mislukt"
 
 #. ********** timezone tooltip **********
 #: ../globaltime/globaltime.c:277
@@ -34,9 +51,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"klik om klok aan te passen"
+msgstr "%s\nklik om klok te wijzigen"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -46,9 +61,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"knop 1 om voorkeuren te veranderen \n"
-"knop 2 om tijd van de klokken bij te stellen"
+msgstr "knop 1 om voorkeuren te veranderen \nknop 2 om tijd van de klokken bij te stellen"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -57,9 +70,11 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"Stel bij om minuut te veranderen. Klik pijlen met knop 2 om slechts 1 minuut "
-"te veranderen."
+msgstr "Stel bij om minuut te veranderen. Klik pijlen met knop 2 om slechts 1 minuut te veranderen."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Wereldtijd"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -107,7 +122,7 @@
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
-msgstr "Stel de tijdzone van deze klok in om de lokale tijdzone te zijn"
+msgstr "stel de tijdzone van deze klok in om de lokale tijdzone te zijn"
 
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
@@ -220,8 +235,7 @@
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"Streep dit door om systeemstandaard te gebruiken i.p.v. gekozen lettertype"
+msgstr "Streep dit door om systeemstandaard te gebruiken i.p.v. gekozen lettertype"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -262,6 +276,10 @@
 msgid "Use normal decorations"
 msgstr "Gebruik normale versieringen"
 
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Geen"
+
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
 msgstr "Toon geen vensterversieringen (randen)"
@@ -337,7 +355,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Locatie"
@@ -398,98 +416,108 @@
 msgid "floating"
 msgstr "zwevend"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Wereldtijd"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Orage Wereldtijd"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "Toon klokken van verschillende landen"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Wereldtijd"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Geen draaiing"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Naar links draaien"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Naar rechts draaien"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "Uiterlijk"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
 msgstr "Toon _omlijsting"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
 msgstr "stel voorgrond_kleur in:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
 msgstr "stel _achtergrondkleur in:"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
 msgstr "stel _hoogte in:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
-"Let op dat u de hoogte van de horizontale werkbalken niet kunt wijzigen"
+msgstr "Let op dat u de hoogte van de horizontale werkbalken niet kunt wijzigen"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
 msgstr "stel _breedte in:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
 msgstr "Let op dat u de breedte van de verticale werkbalken niet kunt wijzigen"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Regels verticaal tonen"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "Klokopties"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
 msgstr "stel tijdzone in op:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "Regel %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
 msgstr "Voer een geldige strftime-functieparameter in."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
 msgstr "Hulptip:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
 msgstr "herstel tijd na pauzestand/slaapstand"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"U hebt dit alleen nodig wanneer u pauzestand of slaapstand voor korte tijd "
-"(minder dan vijf uur) inschakelt en uw zichtbare tijd geen seconden omvat. "
-"Onder deze omstandigheden is het mogelijk dat OrageKlok de tijd onnauwkeurig "
-"weergeeft, tenzij u dit hebt gekozen. Let op: dit kiezen belemmert de "
-"werking van CPU- en interrupt-bespaarfuncties!"
+msgstr "U hebt dit alleen nodig wanneer u pauzestand of slaapstand voor korte tijd (minder dan vijf uur) inschakelt en uw zichtbare tijd geen seconden omvat. Onder deze omstandigheden is het mogelijk dat OrageKlok de tijd onnauwkeurig weergeeft, tenzij u dit hebt gekozen. Let op: dit kiezen belemmert de werking van CPU- en interrupt-bespaarfuncties."
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -499,21 +527,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Dit programma gebruikt de strftime-functie om tijd op te halen.\n"
-"Gebruik een geldige code om tijd op te halen in de opmaak van \n"
-"uw voorkeur. Enkele gebruikelijke codes zijn:\n"
-"\t%A = weekdag\t\t\t%B = maand\n"
-"\t%c = datum & tijd\t\t%R = uur & minuut\n"
-"\t%V = weeknummer\t\t%Z = gebruikte tijdzone\n"
-"\t%H = uren \t\t\t\t%M = minuut\n"
-"\t%X = plaatselijke tijd\t\t\t%x = plaatselijke datum"
+msgstr "Dit programma gebruikt de strftime-functie om tijd op te halen.\nGebruik een geldige code om tijd op te halen in de opmaak van \nuw voorkeur. Enkele gebruikelijke codes zijn:\n\t%A = weekdag\t\t\t%B = maand\n\t%c = datum & tijd\t\t%R = uur & minuut\n\t%V = weeknummer\t\t%Z = gebruikte tijdzone\n\t%H = uren \t\t\t\t%M = minuut\n\t%X = plaatselijke tijd\t\t\t%x = plaatselijke datum"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
 msgstr "Orage klokvoorkeuren"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -522,8 +541,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#. 
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
 
@@ -538,7 +556,7 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Eind"
 
@@ -546,13 +564,13 @@
 msgid "Due"
 msgstr "Verwacht"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Selecteer een bestand..."
 
@@ -560,227 +578,281 @@
 msgid "Sound Files"
 msgstr "Geluidbestanden"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Alle bestanden"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "De afspraakgegevens zijn aangepast."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "Wilt u doorgaan?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Nee, verlaat programma niet"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Ja, negeer wijzigingen en verlaat programma"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "Het einde van deze afspraak is vroeger dan het begin."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "Niet ingesteld"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Voeg nieuwe afspraak toe aan dit bestand."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Standaardbestand van Orage"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Toevoegen van afspraak is mislukt."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Fout opgetreden bij toevoegen van afspraak. In het logboekbestand vindt u meer bijzonderheden."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Bijwerken van afspraak is mislukt."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Zie het logboekbestand voor meer bijzonderheden (werd het bestand misschien buiten Orage om bijgewerkt?)."
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
 msgstr "Deze afspraak zal voorgoed verwijderd worden."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Nee, annuleer de verwijdering"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Ja, verwijder het"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Kies de datum"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Vandaag"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "Deze afspraak bestaat niet."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
 msgstr "Hij werd waarschijnlijk verwijderd, ververs a.u.b. uw scherm."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Huidige categorieën"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Voeg nieuwe categorie toe met kleur"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Categorie:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Categoriekleuren - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr " *** KOPIËREN ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "Nieuwe afspraak - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Bestand"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "Opsl_aan en afsluiten"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "V_erdubbelen"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Opslaan"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Opslaan en sluiten"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Terugdraaien"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Verdubbelen"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Vrij"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Bezig"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Algemeen"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Type "
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Gebeurtenis die ooit gaat plaatsvinden. Bijv.:\n"
-"vergadering, verjaardag of TV-programma."
+msgstr "Gebeurtenis die ooit gaat plaatsvinden. Bijv.:\nvergadering, verjaardag of TV-programma."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "Te doen"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Iets dat u ooit zou moeten doen. Bijvoorbeeld:\n"
-"was uw auto of probeer nieuwe Orage-versie uit."
+msgstr "Iets dat u ooit zou moeten doen. Bijvoorbeeld:\nwas uw auto of probeer nieuwe Orage-versie uit."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Dagboek"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Maak een notitie van iets dat gebeurde. Bijvoorbeeld:\n"
-"merk op dat uw moeder belde of dat de eerste sneeuw viel."
+msgstr "Maak een notitie van iets dat gebeurde. Bijvoorbeeld:\nmerk op dat uw moeder belde of dat de eerste sneeuw viel."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Titel "
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "Gebeurtenis voor de hele dag"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Begin"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Instellen      "
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Duur"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "dagen"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "uren"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "minuten"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Beschikbaarheid"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Voltooid"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "Gedaan"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Categorieën"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Dit is een speciale categorie, die gebruikt kan worden om deze afspraak "
-"gekleurd weer te geven in lijstweergaven."
+msgstr "Dit is een speciale categorie, die gebruikt kan worden om deze afspraak gekleurd weer te geven in lijstweergaven."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "werk kleuren bij voor categorieën."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "Prioriteit"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Indien u dit instelt op 8 of hoger, dan wordt de afspraak niet getoond op de vensterlijst.\nU kunt deze functie gebruiken om uw vensterlijst overzichtelijker te maken, maar dat maakt het wel moeilijker om deze afspraak te vinden.\nWekkers zullen overigens nog steeds normaal afgaan.\nEr is een ongedocumenteerde parameter waarmee u de standaardlimiet van 8 kunt veranderen."
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Opmerking"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -789,140 +861,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"Deze steno-opdrachten hebben direct effect:\n"
-"    <D> voegt huidige datum in, in plaatselijke datumopmaak\n"
-"    <T> voegt tijd in en\n"
-"    <DT> voegt datum en tijd in.\n"
-"\n"
-"Deze worden pas later omgezet, wanneer ze worden gezien:\n"
-"    <&Ynnnn> wordt vertaald naar huidig jaar minus nnnn.\n"
-"Dit kan bijvoorbeeld worden gebruikt bij verjaardagsherinneringen om te "
-"melden hoe oud de persoon zal worden.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Deze steno-opdrachten hebben direct effect:\n    <D> voegt huidige datum in, in plaatselijke datumopmaak\n    <T> voegt tijd in en\n    <DT> voegt datum en tijd in.\n\nDeze worden pas later omgezet, wanneer ze worden gezien:\n    <&Ynnnn> wordt vertaald naar huidig jaar minus nnnn.\nDit kan bijvoorbeeld worden gebruikt bij verjaardagsherinneringen om te melden hoe oud de persoon zal worden."
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "Voor begin"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "Voor einde"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "Na begin"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "Na einde"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
-msgstr "Alarm"
+msgstr "Wekker"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
-msgstr "Alarmtijd"
+msgstr "Wektijd"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Vaak wilt u alarm horen:\n"
-" 1) voor Gebeurtenis-begin\n"
-" 2) voor Te doen-einde\n"
-" 3) na Te doen-begin"
+msgstr "Vaak wilt u een wekker horen:\n 1) voor Gebeurtenis-begin\n 2) voor Te doen-einde\n 3) na Te doen-begin"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
-msgstr "Blijvend alarm"
+msgstr "Blijvende wekker"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Kies dit als u wil dat Orage u eraan herinnert, zelfs wanneer hij niet "
-"actief was toen het alarm plaatsvond."
+msgstr "Kies dit als u wil dat Orage u eraan herinnert, zelfs wanneer hij niet actief was toen de wekker plaatsvond."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Geluid"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "Gebruik"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
-msgstr "Kies dit als u een hoorbaar alarm wil"
+msgstr "Kies dit als u een hoorbare wekker wil"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
-msgstr "Alarmgeluid herhalen"
+msgstr "Wekkergeluid herhalen"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "keer"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "sec interval"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "Visueel"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Gebruik Oragevenster"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
-msgstr "Kies dit als u Orage-vensteralarm wil"
+msgstr "Kies dit als u Orage-vensterwekker wil"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Gebruik melding"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
-msgstr "Kies dit als u meldingalarm wil"
+msgstr "Kies dit als u meldingwekker wil"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "Kies timeout"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
 msgstr "Kies dit als u wil dat melding automatisch verloopt"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 = standaard-verlooptijd van systeem"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "seconden"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Procedure"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
-msgstr "Kies dit als u een procedure- of scriptalarm wil"
+msgstr "Kies dit als u een procedure- of scriptwekker wil"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -932,164 +988,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
-"U moet zelf alle tekens ingeven, zoals escape.\n"
-"Dit tekstsnoer wordt gegeven aan de schil om te verwerken.\n"
-"De volgende speciale opdrachten worden vervangen bij het draaien:\n"
-"\t<&T>  afspraaktitel\n"
-"\t<&D>  afspraakbeschrijving\n"
-"\t<&AT> alarmtijd\n"
-"\t<&ST> begintijd voor afspraak\n"
-"\t<&ET> eindetijd voor afspraak"
+msgstr "U moet zelf alle tekens ingeven, zoals escape.\nDit tekstsnoer wordt gegeven aan de schil om te verwerken.\nDe volgende speciale opdrachten worden vervangen bij het draaien:\n\t<&T>  afspraaktitel\n\t<&D>  afspraakbeschrijving\n\t<&AT> wektijd\n\t<&ST> begintijd voor afspraak\n\t<&ET> eindetijd voor afspraak"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
-msgstr "Probeer dit alarm uit door het nu op te roepen"
+msgstr "Probeer deze wekker uit door hem nu op te roepen"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
-msgstr "<b>Standaardalarm</b>"
+msgstr "<b>Standaardwekker</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
-msgstr "Sla huidige instellingen op als standaardalarm"
+msgstr "Sla huidige instellingen op als standaardwekker"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
-msgstr "Stel huidige instellingen in vanuit standaardalarm"
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Geen"
+msgstr "Stel huidige instellingen in vanuit standaardwekker"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Dagelijks"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Wekelijks"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Maandelijks"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Jaarlijks"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
 msgstr "Ieder uur"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Maan"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Dins"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Woens"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Don"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Vrij"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "Zat"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "Zon"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Herhaling"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Complexiteit"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Elementair"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "Gebruik dit als u een regelmatig terugkerende gebeurtenis wenst"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Gebruik dit als u complexe tijdstippen nodig heeft zoals:\n"
-" elke zaterdag en zondag of \n"
-" eerste dinsdag van elke maand"
+msgstr "Gebruik dit als u complexe tijdstippen nodig heeft zoals:\n elke zaterdag en zondag of \n eerste dinsdag van elke maand"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Frequentie"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Elke"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "gebeurtenis"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Beperk frequentie tot bepaald interval.\n"
-" Bijvoorbeeld: elke derde dag:\n"
-" Frequentie = dagelijks en interval = 3"
+msgstr "Beperk frequentie tot bepaald interval.\n Bijvoorbeeld: elke derde dag:\n Frequentie = dagelijks en interval = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Beperken"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Altijd herhalen"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Herhalen"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Herhaal tot"
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Weekdagen"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "Welke dag"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1097,293 +1135,297 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Geef op welke weekdag voor maandelijkse en jaarlijkse gebeurtenissen.\n"
-" Bijvoorbeeld:\n"
-" tweede woensdag elke maand:\n"
-"\tfrequentie = maandelijks,\n"
-"\tweekdagen = vink alleen woensdag aan,\n"
-"\twelke dag = kies 2 van het aantal onder woensdag"
+msgstr "Geef op welke weekdag voor maandelijkse en jaarlijkse gebeurtenissen.\n Bijvoorbeeld:\n tweede woensdag elke maand:\n\tfrequentie = maandelijks,\n\tweekdagen = vink alleen woensdag aan,\n\twelke dag = kies 2 van het aantal onder woensdag"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr "Te Doen-gegevensbank"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"Te Doen verschijnt opnieuw, startend op begintijd en herhalend na elke "
-"interval, ongeacht wanneer het de laatste keer werd voltooid"
+msgstr "Te Doen verschijnt opnieuw, startend op begintijd en herhalend na elke interval, ongeacht wanneer het de laatste keer werd voltooid"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"Te Doen-verschijning wordt gebaseerd op voltooiingstijd en herhaalt zich na "
-"de interval, geteld vanaf de laatste voltooiingstijd.\n"
-"Let op: u kunt niets afleiden uit de geschiedenis van Te Doen, aangezien de "
-"gegevensbank voor herhaling, verandert na elke voltooiing."
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "Te Doen-verschijning wordt gebaseerd op voltooiingstijd en herhaalt zich na de interval, geteld vanaf de \nlaatste voltooiingstijd. Let op: u kunt niets afleiden uit de geschiedenis van Te Doen, aangezien de gegevensbank voor herhaling, verandert na elke voltooiing."
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "Uitzonderingen"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"Voeg meer uitzonderingsdata toe, door te klikken op de kalender-\n"
-"dagen hieronder. Uitzondering is of uitsluiting(-) of insluiting(+), "
-"afhankelijk van de keuze.\n"
-"Verwijder door de data aan te klikken."
+msgstr "Voeg meer uitzonderingsdata toe, door te klikken op de kalender-\ndagen hieronder. Uitzondering is of uitsluiting(-) of insluiting(+), afhankelijk van de keuze.\nVerwijder door de data aan te klikken."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr "Voeg uitgesloten datum toe (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-"Uitgesloten dagen zijn volle dagen waarop deze afspraak niet plaatsvindt"
+msgstr "Uitgesloten dagen zijn volle dagen waarop deze afspraak niet plaatsvindt"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
 msgstr "Voeg ingesloten tijd toe (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"Ingesloten tijden hebben dezelfde tijdzone als de begintijd, maar ze kunnen "
-"een andere tijd hebben"
+msgstr "Ingesloten tijden hebben dezelfde tijdzone als de begintijd, maar ze kunnen een andere tijd hebben"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
 msgstr "Actiedata"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Weergave"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "_Gaan"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Nieuw"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Terug"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Vandaag"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Vooruit"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Week terug"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Dag terug"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Dag vooruit"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Week vooruit"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Verversen"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Sluiten"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "       Aantal te tonen dagen"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - dagweergave"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Gehele dag"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Tijd"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "Er zijn geen rijen gekozen."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Klik op een rij om hem te kiezen, en daarna kunt u hem kopiëren."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"U zult alle gekozen afspraken\n"
-"blijvend verwijderen."
+msgstr "U zult alle gekozen afspraken\nblijvend verwijderen."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Ja, verwijder ze"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Terug"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Vooruit"
+
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Zoek"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "Dagweergave"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Extra dagen om te tonen"
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Extra te tonen dagen:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "alleen eerste herhalende"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Vink dit aan indien u alleen de eerste herhalende gebeurtenis wil zien. Standaard worden ze alle getoond.\nLet op: dit toont ook alle urgenties.\nLet op (2): herhalende gebeurtenissen kunnen eerder in de lijst verschijnen aangezien slechts het eerste voorval in de lijst staat."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "ook oude"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Vink dit aan indien u ook oude gebeurtenissen wil zien. Dit kan slechts worden gekozen nadat 'alleen eerste herhalende' is ingeschakeld, om erg lange lijsten te vermijden.\nLet op: selectie van extra dagen bepaalt nog steeds of nieuwere afspraken in de lijst staan."
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "Dagboeknotities beginnend op:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Zoek"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "Zoek tekst "
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Merktekens"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Titel"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Dubbelklik op de regel om hem te bewerken.\n"
-"\n"
-"Merktekens op rij:\n"
-"\t 1. Alarm: n=geen alarm\n"
-"\t\t A=visueel alarm S=ook geluidalarm\n"
-"\t 2. Herhaling: n=geen herhaling\n"
-"\t\t D=dagelijks W=wekelijks M=maandelijks Y=jaarlijks\n"
-"\t 3. Type: f=vrij B=bezet\n"
-"\t 4. Geplaatst in bestand:\n"
-"\t\tO=Orage A=archief F=vreemd\n"
-"\t 5. Afspraaktype:\n"
-"\t\tE=gebeurtenis T=te doen J=dagboek"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Kies de datum"
+msgstr "Dubbelklik op een regel om hem te bewerken.\n\nVlaggenvolgorde:\n\t 1. Alarm: n=no alarm\n\t\t A=Alarm is set P=Persistent alarm is set\n\t 2. Herhaling: n=no recurrence\n\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n\t 3. Type: f=free B=Busy\n\t 4. Opgenomen in bestand:\n\t\tO=Orage A=Archive F=Foreign\n\t 5. Afspraaktype:\n\t\tE=Event T=Todo J=Journal"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tHerhaling beëindigd, aan het verplaatsen naar archiefbestand"
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Archiveren niet ingeschakeld. Aan het afsluiten"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Archiefdrempel: %d (maand(en)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tGebeurtenissen archiveren, die ouder zijn dan %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "uid aan het archiveren: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tVTe Doen niet compleet; niet gearchiveerd"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tHerhalend. Einde jaar: %04d, maand: %02d, dag: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Archiveren voltooid\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Beginnend met archiefverwijdering."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tFASE 1: zet herhalende afspraken terug op standaard"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tFASE 2: zet gearchiveerde afspraken terug"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Archiefverwijdering voltooid\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
-msgstr "Orage standaardalarm"
+msgstr "Orage standaardwekker"
+
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Wekkerlijst gemaakt voor hoofdbestand van Orage:"
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Wekkerlijst gemaakt voor niet-eigen bestand: %s (%s)"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "Maak alarmlijst: Toegevoegd %d alarmen. Verwerkt %d gebeurtenissen."
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\t%d wekkers toegevoegd. %d gebeurtenissen verwerkt."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tGevonden %d alarmen, waarvan %d actief (Gezocht %d herhalende alarmen)."
+msgstr "\tGevonden %d wekkers, waarvan %d actief (Gezocht %d herhalende wekkers)."
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1401,7 +1443,16 @@
 msgid "Import file preprocessing done"
 msgstr "Voorbewerking van invoerbestand gereed"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Extern bijgewerkt pakket gevonden op bestand %s."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Wekkers en kalender aan het verversen wegens extern bijgewerkt pakket."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Kalenderbestanden"
 
@@ -1409,621 +1460,670 @@
 msgid "Current foreign files"
 msgstr "Huidige vreemde bestanden"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "ALLEEN-LEZEN"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "LEZEN-SCHRIJVEN"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Geen vreemde bestanden *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Toevoegen niet-eigen bestand mislukt"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage kan slechts 10 niet-eigen bestanden aan. Grens bereikt."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Bestandnaam is leeg."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Naam is leeg."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Bestand bestaat niet."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Zelfde bestandnaam bestaat reeds in Orage."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Zelfde naam bestaat al in Orage."
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Invoer/uitvoer"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Invoeren"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Lees vanuit bestand:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Scheid bestandnamen met komma(,).\n"
-" Let op: komma is geen geldig teken in bestandnamen voor Orage."
+msgstr "Scheid bestandnamen met komma(,).\n Let op: komma is geen geldig teken in bestandnamen voor Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Uitvoeren"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Schrijven naar bestand:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Kiezen"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Alle afspraken"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Genoemde afspraken: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Let op: alleen hoofdbestandafspraken worden gelezen.\n"
-"Gearchiveerde en vreemde gebeurtenissen worden niet uitgevoerd."
+msgstr "Let op: alleen hoofdbestandafspraken worden gelezen.\nGearchiveerde en vreemde gebeurtenissen worden niet uitgevoerd."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Let op: alleen hoofdbestandafspraken worden gelezen.\n"
-"Vreemde gebeurtenissen worden niet uitgevoerd."
+msgstr "Let op: alleen hoofdbestandafspraken worden gelezen.\nVreemde gebeurtenissen worden niet uitgevoerd."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
-msgstr ""
-"U kunt deze gemakkelijk slepen vanuit het venster van de gebeurtenissenlijst."
+msgstr "U kunt deze gemakkelijk slepen vanuit het venster van de gebeurtenissenlijst."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "Orage afspraak-UID's gescheiden door komma's."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Archiveren"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Archiveer nu (drempel: %d maanden)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "U kunt archiveringsdrempel in parameters veranderen"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Draai archief nu terug"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Zet alle gearchiveerde gebeurtenissen terug in hoofd-orage-bestand en \n"
-"verwijder arch-bestand. Dit is bijvoorbeeld nuttig bij uitvoeren en bij\n"
-"het verplaatsen van orage-afspraken naar een ander systeem."
+msgstr "Zet alle gearchiveerde gebeurtenissen terug in hoofd-orage-bestand en \nverwijder arch-bestand. Dit is bijvoorbeeld nuttig bij uitvoeren en bij\nhet verplaatsen van Orage-afspraken naar een ander systeem."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Orage-bestanden"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Orage hoofdkalenderbestand"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Huidig bestand"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Nieuw bestand"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Actie-opties"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Huidig bestand:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Nieuw bestand:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Actie-opties:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Hernoemen"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Uitsluitend hernoemen van interne Orage-bestanden.\n"
-"Raakt extern bestandssysteem totaal niet.\n"
-"Nieuw bestand moet bestaan."
+msgstr "Uitsluitend hernoemen van interne Orage-bestanden.\nRaakt extern bestandssysteem totaal niet.\nNieuw bestand moet bestaan."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr "Huidig bestand wordt gekopieerd en blijft ongewijzigd op oude plek."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Verplaatsen"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "Huidig bestand wordt verplaatst en verdwijnt van oude plek."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Archiefbestand"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Vreemde bestanden"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Voeg nieuw vreemd bestand toe"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Vreemd bestand:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Opties"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Zichtbare naam:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Alleen-lezen"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Stel dit in wanneer u er zeker van wil zijn dat dit bestand nooit zal worden "
-"aangepast door Orage.\n"
-"Let op: aanpassen van vreemde bestanden zou deze onverenigbaar kunnen maken "
-"met het oorspronkelijke gereedschap waar ze vandaan komen!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Stel dit in wanneer u er zeker van wil zijn dat dit bestand nooit zal worden aangepast door Orage.\nLet op: aanpassen van vreemde bestanden zou deze onverenigbaar kunnen maken met het oorspronkelijke gereedschap waar ze vandaan komen!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Deze interne naam wordt getoond aan gebruiker in plaats van bestandnaam."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Wissel gegevens uit - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tDit is %s versie %s\n"
-"\n"
+msgstr "\tDit is %s versie %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tUitgegeven onder de voorwaarden van de GNU General Public License.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tGecompileerd tegen GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "met gebruik van GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tMet gebruik van DBUS voor invoer.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tNiet met gebruik van DBUS. Invoer werkt alleen gedeeltelijk.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tMet gebruik van libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tNiet met gebruik van libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tMet gebruik van automatische archivering.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tNiet met gebruik van archivering.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tMet gebruik van besturingssysteempakket libical.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tMet gebruik van Orage lokale versie van libical.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Gebruik: orage [opties] [bestanden]\n"
-"\n"
+msgstr "Gebruik: orage [opties] [bestanden]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Opties:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\ttoon versie van orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tdruk deze tekst af\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \ttoon voorkeurenformulier\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\tmaak orage zichtbaar/onzichtbaar\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) file [RW] \tvoeg een vreemd bestand toe\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) file [RW] [naam] \tvoeg een niet-eigen bestand toe\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) file \tverwijder een vreemd bestand\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
-"--export (-e) bestand [afspraak...] \texporteer afspraken vanuit Orage naar "
-"bestand\n"
+msgstr "--export (-e) bestand [afspraak...] \texporteer afspraken vanuit Orage naar bestand\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "files=ical bestanden om in orage te laden\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tdbus niet vervat in orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tzonder dbus [bestanden] and opties voor vreemde bestanden (-a & -r) kan "
-"alleen worden gebruikt bij het starten van orage \n"
+msgstr "\tzonder dbus [bestanden] and opties voor vreemde bestanden (-a & -r) kan alleen worden gebruikt bij het starten van Orage \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Onbekende optie %s\n"
-"\n"
+msgstr "\nOnbekende optie %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Gegevens uitwisselen"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Bewerken"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Geselecteerde _datum bekijken"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Geselecteerde _week bekijken"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "_Vandaag selecteren"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
 msgstr "Toon _Wereldtijd"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Hulp"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Geen titel opgegeven"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr "Locatie: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\nNotitie:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "nooit"
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:495
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Titel: %s\n"
-" Begin:\t%s\n"
-" Einde:\t%s\n"
-" Let op:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "Titel: %s\n%s Begin:\t%s\n Vervaltijdstip:\t%s\n Klaar:\t%s%s"
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Titel: %s\n"
-" Begin:\t%s\n"
-" Einde:\t%s\n"
-" Let op:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Titel: %s\n%s Begin:\t%s\n Einde:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Te doen:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Gebeurtenissen voor %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>Gebeurtenissen voor %s - %s:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "Hoofdinstellingen"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Tijdzone"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "U moet altijd uw plaatselijke tijdzone bepalen."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "Archiefdrempel (maanden)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = geen archivering)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Archiveren wordt gebruikt om tijd en ruimte te besparen bij het afhandelen "
-"van gebeurtenissen."
+msgstr "Archiveren wordt gebruikt om tijd en ruimte te besparen bij het afhandelen van gebeurtenissen."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Geluidopdracht"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr "Deze opdracht wordt gegeven aan shell om geluid te maken bij alarmen."
+msgstr "Deze opdracht wordt gegeven aan shell om geluid te maken bij wekkers."
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "Weergave-instellingen"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Venster van kalender"
 
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Kalender hoofdvenster"
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Visuele bijzonderheden van kalender"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "Toon randen"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "Menu weergeven"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Toon maand en jaar"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
 msgstr "Dagnamen weergeven"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
 msgstr "Weeknummers weergeven"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Toon maand en jaar"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Informatie-onderdelen van kalender"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "Te Doen-lijst tonen"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
 msgstr "Aantal dagen om te tonen in gebeurtenisvenster"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
 msgstr "0 = toon überhaupt geen gebeurtenissenlijst"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Zichtbaarheid van kalender"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
 msgstr "Toon op alle werkbladen"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
 msgstr "Hou bovenaan"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "In taakbalk laten zien"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "In pager weergeven"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "In systeemvak weergeven"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "Kalenderbegin"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Weergeven"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Verbergen"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Geminimaliseerd"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr "Extra instellingen"
-
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr "Bij het openen van kalendervenster"
-
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "Datum van vandaag kiezen"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr "Kies voorheen gekozen datum"
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "Gebruik dynamisch systeemvakpictogram"
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "Gebruik dynamisch pictogram"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "Dynamisch pictogram toont huidige maand en dag"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "Open op kalendervenster"
+
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Kies datum van vandaag"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Kies eerder gekozen datum"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Dubbelklik op kalenderdag toont"
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Een dubbelklik op de hoofdkalender toont"
-
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
 msgstr "Dagweergave"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
 msgstr "Gebeurtenissenlijst"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr "Gebeurtenissenlijst-venster"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Extra instellingen"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Venster met gebeurtenissenlijst"
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
 msgstr "Aantal extra dagen te tonen in gebeurtenissenlijst"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
-msgstr ""
-"Dit is slechts de standaardwaarde, u kunt die veranderen in het eigenlijke "
-"venster van de gebeurtenissenlijst"
+msgstr "Dit is slechts de standaardwaarde, u kunt die veranderen in het eigenlijke venster van de gebeurtenissenlijst"
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Toon slechts de eerste herhalende gebeurtenis"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Dagoverzichtvenster standaard voor eerste dag"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Eerste dag van week"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Gekozen dag"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Gebruik dynamisch systeemvakpictogram"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Gebruik dynamisch pictogram"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Dynamisch pictogram toont huidige maand en dag"
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
 msgstr "Gebruik wekker"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-"Gebruik deze wekker indien Orage problemen heeft met juist ontwaken na "
-"pauzestand if slaapstand (bijvoorbeeld: systeemvakpictogram wordt niet "
-"ververst of alarmen gaan niet af)."
+msgstr "Gebruik deze aftelklok indien Orage problemen heeft met juist ontwaken na pauzestand of slaapstand (bijvoorbeeld: systeemvakpictogram wordt niet ververst of wekkers gaan niet af)."
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Niet-eigen bestand voor standaard-visuele wekker"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Venster van Orage"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Melding"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Altijd volledig afsluiten bij sluiten"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Altijd volledig afsluiten"
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Standaard blijft Orage actief op de achtergrond wanneer hij wordt gesloten. Deze optie verandert dat, zodat Orage volledig afsluit en niet op de achtergrond actief blijft bij sluiten."
+
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Orage voorkeuren"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
 msgstr "Eerste start van Orage. Aan het zoeken naar de standaard-tijdzone."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Standaard-tijdzone ingesteld op %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
 msgstr "Standaard-tijdzone niet gevonden, stel deze a.u.b. handmatig in."
 
@@ -2035,40 +2135,35 @@
 msgid "Open"
 msgstr "Open"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Herinnering - Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Uitstellen"
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "Herinner me weer na de opgegeven tijd"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr "Druk op <Execute> om me weer te herinneren na de opgegeven tijd:"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
-msgstr "Volgende actieve alarmen:"
+msgstr "Volgende actieve wekkers:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d d %02d u %02d min tot: %s"
+msgstr "\n%02d d %02d u %02d min tot: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Geen actieve alarmen gevonden"
+msgstr "\nGeen actieve wekkers gevonden"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2091,1537 +2186,2229 @@
 msgstr "Afrika/Algiers"
 
 #: ../src/timezone_names.c:41
+msgid "Africa/Asmara"
+msgstr "Afrika/Asmara"
+
+#: ../src/timezone_names.c:42
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
-#: ../src/timezone_names.c:42
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "Afrika/Banjul"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "Afrika/Caïro"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "Afrika/Conakry"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar es Salaam"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "Afrika/Djibouti"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "Afrika/Douala"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El Aaiun"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "Afrika/Freetown"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaborone"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "Afrika/Juba"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johannesburg"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "Afrika/Khartoem"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinshasa"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "Afrika/Libreville"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Loeboembashi"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "Afrika/Loesaka"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "Afrika/Mapoeto"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "Afrika/Mogadishu"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovia"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndjamena"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamey"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nouakchott"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ouagadougou"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao Tome"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timboektoe"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripoli"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "Afrika/Windhoek"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "Amerika"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "Amerika/Anchorage"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "Amerika/Anguilla"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "Amerika/Antigua"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "Amerika/Araguaina"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "Amerika/Argentinië/Buenos Aires"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "Amerika/Argentinië/Catamarca"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "Amerika/Argentinië/ComodRivadavia"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "Amerika/Argentinië/Cordoba"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "Amerika/Argentinië/Jujuy"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "Amerika/Argentinië/La_Rioja"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "Amerika/Argentinië/Mendoza"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "Amerika/Argentinië/Rio_Gallegos"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "Amerika/Argentinië/Salta"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "Amerika/Argentinië/San_Juan"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "/San_Luis"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "Amerika/Argentinië/Tucuman"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "Amerika/Argentinië/Ushuala"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "Amerika/Asuncion"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "Amerika/Atikokan"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "Amerika/Atka"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "Amerika/Bahia"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "Amerika/Bahia_Banderas"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "Amerika/Blanc-Sablon"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa Vista"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "Amerika/Boise"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos Aires"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Cambridge Bay"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "Amerika/Campo_Grande"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "Amerika/Cancun"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "Amerika/Caracas"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "Amerika/Catamarca"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "Amerika/Cayenne"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "Amerika/Cayman"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "Amerika/Chicago"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "Amerika/Chihuahua"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "Amerika/Coral_Harbour"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "Amerika/Cordoba"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "Amerika/Costa Rica"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "Amerika/Creston"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "Amerika/Cuiaba"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "Amerika/Curaçao"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "Amerika/Danmarkshavn"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "Amerika/Dawson"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Dawson Creek"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "Amerika/Dominica"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "Amerika/Ensenada"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "Amerika/Eirunepe"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "Amerika/El Salvador"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "Amerika/Fort_Wayne"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glace Bay"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "Amerika/Godthab"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "Amerika/Goose Bay"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grand Turk"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "Amerika/Guadeloupe"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "Amerika/Guatemala"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "Amerika/Guayaquil"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "Amerika/Guyana"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "Amerika/Halifax"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosillo"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indiana/Indianapolis"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indiana/Knox"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indiana/Marengo"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "Amerika/Indiana/Petersburg"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "Amerika/Indiana/Tell_City"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indiana/Vevay"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "Amerika/Indiana/Vincennes"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "Amerika/Indiana/Winamac"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "Amerika/Indianapolis"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "Amerika/Iqaluit"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "Amerika/Jamaica"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "Amerika/Jujuy"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "Amerika/Juneau"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentucky/Louisville"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentucky/Monticello"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "Amerika/Knox_IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "Amerika/Kralendijk"
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "Amerika/La Paz"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los Angeles"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "Amerika/Louisville"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "Amerika/Lower_Princes"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "Amerika/Maceio"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "Amerika/Managua"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "Amerika/Marigot"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "Amerika/Martinique"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "Amerika/Matamoros"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "Amerika/Mazatlan"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "Amerika/Menominee"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "Amerika/Metlakatla"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "Amerika/Mexico City"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "Amerika/Miquelon"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "Amerika/Moncton"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "Amerika/Monterrey"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "Amerika/Montserrat"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "Amerika/New York"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "Amerika/Nome"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "Amerika/North_Dakota/Beulah"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "Amerika/North_Dakota/Center"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "Amerika/North_Dakota/New_Salem"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "Amerika/Noronha"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "Amerika/Ojinaga"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "Amerika/Phoenix"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Port-au-Prince"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port of Spain"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "Amerika/Porto_Acre"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "Amerika/Porto Velho"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Puerto Rico"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "Amerika/Rainy River"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Rankin Inlet"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "Amerika/Recife"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "Amerika/Resolute"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio-Branco"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "Amerika/Rosario"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "Amerika/Santa_Isabel"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "Amerika/Santarem"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "Amerika/Santiago"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo Domingo"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao Paulo"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "Amerika/Scoresbysund"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "Amerika/Shiprock"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "Amerika/Sitka"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "Amerika/St_Barthelemy"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "Amerika/St Johns"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "Amerika/St Kitts"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "Amerika/St Lucia"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "Amerika/St Thomas"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "Amerika/St Vincent"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "Amerika/Swift Current"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegucigalpa"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "Amerika/Thule"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Thunder Bay"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "Amerika/Tijuana"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "Amerika/Toronto"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "Amerika/Vancouver"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "Amerika/Virgin"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "Amerika/Whitehorse"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "Amerika/Winnipeg"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "Amerika/Yakutat"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "Amerika/Yellowknife"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Zuidpool"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Zuidpool/Casey"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Zuidpool/Davis"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Zuidpool/DumontDUrville"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Antarctica/Macquarie"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Zuidpool/Mawson"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Zuidpool/McMurdo"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Zuidpool/Palmer"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Antarctica/Rothera"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Antarctica/Zuidpool"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "Antarctica/Syowa"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Antarctica/Vostok"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Noordpool"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Noordpool/Longyearbyen"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Azië"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Azië/Aden"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Azië/Almaty"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Azië/Amman"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Azië/Anadyr"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Azië/Aqtau"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Azië/Aqtobe"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "Azië/Ashgabat"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Azië/Ashkhabad"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "Azië/Bagdad"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Azië/Bahrein"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Azië/Bakoe"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Azië/Bangkok"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Azië/Beiroet"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Azië/Bishkek"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Azië/Brunei"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Azië/Calcutta"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Choibalsan"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "Chongqing"
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "Azië/Chungking"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Azië/Colombo"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Dacca"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "Azië/Damascus"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Azië/Dhaka"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Azië/Dili"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Azië/Dubai"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Azië/Dusjanbe"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Azië/Gaza"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Azië/Harbin"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Hebron"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Azië/Hong Kong"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Ho_Chi_Minh"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Azië/Hovd"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Azië/Irkoetsk"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Azië/Istanboel"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Azië/Djakarta"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Azië/Jayapura"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Azië/Jeruzalem"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Azië/Kaboel"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Azië/Kamtsjatka"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Azië/Karachi"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Azië/Kashgar"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Kathmandu"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Azië/Katmandu"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Khandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Kolkata"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Azië/Krasnojarsk"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Azië/Kuala Lumpur"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Azië/Kuching"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Azië/Koeweit"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Azië/Macao"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Macau"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Azië/Magadan"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Makassar"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Azië/Manilla"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Azië/Muscat"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Azië/Nicosia"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Novokuznetsk"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Azië/Novosibirsk"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Azië/Omsk"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Azië/Oral"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Azië/Phnom Penh"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Azië/Pontianak"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Azië/Pyongyang"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Azië/Qatar"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Qyzylorda"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Azië/Rangoon"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Azië/Riyaad"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Azië/Riyadh87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Azië/Riyadh88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Azië/Riyadh89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Azië/Saigon"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Azië/Sakhalin"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Azië/Samarkand"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Azië/Seoel"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Azië/Sjanghai"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Azië/Singapore"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Azië/Taipei"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Azië/Tasjkent"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Azië/Tbilisi"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Azië/Teheran"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Azië/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Azië/Thimbu"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Azië/Thimphu"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Azië/Tokio"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "Azië/Ujung Pandang"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Azië/Ulaanbaator"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Azië/Ulan_Bator"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Azië/Urumqi"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Azië/Ust-Nera"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Azië/Vientiane"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Azië/Wladiwostok"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Azië/Jakoetsk"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Azië/Jekaterinaburg"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Azië/Erevan"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Atlantische Oceaan"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Atlantische Oceaan/Azoren"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Atlantische Oceaan/Bermuda"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Atlantische Oceaan/Canarische Eilanden"
 
-#: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr "Atlantische Oceaan/Kaapverdië"
+#: ../src/timezone_names.c:369
+msgid "Atlantic/Cape_Verde"
+msgstr "Atlantische Oceaan/Kaapverdië"
+
+#: ../src/timezone_names.c:370
+msgid "Atlantic/Faeroe"
+msgstr "Atlantische Oceaan/Faeröer"
+
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlantische_oceaan/Faroe"
+
+#: ../src/timezone_names.c:372
+msgid "Atlantic/Jan_Mayen"
+msgstr "Atlantische Oceaan/Jan Mayen"
+
+#: ../src/timezone_names.c:373
+msgid "Atlantic/Madeira"
+msgstr "Atlantische Oceaan/Madeira"
+
+#: ../src/timezone_names.c:374
+msgid "Atlantic/Reykjavik"
+msgstr "Atlantische Oceaan/Reykjavik"
+
+#: ../src/timezone_names.c:375
+msgid "Atlantic/South_Georgia"
+msgstr "Atlantische Oceaan/Zuid-Georgië"
+
+#: ../src/timezone_names.c:376
+msgid "Atlantic/St_Helena"
+msgstr "Atlantische Oceaan/Sint Helena"
+
+#: ../src/timezone_names.c:377
+msgid "Atlantic/Stanley"
+msgstr "Atlantische Oceaan/Stanley"
+
+#: ../src/timezone_names.c:378
+msgid "Australia"
+msgstr "Australië"
+
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Australië/ACT"
+
+#: ../src/timezone_names.c:380
+msgid "Australia/Adelaide"
+msgstr "Australië/Adelaide"
+
+#: ../src/timezone_names.c:381
+msgid "Australia/Brisbane"
+msgstr "Australië/Brisbane"
+
+#: ../src/timezone_names.c:382
+msgid "Australia/Broken_Hill"
+msgstr "Australië/Broken Hill"
+
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Australië/Currie"
+
+#: ../src/timezone_names.c:384
+msgid "Australia/Darwin"
+msgstr "Australië/Darwin"
+
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Australië/Eucla"
+
+#: ../src/timezone_names.c:386
+msgid "Australia/Hobart"
+msgstr "Australië/Hobart"
+
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr "Australië/Lindeman"
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr "Australië/Lord Howe"
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "Australië/Melbourne"
+
+#: ../src/timezone_names.c:390
+msgid "Australia/Perth"
+msgstr "Australië/Perth"
+
+#: ../src/timezone_names.c:391
+msgid "Australia/Sydney"
+msgstr "Australië/Sydney"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brazilië"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brazilië/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brazilië/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brazilië/Oost"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brazilië/West"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Canada"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Canada/Atlantische_kust"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Canada/Midden"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Canada/East-Saskatchewan"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Canada/Oosten"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Canada/Bergen"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Canada/Newfoundland"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Canada/Stille_oceaankust"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Canada/Saskatchewan"
 
-#: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr "Atlantische Oceaan/Faeröer"
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Canada/Yukon"
 
-#: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr "Atlantische Oceaan/Jan Mayen"
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Chili"
 
-#: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr "Atlantische Oceaan/Madeira"
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Chili/Continentaal"
 
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr "Atlantische Oceaan/Reykjavik"
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Chili/Paaseiland"
 
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr "Atlantische Oceaan/Zuid-Georgië"
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
 
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr "Atlantische Oceaan/Sint Helena"
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
 
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr "Atlantische Oceaan/Stanley"
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
 
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr "Australië"
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
 
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr "Australië/Adelaide"
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
 
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr "Australië/Brisbane"
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
 
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr "Australië/Broken Hill"
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
 
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr "Australië/Darwin"
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
 
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr "Australië/Hobart"
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
 
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr "Australië/Lindeman"
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
 
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr "Australië/Lord Howe"
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
 
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr "Australië/Melbourne"
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
 
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr "Australië/Perth"
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
 
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr "Australië/Sydney"
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Universeel"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Zoeloe"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Europa"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Europa/Athene"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrado"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Europa/Berlijn"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Europa/Brussel"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Europa/Boekarest"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Europa/Boedapest"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Europa/Busingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Europa/Kopenhagen"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Europa/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Europa/Eiland_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanboel"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Europa/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad (Königsberg)"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Europa/Lissabon"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Europa/Londen"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxemburg"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Europa/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Europa/Moskou"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Europa/Parijs"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Europa/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Europa/Praag"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Europa/Rome"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Europa/San Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Europa/Stockholm"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Europa/Tiraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Europa/Vaticaan"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Europa/Wenen"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "Europa/Wilna"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Europa/Wolgograd"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "Europa/Warschau"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "Europa/Zürich"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Indische Oceaan"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "Indische Oceaan/Antananarivo"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "Indische Oceaan/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "Indische Oceaan/Kersteiland"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "Indische Oceaan/Kokoseilanden"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "Indische Oceaan/Comoro"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "Indische Oceaan/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "Indische Oceaan/Mahe"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "Indische Oceaan/Malediven"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "Indische Oceaan/Mauritius"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "Indische Oceaan/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "Indische Oceaan/Reunion"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Mexico"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Mexico/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Mexico/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Mexico/General"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Midden_Oosten"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "/Riyadh87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Midden_Oosten/Riyadh88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Midden_Oosten/Riyadh89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Stille Oceaan"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "Stille Oceaan/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Stille Oceaan/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Stille Oceaan/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Stille_Oceaan/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "Stille Oceaan/Paaseiland"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "Stille Oceaan/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "Stille Oceaan/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Stille Oceaan/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "Stille Oceaan/Fiji"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Stille Oceaan/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Stille Oceaan/Galapagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Stille Oceaan/Gabier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "Stille Oceaan/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Stille Oceaan/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Stille Oceaan/Honolulu"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Stille Oceaan/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "Stille Oceaan/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "Stille Oceaan/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "Stille Oceaan/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Stille Oceaan/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Stille Oceaan/Marguesas"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Stille Oceaan/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Stille Oceaan/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Stille Oceaan/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Stille Oceaan/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "Stille Oceaan/Noumea"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Stille Oceaan/Pago Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Stille Oceaan/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "Stille Oceaan/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Stille_Oceaan/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "Stille Oceaan/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Stille Oceaan/Port Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Stille Oceaan/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Stille Oceaan/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Stille_Oceaan/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Stille Oceaan/Tahiti"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Stille Oceaan/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Stille Oceaan/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Stille Oceaan/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Stille Oceaan/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Stille Oceaan/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "Stille Oceaan/Yap"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "VS"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "VS/Alaska"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "VS/Aleoeten"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "VS/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "VS/Midden"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "VS/Oostelijk"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "VS/East-Indiana"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "VS/Hawaï"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "VS/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "VS/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "VS/Bergen"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "VS/Stille_Oceaan"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "VS/Stille_Oceaan-nieuw"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "VS/Samoa"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "Nieuwe afspraak"
@@ -3639,160 +4426,26 @@
 msgstr "Tijd en datum tonen?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Kalender"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Orage kalendervoorkeuren"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Orage voorkeuren"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Instellingen voor de Xfce4-Kalendertoepassing (Orage)"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Bureaubladkalender"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Orage kalendervoorkeuren"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Kalender"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Orage kalender"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Titel: %s\n"
-#~ " Begin:\t%s\n"
-#~ " Verwacht:\t%s\n"
-#~ " Gedaan:\t%s\n"
-#~ "Let op:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "U moet alle tekens (escape etc.) zelf ingeven.\n"
-#~ " Dit tekstsnoer wordt alleen gegeven aan shell om te bewerken"
-
-#~ msgid "Orage clock"
-#~ msgstr "Orage klok"
-
-#~ msgid "Contributor"
-#~ msgstr "Medewerker"
-
-#~ msgid "Warning"
-#~ msgstr "Waarschuwing"
-
-#~ msgid "Display"
-#~ msgstr "Weergave"
-
-#~ msgid "Select always today"
-#~ msgstr "Altijd vandaag selecteren"
-
-#~ msgid "Vary"
-#~ msgstr "Varieer"
-
-#~ msgid "Select timezone"
-#~ msgstr "Kies tijdzone"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Wijzig voorkeuren"
-
-#~ msgid "Properties"
-#~ msgstr "Eigenschappen"
-
-#~ msgid "Show event list"
-#~ msgstr "Toon gebeurtenissenlijst"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Xfce4 kalenderinstellingen"
-
-#~ msgid "Monday"
-#~ msgstr "Maandag"
-
-#~ msgid "Tuesday"
-#~ msgstr "Dinsdag"
-
-#~ msgid "Wednesday"
-#~ msgstr "Woensdag"
-
-#~ msgid "Thursday"
-#~ msgstr "Donderdag"
-
-#~ msgid "Friday"
-#~ msgstr "Vrijdag"
-
-#~ msgid "Saturday"
-#~ msgstr "Zaterdag"
-
-#~ msgid "Sunday"
-#~ msgstr "Zondag"
-
-#~ msgid "Days"
-#~ msgstr "Dagen"
-
-#~ msgid "normal"
-#~ msgstr "normaal"
-
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%d/%m/%J"
-
-#~ msgid "Calendar Files"
-#~ msgstr "Kalenderbestanden"
-
-#~ msgid "Calendar borders"
-#~ msgstr "Kalender-randen"
-
-#~ msgid "Hidden"
-#~ msgstr "Verborgen"
-
-#~ msgid "3 months"
-#~ msgstr "3 maanden"
-
-#~ msgid "6 months"
-#~ msgstr "6 maanden"
-
-#~ msgid "1 year"
-#~ msgstr "1 jaar"
-
-#~ msgid "Application"
-#~ msgstr "Toepassing"
-
-#~ msgid "Core developer"
-#~ msgstr "Hoofdontwikkelaar"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Alle informatie over deze datum\n"
-#~ "zal worden verwijderd."
-
-#~ msgid "Clear"
-#~ msgstr "Wissen"
-
-#~ msgid "uid"
-#~ msgstr "uid"
-
-#~ msgid "This should not happen"
-#~ msgstr "Dit hoort niet te gebeuren"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Kan MCS client-kanaal niet maken"
-
-#~ msgid "Open archive file..."
-#~ msgstr "Archiefbestand openen..."
-
-#~ msgid "Close archive file"
-#~ msgstr "Archiefbestand sluiten"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Bureaubladkalender"
diff -Nru orage-4.8.3/po/nn.po orage-4.12.1/po/nn.po
--- orage-4.8.3/po/nn.po	1970-01-01 00:00:00.000000000 +0000
+++ orage-4.12.1/po/nn.po	2015-04-10 10:26:26.000000000 +0000
@@ -0,0 +1,3689 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Xfce Apps\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-11-18 18:30+0100\n"
+"PO-Revision-Date: 2013-11-19 15:56+0000\n"
+"Last-Translator: Xfce <transifex@xfce.org>\n"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/xfce/language/nn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../globaltime/globaltime.c:100
+msgid "Raising GlobalTime window..."
+msgstr "Hevar Globaltid-vindauga"
+
+#: ../globaltime/globaltime.c:102
+msgid "GlobalTime window raise failed"
+msgstr "Kunne ikkje heva Globaltid-vindauget"
+
+#. ********** timezone tooltip **********
+#: ../globaltime/globaltime.c:277
+#, c-format
+msgid ""
+"%s\n"
+"click to modify clock"
+msgstr "%s\nKlikk for å endra klokka"
+
+#: ../globaltime/globaltime.c:386
+msgid "Localtime"
+msgstr "Lokal tid"
+
+#: ../globaltime/globaltime.c:464
+msgid ""
+"button 1 to change preferences \n"
+"button 2 to adjust time of clocks"
+msgstr "Knapp 1 for å endra innstillingar \nKnapp 2 for å justera klokketid"
+
+#: ../globaltime/globaltime.c:480
+msgid "adjust to change hour"
+msgstr "juster for å endra time"
+
+#: ../globaltime/globaltime.c:496
+msgid ""
+"adjust to change minute. Click arrows with button 2 to change only 1 minute."
+msgstr "juster for å endra minutt. Klikk pilene med knapp 2 for å endra med eitt minutt"
+
+#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
+msgid "NEW"
+msgstr "NY"
+
+#: ../globaltime/gt_prefs.c:289
+msgid "NEW COPY"
+msgstr "NY KOPI"
+
+#: ../globaltime/gt_prefs.c:310
+msgid "Not possible to delete the last clock."
+msgstr "Ikkje mogleg å sletta den siste klokka."
+
+#: ../globaltime/gt_prefs.c:516
+msgid "update this clock"
+msgstr "oppdater denne klokka"
+
+#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
+msgid "add new empty clock"
+msgstr "legg til tom klokke"
+
+#: ../globaltime/gt_prefs.c:526
+msgid "add new clock using this clock as model"
+msgstr "legg til ny klokke med denne som mal"
+
+#: ../globaltime/gt_prefs.c:531
+msgid "delete this clock"
+msgstr "slett denne klokka"
+
+#: ../globaltime/gt_prefs.c:539
+msgid "move this clock first"
+msgstr "flytt denne klokka først"
+
+#: ../globaltime/gt_prefs.c:544
+msgid "move this clock left"
+msgstr "flytt denne klokka mot venstre"
+
+#: ../globaltime/gt_prefs.c:549
+msgid "move this clock right"
+msgstr "flytt denne klokka mot høgre"
+
+#: ../globaltime/gt_prefs.c:554
+msgid "move this clock last"
+msgstr "flytt denne klokka sist"
+
+#: ../globaltime/gt_prefs.c:562
+msgid "set the timezone of this clock to be local timezone"
+msgstr "sett tidssone for denne klokka til lokal tidssone"
+
+#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
+msgid "close window and exit"
+msgstr "lukk vindauget og avslutt"
+
+#: ../globaltime/gt_prefs.c:590
+msgid "Globaltime preferences "
+msgstr "Globaltime-innstilling"
+
+#. -----------------------HEADING-------------------------------------------
+#: ../globaltime/gt_prefs.c:603
+msgid "Clock Parameters"
+msgstr "Klokkeparametrar"
+
+#: ../globaltime/gt_prefs.c:607
+msgid "Name of the clock:"
+msgstr "Namn på klokka:"
+
+#: ../globaltime/gt_prefs.c:613
+msgid "enter name of clock"
+msgstr "Skriv inn namn på klokka"
+
+#: ../globaltime/gt_prefs.c:616
+msgid "Timezone of the clock:"
+msgstr "Tidssone for klokka:"
+
+#: ../globaltime/gt_prefs.c:643
+msgid "Text Formatting"
+msgstr "Tekstformatering"
+
+#. ------------------------background-------------------------
+#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
+msgid "Background color:"
+msgstr "Bakgrunnsfarge:"
+
+#: ../globaltime/gt_prefs.c:656
+msgid "Click to change background colour for clock"
+msgstr "Klikk for å endra bakgrunnsfarge for klokka"
+
+#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
+#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
+#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
+#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
+#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
+msgid "Use default"
+msgstr "Bruk forval"
+
+#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
+#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
+#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
+msgid "Cross this to use default instead of selected value"
+msgstr "Kryss av for å bruka forval i staden for valt verdi"
+
+#. ------------------------foreground-------------------------
+#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
+msgid "Foreground (=text) color:"
+msgstr "Forgrunnsfarge (tekst):"
+
+#: ../globaltime/gt_prefs.c:688
+msgid "Click to change foreground colour for clock"
+msgstr "Klikk for å endra forgrunnsfarge for klokka"
+
+#. ------------------------name font-------------------------
+#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
+msgid "Font for name of clock:"
+msgstr "Skrifttype for klokka:"
+
+#: ../globaltime/gt_prefs.c:720
+msgid "Click to change font for clock name"
+msgstr "Klikk for å endra skrifttype for namn på klokka"
+
+#. ------------------------time font-------------------------
+#: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
+msgid "Font for time of clock:"
+msgstr "Skrifttype for klokketid:"
+
+#: ../globaltime/gt_prefs.c:753
+msgid "Click to change font for clock time"
+msgstr "Klikk for å endra skrifttype for tid på klokka"
+
+#. ------------------------underline name--------------------
+#: ../globaltime/gt_prefs.c:780
+msgid "Underline name of clock:"
+msgstr "Understrek klokkenamn:"
+
+#. ------------------------underline time--------------------
+#: ../globaltime/gt_prefs.c:810
+msgid "Underline time of clock:"
+msgstr "Understrek klokketid:"
+
+#: ../globaltime/gt_prefs.c:850
+msgid "Text Default Formatting"
+msgstr "Forvald tekstformatering"
+
+#: ../globaltime/gt_prefs.c:863
+msgid "Click to change default background colour for clocks"
+msgstr "Klikk for å endra forvald bakgrunnsfarge for klokker"
+
+#: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
+msgid "Cross this to use system default instead of selected color"
+msgstr "Kryss av denne for å bruka forvald framfor vald farge"
+
+#: ../globaltime/gt_prefs.c:896
+msgid "Click to change default text colour for clocks"
+msgstr "Klikk for å endra forvald tekstfarge for klokker"
+
+#: ../globaltime/gt_prefs.c:929
+msgid "Click to change default font for clock name"
+msgstr "Klikk for å endra forvald skrifttype for namn på klokka"
+
+#: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
+msgid "Cross this to use system default font instead of selected font"
+msgstr "Kryss av denne for å bruka systemforvald skrifttype i staden for vald skrifttype"
+
+#: ../globaltime/gt_prefs.c:963
+msgid "Click to change default font for clock time"
+msgstr "Klikk for å endra forvald skrifttype for klokketid"
+
+#. ------------------------underline name--------------------
+#: ../globaltime/gt_prefs.c:990
+msgid "Underline for name of clock:"
+msgstr "Understrek namn på klokka:"
+
+#. ------------------------underline time--------------------
+#: ../globaltime/gt_prefs.c:1004
+msgid "Underline for time of clock:"
+msgstr "Understrek klokketid"
+
+#: ../globaltime/gt_prefs.c:1027
+msgid "update preferences"
+msgstr "Oppdater innstilling"
+
+#: ../globaltime/gt_prefs.c:1062
+msgid "Globaltime Preferences"
+msgstr "Globaltid-innstilling"
+
+#. -----------------------HEADING--------------------------------------
+#: ../globaltime/gt_prefs.c:1073
+msgid "General Preferences"
+msgstr "Generelle innstillingar"
+
+#: ../globaltime/gt_prefs.c:1077
+msgid "Decorations:"
+msgstr "Dekorasjonar:"
+
+#: ../globaltime/gt_prefs.c:1078
+msgid "Standard"
+msgstr "Standard"
+
+#: ../globaltime/gt_prefs.c:1083
+msgid "Use normal decorations"
+msgstr "Bruk vanlege dekorasjonar"
+
+#: ../globaltime/gt_prefs.c:1094
+msgid "Do not show window decorations (borders)"
+msgstr "Ikkje vis vindaugsdekorasjonar (rammer)"
+
+#: ../globaltime/gt_prefs.c:1100
+msgid "Clock size:"
+msgstr "Klokkestorleik:"
+
+#: ../globaltime/gt_prefs.c:1101
+msgid "Equal"
+msgstr "Lik"
+
+#: ../globaltime/gt_prefs.c:1106
+msgid "All clocks have same size"
+msgstr "Alle klokker har same storleik"
+
+#: ../globaltime/gt_prefs.c:1111
+msgid "Varying"
+msgstr "Varierande"
+
+#: ../globaltime/gt_prefs.c:1116
+msgid "Clock sizes vary"
+msgstr "Klokkestorleik varierer"
+
+#: ../globaltime/gt_prefs.c:1122
+msgid "Local timezone:"
+msgstr "Lokal tidssone:"
+
+#: ../globaltime/timezone_selection.c:101
+#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
+msgid " Other"
+msgstr "Annan"
+
+#: ../globaltime/timezone_selection.c:156
+#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
+#, c-format
+msgid "%d hour %d mins"
+msgstr "%d timar %d min"
+
+#: ../globaltime/timezone_selection.c:159
+#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
+#, c-format
+msgid "%d hour"
+msgstr "%d timar"
+
+#: ../globaltime/timezone_selection.c:161
+#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
+#, c-format
+msgid "%d mins"
+msgstr "%d minutt"
+
+#: ../globaltime/timezone_selection.c:167
+#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
+msgid "backward"
+msgstr "bakover"
+
+#: ../globaltime/timezone_selection.c:170
+#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
+msgid "forward"
+msgstr "framover"
+
+#: ../globaltime/timezone_selection.c:194
+#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
+msgid "not changed"
+msgstr "ikkje endra"
+
+#: ../globaltime/timezone_selection.c:195
+#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
+msgid "not changing"
+msgstr "uforandra"
+
+#. location
+#: ../globaltime/timezone_selection.c:247
+#: ../globaltime/timezone_selection.c:252
+#: ../panel-plugin/timezone_selection.c:248
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2771
+#: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
+msgid "Location"
+msgstr "Stad"
+
+#: ../globaltime/timezone_selection.c:258
+#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
+msgid "GMT Offset"
+msgstr "GMT-justering"
+
+#: ../globaltime/timezone_selection.c:264
+#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
+msgid "Previous/Next Change"
+msgstr "Førre/neste endring"
+
+#: ../globaltime/timezone_selection.c:269
+#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
+msgid "Country"
+msgstr "Land"
+
+#. We are actually setting the g_par parameter. In other words
+#. we are setting the global default timezone for Orage. This is
+#. done very seldom and we do not want to allow "floating" here.
+#. This test is ugly, but it is not worth an extra parameter.
+#. this is normal appointment
+#: ../globaltime/timezone_selection.c:299
+#: ../globaltime/timezone_selection.c:309
+#: ../panel-plugin/timezone_selection.c:300
+#: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
+#: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
+msgid "Pick timezone"
+msgstr "Vel tidssone"
+
+#: ../globaltime/timezone_selection.c:302
+#: ../globaltime/timezone_selection.c:312
+#: ../panel-plugin/timezone_selection.c:303
+#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
+#: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
+msgid "Change mode"
+msgstr "Endra modus"
+
+#: ../globaltime/timezone_selection.c:303
+#: ../globaltime/timezone_selection.c:313
+#: ../globaltime/timezone_selection.c:352
+#: ../panel-plugin/timezone_selection.c:304
+#: ../panel-plugin/timezone_selection.c:314
+#: ../panel-plugin/timezone_selection.c:353 ../src/timezone_selection.c:320
+#: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
+#: ../src/timezone_selection.c:379
+msgid "UTC"
+msgstr "UTC"
+
+#. NOTE: this exists only if ical timezones are being used
+#: ../globaltime/timezone_selection.c:304
+#: ../globaltime/timezone_selection.c:357
+#: ../panel-plugin/timezone_selection.c:305
+#: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
+#: ../src/timezone_selection.c:384
+msgid "floating"
+msgstr "flytande"
+
+#: ../globaltime/globaltime.desktop.in.h:1
+msgid "Orage Globaltime"
+msgstr "Orage Globaltid"
+
+#: ../globaltime/globaltime.desktop.in.h:2
+msgid "Show clocks from different countries"
+msgstr "Vis klokker frå ulike land"
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Globaltid"
+
+#: ../panel-plugin/oc_config.c:224
+msgid "Appearance"
+msgstr "Utsjånad"
+
+#. show frame
+#: ../panel-plugin/oc_config.c:229
+msgid "Show _frame"
+msgstr "Vis _ramma"
+
+#. foreground color
+#: ../panel-plugin/oc_config.c:239
+msgid "set foreground _color:"
+msgstr "set _forgrunnsfarge"
+
+#. background color
+#: ../panel-plugin/oc_config.c:253
+msgid "set _background color:"
+msgstr "set _bakgrunnsfarge"
+
+#. clock size (=vbox size): height and width
+#: ../panel-plugin/oc_config.c:267
+msgid "set _height:"
+msgstr "set _høgd"
+
+#: ../panel-plugin/oc_config.c:277
+msgid "Note that you can not change the height of horizontal panels"
+msgstr "Merk at du ikkje kan endra høgda på horisontale panel"
+
+#: ../panel-plugin/oc_config.c:282
+msgid "set _width:"
+msgstr "set _breidd"
+
+#: ../panel-plugin/oc_config.c:293
+msgid "Note that you can not change the width of vertical panels"
+msgstr "Merk at du ikkje kan endra breidda til vertikale panel"
+
+#: ../panel-plugin/oc_config.c:316
+msgid "Clock Options"
+msgstr "Klokkeinnstilling"
+
+#. timezone
+#: ../panel-plugin/oc_config.c:326
+msgid "set timezone to:"
+msgstr "set tidssone til:"
+
+#: ../panel-plugin/oc_config.c:347
+#, c-format
+msgid "Line %d:"
+msgstr "Linje %d:"
+
+#: ../panel-plugin/oc_config.c:357
+msgid "Enter any valid strftime function parameter."
+msgstr "Skriv inn gyldig parameter til «strftime»-funksjonen."
+
+#. Tooltip hint
+#: ../panel-plugin/oc_config.c:401
+msgid "Tooltip:"
+msgstr "Verktøytips:"
+
+#. special timing for SUSPEND/HIBERNATE
+#: ../panel-plugin/oc_config.c:411
+msgid "fix time after suspend/hibernate"
+msgstr "korriger tid etter kvile/dvale"
+
+#: ../panel-plugin/oc_config.c:415
+msgid ""
+"You only need this if you do short term (less than 5 hours) suspend or "
+"hibernate and your visible time does not include seconds. Under these "
+"circumstances it is possible that Orageclock shows time inaccurately unless "
+"you have this selected. (Selecting this prevents cpu and interrupt saving "
+"features from working.)"
+msgstr "Du treng berre dette viss du set maskina i kvile/dvale i mindre enn 5 timar og synleg tid ikkje inkluderer sekund. Under desse omstenda er det mogleg at klokka viser tida feil viss dette ikkje er aktivert. (Ved å velja dette vert prosessor og avbruddslagring hindra i å fungera)"
+
+#: ../panel-plugin/oc_config.c:432
+msgid ""
+"This program uses strftime function to get time.\n"
+"Use any valid code to get time in the format you prefer.\n"
+"Some common codes are:\n"
+"\t%A = weekday\t\t\t%B = month\n"
+"\t%c = date & time\t\t%R = hour & minute\n"
+"\t%V = week number\t\t%Z = timezone in use\n"
+"\t%H = hours \t\t\t\t%M = minute\n"
+"\t%X = local time\t\t\t%x = local date"
+msgstr "Dette programmet brukar «strftime»-funksjonen for å formatera dato og tid.\nSkriv inn gyldige koder for å vise tid/klokkeslett slik du ønskjer.\nNokre vanlege koder er:\n\t%A = ukedag\t\t\t%B = månad\n\t%c = dato og tid\t\t%R = timar og minutt\n\t%V = ukenummer\t\t%Z = tidssone\n\t%H = timar \t\t\t\t%M = minutt\n\t%X = lokal tid\t\t\t%x = lokal dato"
+
+#: ../panel-plugin/oc_config.c:457
+msgid "Orage clock Preferences"
+msgstr "Orage klokkeinnstilling"
+
+#. no lines yet
+#. TRANSLATORS: Use format characters from strftime(3)
+#. * to get the proper string for your locale.
+#. * I used these:
+#. * %A  : full weekday name
+#. * %d  : day of the month
+#. * %B  : full month name
+#. * %Y  : four digit year
+#. * %V  : ISO week number
+#. 
+#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+msgid "%A %d %B %Y/%V"
+msgstr "%A %d. %B %Y / %V"
+
+#: ../src/about-xfcalendar.c:40
+msgid "Maintainer"
+msgstr "Vedlikehaldar"
+
+#: ../src/about-xfcalendar.c:47
+msgid "Manage your time with Orage"
+msgstr "Hald styr på tida di med Orage"
+
+#. if (gtk_toggle_button_get_active(
+#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
+#. end time
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2800
+msgid "End"
+msgstr "Slutt"
+
+#: ../src/appointment.c:333
+msgid "Due"
+msgstr "Frist"
+
+#: ../src/appointment.c:493 ../src/mainbox.c:862
+msgid "Orage"
+msgstr "Orage"
+
+#. to avoid timing problems when updating entry
+#. Create file chooser
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
+msgid "Select a file..."
+msgstr "Vel ei fil …"
+
+#: ../src/appointment.c:680
+msgid "Sound Files"
+msgstr "Lydfiler"
+
+#: ../src/appointment.c:687 ../src/interface.c:277
+msgid "All Files"
+msgstr "Alle filer"
+
+#: ../src/appointment.c:738
+msgid "The appointment information has been modified."
+msgstr "Avtaleinformasjonen er endra."
+
+#: ../src/appointment.c:739 ../src/appointment.c:1282 ../src/event-list.c:921
+msgid "Do you want to continue?"
+msgstr "Ønskjer du å halda fram?"
+
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr ""
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr ""
+
+#: ../src/appointment.c:768
+msgid "The end of this appointment is earlier than the beginning."
+msgstr "Denne avtala sluttar før han startar."
+
+#: ../src/appointment.c:1035 ../src/appointment.c:1918
+msgid "Not set"
+msgstr "Ikkje sett"
+
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1220
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1221
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1231
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1232
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1281
+msgid "This appointment will be permanently removed."
+msgstr "Avtala vil slettast."
+
+#: ../src/appointment.c:1283 ../src/event-list.c:922
+msgid "No, cancel the removal"
+msgstr ""
+
+#: ../src/appointment.c:1284
+msgid "Yes, remove it"
+msgstr ""
+
+#: ../src/appointment.c:1373 ../src/appointment.c:1388 ../src/day-view.c:457
+#: ../src/event-list.c:980
+msgid "Pick the date"
+msgstr ""
+
+#: ../src/appointment.c:1375 ../src/appointment.c:1390 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:982 ../src/event-list.c:1132
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "I dag"
+
+#: ../src/appointment.c:1798
+msgid "This appointment does not exist."
+msgstr "Avtala eksisterer ikkje."
+
+#: ../src/appointment.c:1799
+msgid "It was probably removed, please refresh your screen."
+msgstr "Det vart sannsynlegvis fjerna, ver venleg og oppdater skjermbiletet."
+
+#: ../src/appointment.c:2100
+msgid "Current categories"
+msgstr "Gjeldande kategoriar"
+
+#: ../src/appointment.c:2115
+msgid "Add new category with color"
+msgstr "Legg til ny kategori med farge"
+
+#: ../src/appointment.c:2119
+msgid "Category:"
+msgstr "Kategori:"
+
+#: ../src/appointment.c:2150
+msgid "Colors of categories - Orage"
+msgstr "Fargekategoriar – Orage"
+
+#: ../src/appointment.c:2196
+msgid " *** COPY ***"
+msgstr " *** KOPI ***"
+
+#: ../src/appointment.c:2461
+msgid "New appointment - Orage"
+msgstr "Ny _avtale – Orage"
+
+#. File menu stuff
+#. ********* File menu *********
+#. File menu
+#: ../src/appointment.c:2491 ../src/day-view.c:279 ../src/event-list.c:1033
+#: ../src/interface.c:813 ../src/mainbox.c:297
+msgid "_File"
+msgstr "_Fil"
+
+#: ../src/appointment.c:2497
+msgid "Sav_e and close"
+msgstr "Lagr_a og lukk"
+
+#: ../src/appointment.c:2510 ../src/event-list.c:1039
+msgid "D_uplicate"
+msgstr "D_upliser"
+
+#: ../src/appointment.c:2697
+msgid "Save"
+msgstr "Lagra"
+
+#: ../src/appointment.c:2699
+msgid "Save and close"
+msgstr "Lagra og lukk"
+
+#: ../src/appointment.c:2704
+msgid "Revert"
+msgstr "Tilbakestill"
+
+#: ../src/appointment.c:2706 ../src/event-list.c:1123
+msgid "Duplicate"
+msgstr "Dupliser"
+
+#: ../src/appointment.c:2711 ../src/event-list.c:1125
+msgid "Delete"
+msgstr "Slett"
+
+#: ../src/appointment.c:2729
+msgid "Free"
+msgstr "Frigjer"
+
+#: ../src/appointment.c:2729
+msgid "Busy"
+msgstr "Oppteken"
+
+#: ../src/appointment.c:2733
+msgid "General"
+msgstr "Generell"
+
+#. type
+#: ../src/appointment.c:2739
+msgid "Type "
+msgstr "Type "
+
+#: ../src/appointment.c:2741 ../src/event-list.c:1176
+msgid "Event"
+msgstr "Hending"
+
+#: ../src/appointment.c:2744
+msgid ""
+"Event that will happen sometime. For example:\n"
+"Meeting or birthday or TV show."
+msgstr "Hending som vil skje. Til dømes:\nEit møte, ein bursdag eller eit TV-program."
+
+#: ../src/appointment.c:2747 ../src/event-list.c:1196
+msgid "Todo"
+msgstr "Oppgåver"
+
+#: ../src/appointment.c:2750
+msgid ""
+"Something that you should do sometime. For example:\n"
+"Wash your car or test new version of Orage."
+msgstr "Noko du burde gjera. Til dømes:\nVaska bilen din eller testa ein ny versjon av Orage."
+
+#: ../src/appointment.c:2753 ../src/event-list.c:1209
+msgid "Journal"
+msgstr "Journal"
+
+#: ../src/appointment.c:2757
+msgid ""
+"Make a note that something happened. For example:\n"
+"Remark that your mother called or first snow came."
+msgstr "Noter deg eitkvart. Til dømes:\nNoter at mora di ringte eller at den første snøen denne vinteren kom."
+
+#. title
+#: ../src/appointment.c:2764
+msgid "Title "
+msgstr "Tittel "
+
+#: ../src/appointment.c:2779
+msgid "All day event"
+msgstr "Heildagsavtale"
+
+#. start time
+#: ../src/appointment.c:2785 ../src/appointment.c:3446 ../src/day-view.c:801
+msgid "Start"
+msgstr "Start"
+
+#: ../src/appointment.c:2805
+msgid "Set      "
+msgstr "Set     "
+
+#: ../src/appointment.c:2826
+msgid "Duration"
+msgstr "Varigskap"
+
+#: ../src/appointment.c:2830 ../src/appointment.c:3020 ../src/reminder.c:758
+msgid "days"
+msgstr "dagar"
+
+#: ../src/appointment.c:2832 ../src/appointment.c:3022 ../src/reminder.c:760
+msgid "hours"
+msgstr "timar"
+
+#: ../src/appointment.c:2834 ../src/appointment.c:3024 ../src/reminder.c:762
+msgid "mins"
+msgstr "minutt"
+
+#. Availability (only for EVENT)
+#: ../src/appointment.c:2846
+msgid "Availability"
+msgstr "Tilgjengelegheit"
+
+#. completed (only for TODO)
+#: ../src/appointment.c:2854 ../src/appointment.c:3452
+msgid "Completed"
+msgstr "Fullført"
+
+#: ../src/appointment.c:2857
+msgid "Done"
+msgstr "Ferdig"
+
+#. categories
+#: ../src/appointment.c:2878
+msgid "Categories"
+msgstr "Kategoriar"
+
+#: ../src/appointment.c:2890
+msgid ""
+"This is special category, which can be used to color this appointment in "
+"list views."
+msgstr "Dette er ein spesiell kategori som kan brukast for å farga denne avtala i listevising."
+
+#: ../src/appointment.c:2895
+msgid "update colors for categories."
+msgstr "oppdater fargar for kategoriar."
+
+#. priority
+#: ../src/appointment.c:2901
+msgid "Priority"
+msgstr "Prioritet"
+
+#. note
+#: ../src/appointment.c:2911
+msgid "Note"
+msgstr "Merknad"
+
+#: ../src/appointment.c:2932
+msgid ""
+"These shorthand commands take effect immediately:\n"
+"    <D> inserts current date in local date format\n"
+"    <T> inserts time and\n"
+"    <DT> inserts date and time.\n"
+"\n"
+"These are converted only later when they are seen:\n"
+"    <&Ynnnn> is translated to current year minus nnnn.\n"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Disse hurtigkommandoene vert oppdaterte umiddelbart:\n    <D> set inn dagens dato med lokalt datoformat\n    <T> set inn klokkeslett og\n    <DT> set inn både dato og klokkeslett.\n\nDesse vert seinare konverterte før vising:\n    <&Ynnnn> vert omsett til gjeldande år minus nnnn.\n(Dette kan til dømes brukast til bursdagspåminningar for å visa alderen til den som har bursdag.)"
+
+#: ../src/appointment.c:3003
+msgid "Before Start"
+msgstr "Før start"
+
+#: ../src/appointment.c:3003
+msgid "Before End"
+msgstr "Før slutt"
+
+#: ../src/appointment.c:3004
+msgid "After Start"
+msgstr "Etter start"
+
+#: ../src/appointment.c:3004
+msgid "After End"
+msgstr "Etter slutt"
+
+#: ../src/appointment.c:3011
+msgid "Alarm"
+msgstr "Påminning"
+
+#. **** ALARM TIME ****
+#: ../src/appointment.c:3017
+msgid "Alarm time"
+msgstr "Påminningstidspunkt"
+
+#: ../src/appointment.c:3041
+msgid ""
+"Often you want to get alarm:\n"
+" 1) before Event start\n"
+" 2) before Todo end\n"
+" 3) after Todo start"
+msgstr "Kor ofte vil du ha ei påminning:\n 1) før hendinga startar\n 2) før oppgåver sluttar\n 3) etter oppgåver startar"
+
+#: ../src/appointment.c:3046
+msgid "Persistent alarm"
+msgstr "Vedvarande alarm"
+
+#: ../src/appointment.c:3048
+msgid ""
+"Select this if you want Orage to remind you even if it has not been active "
+"when the alarm happened."
+msgstr "Vel dette viss du vil at Orage skal minna deg sjølv om Orage ikkje var aktivt når alarmtidspunktet inntraff"
+
+#. **** Audio Alarm ****
+#: ../src/appointment.c:3057
+msgid "Sound"
+msgstr "Lyd"
+
+#: ../src/appointment.c:3061 ../src/appointment.c:3181
+msgid "Use"
+msgstr "Bruk"
+
+#: ../src/appointment.c:3063
+msgid "Select this if you want audible alarm"
+msgstr "Vel denne viss du ønskjer ei høyrbar påminning"
+
+#: ../src/appointment.c:3080
+msgid "Repeat alarm sound"
+msgstr "Gjenta påminninga"
+
+#: ../src/appointment.c:3096 ../src/appointment.c:3395
+msgid "times"
+msgstr "gonger"
+
+#: ../src/appointment.c:3112
+msgid "sec interval"
+msgstr "intervall i sekund"
+
+#. **** Display Alarm ****
+#: ../src/appointment.c:3122
+msgid "Visual"
+msgstr "Visuell"
+
+#: ../src/appointment.c:3126
+msgid "Use Orage window"
+msgstr "Bruk Orage-vindauget"
+
+#: ../src/appointment.c:3128
+msgid "Select this if you want Orage window alarm"
+msgstr "Vel denne viss du vil ha Orage-vindaugsalarm"
+
+#: ../src/appointment.c:3140
+msgid "Use notification"
+msgstr "Bruk påminning"
+
+#: ../src/appointment.c:3142
+msgid "Select this if you want notification alarm"
+msgstr "Vel denne viss du vil ha ei påminning"
+
+#: ../src/appointment.c:3148
+msgid "Set timeout"
+msgstr "Set tidsavbrot"
+
+#: ../src/appointment.c:3150
+msgid "Select this if you want notification to expire automatically"
+msgstr "Vel denne viss du vil at påminninga skal løpa ut automatisk"
+
+#: ../src/appointment.c:3161
+msgid "0 = system default expiration time"
+msgstr "0 = forvald systemutløpstid"
+
+#: ../src/appointment.c:3166
+msgid "seconds"
+msgstr "sekund"
+
+#. **** Procedure Alarm ****
+#: ../src/appointment.c:3177
+msgid "Procedure"
+msgstr "Metode"
+
+#: ../src/appointment.c:3183
+msgid "Select this if you want procedure or script alarm"
+msgstr "Vel denne viss du vil ha metode- eller skriptalarm"
+
+#: ../src/appointment.c:3189
+msgid ""
+"You must enter all escape etc characters yourself.\n"
+"This string is just given to shell to process.\n"
+"The following special commands are replaced at run time:\n"
+"\t<&T>  appointment title\n"
+"\t<&D>  appointment description\n"
+"\t<&AT> alarm time\n"
+"\t<&ST> appointment start time\n"
+"\t<&ET> appointment end time"
+msgstr "Du må skriva inn alle tastesekvensar sjølv.\nDenne strengen går berre til skallet.\nDesse kommandoane blir bytte ut når du køyrer programmet:\n\t<&T>  namn på avtala\n\t<&D>  skildring av avtala\n\t<&AT> alarmtid\n\t<&ST> starttid for avtala\n\t<&ET> sluttid for avtala"
+
+#: ../src/appointment.c:3201
+msgid "Test this alarm by raising it now"
+msgstr "Test dette varselet no"
+
+#: ../src/appointment.c:3208
+msgid "<b>Default alarm</b>"
+msgstr "<b>Standard påminning</b>"
+
+#: ../src/appointment.c:3216
+msgid "Store current settings as default alarm"
+msgstr "Lagra gjeldande innstillingar som standard påminning"
+
+#: ../src/appointment.c:3221
+msgid "Set current settings from default alarm"
+msgstr "Set gjeldande innstillingar frå standard påminning"
+
+#: ../src/appointment.c:3283
+msgid "None"
+msgstr "Ingen"
+
+#: ../src/appointment.c:3283
+msgid "Daily"
+msgstr "Dagleg"
+
+#: ../src/appointment.c:3283
+msgid "Weekly"
+msgstr "Kvar veke"
+
+#: ../src/appointment.c:3283
+msgid "Monthly"
+msgstr "Kvar månad"
+
+#: ../src/appointment.c:3283
+msgid "Yearly"
+msgstr "Årleg"
+
+#: ../src/appointment.c:3283
+msgid "Hourly"
+msgstr "Kvar time"
+
+#: ../src/appointment.c:3285
+msgid "Mon"
+msgstr "Mån"
+
+#: ../src/appointment.c:3285
+msgid "Tue"
+msgstr "Tys"
+
+#: ../src/appointment.c:3285
+msgid "Wed"
+msgstr "Ons"
+
+#: ../src/appointment.c:3285
+msgid "Thu"
+msgstr "Tor"
+
+#: ../src/appointment.c:3285
+msgid "Fri"
+msgstr "Fre"
+
+#: ../src/appointment.c:3285
+msgid "Sat"
+msgstr "Lau"
+
+#: ../src/appointment.c:3285
+msgid "Sun"
+msgstr "Sun"
+
+#: ../src/appointment.c:3290
+msgid "Recurrence"
+msgstr "Gjentaking"
+
+#. complexity
+#: ../src/appointment.c:3296
+msgid "Complexity"
+msgstr "Kompleksitet"
+
+#: ../src/appointment.c:3299
+msgid "Basic"
+msgstr "Enkel"
+
+#: ../src/appointment.c:3305
+msgid "Advanced"
+msgstr "Avansert"
+
+#: ../src/appointment.c:3309
+msgid "Use this if you want regular repeating event"
+msgstr "Bruk denne for gjentakande hendingar"
+
+#: ../src/appointment.c:3311
+msgid ""
+"Use this if you need complex times like:\n"
+" Every Saturday and Sunday or \n"
+" First Tuesday every month"
+msgstr "Nytt denne viss du treng komplekse oppsett:\n Kvar laurdag og sundag eller \n Første tysdag i månaden"
+
+#. frequency
+#: ../src/appointment.c:3317
+msgid "Frequency"
+msgstr "Frekvens"
+
+#: ../src/appointment.c:3323
+msgid "Each"
+msgstr "Kvar"
+
+#: ../src/appointment.c:3330
+msgid "occurrence"
+msgstr "førekomst"
+
+#: ../src/appointment.c:3334
+msgid ""
+"Limit frequency to certain interval.\n"
+" For example: Every third day:\n"
+" Frequency = Daily and Interval = 3"
+msgstr "Avgrens frekvensen til bestemt intervall.\n Døme: Kvar tredje dag: \n Frekvens = dagleg og intervall = 3"
+
+#: ../src/appointment.c:3379
+msgid "Limit"
+msgstr "Grense"
+
+#: ../src/appointment.c:3381
+msgid "Repeat forever"
+msgstr "Gjenta for alltid"
+
+#: ../src/appointment.c:3387
+msgid "Repeat "
+msgstr "Gjenta"
+
+#: ../src/appointment.c:3403
+msgid "Repeat until "
+msgstr "Gjenta til "
+
+#. weekdays (only for complex settings)
+#: ../src/appointment.c:3416
+msgid "Weekdays"
+msgstr "Vekedagar"
+
+#: ../src/appointment.c:3428
+msgid "Which day"
+msgstr "Dag"
+
+#: ../src/appointment.c:3436
+msgid ""
+"Specify which weekday for monthly and yearly events.\n"
+" For example:\n"
+" Second Wednesday each month:\n"
+"\tFrequency = Monthly,\n"
+"\tWeekdays = check only Wednesday,\n"
+"\tWhich day = select 2 from the number below Wednesday"
+msgstr "Nemn vekedagen for månadlege og årlege hendingar.\n Døme:\n Andre onsdag kvar månad:\n\tFrekvens = månadleg,\n\tVekedagar = vel berre onsdag,\n\tDag = vel verdien 2 under onsdag."
+
+#. TODO base (only for TODOs)
+#: ../src/appointment.c:3443
+msgid "TODO base"
+msgstr "TODO base"
+
+#: ../src/appointment.c:3456
+msgid ""
+"TODO reoccurs regularly starting on start time and repeating after each "
+"interval no matter when it was last completed"
+msgstr "SKAL GJERAST kjem att på nytt og startar på starttidspunktet, og gjentek seg ved kvart intervall uansett når han vart fullført sist"
+
+#: ../src/appointment.c:3458
+msgid ""
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "SKAL GJERAST-oppattakingane er baserte på tid, og kjem att etter tidsrommet frå førre fullførte tidspunktet.\n(Merk at du ikkje veit noko om historikk for SKAL GJERAST sidan utgangspunktet for oppattaking blir endra etter kvar fullføring.)"
+
+#. exceptions
+#: ../src/appointment.c:3464
+msgid "Exceptions"
+msgstr "Unntak"
+
+#: ../src/appointment.c:3477
+msgid ""
+"Add more exception dates by clicking the calendar days below.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
+"Remove by clicking the data."
+msgstr "Legg til fleire dagar med unntak ved å klikka kalenderdagar under.\nUnntak er anten eksklusjon(-) eller inkludering(+) avhengig av kva som er valt.\nFjern ved å klikka på dataa."
+
+#: ../src/appointment.c:3482
+msgid "Add excluded date (-)"
+msgstr "Legg til unntaksdato (-)"
+
+#: ../src/appointment.c:3484
+msgid "Excluded days are full days where this appointment is not happening"
+msgstr "Unntaksdagar er fulle dagar der denne avtala ikkje gjeld"
+
+#: ../src/appointment.c:3490
+msgid "Add included time (+)"
+msgstr "Legg til inkludert tid (+)"
+
+#: ../src/appointment.c:3492
+msgid ""
+"Included times have same timezone than start time, but they may have "
+"different time"
+msgstr "Inkluderte tider har same tidssone som starttida, men kan ha eit anna tidspunkt"
+
+#. calendars showing the action days
+#: ../src/appointment.c:3509
+msgid "Action dates"
+msgstr "Hendingsdagar"
+
+#. ********* View menu *********
+#. View menu
+#: ../src/day-view.c:289 ../src/event-list.c:1056 ../src/mainbox.c:323
+msgid "_View"
+msgstr "_Vis"
+
+#. ********* Go menu   *********
+#: ../src/day-view.c:303 ../src/event-list.c:1075
+msgid "_Go"
+msgstr "_Gå"
+
+#: ../src/day-view.c:377 ../src/event-list.c:1121
+msgid "New"
+msgstr "Ny"
+
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr ""
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
+
+#: ../src/day-view.c:395 ../src/event-list.c:1139
+msgid "Refresh"
+msgstr "Les på nytt"
+
+#: ../src/day-view.c:400 ../src/event-list.c:1146 ../src/interface.c:834
+msgid "Close"
+msgstr "Lukk"
+
+#: ../src/day-view.c:549
+msgid "Unknown"
+msgstr "Ukjend"
+
+#: ../src/day-view.c:807
+msgid "       Number of days to show"
+msgstr "       Kor mange dagar me skal syna"
+
+#: ../src/day-view.c:1073
+msgid "Orage - day view"
+msgstr "Orage - dagsvising"
+
+#. date only appointment
+#: ../src/event-list.c:190
+msgid "All day"
+msgstr "Heile dagen"
+
+#: ../src/event-list.c:583 ../src/event-list.c:1292
+msgid "Time"
+msgstr "Tid"
+
+#: ../src/event-list.c:751
+msgid "No rows have been selected."
+msgstr "Du har ikkje valt nokon rader."
+
+#: ../src/event-list.c:752
+msgid "Click a row to select it and after that you can copy it."
+msgstr "Klikk på ei rad for å velja henne og etterpå kan du kopiera henne."
+
+#: ../src/event-list.c:920
+msgid ""
+"You will permanently remove all\n"
+"selected appointments."
+msgstr ""
+
+#: ../src/event-list.c:923
+msgid "Yes, remove them"
+msgstr ""
+
+#: ../src/event-list.c:1130
+msgid "Back"
+msgstr "Tilbake"
+
+#: ../src/event-list.c:1134
+msgid "Forward"
+msgstr "Framover"
+
+#: ../src/event-list.c:1141
+msgid "Find"
+msgstr ""
+
+#: ../src/event-list.c:1148
+msgid "Dayview"
+msgstr ""
+
+#: ../src/event-list.c:1181
+msgid "Extra days to show "
+msgstr ""
+
+#: ../src/event-list.c:1212
+msgid "Journal entries starting from:"
+msgstr ""
+
+#: ../src/event-list.c:1232
+msgid "Search"
+msgstr ""
+
+#: ../src/event-list.c:1235
+msgid "Search text "
+msgstr ""
+
+#: ../src/event-list.c:1300
+msgid "Flags"
+msgstr ""
+
+#: ../src/event-list.c:1308
+msgid "Title"
+msgstr ""
+
+#: ../src/event-list.c:1334
+msgid ""
+"Double click line to edit it.\n"
+"\n"
+"Flags in order:\n"
+"\t 1. Alarm: n=no alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
+"\t 2. Recurrence: n=no recurrence\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t 3. Type: f=free B=Busy\n"
+"\t 4. Located in file:\n"
+"\t\tO=Orage A=Archive F=Foreign\n"
+"\t 5. Appointment type:\n"
+"\t\tE=Event T=Todo J=Journal"
+msgstr ""
+
+#. remove since it has ended
+#: ../src/ical-archive.c:267
+msgid "\tRecur ended, moving to archive file."
+msgstr ""
+
+#: ../src/ical-archive.c:330
+msgid "Archiving not enabled. Exiting"
+msgstr ""
+
+#: ../src/ical-archive.c:349
+#, c-format
+msgid "Archiving threshold: %d month(s)"
+msgstr ""
+
+#. yy mon day
+#: ../src/ical-archive.c:352
+#, c-format
+msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
+msgstr ""
+
+#: ../src/ical-archive.c:379
+#, c-format
+msgid "Archiving uid: %s"
+msgstr ""
+
+#. VTODO not completed, do not archive
+#: ../src/ical-archive.c:385
+msgid "\tVTODO not complete; not archived"
+msgstr ""
+
+#. it is recurrent event
+#: ../src/ical-archive.c:390
+#, c-format
+msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
+msgstr ""
+
+#: ../src/ical-archive.c:407
+msgid "Archiving done\n"
+msgstr ""
+
+#. PHASE 1: go through base orage file and remove "repeat" shortcuts
+#: ../src/ical-archive.c:423
+msgid "Starting archive removal."
+msgstr ""
+
+#: ../src/ical-archive.c:424
+msgid "\tPHASE 1: reset recurring appointments"
+msgstr ""
+
+#. PHASE 2: go through archive file and add everything back to base orage.
+#. * After that delete the whole arch file
+#: ../src/ical-archive.c:446
+msgid "\tPHASE 2: return archived appointments"
+msgstr ""
+
+#: ../src/ical-archive.c:472
+msgid "Archive removal done\n"
+msgstr ""
+
+#: ../src/ical-code.c:972
+msgid "Orage default alarm"
+msgstr ""
+
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr ""
+
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr ""
+
+#: ../src/ical-code.c:3185
+#, c-format
+msgid ""
+"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
+msgstr ""
+
+#: ../src/ical-expimp.c:123
+msgid "Starting import file preprocessing"
+msgstr ""
+
+#: ../src/ical-expimp.c:158
+msgid "... Patched DCREATED to be CREATED."
+msgstr ""
+
+#: ../src/ical-expimp.c:197
+msgid "... Patched timezone to Orage format."
+msgstr ""
+
+#: ../src/ical-expimp.c:206
+msgid "Import file preprocessing done"
+msgstr ""
+
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
+msgid "Calendar files"
+msgstr "Kalenderfiler"
+
+#: ../src/interface.c:631
+msgid "Current foreign files"
+msgstr ""
+
+#: ../src/interface.c:648
+msgid "READ ONLY"
+msgstr ""
+
+#: ../src/interface.c:650
+msgid "READ WRITE"
+msgstr ""
+
+#: ../src/interface.c:669
+msgid "***** No foreign files *****"
+msgstr ""
+
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr ""
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
+msgid "Import/export"
+msgstr ""
+
+#: ../src/interface.c:972
+msgid "Import"
+msgstr ""
+
+#: ../src/interface.c:977
+msgid "Read from file:"
+msgstr ""
+
+#: ../src/interface.c:994
+msgid ""
+"Separate filenames with comma(,).\n"
+" NOTE: comma is not valid character in filenames for Orage."
+msgstr ""
+
+#: ../src/interface.c:999
+msgid "Export"
+msgstr ""
+
+#: ../src/interface.c:1004
+msgid "Write to file:"
+msgstr ""
+
+#: ../src/interface.c:1025 ../src/interface.c:1037
+msgid "Select"
+msgstr ""
+
+#: ../src/interface.c:1028
+msgid "All appointments"
+msgstr ""
+
+#: ../src/interface.c:1041
+msgid "Named appointments: "
+msgstr ""
+
+#: ../src/interface.c:1053
+msgid ""
+"Note that only main file appointments are read.\n"
+"Archived and Foreign events are not exported."
+msgstr ""
+
+#: ../src/interface.c:1056
+msgid ""
+"Note that only main file appointments are read.\n"
+"Foreign events are not exported."
+msgstr ""
+
+#: ../src/interface.c:1059
+msgid "You can easily drag these from event-list window."
+msgstr ""
+
+#: ../src/interface.c:1061
+msgid "Orage appointment UIDs separated by commas."
+msgstr ""
+
+#: ../src/interface.c:1067
+msgid "Archive"
+msgstr ""
+
+#: ../src/interface.c:1075
+#, c-format
+msgid "Archive now (threshold: %d months)"
+msgstr ""
+
+#: ../src/interface.c:1085
+msgid "You can change archive threshold in parameters"
+msgstr ""
+
+#: ../src/interface.c:1092
+msgid "Revert archive now"
+msgstr ""
+
+#: ../src/interface.c:1098
+msgid ""
+"Return all archived events into main orage file and remove arch file.\n"
+"This is useful for example when doing export and moving orage\n"
+"appointments to another system."
+msgstr ""
+
+#: ../src/interface.c:1109
+msgid "Orage files"
+msgstr ""
+
+#: ../src/interface.c:1116
+msgid "Orage main calendar file"
+msgstr ""
+
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr ""
+
+#: ../src/interface.c:1147 ../src/interface.c:1213
+msgid "Rename"
+msgstr ""
+
+#: ../src/interface.c:1151
+msgid ""
+"Orage internal file rename only.\n"
+"Does not touch external filesystem at all.\n"
+"New file must exist."
+msgstr ""
+
+#: ../src/interface.c:1155 ../src/interface.c:1218
+msgid "Copy"
+msgstr ""
+
+#: ../src/interface.c:1159
+msgid "Current file is copied and stays unmodified in the old place."
+msgstr ""
+
+#: ../src/interface.c:1163 ../src/interface.c:1223
+msgid "Move"
+msgstr ""
+
+#: ../src/interface.c:1167
+msgid "Current file is moved and vanishes from the old place."
+msgstr ""
+
+#: ../src/interface.c:1181
+msgid "Archive file"
+msgstr ""
+
+#: ../src/interface.c:1245
+msgid "Foreign files"
+msgstr ""
+
+#: ../src/interface.c:1252
+msgid "Add new foreign file"
+msgstr ""
+
+#: ../src/interface.c:1257
+msgid "Foreign file:"
+msgstr ""
+
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
+
+#: ../src/interface.c:1285
+msgid "Read only"
+msgstr ""
+
+#: ../src/interface.c:1292
+msgid ""
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr ""
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr ""
+
+#: ../src/interface.c:1308
+msgid "Exchange data - Orage"
+msgstr ""
+
+#: ../src/main.c:275
+#, c-format
+msgid ""
+"\tThis is %s version %s\n"
+"\n"
+msgstr ""
+
+#: ../src/main.c:277
+#, c-format
+msgid "\tReleased under the terms of the GNU General Public License.\n"
+msgstr ""
+
+#: ../src/main.c:278
+#, c-format
+msgid "\tCompiled against GTK+-%d.%d.%d, "
+msgstr ""
+
+#: ../src/main.c:280
+#, c-format
+msgid "using GTK+-%d.%d.%d.\n"
+msgstr ""
+
+#: ../src/main.c:283
+#, c-format
+msgid "\tUsing DBUS for import.\n"
+msgstr ""
+
+#: ../src/main.c:285
+#, c-format
+msgid "\tNot using DBUS. Import works only partially.\n"
+msgstr ""
+
+#: ../src/main.c:288
+#, c-format
+msgid "\tUsing libnotify.\n"
+msgstr ""
+
+#: ../src/main.c:290
+#, c-format
+msgid "\tNot using libnotify.\n"
+msgstr ""
+
+#: ../src/main.c:293
+#, c-format
+msgid "\tUsing automatic archiving.\n"
+msgstr ""
+
+#: ../src/main.c:295
+#, c-format
+msgid "\tNot using archiving.\n"
+msgstr ""
+
+#: ../src/main.c:298
+#, c-format
+msgid "\tUsing operating system package libical.\n"
+msgstr ""
+
+#: ../src/main.c:300
+#, c-format
+msgid "\tUsing Orage local version of libical.\n"
+msgstr ""
+
+#: ../src/main.c:313
+#, c-format
+msgid ""
+"Usage: orage [options] [files]\n"
+"\n"
+msgstr ""
+
+#: ../src/main.c:314
+#, c-format
+msgid "Options:\n"
+msgstr ""
+
+#: ../src/main.c:315
+#, c-format
+msgid "--version (-v) \t\tshow version of orage\n"
+msgstr ""
+
+#: ../src/main.c:316
+#, c-format
+msgid "--help (-h) \t\tprint this text\n"
+msgstr ""
+
+#: ../src/main.c:317
+#, c-format
+msgid "--preferences (-p) \tshow preferences form\n"
+msgstr ""
+
+#: ../src/main.c:318
+#, c-format
+msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
+msgstr ""
+
+#: ../src/main.c:319
+#, c-format
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr ""
+
+#: ../src/main.c:320
+#, c-format
+msgid "--remove-foreign (-r) file \tremove a foreign file\n"
+msgstr ""
+
+#: ../src/main.c:321
+#, c-format
+msgid ""
+"--export (-e) file [appointment...] \texport appointments from Orage to "
+"file\n"
+msgstr "--export (-e) fil [avtale..] \teksporter avtaler frå Orage til ei fil\n"
+
+#: ../src/main.c:323
+#, c-format
+msgid "files=ical files to load into orage\n"
+msgstr ""
+
+#: ../src/main.c:325
+#, c-format
+msgid "\tdbus not included in orage. \n"
+msgstr ""
+
+#: ../src/main.c:326
+#, c-format
+msgid ""
+"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
+"when starting orage \n"
+msgstr ""
+
+#: ../src/main.c:535
+#, c-format
+msgid ""
+"\n"
+"Unknown option %s\n"
+"\n"
+msgstr ""
+
+#: ../src/mainbox.c:305
+msgid "_Exchange data"
+msgstr ""
+
+#. Edit menu
+#: ../src/mainbox.c:316
+msgid "_Edit"
+msgstr ""
+
+#: ../src/mainbox.c:326
+msgid "View selected _date"
+msgstr ""
+
+#: ../src/mainbox.c:329
+msgid "View selected _week"
+msgstr ""
+
+#: ../src/mainbox.c:335
+msgid "Select _Today"
+msgstr ""
+
+#: ../src/mainbox.c:341
+msgid "Show _Globaltime"
+msgstr ""
+
+#. Help menu
+#: ../src/mainbox.c:345
+msgid "_Help"
+msgstr ""
+
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr ""
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr ""
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr ""
+
+#: ../src/mainbox.c:489
+msgid "Never"
+msgstr ""
+
+#: ../src/mainbox.c:495
+#, c-format
+msgid ""
+"Title: %s\n"
+"%s Start:\t%s\n"
+" Due:\t%s\n"
+" Done:\t%s%s"
+msgstr ""
+
+#: ../src/mainbox.c:503
+#, c-format
+msgid ""
+"Title: %s\n"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr ""
+
+#: ../src/mainbox.c:613
+msgid "<b>To do:</b>"
+msgstr ""
+
+#: ../src/mainbox.c:649
+#, c-format
+msgid "<b>Events for %s:</b>"
+msgstr ""
+
+#: ../src/mainbox.c:660
+#, c-format
+msgid "<b>Events for %s - %s:</b>"
+msgstr ""
+
+#: ../src/parameters.c:486
+msgid "Main settings"
+msgstr ""
+
+#: ../src/parameters.c:492
+msgid "Timezone"
+msgstr ""
+
+#: ../src/parameters.c:507
+msgid "You should always define your local timezone."
+msgstr ""
+
+#: ../src/parameters.c:515
+msgid "Archive threshold (months)"
+msgstr ""
+
+#: ../src/parameters.c:525
+msgid "(0 = no archiving)"
+msgstr ""
+
+#: ../src/parameters.c:528
+msgid "Archiving is used to save time and space when handling events."
+msgstr ""
+
+#: ../src/parameters.c:536
+msgid "Sound command"
+msgstr ""
+
+#: ../src/parameters.c:551
+msgid "This command is given to shell to make sound in alarms."
+msgstr ""
+
+#: ../src/parameters.c:590
+msgid "Calendar window"
+msgstr ""
+
+#: ../src/parameters.c:597
+msgid "Calendar visual details"
+msgstr ""
+
+#: ../src/parameters.c:603
+msgid "Show borders"
+msgstr ""
+
+#: ../src/parameters.c:608
+msgid "Show menu"
+msgstr ""
+
+#: ../src/parameters.c:616
+msgid "Show day names"
+msgstr ""
+
+#: ../src/parameters.c:621
+msgid "Show week numbers"
+msgstr ""
+
+#: ../src/parameters.c:629
+msgid "Show month and year"
+msgstr ""
+
+#: ../src/parameters.c:649
+msgid "Calendar info boxes"
+msgstr ""
+
+#: ../src/parameters.c:654
+msgid "Show todo list"
+msgstr ""
+
+#: ../src/parameters.c:661
+msgid "Number of days to show in event window"
+msgstr ""
+
+#: ../src/parameters.c:667
+msgid "0 = do not show event list at all"
+msgstr ""
+
+#: ../src/parameters.c:680
+msgid "Calendar visibility"
+msgstr ""
+
+#: ../src/parameters.c:685
+msgid "Show on all desktops"
+msgstr ""
+
+#: ../src/parameters.c:690
+msgid "Keep on top"
+msgstr ""
+
+#: ../src/parameters.c:698
+msgid "Show in taskbar"
+msgstr ""
+
+#: ../src/parameters.c:703
+msgid "Show in pager"
+msgstr ""
+
+#: ../src/parameters.c:711
+msgid "Show in systray"
+msgstr "Vis i systemtrauet"
+
+#: ../src/parameters.c:732
+msgid "Calendar start"
+msgstr "Kalenderstart"
+
+#: ../src/parameters.c:737
+msgid "Show"
+msgstr "Vis"
+
+#: ../src/parameters.c:749
+msgid "Hide"
+msgstr "Gøym"
+
+#: ../src/parameters.c:761
+msgid "Minimized"
+msgstr "minimert"
+
+#: ../src/parameters.c:781
+msgid "On calendar window open"
+msgstr ""
+
+#: ../src/parameters.c:786
+msgid "Select today's date"
+msgstr ""
+
+#: ../src/parameters.c:799
+msgid "Select previously selected date"
+msgstr ""
+
+#: ../src/parameters.c:817
+msgid "Calendar day double click shows"
+msgstr ""
+
+#: ../src/parameters.c:822
+msgid "Days view"
+msgstr "Dagsvising"
+
+#: ../src/parameters.c:834
+msgid "Event list"
+msgstr "Hendingsliste"
+
+#: ../src/parameters.c:856
+msgid "Extra settings"
+msgstr "Ekstra innstillingar"
+
+#: ../src/parameters.c:863
+msgid "Event list window extra days"
+msgstr ""
+
+#: ../src/parameters.c:868
+msgid "Number of extra days to show in event list"
+msgstr "Kor mange ekstra dagar å visa i hendingslista"
+
+#: ../src/parameters.c:876
+msgid ""
+"This is just the default value, you can change it in the actual eventlist "
+"window."
+msgstr "Dette er standardverdien, du kan endra han i hendingslistevindauga."
+
+#: ../src/parameters.c:886
+msgid "Day view window default first day"
+msgstr ""
+
+#: ../src/parameters.c:891
+msgid "First day of week"
+msgstr ""
+
+#: ../src/parameters.c:904
+msgid "Selected day"
+msgstr ""
+
+#: ../src/parameters.c:922
+msgid "Use dynamic tray icon"
+msgstr "Bruk dynamisk trauikon"
+
+#: ../src/parameters.c:927
+msgid "Use dynamic icon"
+msgstr "Bruk dynamisk ikon"
+
+#: ../src/parameters.c:933
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Dynamisk ikon viser gjeldande månad og dag i månaden."
+
+#: ../src/parameters.c:941 ../src/parameters.c:946
+msgid "Use wakeup timer"
+msgstr "Bruk vekkingstidteljar"
+
+#: ../src/parameters.c:952
+msgid ""
+"Use this timer if Orage has problems waking up properly after suspend or "
+"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "Bruk denne tidtakaren viss Orage har problem med å vakna att skikkeleg etter dvale- eller kvilemodus (til dømes når trau-ikonet ikkje blir oppfriska, eller alarmen ikkje går av)."
+
+#: ../src/parameters.c:961
+msgid "Foreign file default visual alarm"
+msgstr ""
+
+#: ../src/parameters.c:966
+msgid "Orage window"
+msgstr ""
+
+#: ../src/parameters.c:979
+msgid "Notify notification"
+msgstr ""
+
+#: ../src/parameters.c:997
+msgid "Always quit when asked to close"
+msgstr ""
+
+#: ../src/parameters.c:1002
+msgid "Always quit"
+msgstr ""
+
+#: ../src/parameters.c:1008
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr ""
+
+#: ../src/parameters.c:1024
+msgid "Orage Preferences"
+msgstr "Orage-innstillingar"
+
+#: ../src/parameters.c:1136
+msgid "First Orage start. Searching default timezone."
+msgstr "Første Orage oppstart. Søkjer etter standard tidssone."
+
+#: ../src/parameters.c:1155
+#, c-format
+msgid "Default timezone set to %s."
+msgstr "Sette standard tidssone til %s."
+
+#: ../src/parameters.c:1158
+msgid "Default timezone not found, please, set it manually."
+msgstr "Fann ikkje standard tidssone. Må setjast manuelt."
+
+#: ../src/reminder.c:562
+msgid "Reminder "
+msgstr "Påminning"
+
+#: ../src/reminder.c:591
+msgid "Open"
+msgstr "Opna"
+
+#: ../src/reminder.c:719
+msgid "Reminder - Orage"
+msgstr "Påminning - Orage"
+
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr ""
+
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
+msgstr "Påminning på nytt etter angjeven tid"
+
+#: ../src/reminder.c:1091
+msgid "Next active alarms:"
+msgstr "Neste aktive alarm:"
+
+#: ../src/reminder.c:1145
+#, c-format
+msgid ""
+"\n"
+"%02d d %02d h %02d min to: %s"
+msgstr "\n%02d d %02d t %02d min til: %s"
+
+#: ../src/reminder.c:1154
+#, c-format
+msgid ""
+"\n"
+"No active alarms found"
+msgstr "\nFann ingen aktive alarmar"
+
+#: ../src/timezone_names.c:36
+msgid "Africa"
+msgstr "Afrika"
+
+#: ../src/timezone_names.c:37
+msgid "Africa/Abidjan"
+msgstr "Africa/Abidjan"
+
+#: ../src/timezone_names.c:38
+msgid "Africa/Accra"
+msgstr "Africa/Accra"
+
+#: ../src/timezone_names.c:39
+msgid "Africa/Addis_Ababa"
+msgstr "Africa/Addis_Ababa"
+
+#: ../src/timezone_names.c:40
+msgid "Africa/Algiers"
+msgstr "Africa/Algiers"
+
+#: ../src/timezone_names.c:41
+msgid "Africa/Asmera"
+msgstr "Africa/Asmera"
+
+#: ../src/timezone_names.c:42
+msgid "Africa/Bamako"
+msgstr "Africa/Bamako"
+
+#: ../src/timezone_names.c:43
+msgid "Africa/Bangui"
+msgstr "Africa/Bangui"
+
+#: ../src/timezone_names.c:44
+msgid "Africa/Banjul"
+msgstr "Africa/Banjul"
+
+#: ../src/timezone_names.c:45
+msgid "Africa/Bissau"
+msgstr "Afrika/Bissau"
+
+#: ../src/timezone_names.c:46
+msgid "Africa/Blantyre"
+msgstr "Africa/Blantyre"
+
+#: ../src/timezone_names.c:47
+msgid "Africa/Brazzaville"
+msgstr "Africa/Brazzaville"
+
+#: ../src/timezone_names.c:48
+msgid "Africa/Bujumbura"
+msgstr "Africa/Bujumbura"
+
+#: ../src/timezone_names.c:49
+msgid "Africa/Cairo"
+msgstr "Africa/Cairo"
+
+#: ../src/timezone_names.c:50
+msgid "Africa/Casablanca"
+msgstr "Africa/Casablanca"
+
+#: ../src/timezone_names.c:51
+msgid "Africa/Ceuta"
+msgstr "Africa/Ceuta"
+
+#: ../src/timezone_names.c:52
+msgid "Africa/Conakry"
+msgstr "Africa/Conakry"
+
+#: ../src/timezone_names.c:53
+msgid "Africa/Dakar"
+msgstr "Africa/Dakar"
+
+#: ../src/timezone_names.c:54
+msgid "Africa/Dar_es_Salaam"
+msgstr "Afrika/Dar_es_salaam"
+
+#: ../src/timezone_names.c:55
+msgid "Africa/Djibouti"
+msgstr "Africa/Djibouti"
+
+#: ../src/timezone_names.c:56
+msgid "Africa/Douala"
+msgstr "Africa/Douala"
+
+#: ../src/timezone_names.c:57
+msgid "Africa/El_Aaiun"
+msgstr "Africa/El_Aaiun"
+
+#: ../src/timezone_names.c:58
+msgid "Africa/Freetown"
+msgstr "Africa/Freetown"
+
+#: ../src/timezone_names.c:59
+msgid "Africa/Gaborone"
+msgstr "Africa/Gaborone"
+
+#: ../src/timezone_names.c:60
+msgid "Africa/Harare"
+msgstr "Africa/Harare"
+
+#: ../src/timezone_names.c:61
+msgid "Africa/Johannesburg"
+msgstr "Africa/Johannesburg"
+
+#: ../src/timezone_names.c:62
+msgid "Africa/Kampala"
+msgstr "Africa/Kampala"
+
+#: ../src/timezone_names.c:63
+msgid "Africa/Khartoum"
+msgstr "Africa/Khartoum"
+
+#: ../src/timezone_names.c:64
+msgid "Africa/Kigali"
+msgstr "Africa/Kigali"
+
+#: ../src/timezone_names.c:65
+msgid "Africa/Kinshasa"
+msgstr "Africa/Kinshasa"
+
+#: ../src/timezone_names.c:66
+msgid "Africa/Lagos"
+msgstr "Africa/Lagos"
+
+#: ../src/timezone_names.c:67
+msgid "Africa/Libreville"
+msgstr "Africa/Libreville"
+
+#: ../src/timezone_names.c:68
+msgid "Africa/Lome"
+msgstr "Africa/Lome"
+
+#: ../src/timezone_names.c:69
+msgid "Africa/Luanda"
+msgstr "Africa/Luanda"
+
+#: ../src/timezone_names.c:70
+msgid "Africa/Lubumbashi"
+msgstr "Africa/Lubumbashi"
+
+#: ../src/timezone_names.c:71
+msgid "Africa/Lusaka"
+msgstr "Africa/Lusaka"
+
+#: ../src/timezone_names.c:72
+msgid "Africa/Malabo"
+msgstr "Africa/Malabo"
+
+#: ../src/timezone_names.c:73
+msgid "Africa/Maputo"
+msgstr "Africa/Maputo"
+
+#: ../src/timezone_names.c:74
+msgid "Africa/Maseru"
+msgstr "Africa/Maseru"
+
+#: ../src/timezone_names.c:75
+msgid "Africa/Mbabane"
+msgstr "Africa/Mbabane"
+
+#: ../src/timezone_names.c:76
+msgid "Africa/Mogadishu"
+msgstr "Africa/Mogadishu"
+
+#: ../src/timezone_names.c:77
+msgid "Africa/Monrovia"
+msgstr "Africa/Monrovia"
+
+#: ../src/timezone_names.c:78
+msgid "Africa/Nairobi"
+msgstr "Africa/Nairobi"
+
+#: ../src/timezone_names.c:79
+msgid "Africa/Ndjamena"
+msgstr "Africa/Ndjamena"
+
+#: ../src/timezone_names.c:80
+msgid "Africa/Niamey"
+msgstr "Africa/Niamey"
+
+#: ../src/timezone_names.c:81
+msgid "Africa/Nouakchott"
+msgstr "Africa/Nouakchott"
+
+#: ../src/timezone_names.c:82
+msgid "Africa/Ouagadougou"
+msgstr "Africa/Ouagadougou"
+
+#: ../src/timezone_names.c:83
+msgid "Africa/Porto-Novo"
+msgstr "Africa/Porto-Novo"
+
+#: ../src/timezone_names.c:84
+msgid "Africa/Sao_Tome"
+msgstr "Africa/Sao_Tome"
+
+#: ../src/timezone_names.c:85
+msgid "Africa/Timbuktu"
+msgstr "Africa/Timbuktu"
+
+#: ../src/timezone_names.c:86
+msgid "Africa/Tripoli"
+msgstr "Africa/Tripoli"
+
+#: ../src/timezone_names.c:87
+msgid "Africa/Tunis"
+msgstr "Africa/Tunis"
+
+#: ../src/timezone_names.c:88
+msgid "Africa/Windhoek"
+msgstr "Africa/Windhoek"
+
+#: ../src/timezone_names.c:89
+msgid "America"
+msgstr "Amerika"
+
+#: ../src/timezone_names.c:90
+msgid "America/Adak"
+msgstr "America/Adak"
+
+#: ../src/timezone_names.c:91
+msgid "America/Anchorage"
+msgstr "America/Anchorage"
+
+#: ../src/timezone_names.c:92
+msgid "America/Anguilla"
+msgstr "America/Anguilla"
+
+#: ../src/timezone_names.c:93
+msgid "America/Antigua"
+msgstr "America/Antigua"
+
+#: ../src/timezone_names.c:94
+msgid "America/Araguaina"
+msgstr "America/Araguaina"
+
+#: ../src/timezone_names.c:95
+msgid "America/Argentina/Buenos_Aires"
+msgstr "America/Argentina/Buenos_Aires"
+
+#: ../src/timezone_names.c:96
+msgid "America/Argentina/Catamarca"
+msgstr "America/Argentina/Catamarca"
+
+#: ../src/timezone_names.c:97
+msgid "America/Argentina/Cordoba"
+msgstr "America/Argentina/Cordoba"
+
+#: ../src/timezone_names.c:98
+msgid "America/Argentina/Jujuy"
+msgstr "America/Argentina/Jujuy"
+
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/Mendoza"
+msgstr "America/Argentina/Mendoza"
+
+#: ../src/timezone_names.c:100
+msgid "America/Aruba"
+msgstr "America/Aruba"
+
+#: ../src/timezone_names.c:101
+msgid "America/Asuncion"
+msgstr "America/Asuncion"
+
+#: ../src/timezone_names.c:102
+msgid "America/Barbados"
+msgstr "America/Barbados"
+
+#: ../src/timezone_names.c:103
+msgid "America/Belem"
+msgstr "America/Belem"
+
+#: ../src/timezone_names.c:104
+msgid "America/Belize"
+msgstr "America/Belize"
+
+#: ../src/timezone_names.c:105
+msgid "America/Boa_Vista"
+msgstr "America/Boa_Vista"
+
+#: ../src/timezone_names.c:106
+msgid "America/Bogota"
+msgstr "America/Bogota"
+
+#: ../src/timezone_names.c:107
+msgid "America/Boise"
+msgstr "America/Boise"
+
+#: ../src/timezone_names.c:108
+msgid "America/Buenos_Aires"
+msgstr "America/Buenos_Aires"
+
+#: ../src/timezone_names.c:109
+msgid "America/Cambridge_Bay"
+msgstr "America/Cambridge_Bay"
+
+#: ../src/timezone_names.c:110
+msgid "America/Cancun"
+msgstr "America/Cancun"
+
+#: ../src/timezone_names.c:111
+msgid "America/Caracas"
+msgstr "America/Caracas"
+
+#: ../src/timezone_names.c:112
+msgid "America/Catamarca"
+msgstr "America/Catamarca"
+
+#: ../src/timezone_names.c:113
+msgid "America/Cayenne"
+msgstr "America/Cayenne"
+
+#: ../src/timezone_names.c:114
+msgid "America/Cayman"
+msgstr "Caymanøyane"
+
+#: ../src/timezone_names.c:115
+msgid "America/Chicago"
+msgstr "America/Chicago"
+
+#: ../src/timezone_names.c:116
+msgid "America/Chihuahua"
+msgstr "America/Chihuahua"
+
+#: ../src/timezone_names.c:117
+msgid "America/Cordoba"
+msgstr "America/Cordoba"
+
+#: ../src/timezone_names.c:118
+msgid "America/Costa_Rica"
+msgstr "America/Costa_Rica"
+
+#: ../src/timezone_names.c:119
+msgid "America/Cuiaba"
+msgstr "America/Cuiaba"
+
+#: ../src/timezone_names.c:120
+msgid "America/Curacao"
+msgstr "America/Curacao"
+
+#: ../src/timezone_names.c:121
+msgid "America/Dawson"
+msgstr "America/Dawson"
+
+#: ../src/timezone_names.c:122
+msgid "America/Dawson_Creek"
+msgstr "America/Dawson_Creek"
+
+#: ../src/timezone_names.c:123
+msgid "America/Denver"
+msgstr "America/Denver"
+
+#: ../src/timezone_names.c:124
+msgid "America/Detroit"
+msgstr "America/Detroit"
+
+#: ../src/timezone_names.c:125
+msgid "America/Dominica"
+msgstr "America/Dominica"
+
+#: ../src/timezone_names.c:126
+msgid "America/Edmonton"
+msgstr "America/Edmonton"
+
+#: ../src/timezone_names.c:127
+msgid "America/Eirunepe"
+msgstr "America/Eirunepe"
+
+#: ../src/timezone_names.c:128
+msgid "America/El_Salvador"
+msgstr "America/El_Salvador"
+
+#: ../src/timezone_names.c:129
+msgid "America/Fortaleza"
+msgstr "America/Fortaleza"
+
+#: ../src/timezone_names.c:130
+msgid "America/Glace_Bay"
+msgstr "America/Glace_Bay"
+
+#: ../src/timezone_names.c:131
+msgid "America/Godthab"
+msgstr "Amerika/Godthåp"
+
+#: ../src/timezone_names.c:132
+msgid "America/Goose_Bay"
+msgstr "America/Goose_Bay"
+
+#: ../src/timezone_names.c:133
+msgid "America/Grand_Turk"
+msgstr "America/Grand_Turk"
+
+#: ../src/timezone_names.c:134
+msgid "America/Grenada"
+msgstr "America/Grenada"
+
+#: ../src/timezone_names.c:135
+msgid "America/Guadeloupe"
+msgstr "America/Guadeloupe"
+
+#: ../src/timezone_names.c:136
+msgid "America/Guatemala"
+msgstr "America/Guatemala"
+
+#: ../src/timezone_names.c:137
+msgid "America/Guayaquil"
+msgstr "America/Guayaquil"
+
+#: ../src/timezone_names.c:138
+msgid "America/Guyana"
+msgstr "America/Guyana"
+
+#: ../src/timezone_names.c:139
+msgid "America/Halifax"
+msgstr "America/Halifax"
+
+#: ../src/timezone_names.c:140
+msgid "America/Havana"
+msgstr "America/Havana"
+
+#: ../src/timezone_names.c:141
+msgid "America/Hermosillo"
+msgstr "America/Hermosillo"
+
+#: ../src/timezone_names.c:142
+msgid "America/Indiana/Indianapolis"
+msgstr "America/Indiana/Indianapolis"
+
+#: ../src/timezone_names.c:143
+msgid "America/Indiana/Knox"
+msgstr "America/Indiana/Knox"
+
+#: ../src/timezone_names.c:144
+msgid "America/Indiana/Marengo"
+msgstr "America/Indiana/Marengo"
+
+#: ../src/timezone_names.c:145
+msgid "America/Indiana/Vevay"
+msgstr "America/Indiana/Vevay"
+
+#: ../src/timezone_names.c:146
+msgid "America/Indianapolis"
+msgstr "America/Indianapolis"
+
+#: ../src/timezone_names.c:147
+msgid "America/Inuvik"
+msgstr "America/Inuvik"
+
+#: ../src/timezone_names.c:148
+msgid "America/Iqaluit"
+msgstr "America/Iqaluit"
+
+#: ../src/timezone_names.c:149
+msgid "America/Jamaica"
+msgstr "America/Jamaica"
+
+#: ../src/timezone_names.c:150
+msgid "America/Jujuy"
+msgstr "America/Jujuy"
+
+#: ../src/timezone_names.c:151
+msgid "America/Juneau"
+msgstr "America/Juneau"
+
+#: ../src/timezone_names.c:152
+msgid "America/Kentucky/Louisville"
+msgstr "America/Kentucky/Louisville"
+
+#: ../src/timezone_names.c:153
+msgid "America/Kentucky/Monticello"
+msgstr "America/Kentucky/Monticello"
+
+#: ../src/timezone_names.c:154
+msgid "America/La_Paz"
+msgstr "America/La_Paz"
+
+#: ../src/timezone_names.c:155
+msgid "America/Lima"
+msgstr "America/Lima"
+
+#: ../src/timezone_names.c:156
+msgid "America/Los_Angeles"
+msgstr "America/Los_Angeles"
+
+#: ../src/timezone_names.c:157
+msgid "America/Louisville"
+msgstr "America/Louisville"
+
+#: ../src/timezone_names.c:158
+msgid "America/Maceio"
+msgstr "America/Maceio"
+
+#: ../src/timezone_names.c:159
+msgid "America/Managua"
+msgstr "America/Managua"
+
+#: ../src/timezone_names.c:160
+msgid "America/Manaus"
+msgstr "America/Manaus"
+
+#: ../src/timezone_names.c:161
+msgid "America/Martinique"
+msgstr "America/Martinique"
+
+#: ../src/timezone_names.c:162
+msgid "America/Mazatlan"
+msgstr "America/Mazatlan"
+
+#: ../src/timezone_names.c:163
+msgid "America/Mendoza"
+msgstr "America/Mendoza"
+
+#: ../src/timezone_names.c:164
+msgid "America/Menominee"
+msgstr "America/Menominee"
+
+#: ../src/timezone_names.c:165
+msgid "America/Merida"
+msgstr "America/Merida"
+
+#: ../src/timezone_names.c:166
+msgid "America/Mexico_City"
+msgstr "America/Mexico_City"
+
+#: ../src/timezone_names.c:167
+msgid "America/Miquelon"
+msgstr "America/Miquelon"
+
+#: ../src/timezone_names.c:168
+msgid "America/Monterrey"
+msgstr "America/Monterrey"
+
+#: ../src/timezone_names.c:169
+msgid "America/Montevideo"
+msgstr "America/Montevideo"
+
+#: ../src/timezone_names.c:170
+msgid "America/Montreal"
+msgstr "America/Montreal"
+
+#: ../src/timezone_names.c:171
+msgid "America/Montserrat"
+msgstr "America/Montserrat"
+
+#: ../src/timezone_names.c:172
+msgid "America/Nassau"
+msgstr "America/Nassau"
+
+#: ../src/timezone_names.c:173
+msgid "America/New_York"
+msgstr "America/New_York"
+
+#: ../src/timezone_names.c:174
+msgid "America/Nipigon"
+msgstr "America/Nipigon"
+
+#: ../src/timezone_names.c:175
+msgid "America/Nome"
+msgstr "America/Nome"
+
+#: ../src/timezone_names.c:176
+msgid "America/Noronha"
+msgstr "America/Noronha"
+
+#: ../src/timezone_names.c:177
+msgid "America/Panama"
+msgstr "America/Panama"
+
+#: ../src/timezone_names.c:178
+msgid "America/Pangnirtung"
+msgstr "America/Pangnirtung"
+
+#: ../src/timezone_names.c:179
+msgid "America/Paramaribo"
+msgstr "cSambandsstatane"
+
+#: ../src/timezone_names.c:180
+msgid "America/Phoenix"
+msgstr "America/Phoenix"
+
+#: ../src/timezone_names.c:181
+msgid "America/Port-au-Prince"
+msgstr "America/Port-au-Prince"
+
+#: ../src/timezone_names.c:182
+msgid "America/Port_of_Spain"
+msgstr "America/Port_of_Spain"
+
+#: ../src/timezone_names.c:183
+msgid "America/Porto_Velho"
+msgstr "America/Porto_Velho"
+
+#: ../src/timezone_names.c:184
+msgid "America/Puerto_Rico"
+msgstr "America/Puerto_Rico"
+
+#: ../src/timezone_names.c:185
+msgid "America/Rainy_River"
+msgstr "America/Rainy_River"
+
+#: ../src/timezone_names.c:186
+msgid "America/Rankin_Inlet"
+msgstr "America/Rankin_Inlet"
+
+#: ../src/timezone_names.c:187
+msgid "America/Recife"
+msgstr "America/Recife"
+
+#: ../src/timezone_names.c:188
+msgid "America/Regina"
+msgstr "America/Regina"
+
+#: ../src/timezone_names.c:189
+msgid "America/Rio_Branco"
+msgstr "America/Rio_Branco"
+
+#: ../src/timezone_names.c:190
+msgid "America/Rosario"
+msgstr "America/Rosario"
+
+#: ../src/timezone_names.c:191
+msgid "America/Santiago"
+msgstr "America/Santiago"
+
+#: ../src/timezone_names.c:192
+msgid "America/Santo_Domingo"
+msgstr "America/Santo_Domingo"
+
+#: ../src/timezone_names.c:193
+msgid "America/Sao_Paulo"
+msgstr "America/Sao_Paulo"
+
+#: ../src/timezone_names.c:194
+msgid "America/Scoresbysund"
+msgstr "America/Scoresbysund"
+
+#: ../src/timezone_names.c:195
+msgid "America/Shiprock"
+msgstr "America/Shiprock"
+
+#: ../src/timezone_names.c:196
+msgid "America/St_Johns"
+msgstr "America/St_Johns"
+
+#: ../src/timezone_names.c:197
+msgid "America/St_Kitts"
+msgstr "America/St_Kitts"
+
+#: ../src/timezone_names.c:198
+msgid "America/St_Lucia"
+msgstr "America/St_Lucia"
+
+#: ../src/timezone_names.c:199
+msgid "America/St_Thomas"
+msgstr "America/St_Thomas"
+
+#: ../src/timezone_names.c:200
+msgid "America/St_Vincent"
+msgstr "America/St_Vincent"
+
+#: ../src/timezone_names.c:201
+msgid "America/Swift_Current"
+msgstr "America/Swift_Current"
+
+#: ../src/timezone_names.c:202
+msgid "America/Tegucigalpa"
+msgstr "America/Tegucigalpa"
+
+#: ../src/timezone_names.c:203
+msgid "America/Thule"
+msgstr "America/Thule"
+
+#: ../src/timezone_names.c:204
+msgid "America/Thunder_Bay"
+msgstr "America/Thunder_Bay"
+
+#: ../src/timezone_names.c:205
+msgid "America/Tijuana"
+msgstr "America/Tijuana"
+
+#: ../src/timezone_names.c:206
+msgid "America/Tortola"
+msgstr "America/Tortola"
+
+#: ../src/timezone_names.c:207
+msgid "America/Vancouver"
+msgstr "Amerika/Vancouver"
+
+#: ../src/timezone_names.c:208
+msgid "America/Whitehorse"
+msgstr "Amerika/Whitehorse"
+
+#: ../src/timezone_names.c:209
+msgid "America/Winnipeg"
+msgstr "Amerika/Winnipeg"
+
+#: ../src/timezone_names.c:210
+msgid "America/Yakutat"
+msgstr "Amerika/Yakutat"
+
+#: ../src/timezone_names.c:211
+msgid "America/Yellowknife"
+msgstr "Amerika/Yellowknife"
+
+#: ../src/timezone_names.c:212
+msgid "Antarctica"
+msgstr "Antarktis"
+
+#: ../src/timezone_names.c:213
+msgid "Antarctica/Casey"
+msgstr "Antarktis/Casey"
+
+#: ../src/timezone_names.c:214
+msgid "Antarctica/Davis"
+msgstr "Antarktis/Davis"
+
+#: ../src/timezone_names.c:215
+msgid "Antarctica/DumontDUrville"
+msgstr "Antarktis/DumontDurville"
+
+#: ../src/timezone_names.c:216
+msgid "Antarctica/Mawson"
+msgstr "Antarktis/Mawson"
+
+#: ../src/timezone_names.c:217
+msgid "Antarctica/McMurdo"
+msgstr "Antarktis/McMurdo"
+
+#: ../src/timezone_names.c:218
+msgid "Antarctica/Palmer"
+msgstr "Antarktis/Palmar"
+
+#: ../src/timezone_names.c:219
+msgid "Antarctica/South_Pole"
+msgstr "Antarktis/Sørpolen"
+
+#: ../src/timezone_names.c:220
+msgid "Antarctica/Syowa"
+msgstr "Antarktis/Syowa"
+
+#: ../src/timezone_names.c:221
+msgid "Antarctica/Vostok"
+msgstr "Antarktis/Vostok"
+
+#: ../src/timezone_names.c:222
+msgid "Arctic"
+msgstr "Arktis"
+
+#: ../src/timezone_names.c:223
+msgid "Arctic/Longyearbyen"
+msgstr "Arktis/Longearbyen"
+
+#: ../src/timezone_names.c:224
+msgid "Asia"
+msgstr "Asia"
+
+#: ../src/timezone_names.c:225
+msgid "Asia/Aden"
+msgstr "Asia/Aden"
+
+#: ../src/timezone_names.c:226
+msgid "Asia/Almaty"
+msgstr "Asia/Almaty"
+
+#: ../src/timezone_names.c:227
+msgid "Asia/Amman"
+msgstr "Asia/Amman"
+
+#: ../src/timezone_names.c:228
+msgid "Asia/Anadyr"
+msgstr "Asia/Anadyr"
+
+#: ../src/timezone_names.c:229
+msgid "Asia/Aqtau"
+msgstr "Asia/Aqtau"
+
+#: ../src/timezone_names.c:230
+msgid "Asia/Aqtobe"
+msgstr "Asia/Aqtobe"
+
+#: ../src/timezone_names.c:231
+msgid "Asia/Ashgabat"
+msgstr "Asia/Ashgabat"
+
+#: ../src/timezone_names.c:232
+msgid "Asia/Baghdad"
+msgstr "Asia/Bagdad"
+
+#: ../src/timezone_names.c:233
+msgid "Asia/Bahrain"
+msgstr "Kongedømet Bahrain"
+
+#: ../src/timezone_names.c:234
+msgid "Asia/Baku"
+msgstr "Asia/Baku"
+
+#: ../src/timezone_names.c:235
+msgid "Asia/Bangkok"
+msgstr "Asia/Bangkok"
+
+#: ../src/timezone_names.c:236
+msgid "Asia/Beirut"
+msgstr "Asia/Beirut"
+
+#: ../src/timezone_names.c:237
+msgid "Asia/Bishkek"
+msgstr "Asia/Bishkek"
+
+#: ../src/timezone_names.c:238
+msgid "Asia/Brunei"
+msgstr "Brunei"
+
+#: ../src/timezone_names.c:239
+msgid "Asia/Calcutta"
+msgstr "Asia/Calcutta"
+
+#: ../src/timezone_names.c:240
+msgid "Asia/Chungking"
+msgstr "Asia/Chungking"
+
+#: ../src/timezone_names.c:241
+msgid "Asia/Colombo"
+msgstr "Asia/Colombo"
+
+#: ../src/timezone_names.c:242
+msgid "Asia/Damascus"
+msgstr "Asia/Damaskus"
+
+#: ../src/timezone_names.c:243
+msgid "Asia/Dhaka"
+msgstr "Asia/Dhaka"
+
+#: ../src/timezone_names.c:244
+msgid "Asia/Dili"
+msgstr "Asia/Dili"
+
+#: ../src/timezone_names.c:245
+msgid "Asia/Dubai"
+msgstr "Asia/Dubai"
+
+#: ../src/timezone_names.c:246
+msgid "Asia/Dushanbe"
+msgstr "Asia/Dushanbe"
+
+#: ../src/timezone_names.c:247
+msgid "Asia/Gaza"
+msgstr "Asia/Gaza"
+
+#: ../src/timezone_names.c:248
+msgid "Asia/Harbin"
+msgstr "Asia/Harbin"
+
+#: ../src/timezone_names.c:249
+msgid "Asia/Hong_Kong"
+msgstr "Asia/Hong Kong"
+
+#: ../src/timezone_names.c:250
+msgid "Asia/Hovd"
+msgstr "Asia/Hovd"
+
+#: ../src/timezone_names.c:251
+msgid "Asia/Irkutsk"
+msgstr "Asia/Irkutsk"
+
+#: ../src/timezone_names.c:252
+msgid "Asia/Istanbul"
+msgstr "Asia/Istanbul"
+
+#: ../src/timezone_names.c:253
+msgid "Asia/Jakarta"
+msgstr "Asia/Jakarta"
+
+#: ../src/timezone_names.c:254
+msgid "Asia/Jayapura"
+msgstr "Asia/Jayapura"
+
+#: ../src/timezone_names.c:255
+msgid "Asia/Jerusalem"
+msgstr "Asia/Jerusalem"
+
+#: ../src/timezone_names.c:256
+msgid "Asia/Kabul"
+msgstr "Asia/Kabul"
+
+#: ../src/timezone_names.c:257
+msgid "Asia/Kamchatka"
+msgstr "Asia/Kamtsjatka"
+
+#: ../src/timezone_names.c:258
+msgid "Asia/Karachi"
+msgstr "Asia/Karachi"
+
+#: ../src/timezone_names.c:259
+msgid "Asia/Kashgar"
+msgstr "Asia/Kashgar"
+
+#: ../src/timezone_names.c:260
+msgid "Asia/Katmandu"
+msgstr "Asia/Katmandu"
+
+#: ../src/timezone_names.c:261
+msgid "Asia/Krasnoyarsk"
+msgstr "Asia/Krasnojarsk"
+
+#: ../src/timezone_names.c:262
+msgid "Asia/Kuala_Lumpur"
+msgstr "Asia/Kuala_lumpur"
+
+#: ../src/timezone_names.c:263
+msgid "Asia/Kuching"
+msgstr "Asia/Kuching"
+
+#: ../src/timezone_names.c:264
+msgid "Asia/Kuwait"
+msgstr "Staten Kuwait"
+
+#: ../src/timezone_names.c:265
+msgid "Asia/Macao"
+msgstr "Asia/Macao"
+
+#: ../src/timezone_names.c:266
+msgid "Asia/Magadan"
+msgstr "Asia/Magadan"
+
+#: ../src/timezone_names.c:267
+msgid "Asia/Manila"
+msgstr "Asia/Manila"
+
+#: ../src/timezone_names.c:268
+msgid "Asia/Muscat"
+msgstr "Asia/Muscat"
+
+#: ../src/timezone_names.c:269
+msgid "Asia/Nicosia"
+msgstr "Asia/Nicosia"
+
+#: ../src/timezone_names.c:270
+msgid "Asia/Novosibirsk"
+msgstr "Asia/Novosibirsk"
+
+#: ../src/timezone_names.c:271
+msgid "Asia/Omsk"
+msgstr "Asia/Omsk"
+
+#: ../src/timezone_names.c:272
+msgid "Asia/Phnom_Penh"
+msgstr "Asia/Phnom_penh"
+
+#: ../src/timezone_names.c:273
+msgid "Asia/Pontianak"
+msgstr "Asia/Pontianak"
+
+#: ../src/timezone_names.c:274
+msgid "Asia/Pyongyang"
+msgstr "Asia/Pyongyang"
+
+#: ../src/timezone_names.c:275
+msgid "Asia/Qatar"
+msgstr "Staten Qatar"
+
+#: ../src/timezone_names.c:276
+msgid "Asia/Rangoon"
+msgstr "Asia/Rangoon"
+
+#: ../src/timezone_names.c:277
+msgid "Asia/Riyadh"
+msgstr "Asia/Riyadh"
+
+#: ../src/timezone_names.c:278
+msgid "Asia/Saigon"
+msgstr "Asia/Saigon"
+
+#: ../src/timezone_names.c:279
+msgid "Asia/Samarkand"
+msgstr "Asia/Samarkand"
+
+#: ../src/timezone_names.c:280
+msgid "Asia/Seoul"
+msgstr "Asia/Seoul"
+
+#: ../src/timezone_names.c:281
+msgid "Asia/Shanghai"
+msgstr "Asia/Shanghai"
+
+#: ../src/timezone_names.c:282
+msgid "Asia/Singapore"
+msgstr "Republikken Singapore"
+
+#: ../src/timezone_names.c:283
+msgid "Asia/Taipei"
+msgstr "Asia/Taipei"
+
+#: ../src/timezone_names.c:284
+msgid "Asia/Tashkent"
+msgstr "Asia/Tashkent"
+
+#: ../src/timezone_names.c:285
+msgid "Asia/Tbilisi"
+msgstr "Asia/Tbilisi"
+
+#: ../src/timezone_names.c:286
+msgid "Asia/Tehran"
+msgstr "Asia/Tehran"
+
+#: ../src/timezone_names.c:287
+msgid "Asia/Thimphu"
+msgstr "Asia/Thimphu"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Tokyo"
+msgstr "Asia/Tokyo"
+
+#: ../src/timezone_names.c:289
+msgid "Asia/Ujung_Pandang"
+msgstr "Asia/Ujung_pandang"
+
+#: ../src/timezone_names.c:290
+msgid "Asia/Ulaanbaatar"
+msgstr "Asia/Ulaanbaatar"
+
+#: ../src/timezone_names.c:291
+msgid "Asia/Urumqi"
+msgstr "Asia/Urumqi"
+
+#: ../src/timezone_names.c:292
+msgid "Asia/Vientiane"
+msgstr "Asia/Vientiane"
+
+#: ../src/timezone_names.c:293
+msgid "Asia/Vladivostok"
+msgstr "Asia/Vladivostok"
+
+#: ../src/timezone_names.c:294
+msgid "Asia/Yakutsk"
+msgstr "Asia/Jakutsk"
+
+#: ../src/timezone_names.c:295
+msgid "Asia/Yekaterinburg"
+msgstr "Asia/Jekaterinburg"
+
+#: ../src/timezone_names.c:296
+msgid "Asia/Yerevan"
+msgstr "Asia/Yerevan"
+
+#: ../src/timezone_names.c:297
+msgid "Atlantic"
+msgstr "Atlanteren"
+
+#: ../src/timezone_names.c:298
+msgid "Atlantic/Azores"
+msgstr "Atlanteren/Azorane"
+
+#: ../src/timezone_names.c:299
+msgid "Atlantic/Bermuda"
+msgstr "Atlanteren/Bermuda"
+
+#: ../src/timezone_names.c:300
+msgid "Atlantic/Canary"
+msgstr "Atlanteren/Kanariøyene"
+
+#: ../src/timezone_names.c:301
+msgid "Atlantic/Cape_Verde"
+msgstr "Republikken Kapp Verde"
+
+#: ../src/timezone_names.c:302
+msgid "Atlantic/Faeroe"
+msgstr "Atlanteren/Færøyene"
+
+#: ../src/timezone_names.c:303
+msgid "Atlantic/Jan_Mayen"
+msgstr "Jan Mayen"
+
+#: ../src/timezone_names.c:304
+msgid "Atlantic/Madeira"
+msgstr "Atlanteren/Madeira"
+
+#: ../src/timezone_names.c:305
+msgid "Atlantic/Reykjavik"
+msgstr "Atlanteren/Reykjavik"
+
+#: ../src/timezone_names.c:306
+msgid "Atlantic/South_Georgia"
+msgstr "Atlanteren/Sør-_Georgia"
+
+#: ../src/timezone_names.c:307
+msgid "Atlantic/St_Helena"
+msgstr "Atlanteren/St. _Helena"
+
+#: ../src/timezone_names.c:308
+msgid "Atlantic/Stanley"
+msgstr "Atlanteren/Stanley"
+
+#: ../src/timezone_names.c:309
+msgid "Australia"
+msgstr "Australia"
+
+#: ../src/timezone_names.c:310
+msgid "Australia/Adelaide"
+msgstr "Australia/Adelaide"
+
+#: ../src/timezone_names.c:311
+msgid "Australia/Brisbane"
+msgstr "Australia/Brisbane"
+
+#: ../src/timezone_names.c:312
+msgid "Australia/Broken_Hill"
+msgstr "Australia/Broken_hill"
+
+#: ../src/timezone_names.c:313
+msgid "Australia/Darwin"
+msgstr "Australia/Darwin"
+
+#: ../src/timezone_names.c:314
+msgid "Australia/Hobart"
+msgstr "Australia/Hobart"
+
+#: ../src/timezone_names.c:315
+msgid "Australia/Lindeman"
+msgstr "Australia/Lindeman"
+
+#: ../src/timezone_names.c:316
+msgid "Australia/Lord_Howe"
+msgstr "Australia/Lord_howe"
+
+#: ../src/timezone_names.c:317
+msgid "Australia/Melbourne"
+msgstr "Australia/Melbourne"
+
+#: ../src/timezone_names.c:318
+msgid "Australia/Perth"
+msgstr "Australia/Perth"
+
+#: ../src/timezone_names.c:319
+msgid "Australia/Sydney"
+msgstr "Australia/Sydney"
+
+#: ../src/timezone_names.c:320
+msgid "Europe"
+msgstr "Europa"
+
+#: ../src/timezone_names.c:321
+msgid "Europe/Amsterdam"
+msgstr "Europa/Amsterdam"
+
+#: ../src/timezone_names.c:322
+msgid "Europe/Andorra"
+msgstr "Fyrstedømet Andorra"
+
+#: ../src/timezone_names.c:323
+msgid "Europe/Athens"
+msgstr "Europa/Aten"
+
+#: ../src/timezone_names.c:324
+msgid "Europe/Belfast"
+msgstr "Europa/Belfast"
+
+#: ../src/timezone_names.c:325
+msgid "Europe/Belgrade"
+msgstr "Europa/Beograd"
+
+#: ../src/timezone_names.c:326
+msgid "Europe/Berlin"
+msgstr "Europa/Berlin"
+
+#: ../src/timezone_names.c:327
+msgid "Europe/Bratislava"
+msgstr "Europa/Bratislava"
+
+#: ../src/timezone_names.c:328
+msgid "Europe/Brussels"
+msgstr "Europa/Brussel"
+
+#: ../src/timezone_names.c:329
+msgid "Europe/Bucharest"
+msgstr "Europa/Bukarest"
+
+#: ../src/timezone_names.c:330
+msgid "Europe/Budapest"
+msgstr "Europa/Budapest"
+
+#: ../src/timezone_names.c:331
+msgid "Europe/Chisinau"
+msgstr "Europa/Chisinau"
+
+#: ../src/timezone_names.c:332
+msgid "Europe/Copenhagen"
+msgstr "Europa/København"
+
+#: ../src/timezone_names.c:333
+msgid "Europe/Dublin"
+msgstr "Europa/Dublin"
+
+#: ../src/timezone_names.c:334
+msgid "Europe/Gibraltar"
+msgstr "Europa/Gibraltar"
+
+#: ../src/timezone_names.c:335
+msgid "Europe/Helsinki"
+msgstr "Europa/Helsinki"
+
+#: ../src/timezone_names.c:336
+msgid "Europe/Istanbul"
+msgstr "Europa/Istanbul"
+
+#: ../src/timezone_names.c:337
+msgid "Europe/Kaliningrad"
+msgstr "Europa/Kaliningrad"
+
+#: ../src/timezone_names.c:338
+msgid "Europe/Kiev"
+msgstr "Europa/Kiev"
+
+#: ../src/timezone_names.c:339
+msgid "Europe/Lisbon"
+msgstr "Europa/Lisboa"
+
+#: ../src/timezone_names.c:340
+msgid "Europe/Ljubljana"
+msgstr "Europa/Ljubljana"
+
+#: ../src/timezone_names.c:341
+msgid "Europe/London"
+msgstr "Europa/London"
+
+#: ../src/timezone_names.c:342
+msgid "Europe/Luxembourg"
+msgstr "Europa/Luxembourg"
+
+#: ../src/timezone_names.c:343
+msgid "Europe/Madrid"
+msgstr "Europa/Madrid"
+
+#: ../src/timezone_names.c:344
+msgid "Europe/Malta"
+msgstr "Republikken Malta"
+
+#: ../src/timezone_names.c:345
+msgid "Europe/Minsk"
+msgstr "Europa/Minsk"
+
+#: ../src/timezone_names.c:346
+msgid "Europe/Monaco"
+msgstr "Fyrstedømet Monaco"
+
+#: ../src/timezone_names.c:347
+msgid "Europe/Moscow"
+msgstr "Europa/Moskva"
+
+#: ../src/timezone_names.c:348
+msgid "Europe/Nicosia"
+msgstr "Europa/Nicosia"
+
+#: ../src/timezone_names.c:349
+msgid "Europe/Oslo"
+msgstr "Europa/Oslo"
+
+#: ../src/timezone_names.c:350
+msgid "Europe/Paris"
+msgstr "Europe/Paris"
+
+#: ../src/timezone_names.c:351
+msgid "Europe/Prague"
+msgstr "Europe/Praha"
+
+#: ../src/timezone_names.c:352
+msgid "Europe/Riga"
+msgstr "Europe/Riga"
+
+#: ../src/timezone_names.c:353
+msgid "Europe/Rome"
+msgstr "Europa/Roma"
+
+#: ../src/timezone_names.c:354
+msgid "Europe/Samara"
+msgstr "Europa/Samara"
+
+#: ../src/timezone_names.c:355
+msgid "Europe/San_Marino"
+msgstr "Republikken San Marino"
+
+#: ../src/timezone_names.c:356
+msgid "Europe/Sarajevo"
+msgstr "Europa/Sarajevo"
+
+#: ../src/timezone_names.c:357
+msgid "Europe/Simferopol"
+msgstr "Europa/Simferopol"
+
+#: ../src/timezone_names.c:358
+msgid "Europe/Skopje"
+msgstr "Europa/Skopje"
+
+#: ../src/timezone_names.c:359
+msgid "Europe/Sofia"
+msgstr "Europa/Sofia"
+
+#: ../src/timezone_names.c:360
+msgid "Europe/Stockholm"
+msgstr "Europa/Stockholm"
+
+#: ../src/timezone_names.c:361
+msgid "Europe/Tallinn"
+msgstr "Europa/Tallinn"
+
+#: ../src/timezone_names.c:362
+msgid "Europe/Tirane"
+msgstr "Europa/Tirana"
+
+#: ../src/timezone_names.c:363
+msgid "Europe/Uzhgorod"
+msgstr "Europa/Uzhgorod"
+
+#: ../src/timezone_names.c:364
+msgid "Europe/Vaduz"
+msgstr "Europa/Vaduz"
+
+#: ../src/timezone_names.c:365
+msgid "Europe/Vatican"
+msgstr "Europa/Vatikanet"
+
+#: ../src/timezone_names.c:366
+msgid "Europe/Vienna"
+msgstr "Europa/Wien"
+
+#: ../src/timezone_names.c:367
+msgid "Europe/Vilnius"
+msgstr "Europa/Vilnius"
+
+#: ../src/timezone_names.c:368
+msgid "Europe/Warsaw"
+msgstr "Europa/Warsawa"
+
+#: ../src/timezone_names.c:369
+msgid "Europe/Zagreb"
+msgstr "Europa/Zagreb"
+
+#: ../src/timezone_names.c:370
+msgid "Europe/Zaporozhye"
+msgstr "Europa/Zaporozhye"
+
+#: ../src/timezone_names.c:371
+msgid "Europe/Zurich"
+msgstr "Europa/Zürich"
+
+#: ../src/timezone_names.c:372
+msgid "Indian"
+msgstr "Indiahavet"
+
+#: ../src/timezone_names.c:373
+msgid "Indian/Antananarivo"
+msgstr "Indiahavet/Antananarivo"
+
+#: ../src/timezone_names.c:374
+msgid "Indian/Chagos"
+msgstr "Indiahavet/Chagos"
+
+#: ../src/timezone_names.c:375
+msgid "Indian/Christmas"
+msgstr "Christmasøya"
+
+#: ../src/timezone_names.c:376
+msgid "Indian/Cocos"
+msgstr "Indiahavet/Cocos"
+
+#: ../src/timezone_names.c:377
+msgid "Indian/Comoro"
+msgstr "Indiahavet/Komoro"
+
+#: ../src/timezone_names.c:378
+msgid "Indian/Kerguelen"
+msgstr "Indiahavet/Kerguelen"
+
+#: ../src/timezone_names.c:379
+msgid "Indian/Mahe"
+msgstr "Indiahavet/Mahe"
+
+#: ../src/timezone_names.c:380
+msgid "Indian/Maldives"
+msgstr "Republikken Maldivane"
+
+#: ../src/timezone_names.c:381
+msgid "Indian/Mauritius"
+msgstr "Republikken Mauritius"
+
+#: ../src/timezone_names.c:382
+msgid "Indian/Mayotte"
+msgstr "Indiahavet/Mayotte"
+
+#: ../src/timezone_names.c:383
+msgid "Indian/Reunion"
+msgstr "Indiahavet/Reunion"
+
+#: ../src/timezone_names.c:384
+msgid "Pacific"
+msgstr "Stillehavet"
+
+#: ../src/timezone_names.c:385
+msgid "Pacific/Apia"
+msgstr "Stillehavet/Apia"
+
+#: ../src/timezone_names.c:386
+msgid "Pacific/Auckland"
+msgstr "Stillehavet/Auckland"
+
+#: ../src/timezone_names.c:387
+msgid "Pacific/Chatham"
+msgstr "Stillehavet/Chatham"
+
+#: ../src/timezone_names.c:388
+msgid "Pacific/Easter"
+msgstr "Stillehavet/Påskeøya"
+
+#: ../src/timezone_names.c:389
+msgid "Pacific/Efate"
+msgstr "Stillehavet/Efate"
+
+#: ../src/timezone_names.c:390
+msgid "Pacific/Enderbury"
+msgstr "Stillehavet/Enderbury"
+
+#: ../src/timezone_names.c:391
+msgid "Pacific/Fakaofo"
+msgstr "Stillehavet/Fakaofo"
+
+#: ../src/timezone_names.c:392
+msgid "Pacific/Fiji"
+msgstr "Stillehavet/Fiji"
+
+#: ../src/timezone_names.c:393
+msgid "Pacific/Funafuti"
+msgstr "Stillehavet/Funafuti"
+
+#: ../src/timezone_names.c:394
+msgid "Pacific/Galapagos"
+msgstr "Stillehavet/Galapagos"
+
+#: ../src/timezone_names.c:395
+msgid "Pacific/Gambier"
+msgstr "Stillehavet/Gambier"
+
+#: ../src/timezone_names.c:396
+msgid "Pacific/Guadalcanal"
+msgstr "Stillehavet/Guadalcanal"
+
+#: ../src/timezone_names.c:397
+msgid "Pacific/Guam"
+msgstr "Stillehavet/Guam"
+
+#: ../src/timezone_names.c:398
+msgid "Pacific/Honolulu"
+msgstr "Stillehavet/Honolulu"
+
+#: ../src/timezone_names.c:399
+msgid "Pacific/Johnston"
+msgstr "Johnstonøyane"
+
+#: ../src/timezone_names.c:400
+msgid "Pacific/Kiritimati"
+msgstr "Stillehavet/Kiritimati"
+
+#: ../src/timezone_names.c:401
+msgid "Pacific/Kosrae"
+msgstr "Stillehavet/Kosrae"
+
+#: ../src/timezone_names.c:402
+msgid "Pacific/Kwajalein"
+msgstr "Stillehavet/Kwajalein"
+
+#: ../src/timezone_names.c:403
+msgid "Pacific/Majuro"
+msgstr "Stillehavet/Majuro"
+
+#: ../src/timezone_names.c:404
+msgid "Pacific/Marquesas"
+msgstr "Stillehavet/Marquesas"
+
+#: ../src/timezone_names.c:405
+msgid "Pacific/Midway"
+msgstr "Midwayøyane"
+
+#: ../src/timezone_names.c:406
+msgid "Pacific/Nauru"
+msgstr "Republikken Nauru"
+
+#: ../src/timezone_names.c:407
+msgid "Pacific/Niue"
+msgstr "Stillehavet/Niue"
+
+#: ../src/timezone_names.c:408
+msgid "Pacific/Norfolk"
+msgstr "Norfolkøya; Norfolk Island"
+
+#: ../src/timezone_names.c:409
+msgid "Pacific/Noumea"
+msgstr "Stillehavet/Noumea"
+
+#: ../src/timezone_names.c:410
+msgid "Pacific/Pago_Pago"
+msgstr "Stillehavet/Pago_pago"
+
+#: ../src/timezone_names.c:411
+msgid "Pacific/Palau"
+msgstr "Republikken Palau"
+
+#: ../src/timezone_names.c:412
+msgid "Pacific/Pitcairn"
+msgstr "Stillehavet/Pitcairn"
+
+#: ../src/timezone_names.c:413
+msgid "Pacific/Ponape"
+msgstr "Stillehavet/Ponape"
+
+#: ../src/timezone_names.c:414
+msgid "Pacific/Port_Moresby"
+msgstr "Stillehavet/Port Moresby"
+
+#: ../src/timezone_names.c:415
+msgid "Pacific/Rarotonga"
+msgstr "Stillehavet/Rarotonga"
+
+#: ../src/timezone_names.c:416
+msgid "Pacific/Saipan"
+msgstr "Stillehavet/Saipan"
+
+#: ../src/timezone_names.c:417
+msgid "Pacific/Tahiti"
+msgstr "Stillehavet/Tahiti"
+
+#: ../src/timezone_names.c:418
+msgid "Pacific/Tarawa"
+msgstr "Stillehavet/Tarawa"
+
+#: ../src/timezone_names.c:419
+msgid "Pacific/Tongatapu"
+msgstr "Stillehavet/Tongatapu"
+
+#: ../src/timezone_names.c:420
+msgid "Pacific/Truk"
+msgstr "Stillehavet/Truk"
+
+#: ../src/timezone_names.c:421
+msgid "Pacific/Wake"
+msgstr "Wake Island"
+
+#: ../src/timezone_names.c:422
+msgid "Pacific/Wallis"
+msgstr "Wallis- og Futunaøyane"
+
+#: ../src/timezone_names.c:423
+msgid "Pacific/Yap"
+msgstr "Stillehavet/Yap"
+
+#: ../src/tray_icon.c:469
+msgid "New appointment"
+msgstr "Ny avtale"
+
+#: ../src/tray_icon.c:485
+msgid "About Orage"
+msgstr "Om Orage"
+
+#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
+msgid "Orage Panel Clock"
+msgstr "Orage panelklokke"
+
+#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
+msgid "Show time and date?"
+msgstr "Vis tid og dato?"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
+msgid "Orage preferences"
+msgstr "Orage-innstillingar"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr "Innstillingar for Xfce 4 Kalenderprogram (Orage)"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Innstillingar for Orage-kalenderen"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Kalender"
+
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr "Orage-kalender"
+
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Skrivebordskalender"
diff -Nru orage-4.8.3/po/oc.po orage-4.12.1/po/oc.po
--- orage-4.8.3/po/oc.po	1970-01-01 00:00:00.000000000 +0000
+++ orage-4.12.1/po/oc.po	2015-04-10 10:26:26.000000000 +0000
@@ -0,0 +1,4418 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Cedric31 <cvalmary@yahoo.fr>, 2013
+# Cedric31 <cvalmary@yahoo.fr>, 2013
+# Cedric31 <cvalmary@yahoo.fr>, 2013
+# Cedric31 <cvalmary@yahoo.fr>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: Xfce Apps\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-12-02 18:30+0100\n"
+"PO-Revision-Date: 2013-12-07 16:44+0000\n"
+"Last-Translator: Cedric31 <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/xfce/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../globaltime/globaltime.c:100
+msgid "Raising GlobalTime window..."
+msgstr "Afichar la fenèstra ora globala..."
+
+#: ../globaltime/globaltime.c:102
+msgid "GlobalTime window raise failed"
+msgstr "La fenèstra ora globala a pas pogut èsser afichada"
+
+#. ********** timezone tooltip **********
+#: ../globaltime/globaltime.c:277
+#, c-format
+msgid ""
+"%s\n"
+"click to modify clock"
+msgstr "%s\nclicar per modificar lo relòtge"
+
+#: ../globaltime/globaltime.c:386
+msgid "Localtime"
+msgstr "Ora locala"
+
+#: ../globaltime/globaltime.c:464
+msgid ""
+"button 1 to change preferences \n"
+"button 2 to adjust time of clocks"
+msgstr "boton 1 per modificar las preferéncias \nboton 2 per ajustar l'ora del relòtge"
+
+#: ../globaltime/globaltime.c:480
+msgid "adjust to change hour"
+msgstr "ajustar per cambiar l'ora"
+
+#: ../globaltime/globaltime.c:496
+msgid ""
+"adjust to change minute. Click arrows with button 2 to change only 1 minute."
+msgstr "ajustar per cambiar las minutas. Clicar sus las flèchas amb lo boton 2 per cambiar solament 1 minuta."
+
+#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
+msgid "NEW"
+msgstr "NOVÈL"
+
+#: ../globaltime/gt_prefs.c:289
+msgid "NEW COPY"
+msgstr "NOVÈLA CÒPIA"
+
+#: ../globaltime/gt_prefs.c:310
+msgid "Not possible to delete the last clock."
+msgstr "Pas possible de suprimir la darrièra ora."
+
+#: ../globaltime/gt_prefs.c:516
+msgid "update this clock"
+msgstr "metre a jorn aqueste relòtge"
+
+#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
+msgid "add new empty clock"
+msgstr "apondre una novèla relòtge void"
+
+#: ../globaltime/gt_prefs.c:526
+msgid "add new clock using this clock as model"
+msgstr "apondre un novèl relòtge en prenent aquesta coma modèl"
+
+#: ../globaltime/gt_prefs.c:531
+msgid "delete this clock"
+msgstr "suprimir aqueste relòtge"
+
+#: ../globaltime/gt_prefs.c:539
+msgid "move this clock first"
+msgstr "desplaçar aqueste relòtge al començament"
+
+#: ../globaltime/gt_prefs.c:544
+msgid "move this clock left"
+msgstr "desplaçar aqueste relòtge cap a esquèrra"
+
+#: ../globaltime/gt_prefs.c:549
+msgid "move this clock right"
+msgstr "desplaçar aqueste relòtge cap a drecha"
+
+#: ../globaltime/gt_prefs.c:554
+msgid "move this clock last"
+msgstr "desplaçar aqueste relòtge a la fin"
+
+#: ../globaltime/gt_prefs.c:562
+msgid "set the timezone of this clock to be local timezone"
+msgstr "definir lo fus orari d'aqueste relòtge coma ora locala"
+
+#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
+msgid "close window and exit"
+msgstr "tampar la fenèstra e quitar"
+
+#: ../globaltime/gt_prefs.c:590
+msgid "Globaltime preferences "
+msgstr "Preferéncias Temps Global"
+
+#. -----------------------HEADING-------------------------------------------
+#: ../globaltime/gt_prefs.c:603
+msgid "Clock Parameters"
+msgstr "Paramètres del relòtge"
+
+#: ../globaltime/gt_prefs.c:607
+msgid "Name of the clock:"
+msgstr "Nom del relòtge :"
+
+#: ../globaltime/gt_prefs.c:613
+msgid "enter name of clock"
+msgstr "entrar lo nom del relòtge"
+
+#: ../globaltime/gt_prefs.c:616
+msgid "Timezone of the clock:"
+msgstr "Fus orari del relòtge :"
+
+#: ../globaltime/gt_prefs.c:643
+msgid "Text Formatting"
+msgstr "Formatatge del tèxte"
+
+#. ------------------------background-------------------------
+#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
+msgid "Background color:"
+msgstr "Color de fons :"
+
+#: ../globaltime/gt_prefs.c:656
+msgid "Click to change background colour for clock"
+msgstr "Clicatz per cambiar la color de fons del relòtge"
+
+#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
+#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
+#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
+#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
+#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
+msgid "Use default"
+msgstr "Valor per defaut"
+
+#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
+#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
+#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
+msgid "Cross this to use default instead of selected value"
+msgstr "Marcar aquesta opcion per utilizar la valor per defaut al luòc de la valor seleccionada"
+
+#. ------------------------foreground-------------------------
+#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
+msgid "Foreground (=text) color:"
+msgstr "Color de primièr plan (=tèxte) :"
+
+#: ../globaltime/gt_prefs.c:688
+msgid "Click to change foreground colour for clock"
+msgstr "Clicar per cambiar la color de primièr plan del relòtge"
+
+#. ------------------------name font-------------------------
+#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
+msgid "Font for name of clock:"
+msgstr "Poliça pel nom del relòtge :"
+
+#: ../globaltime/gt_prefs.c:720
+msgid "Click to change font for clock name"
+msgstr "Clicar per cambiar la poliça del nom del relòtge"
+
+#. ------------------------time font-------------------------
+#: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
+msgid "Font for time of clock:"
+msgstr "Poliça per l'ora del relòtge :"
+
+#: ../globaltime/gt_prefs.c:753
+msgid "Click to change font for clock time"
+msgstr "Clicar per cambiar la poliça del relòtge"
+
+#. ------------------------underline name--------------------
+#: ../globaltime/gt_prefs.c:780
+msgid "Underline name of clock:"
+msgstr "Solinhar lo nom del relòtge :"
+
+#. ------------------------underline time--------------------
+#: ../globaltime/gt_prefs.c:810
+msgid "Underline time of clock:"
+msgstr "Solinhar l'ora del relòtge :"
+
+#: ../globaltime/gt_prefs.c:850
+msgid "Text Default Formatting"
+msgstr "Formatatge del tèxte per defaut"
+
+#: ../globaltime/gt_prefs.c:863
+msgid "Click to change default background colour for clocks"
+msgstr "Clicar per cambiar la color de fons per defaut dels relòtges"
+
+#: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
+msgid "Cross this to use system default instead of selected color"
+msgstr "Marcar aquesta opcion per utilizar la valor per defaut del sistèma al luòc de la color seleccionada"
+
+#: ../globaltime/gt_prefs.c:896
+msgid "Click to change default text colour for clocks"
+msgstr "Clicar per cambiar la color per defaut del tèxte pels relòtges"
+
+#: ../globaltime/gt_prefs.c:929
+msgid "Click to change default font for clock name"
+msgstr "Clicar per cambiar la poliça per defaut del nom del relòtge"
+
+#: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
+msgid "Cross this to use system default font instead of selected font"
+msgstr "Marcar aquesta opcion per utilizar la valor per defaut del sistèma al luòc de la poliça seleccionada"
+
+#: ../globaltime/gt_prefs.c:963
+msgid "Click to change default font for clock time"
+msgstr "Clicar per cambiar la poliça per defaut de l'ora del relòtge"
+
+#. ------------------------underline name--------------------
+#: ../globaltime/gt_prefs.c:990
+msgid "Underline for name of clock:"
+msgstr "Solinhament del nom del relòtge :"
+
+#. ------------------------underline time--------------------
+#: ../globaltime/gt_prefs.c:1004
+msgid "Underline for time of clock:"
+msgstr "Solinhament de l'ora del relòtge :"
+
+#: ../globaltime/gt_prefs.c:1027
+msgid "update preferences"
+msgstr "Metre a jorn las preferéncias"
+
+#: ../globaltime/gt_prefs.c:1062
+msgid "Globaltime Preferences"
+msgstr "Preferéncias Temps Global"
+
+#. -----------------------HEADING--------------------------------------
+#: ../globaltime/gt_prefs.c:1073
+msgid "General Preferences"
+msgstr "Preferéncias principalas"
+
+#: ../globaltime/gt_prefs.c:1077
+msgid "Decorations:"
+msgstr "Decoracions :"
+
+#: ../globaltime/gt_prefs.c:1078
+msgid "Standard"
+msgstr "Estandard"
+
+#: ../globaltime/gt_prefs.c:1083
+msgid "Use normal decorations"
+msgstr "Utilizar de decoracions normalas"
+
+#: ../globaltime/gt_prefs.c:1094
+msgid "Do not show window decorations (borders)"
+msgstr "Afichar pas las decoracions de la fenèstra (bordaduras)"
+
+#: ../globaltime/gt_prefs.c:1100
+msgid "Clock size:"
+msgstr "Talha del relòtge :"
+
+#: ../globaltime/gt_prefs.c:1101
+msgid "Equal"
+msgstr "Egal"
+
+#: ../globaltime/gt_prefs.c:1106
+msgid "All clocks have same size"
+msgstr "Totes los relòtges an la meteissa talha"
+
+#: ../globaltime/gt_prefs.c:1111
+msgid "Varying"
+msgstr "Variar"
+
+#: ../globaltime/gt_prefs.c:1116
+msgid "Clock sizes vary"
+msgstr "La talha dels relòtges varia"
+
+#: ../globaltime/gt_prefs.c:1122
+msgid "Local timezone:"
+msgstr "Fus orari :"
+
+#: ../globaltime/timezone_selection.c:101
+#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
+msgid " Other"
+msgstr "Autre"
+
+#: ../globaltime/timezone_selection.c:156
+#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
+#, c-format
+msgid "%d hour %d mins"
+msgstr "%d oras %d minutas"
+
+#: ../globaltime/timezone_selection.c:159
+#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
+#, c-format
+msgid "%d hour"
+msgstr "%d oras"
+
+#: ../globaltime/timezone_selection.c:161
+#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
+#, c-format
+msgid "%d mins"
+msgstr "%d minutas"
+
+#: ../globaltime/timezone_selection.c:167
+#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
+msgid "backward"
+msgstr "recuolar"
+
+#: ../globaltime/timezone_selection.c:170
+#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
+msgid "forward"
+msgstr "avançar"
+
+#: ../globaltime/timezone_selection.c:194
+#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
+msgid "not changed"
+msgstr "pas cambiat"
+
+#: ../globaltime/timezone_selection.c:195
+#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
+msgid "not changing"
+msgstr "càmbia pas"
+
+#. location
+#: ../globaltime/timezone_selection.c:247
+#: ../globaltime/timezone_selection.c:252
+#: ../panel-plugin/timezone_selection.c:248
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
+#: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
+msgid "Location"
+msgstr "Luòc"
+
+#: ../globaltime/timezone_selection.c:258
+#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
+msgid "GMT Offset"
+msgstr "Decalatge GMT"
+
+#: ../globaltime/timezone_selection.c:264
+#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
+msgid "Previous/Next Change"
+msgstr "Cambiament precedent/seguent"
+
+#: ../globaltime/timezone_selection.c:269
+#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
+msgid "Country"
+msgstr "País"
+
+#. We are actually setting the g_par parameter. In other words
+#. we are setting the global default timezone for Orage. This is
+#. done very seldom and we do not want to allow "floating" here.
+#. This test is ugly, but it is not worth an extra parameter.
+#. this is normal appointment
+#: ../globaltime/timezone_selection.c:299
+#: ../globaltime/timezone_selection.c:309
+#: ../panel-plugin/timezone_selection.c:300
+#: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
+#: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
+msgid "Pick timezone"
+msgstr "Causir la zòna orari"
+
+#: ../globaltime/timezone_selection.c:302
+#: ../globaltime/timezone_selection.c:312
+#: ../panel-plugin/timezone_selection.c:303
+#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
+#: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
+msgid "Change mode"
+msgstr "Cambiar lo mòde"
+
+#: ../globaltime/timezone_selection.c:303
+#: ../globaltime/timezone_selection.c:313
+#: ../globaltime/timezone_selection.c:352
+#: ../panel-plugin/timezone_selection.c:304
+#: ../panel-plugin/timezone_selection.c:314
+#: ../panel-plugin/timezone_selection.c:353 ../src/timezone_selection.c:320
+#: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
+#: ../src/timezone_selection.c:379
+msgid "UTC"
+msgstr "UTC"
+
+#. NOTE: this exists only if ical timezones are being used
+#: ../globaltime/timezone_selection.c:304
+#: ../globaltime/timezone_selection.c:357
+#: ../panel-plugin/timezone_selection.c:305
+#: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
+#: ../src/timezone_selection.c:384
+msgid "floating"
+msgstr "flotanta"
+
+#: ../globaltime/globaltime.desktop.in.h:1
+msgid "Orage Globaltime"
+msgstr "Temps Global Orage"
+
+#: ../globaltime/globaltime.desktop.in.h:2
+msgid "Show clocks from different countries"
+msgstr "Veire los relòtges de diferents païses"
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Temps Global"
+
+#: ../panel-plugin/oc_config.c:224
+msgid "Appearance"
+msgstr "Aparéncia"
+
+#. show frame
+#: ../panel-plugin/oc_config.c:229
+msgid "Show _frame"
+msgstr "Afichar lo quadre"
+
+#. foreground color
+#: ../panel-plugin/oc_config.c:239
+msgid "set foreground _color:"
+msgstr "definir la _color del primièr plan :"
+
+#. background color
+#: ../panel-plugin/oc_config.c:253
+msgid "set _background color:"
+msgstr "definir la color del _rèire plan :"
+
+#. clock size (=vbox size): height and width
+#: ../panel-plugin/oc_config.c:267
+msgid "set _height:"
+msgstr "definir la _nautor :"
+
+#: ../panel-plugin/oc_config.c:277
+msgid "Note that you can not change the height of horizontal panels"
+msgstr "Notatz que podètz pas modificar la nautor dels panèls orizontals"
+
+#: ../panel-plugin/oc_config.c:282
+msgid "set _width:"
+msgstr "Definir la _largor :"
+
+#: ../panel-plugin/oc_config.c:293
+msgid "Note that you can not change the width of vertical panels"
+msgstr "Notatz que podètz pas modificar la largor dels panèls verticals"
+
+#: ../panel-plugin/oc_config.c:316
+msgid "Clock Options"
+msgstr "Opcions de Relòtge"
+
+#. timezone
+#: ../panel-plugin/oc_config.c:326
+msgid "set timezone to:"
+msgstr "definir la zòna orària a :"
+
+#: ../panel-plugin/oc_config.c:347
+#, c-format
+msgid "Line %d:"
+msgstr "Linha %d :"
+
+#: ../panel-plugin/oc_config.c:357
+msgid "Enter any valid strftime function parameter."
+msgstr "Entratz quin paramètre valid que siá de la foncion strftime."
+
+#. Tooltip hint
+#: ../panel-plugin/oc_config.c:401
+msgid "Tooltip:"
+msgstr "Infobulla :"
+
+#. special timing for SUSPEND/HIBERNATE
+#: ../panel-plugin/oc_config.c:411
+msgid "fix time after suspend/hibernate"
+msgstr "ajustar l'ora aprèp una mesa en velha/mesa en ivernacion"
+
+#: ../panel-plugin/oc_config.c:415
+msgid ""
+"You only need this if you do short term (less than 5 hours) suspend or "
+"hibernate and your visible time does not include seconds. Under these "
+"circumstances it is possible that Orageclock shows time inaccurately unless "
+"you have this selected. (Selecting this prevents cpu and interrupt saving "
+"features from working.)"
+msgstr "Avètz besonh d'aquò se fasètz sus un temps cort (mens de 5 oras) una suspension o una mesa en ivernacion e vòstre temps visible comprend pas de segondas. Dins aquelas circonstàncias, es possible que lo relòtge Orage mòstre lp temps inexacte per rapòrt a lo qu'avètz seleccionat. (Seleccionar aquò empacha lo processor e interrompre las foncions d'estalvi \t\na partir del trabalhar)."
+
+#: ../panel-plugin/oc_config.c:432
+msgid ""
+"This program uses strftime function to get time.\n"
+"Use any valid code to get time in the format you prefer.\n"
+"Some common codes are:\n"
+"\t%A = weekday\t\t\t%B = month\n"
+"\t%c = date & time\t\t%R = hour & minute\n"
+"\t%V = week number\t\t%Z = timezone in use\n"
+"\t%H = hours \t\t\t\t%M = minute\n"
+"\t%X = local time\t\t\t%x = local date"
+msgstr "Aqueste programa utiliza la foncion strftime per recuperar la data e l'ora.\nUtilizatz un còde valid per obténer l'ora dins lo format que vos agrada mai.\nQualques còdes emplegats :\n\t%A = jorn de  la setmana\t\t\t%B = mes\n\t%c = data & ora\t\t%R = ora & minuta\n\t%V = numèro de setmana\t\t%Z = fus orari utilizat\n\t%H = oras \t\t\t\t%M = minuta\n\t%X = ora locala\t\t\t%x = data locala"
+
+#: ../panel-plugin/oc_config.c:457
+msgid "Orage clock Preferences"
+msgstr "Preferéncias del relòtge Orage"
+
+#. no lines yet
+#. TRANSLATORS: Use format characters from strftime(3)
+#. * to get the proper string for your locale.
+#. * I used these:
+#. * %A  : full weekday name
+#. * %d  : day of the month
+#. * %B  : full month name
+#. * %Y  : four digit year
+#. * %V  : ISO week number
+#. 
+#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+msgid "%A %d %B %Y/%V"
+msgstr "%A %d %B %Y/%V"
+
+#: ../src/about-xfcalendar.c:40
+msgid "Maintainer"
+msgstr "Desvolopaire"
+
+#: ../src/about-xfcalendar.c:47
+msgid "Manage your time with Orage"
+msgstr "Gerir vòstre temps amb Orage"
+
+#. if (gtk_toggle_button_get_active(
+#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
+#. end time
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
+msgid "End"
+msgstr "Fin"
+
+#: ../src/appointment.c:333
+msgid "Due"
+msgstr "Escasença"
+
+#: ../src/appointment.c:493 ../src/mainbox.c:862
+msgid "Orage"
+msgstr "Orage"
+
+#. to avoid timing problems when updating entry
+#. Create file chooser
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
+msgid "Select a file..."
+msgstr "Causir un fichièr..."
+
+#: ../src/appointment.c:680
+msgid "Sound Files"
+msgstr "Fichièrs son"
+
+#: ../src/appointment.c:687 ../src/interface.c:277
+msgid "All Files"
+msgstr "Totes los fichièrs"
+
+#: ../src/appointment.c:738
+msgid "The appointment information has been modified."
+msgstr "Las infos del rendètz-vos son estadas modificadas."
+
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
+msgid "Do you want to continue?"
+msgstr "Volètz contunhar ?"
+
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Non, daissar pas"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Òc, ignorar las modificacions e quitar"
+
+#: ../src/appointment.c:768
+msgid "The end of this appointment is earlier than the beginning."
+msgstr "L'ora de fin del rendètz-vos precedís l'ora de començament."
+
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
+msgid "Not set"
+msgstr "Pas definit"
+
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Apondre un novèl rendètz-vos per aqueste fichièr."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Fichièr per defaut Orage"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Apondon del rendètz-vos mancat."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "L'error s'es producha al moment de l'apondon d'un rendètz-vos. Veire mai de detalhs dins lo fichièr del jornal."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Mesa a jorn del rendètz-vos mancat."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Veire mai de detalhs dins lo fichièr del jornal. (Benlèu que lo fichièr es estat mes a jorn de faiçon extèrna a Orage ?)"
+
+#: ../src/appointment.c:1286
+msgid "This appointment will be permanently removed."
+msgstr "Aqueste rendètz-vos serà levat definitivament."
+
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Non, anullar la supression"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Òc, suprimissètz-lo"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Causir la data"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Uèi"
+
+#: ../src/appointment.c:1803
+msgid "This appointment does not exist."
+msgstr "Aqueste rendètz-vos existís pas."
+
+#: ../src/appointment.c:1804
+msgid "It was probably removed, please refresh your screen."
+msgstr "Probablament qu'es estat levat, refrescar l'ecran."
+
+#: ../src/appointment.c:2105
+msgid "Current categories"
+msgstr "Categorias actualas"
+
+#: ../src/appointment.c:2120
+msgid "Add new category with color"
+msgstr "Apondre una novèla categoria amb color"
+
+#: ../src/appointment.c:2124
+msgid "Category:"
+msgstr "Categoria :"
+
+#: ../src/appointment.c:2155
+msgid "Colors of categories - Orage"
+msgstr "Color de las categorias - Orage"
+
+#: ../src/appointment.c:2201
+msgid " *** COPY ***"
+msgstr " *** COPIAR ***"
+
+#: ../src/appointment.c:2466
+msgid "New appointment - Orage"
+msgstr "Novèl rendètz-vos - Orage"
+
+#. File menu stuff
+#. ********* File menu *********
+#. File menu
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
+msgid "_File"
+msgstr "_Fichièr"
+
+#: ../src/appointment.c:2502
+msgid "Sav_e and close"
+msgstr "Enr_egistrar e tampar"
+
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
+msgid "D_uplicate"
+msgstr "D_uplicar"
+
+#: ../src/appointment.c:2702
+msgid "Save"
+msgstr "Enregistrar"
+
+#: ../src/appointment.c:2704
+msgid "Save and close"
+msgstr "Enregistrar e tampar"
+
+#: ../src/appointment.c:2709
+msgid "Revert"
+msgstr "Tornar"
+
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
+msgid "Duplicate"
+msgstr "Duplicar"
+
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
+msgid "Delete"
+msgstr "Escafar"
+
+#: ../src/appointment.c:2734
+msgid "Free"
+msgstr "Liure"
+
+#: ../src/appointment.c:2734
+msgid "Busy"
+msgstr "Ocupat"
+
+#: ../src/appointment.c:2738
+msgid "General"
+msgstr "Generala"
+
+#. type
+#: ../src/appointment.c:2744
+msgid "Type "
+msgstr "Tipe"
+
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
+msgid "Event"
+msgstr "Eveniment"
+
+#: ../src/appointment.c:2749
+msgid ""
+"Event that will happen sometime. For example:\n"
+"Meeting or birthday or TV show."
+msgstr "Eveniment que se va passar qualques còps. Per exemple :\nRendètz-vos o anniversari o programa TV."
+
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
+msgid "Todo"
+msgstr "A far"
+
+#: ../src/appointment.c:2755
+msgid ""
+"Something that you should do sometime. For example:\n"
+"Wash your car or test new version of Orage."
+msgstr "Quicòm a far qualques còps. Per exemple :\nLavar la veitura o testar la novèla version d'Orage."
+
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
+msgid "Journal"
+msgstr "Jornal"
+
+#: ../src/appointment.c:2762
+msgid ""
+"Make a note that something happened. For example:\n"
+"Remark that your mother called or first snow came."
+msgstr "Far una nòta per anonciar un eveniment. Per exemple :\nNotificar que vòstra maire a sonat o que la primièra nèu es tombada."
+
+#. title
+#: ../src/appointment.c:2769
+msgid "Title "
+msgstr "Títol"
+
+#: ../src/appointment.c:2784
+msgid "All day event"
+msgstr "Eveniment del quotidian"
+
+#. start time
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
+msgid "Start"
+msgstr "Començament"
+
+#: ../src/appointment.c:2810
+msgid "Set      "
+msgstr "Definir"
+
+#: ../src/appointment.c:2831
+msgid "Duration"
+msgstr "Durada"
+
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
+msgid "days"
+msgstr "jorns"
+
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
+msgid "hours"
+msgstr "oras"
+
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
+msgid "mins"
+msgstr "mins"
+
+#. Availability (only for EVENT)
+#: ../src/appointment.c:2851
+msgid "Availability"
+msgstr "Disponibilitat"
+
+#. completed (only for TODO)
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
+msgid "Completed"
+msgstr "Acabat"
+
+#: ../src/appointment.c:2862
+msgid "Done"
+msgstr "Fach"
+
+#. categories
+#: ../src/appointment.c:2883
+msgid "Categories"
+msgstr "Categorias"
+
+#: ../src/appointment.c:2895
+msgid ""
+"This is special category, which can be used to color this appointment in "
+"list views."
+msgstr "Aquò es una categoria especiala que servís a l'apondon de color als rendètz-vos dins la vista lista."
+
+#: ../src/appointment.c:2900
+msgid "update colors for categories."
+msgstr "metre a jorn las colors per las categorias."
+
+#. priority
+#: ../src/appointment.c:2906
+msgid "Priority"
+msgstr "Prioritat"
+
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Se definissètz aquò a 8 o mai, lo rendètz-vos figura PAS dins las fenèstras de la lista.\nPodètz utilizar aquesta foncionalitat per desencombrar vòstras fenèstras de la lista, mas rend mai dificile de trobar aqueste rendètz-vos.\n(Las alarmas seràn totjorn normalas.)\n(Aquò es un paramètre non-documentat per tal que poscatz modificar lo limit per defaut de 8.)"
+
+#. note
+#: ../src/appointment.c:2918
+msgid "Note"
+msgstr "Nòta"
+
+#: ../src/appointment.c:2939
+msgid ""
+"These shorthand commands take effect immediately:\n"
+"    <D> inserts current date in local date format\n"
+"    <T> inserts time and\n"
+"    <DT> inserts date and time.\n"
+"\n"
+"These are converted only later when they are seen:\n"
+"    <&Ynnnn> is translated to current year minus nnnn.\n"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Aquestes acorchis de comandas prenon efièches immediatament :\n     <D> inserís la data actuala dins lo format de la data locala\n    <T> inserís l'ora e\n    <DT> inserís la data e l'ora.\n\nAqueles son convertits solament pus tard, quand son vistes :\n    <& Ynnnn> es traducit dins l'annada en cors nnnn.\n(Aquò pòt èsser utilizat per exemple dins los rapèls d'anniversari per dire quin atge la persona aurà)."
+
+#: ../src/appointment.c:3010
+msgid "Before Start"
+msgstr "Abans lo començament"
+
+#: ../src/appointment.c:3010
+msgid "Before End"
+msgstr "Abans la fin"
+
+#: ../src/appointment.c:3011
+msgid "After Start"
+msgstr "Aprèp lo començament"
+
+#: ../src/appointment.c:3011
+msgid "After End"
+msgstr "Aprèp la fin"
+
+#: ../src/appointment.c:3018
+msgid "Alarm"
+msgstr "Alarma"
+
+#. **** ALARM TIME ****
+#: ../src/appointment.c:3024
+msgid "Alarm time"
+msgstr "Ora d'alarma"
+
+#: ../src/appointment.c:3048
+msgid ""
+"Often you want to get alarm:\n"
+" 1) before Event start\n"
+" 2) before Todo end\n"
+" 3) after Todo start"
+msgstr "Arriba de voler una alarma :\n 1) abans lo començament de l'eveniment\n 2) abans la fin del Todo\n 3) aprèp lo començament del Todo"
+
+#: ../src/appointment.c:3053
+msgid "Persistent alarm"
+msgstr "Alarma persistenta"
+
+#: ../src/appointment.c:3055
+msgid ""
+"Select this if you want Orage to remind you even if it has not been active "
+"when the alarm happened."
+msgstr "Seleccionatz aquò se volètz qu'Orage lo rapèla, quitament se Orage èra pas actiu al moment ont l'alarma auriá degut se desenclavar."
+
+#. **** Audio Alarm ****
+#: ../src/appointment.c:3064
+msgid "Sound"
+msgstr "Son"
+
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
+msgid "Use"
+msgstr "Utilizar"
+
+#: ../src/appointment.c:3070
+msgid "Select this if you want audible alarm"
+msgstr "Seleccionar aquesta opcion se volètz una alarma sonòra"
+
+#: ../src/appointment.c:3087
+msgid "Repeat alarm sound"
+msgstr "Repetir lo son de l'alarma"
+
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
+msgid "times"
+msgstr "còps"
+
+#: ../src/appointment.c:3119
+msgid "sec interval"
+msgstr "interval seg."
+
+#. **** Display Alarm ****
+#: ../src/appointment.c:3129
+msgid "Visual"
+msgstr "Visual"
+
+#: ../src/appointment.c:3133
+msgid "Use Orage window"
+msgstr "Utilizar la fenèstra d'Orage"
+
+#: ../src/appointment.c:3135
+msgid "Select this if you want Orage window alarm"
+msgstr "Seleccionar aquò se volètz una fenèstra d'alarma Orage"
+
+#: ../src/appointment.c:3147
+msgid "Use notification"
+msgstr "Utilizar la notificacion"
+
+#: ../src/appointment.c:3149
+msgid "Select this if you want notification alarm"
+msgstr "Seleccionatz aquò se volètz una notificacion d'alarma"
+
+#: ../src/appointment.c:3155
+msgid "Set timeout"
+msgstr "Definir lo relambi"
+
+#: ../src/appointment.c:3157
+msgid "Select this if you want notification to expire automatically"
+msgstr "Seleccionatz aquò opcion se volètz que la notificacion expira automaticament"
+
+#: ../src/appointment.c:3168
+msgid "0 = system default expiration time"
+msgstr "0 = temps d'expiracion per defaut del sistèma"
+
+#: ../src/appointment.c:3173
+msgid "seconds"
+msgstr "segondas"
+
+#. **** Procedure Alarm ****
+#: ../src/appointment.c:3184
+msgid "Procedure"
+msgstr "Procedura"
+
+#: ../src/appointment.c:3190
+msgid "Select this if you want procedure or script alarm"
+msgstr "Seleccionatz aquò se volètz una alarma procedura o escript"
+
+#: ../src/appointment.c:3196
+msgid ""
+"You must enter all escape etc characters yourself.\n"
+"This string is just given to shell to process.\n"
+"The following special commands are replaced at run time:\n"
+"\t<&T>  appointment title\n"
+"\t<&D>  appointment description\n"
+"\t<&AT> alarm time\n"
+"\t<&ST> appointment start time\n"
+"\t<&ET> appointment end time"
+msgstr "Vos cal entrar totes los caractères etc d'escapament vos-meteis.\nAquesta cadena es simplament donada lo convit de comanda per tractament.\nLas comandas especialas seguentas son remplaçadas al moment de l'execucion :\n\t<&T> del rendètz-vos\n\t <&D> descripcion del rendètz-vos\n\t<&AT> ora de l'alarma\n\t<&ST> ora de començament del rendètz-vos\n\t<&ET> ora de fin del rendètz-vos"
+
+#: ../src/appointment.c:3208
+msgid "Test this alarm by raising it now"
+msgstr "Testar aquesta alarma en la fasent ara"
+
+#: ../src/appointment.c:3215
+msgid "<b>Default alarm</b>"
+msgstr "<b>Alarma per defaut</b>"
+
+#: ../src/appointment.c:3223
+msgid "Store current settings as default alarm"
+msgstr "Enregistrar los paramètres actuals coma alarma per defaut"
+
+#: ../src/appointment.c:3228
+msgid "Set current settings from default alarm"
+msgstr "Definir los paramètres actuals de l'alarma per defaut"
+
+#: ../src/appointment.c:3290
+msgid "None"
+msgstr "Pas cap"
+
+#: ../src/appointment.c:3290
+msgid "Daily"
+msgstr "Quotidian"
+
+#: ../src/appointment.c:3290
+msgid "Weekly"
+msgstr "Setmanièr"
+
+#: ../src/appointment.c:3290
+msgid "Monthly"
+msgstr "Mesadièr"
+
+#: ../src/appointment.c:3290
+msgid "Yearly"
+msgstr "Annadièr"
+
+#: ../src/appointment.c:3290
+msgid "Hourly"
+msgstr "Totas las oras"
+
+#: ../src/appointment.c:3292
+msgid "Mon"
+msgstr "Lun"
+
+#: ../src/appointment.c:3292
+msgid "Tue"
+msgstr "Mar"
+
+#: ../src/appointment.c:3292
+msgid "Wed"
+msgstr "Mer"
+
+#: ../src/appointment.c:3292
+msgid "Thu"
+msgstr "Jòu"
+
+#: ../src/appointment.c:3292
+msgid "Fri"
+msgstr "Ven"
+
+#: ../src/appointment.c:3292
+msgid "Sat"
+msgstr "Sab"
+
+#: ../src/appointment.c:3292
+msgid "Sun"
+msgstr "Dim"
+
+#: ../src/appointment.c:3297
+msgid "Recurrence"
+msgstr "Repeticion"
+
+#. complexity
+#: ../src/appointment.c:3303
+msgid "Complexity"
+msgstr "Complexitat"
+
+#: ../src/appointment.c:3306
+msgid "Basic"
+msgstr "De basa"
+
+#: ../src/appointment.c:3312
+msgid "Advanced"
+msgstr "Avançat"
+
+#: ../src/appointment.c:3316
+msgid "Use this if you want regular repeating event"
+msgstr "Utilizatz aquò per un eveniment regular e repetit"
+
+#: ../src/appointment.c:3318
+msgid ""
+"Use this if you need complex times like:\n"
+" Every Saturday and Sunday or \n"
+" First Tuesday every month"
+msgstr "Utilizatz aquò per de frequéncias complèxas coma : \n Totes los dissabtes e dimenges o\n Lo primièr dimars de cada mes"
+
+#. frequency
+#: ../src/appointment.c:3324
+msgid "Frequency"
+msgstr "Frequéncia"
+
+#: ../src/appointment.c:3330
+msgid "Each"
+msgstr "Cadun"
+
+#: ../src/appointment.c:3337
+msgid "occurrence"
+msgstr "periodicitat"
+
+#: ../src/appointment.c:3341
+msgid ""
+"Limit frequency to certain interval.\n"
+" For example: Every third day:\n"
+" Frequency = Daily and Interval = 3"
+msgstr "Limitar la frequéncia a certans intervals.\n Per exemple : A cada tres jorns :\n Frequéncia = Quotidiana e Interval = 3"
+
+#: ../src/appointment.c:3386
+msgid "Limit"
+msgstr "Limit"
+
+#: ../src/appointment.c:3388
+msgid "Repeat forever"
+msgstr "Repetir sens arrèst"
+
+#: ../src/appointment.c:3394
+msgid "Repeat "
+msgstr "Repetir"
+
+#: ../src/appointment.c:3410
+msgid "Repeat until "
+msgstr "Repetir fins al"
+
+#. weekdays (only for complex settings)
+#: ../src/appointment.c:3423
+msgid "Weekdays"
+msgstr "Jorns de la setmana"
+
+#: ../src/appointment.c:3435
+msgid "Which day"
+msgstr "Quin jorn"
+
+#: ../src/appointment.c:3443
+msgid ""
+"Specify which weekday for monthly and yearly events.\n"
+" For example:\n"
+" Second Wednesday each month:\n"
+"\tFrequency = Monthly,\n"
+"\tWeekdays = check only Wednesday,\n"
+"\tWhich day = select 2 from the number below Wednesday"
+msgstr "Especificar quin jorn de la setmana per d'eveniments mesadièrs o annadièrs.\n Per exemple : \n Lo segond dimècres de cada mes : \n\tFrequéncia = Mesadièra,\n\tJorn de la setmana = marcar solament dimècres, \n\tQuin jorn = causir 2 dempuèi lo numèro en dejós de dimècres"
+
+#. TODO base (only for TODOs)
+#: ../src/appointment.c:3450
+msgid "TODO base"
+msgstr "basa TODO"
+
+#: ../src/appointment.c:3463
+msgid ""
+"TODO reoccurs regularly starting on start time and repeating after each "
+"interval no matter when it was last completed"
+msgstr "TODO reapareis regularament a l'aviada e se repetís aprèp cada interval, pauc impòrta s'es estat acabat"
+
+#: ../src/appointment.c:3465
+msgid ""
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "TODO es basat sul temps complet e se repetís aprèp interval comptat dempuèi lo darrièr còp acabat.\n(Notatz que podètz pas dire quicòm sus l'istòria del TODO donat que los cambiaments de basa se reprodusisson qu'aprèp cada execucion.)"
+
+#. exceptions
+#: ../src/appointment.c:3471
+msgid "Exceptions"
+msgstr "Excepcions"
+
+#: ../src/appointment.c:3484
+msgid ""
+"Add more exception dates by clicking the calendar days below.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
+"Remove by clicking the data."
+msgstr "Apondre mai de datas excepcionalas en clicant suls jorns del calendièr çaijós.\n Excepcion es siá l'exclusion (-), siá l'inclusion (+) en foncion de la seleccion.\nSuprimir en clicant sus las donadas."
+
+#: ../src/appointment.c:3489
+msgid "Add excluded date (-)"
+msgstr "Apondre un jorn exclut (-)"
+
+#: ../src/appointment.c:3491
+msgid "Excluded days are full days where this appointment is not happening"
+msgstr "Los jorns excluts son de jornadas completas ont aqueste rendètz-vos es pas arribat"
+
+#: ../src/appointment.c:3497
+msgid "Add included time (+)"
+msgstr "Apondre una ora inclusa (+)"
+
+#: ../src/appointment.c:3499
+msgid ""
+"Included times have same timezone than start time, but they may have "
+"different time"
+msgstr "Las oras inclusas an lo meteis fus orari que l'ora de començament, mas pòdon aver de tempses diferents"
+
+#. calendars showing the action days
+#: ../src/appointment.c:3516
+msgid "Action dates"
+msgstr "Datas de las accions"
+
+#. ********* View menu *********
+#. View menu
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
+msgid "_View"
+msgstr "_Veire"
+
+#. ********* Go menu   *********
+#: ../src/day-view.c:303 ../src/event-list.c:1123
+msgid "_Go"
+msgstr "_Anar"
+
+#: ../src/day-view.c:377 ../src/event-list.c:1169
+msgid "New"
+msgstr "Novèl"
+
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Recuolar d'una setmana"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Recuolar d'un jorn"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Avançar d'un jorn"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Avançar d'una setmana"
+
+#: ../src/day-view.c:395 ../src/event-list.c:1187
+msgid "Refresh"
+msgstr "Resfrescar"
+
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
+msgid "Close"
+msgstr "Tampar"
+
+#: ../src/day-view.c:549
+msgid "Unknown"
+msgstr "Desconegut"
+
+#: ../src/day-view.c:807
+msgid "       Number of days to show"
+msgstr "       Nombre de jorns d'afichar"
+
+#: ../src/day-view.c:1073
+msgid "Orage - day view"
+msgstr "Orage - vista jornalièra"
+
+#. date only appointment
+#: ../src/event-list.c:191
+msgid "All day"
+msgstr "Tota la jornada"
+
+#: ../src/event-list.c:596 ../src/event-list.c:1370
+msgid "Time"
+msgstr "Temps"
+
+#: ../src/event-list.c:784
+msgid "No rows have been selected."
+msgstr "Pas cap linha es pas estada seleccionada."
+
+#: ../src/event-list.c:785
+msgid "Click a row to select it and after that you can copy it."
+msgstr "Clicar sus una linha per la seleccionar, puèi poiretz la copiar."
+
+#: ../src/event-list.c:968
+msgid ""
+"You will permanently remove all\n"
+"selected appointments."
+msgstr "Anatz suprimir definitivament totes\nrendètz-vos causit ."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Òc, levatz-los"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Tornar"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Avançar"
+
+#: ../src/event-list.c:1189
+msgid "Find"
+msgstr "Trobar"
+
+#: ../src/event-list.c:1196
+msgid "Dayview"
+msgstr "Apercebut jornalièr"
+
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Afichar la fenèstra ora globala :"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "solament la primièra repeticion"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Marcar aquesta casa se volètz veire que lo primièr eveniment recurrent. Per defaut, totes son viste.\nNotatz qu'aquò mòstra tanben totas las urgéncias.\nNotatz que los eveniments recurrents pòdon aparéisser mai d'ora dins la lista quand « solament la primièra repeticion » es listada."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "tanben los ancians"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Marcar aquesta casa se volètz veire los ancians eveniments tanben. Aquò pòt pas èsser seleccionat que se « solament la primièra repeticion » es activada per evitar de listas longassas. \nNotatz que la seleccion dels jorns suplementaris definís encara se los rendètz-vos los mai recents son listats."
+
+#: ../src/event-list.c:1290
+msgid "Journal entries starting from:"
+msgstr "Las escrituras del jornal son aviadas lo :"
+
+#: ../src/event-list.c:1310
+msgid "Search"
+msgstr "Recercar"
+
+#: ../src/event-list.c:1313
+msgid "Search text "
+msgstr "Recèrca de tèxte"
+
+#: ../src/event-list.c:1378
+msgid "Flags"
+msgstr "Drapèus"
+
+#: ../src/event-list.c:1386
+msgid "Title"
+msgstr "Títol"
+
+#: ../src/event-list.c:1412
+msgid ""
+"Double click line to edit it.\n"
+"\n"
+"Flags in order:\n"
+"\t 1. Alarm: n=no alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
+"\t 2. Recurrence: n=no recurrence\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t 3. Type: f=free B=Busy\n"
+"\t 4. Located in file:\n"
+"\t\tO=Orage A=Archive F=Foreign\n"
+"\t 5. Appointment type:\n"
+"\t\tE=Event T=Todo J=Journal"
+msgstr "Doble-clicar sus la linha per l'editar.\n\nDrapèus dins l'òrdre :\n\t 1. Alarma : n = pas d'alarma\n\t\t A = Alarma es definida P = Alarma persistenta es definida\n\t 2. Repeticion : n = pas de repeticion\n\t\t H = Orari D =  Quotidian W = Setmanièr M = Mesadièr Y  = Annadièr\n\t 3. Tipe : f = Liure B = Ocupat\n\t 4. Localizat dins lo fichièr :\n\t \tO = Orage A = Archiu F = Estrangièr\n\t 5. Tipe de rendètz-vos:\n\t\tE = Eveniment T = Todo J = Jornal"
+
+#. remove since it has ended
+#: ../src/ical-archive.c:267
+msgid "\tRecur ended, moving to archive file."
+msgstr "\tPeriodicitat acabada, archivatge del fichièr."
+
+#: ../src/ical-archive.c:330
+msgid "Archiving not enabled. Exiting"
+msgstr "L'archivatge es pas activat. Tampadura"
+
+#: ../src/ical-archive.c:349
+#, c-format
+msgid "Archiving threshold: %d month(s)"
+msgstr "Sulhet d'archivatge : %d mes(es)"
+
+#. yy mon day
+#: ../src/ical-archive.c:352
+#, c-format
+msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
+msgstr "\tArchivatge d'eveniments mai ancian que : %04d-%02d-%02d"
+
+#: ../src/ical-archive.c:379
+#, c-format
+msgid "Archiving uid: %s"
+msgstr "uid d'archivatge : %s"
+
+#. VTODO not completed, do not archive
+#: ../src/ical-archive.c:385
+msgid "\tVTODO not complete; not archived"
+msgstr "\tVTODO incomplet; pas archivat"
+
+#. it is recurrent event
+#: ../src/ical-archive.c:390
+#, c-format
+msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
+msgstr "\tPeriodicitat. Annada de fin : %04d, mes : %02d, jorn : %02d"
+
+#: ../src/ical-archive.c:407
+msgid "Archiving done\n"
+msgstr "Archivatge acabat\n"
+
+#. PHASE 1: go through base orage file and remove "repeat" shortcuts
+#: ../src/ical-archive.c:423
+msgid "Starting archive removal."
+msgstr "Aviada escafament de l'archiu."
+
+#: ../src/ical-archive.c:424
+msgid "\tPHASE 1: reset recurring appointments"
+msgstr "\tFASA 1 : anullar los rendètz-vos periodics"
+
+#. PHASE 2: go through archive file and add everything back to base orage.
+#. * After that delete the whole arch file
+#: ../src/ical-archive.c:446
+msgid "\tPHASE 2: return archived appointments"
+msgstr "\tFASA 2 : restablir los rendètz-vos archivats"
+
+#: ../src/ical-archive.c:472
+msgid "Archive removal done\n"
+msgstr "Escafament de l'archiu acabat.\n"
+
+#: ../src/ical-code.c:972
+msgid "Orage default alarm"
+msgstr "Alarma Orage per defaut"
+
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Lista de las alarmas creat pel fichièr Orage principal :"
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Lista de las alarmas creat per un fichièr extèrne : %s ( %s )"
+
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\t%d alarmas apondudas . %d eveniments tractats."
+
+#: ../src/ical-code.c:3185
+#, c-format
+msgid ""
+"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
+msgstr "\t%d alarmas trobadas dont %d son activas. (cercat dins %d alarmas periodicas.)"
+
+#: ../src/ical-expimp.c:123
+msgid "Starting import file preprocessing"
+msgstr "Preparacion de l'impòrt del fichièr extèrne"
+
+#: ../src/ical-expimp.c:158
+msgid "... Patched DCREATED to be CREATED."
+msgstr "... DCREATED modificat per èsser CREATED."
+
+#: ../src/ical-expimp.c:197
+msgid "... Patched timezone to Orage format."
+msgstr "... Fus orari modificat al format Orage."
+
+#: ../src/ical-expimp.c:206
+msgid "Import file preprocessing done"
+msgstr "Preparacion del fichièr d'importacion acabada"
+
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Trobat mesa a jorn extèrna dins lo fichièr %s ."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Refrescament de las alarmas e dels calendièrs en rason de la mesa a jorn del fichièr extèrne."
+
+#: ../src/interface.c:271
+msgid "Calendar files"
+msgstr "Fichièrs calendièr"
+
+#: ../src/interface.c:631
+msgid "Current foreign files"
+msgstr "Fichièrs extèrnes actuals"
+
+#: ../src/interface.c:648
+msgid "READ ONLY"
+msgstr "LECTURA SOLA"
+
+#: ../src/interface.c:650
+msgid "READ WRITE"
+msgstr "LECTURA ESCRITURA"
+
+#: ../src/interface.c:669
+msgid "***** No foreign files *****"
+msgstr "***** Pas cap de fichièr extèrne *****"
+
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Apondon dels fichièrs extèrnes fracassat"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage pòt pas tractar que 10 fichièrs extèrnes. Limit atench."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Lo nom del fichièr es void."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Lo nom es void."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Lo fichièr existís pas."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Nom de fichièr existent ja dins Orage."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Nom existent ja dins Orage."
+
+#: ../src/interface.c:965
+msgid "Import/export"
+msgstr "Importar/exportar"
+
+#: ../src/interface.c:972
+msgid "Import"
+msgstr "Importar"
+
+#: ../src/interface.c:977
+msgid "Read from file:"
+msgstr "Legir dempuèi un fichièr :"
+
+#: ../src/interface.c:994
+msgid ""
+"Separate filenames with comma(,).\n"
+" NOTE: comma is not valid character in filenames for Orage."
+msgstr "Separar los noms de fichièrs amb una virgula(,).\n NÒTA : la virgula es pas un caractèr valid dins los noms de fichièrs per Orage."
+
+#: ../src/interface.c:999
+msgid "Export"
+msgstr "Exportar"
+
+#: ../src/interface.c:1004
+msgid "Write to file:"
+msgstr "Escriure dins lo fichièr :"
+
+#: ../src/interface.c:1025 ../src/interface.c:1037
+msgid "Select"
+msgstr "Seleccionar"
+
+#: ../src/interface.c:1028
+msgid "All appointments"
+msgstr "Totes los rendètz-vos"
+
+#: ../src/interface.c:1041
+msgid "Named appointments: "
+msgstr "Rendètz-vos nomenats :"
+
+#: ../src/interface.c:1053
+msgid ""
+"Note that only main file appointments are read.\n"
+"Archived and Foreign events are not exported."
+msgstr "Notar que sols los fichièrs principals rendètz-vos son legits.\nLos eveniments archivats e exteriors son pas exportats."
+
+#: ../src/interface.c:1056
+msgid ""
+"Note that only main file appointments are read.\n"
+"Foreign events are not exported."
+msgstr "Notar que sols los fichièrs principals rendètz-vos son legits.\nLos eveniments exteriors son pas exportats."
+
+#: ../src/interface.c:1059
+msgid "You can easily drag these from event-list window."
+msgstr "Los podètz lisar dempuèi la fenèstra lista dels eveniments."
+
+#: ../src/interface.c:1061
+msgid "Orage appointment UIDs separated by commas."
+msgstr "UIDs dels rendètz-vos d'orage separats per de virgulas."
+
+#: ../src/interface.c:1067
+msgid "Archive"
+msgstr "Archiu"
+
+#: ../src/interface.c:1075
+#, c-format
+msgid "Archive now (threshold: %d months)"
+msgstr "Archivar ara (sulhet d'archivatge : %d meses)"
+
+#: ../src/interface.c:1085
+msgid "You can change archive threshold in parameters"
+msgstr "Podètz modificar lo sulhet d'archiu dins los paramètres"
+
+#: ../src/interface.c:1092
+msgid "Revert archive now"
+msgstr "Restablir l'archiu ara"
+
+#: ../src/interface.c:1098
+msgid ""
+"Return all archived events into main orage file and remove arch file.\n"
+"This is useful for example when doing export and moving orage\n"
+"appointments to another system."
+msgstr "Tornar totes los eveniments archivats dins lo fichièr principal d'orage e suprimir lo fichièr arch.\nAquò's utile per exemple quand efectuatz l'exportacion e lo desplaçament d'un rendètz-vos\norage dins un autre sistèma."
+
+#: ../src/interface.c:1109
+msgid "Orage files"
+msgstr "Fichièrs d'Orage"
+
+#: ../src/interface.c:1116
+msgid "Orage main calendar file"
+msgstr "Fichièr calendièr principal d'Orage"
+
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Fichièr actual :"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Fichièr novèl :"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Opcions d'accion :"
+
+#: ../src/interface.c:1147 ../src/interface.c:1213
+msgid "Rename"
+msgstr "Renomenar"
+
+#: ../src/interface.c:1151
+msgid ""
+"Orage internal file rename only.\n"
+"Does not touch external filesystem at all.\n"
+"New file must exist."
+msgstr "Renomenar lo fichièr Orage intèrne unicament.\nTocar pas brica lo sistèma de fichièrs extèrnes.\nLo novèl fichièr deu existir."
+
+#: ../src/interface.c:1155 ../src/interface.c:1218
+msgid "Copy"
+msgstr "Copiar"
+
+#: ../src/interface.c:1159
+msgid "Current file is copied and stays unmodified in the old place."
+msgstr "Lo fichièr actual es copiat e demòra incambiat a son anciana plaça."
+
+#: ../src/interface.c:1163 ../src/interface.c:1223
+msgid "Move"
+msgstr "Desplaçar"
+
+#: ../src/interface.c:1167
+msgid "Current file is moved and vanishes from the old place."
+msgstr "Lo fichièr actual es deplaçat e desapareis de l'anciana plaça."
+
+#: ../src/interface.c:1181
+msgid "Archive file"
+msgstr "Fichièr archiu"
+
+#: ../src/interface.c:1245
+msgid "Foreign files"
+msgstr "Fichièrs extèrnes"
+
+#: ../src/interface.c:1252
+msgid "Add new foreign file"
+msgstr "Apondre un novèl fichièr extèrne"
+
+#: ../src/interface.c:1257
+msgid "Foreign file:"
+msgstr "Fichièr extèrne :"
+
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Nom visible :"
+
+#: ../src/interface.c:1285
+msgid "Read only"
+msgstr "Lectura sola"
+
+#: ../src/interface.c:1292
+msgid ""
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Permet d'èsser segur qu'aqueste fichièr siá pas jamai modificat per Orage.\nNotatz que la modificacion dels fichièrs extèrnes los rend incompatibles amb l'aisina qu'a servit a los crear !"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Aqueste nom intèrne s'aficha per l'utilizaire a la plaça del nom del fichièr."
+
+#: ../src/interface.c:1308
+msgid "Exchange data - Orage"
+msgstr "Escambi de donadas - Orage"
+
+#: ../src/main.c:275
+#, c-format
+msgid ""
+"\tThis is %s version %s\n"
+"\n"
+msgstr "\tAquò es %s version %s\n\n"
+
+#: ../src/main.c:277
+#, c-format
+msgid "\tReleased under the terms of the GNU General Public License.\n"
+msgstr "\tDistribuit jols tèrmes de la GNU General Public License.\n"
+
+#: ../src/main.c:278
+#, c-format
+msgid "\tCompiled against GTK+-%d.%d.%d, "
+msgstr "\tCompilat amb GTK+-%d.%d.%d, "
+
+#: ../src/main.c:280
+#, c-format
+msgid "using GTK+-%d.%d.%d.\n"
+msgstr "utilizant GTK+-%d.%d.%d.\n"
+
+#: ../src/main.c:283
+#, c-format
+msgid "\tUsing DBUS for import.\n"
+msgstr "\tUtilizacion de DBUS per l'importacion.\n"
+
+#: ../src/main.c:285
+#, c-format
+msgid "\tNot using DBUS. Import works only partially.\n"
+msgstr "\tDBUS pas utilizat. L'importacion fonciona pas que parcialament.\n"
+
+#: ../src/main.c:288
+#, c-format
+msgid "\tUsing libnotify.\n"
+msgstr "\tUtilizacion de libnotify.\n"
+
+#: ../src/main.c:290
+#, c-format
+msgid "\tNot using libnotify.\n"
+msgstr "\tlibnotify  pas utilizat.\n"
+
+#: ../src/main.c:293
+#, c-format
+msgid "\tUsing automatic archiving.\n"
+msgstr "\tUtilizacion de l'archivatge automatic.\n"
+
+#: ../src/main.c:295
+#, c-format
+msgid "\tNot using archiving.\n"
+msgstr "\tArchivatge pas utilizat.\n"
+
+#: ../src/main.c:298
+#, c-format
+msgid "\tUsing operating system package libical.\n"
+msgstr "\tUtilizacion del paquet libical provesit pel sistèma operatiu\n"
+
+#: ../src/main.c:300
+#, c-format
+msgid "\tUsing Orage local version of libical.\n"
+msgstr "\tUtilizacion de la version pròpri a Orage de libical.\n"
+
+#: ../src/main.c:313
+#, c-format
+msgid ""
+"Usage: orage [options] [files]\n"
+"\n"
+msgstr "Utilizacion : orage [opcions] [fichièrs]\n\n"
+
+#: ../src/main.c:314
+#, c-format
+msgid "Options:\n"
+msgstr "Opcions :\n"
+
+#: ../src/main.c:315
+#, c-format
+msgid "--version (-v) \t\tshow version of orage\n"
+msgstr "--version (v) \t\tafichar la version d'orage\n"
+
+#: ../src/main.c:316
+#, c-format
+msgid "--help (-h) \t\tprint this text\n"
+msgstr "--help (-h) \t\tafichar l'ajuda\n"
+
+#: ../src/main.c:317
+#, c-format
+msgid "--preferences (-p) \tshow preferences form\n"
+msgstr "--preferences (-p) \tafichar las preferéncias\n"
+
+#: ../src/main.c:318
+#, c-format
+msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
+msgstr "--toggle (-t) \t\trendre orage visible/invisible\n"
+
+#: ../src/main.c:319
+#, c-format
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) fichièr [RW] [nom] \tapondre un fichièr extèrne\n"
+
+#: ../src/main.c:320
+#, c-format
+msgid "--remove-foreign (-r) file \tremove a foreign file\n"
+msgstr "--remove-foreign (-r) fichièr \tsuprimir un fichièr extèrne\n"
+
+#: ../src/main.c:321
+#, c-format
+msgid ""
+"--export (-e) file [appointment...] \texport appointments from Orage to "
+"file\n"
+msgstr "--export (-e) file [rendètz-vos...] \texportar los rendètz-vos d'Orage dins un fichièr\n"
+
+#: ../src/main.c:323
+#, c-format
+msgid "files=ical files to load into orage\n"
+msgstr "files=fichièrs ical de cargar dins Orage\n"
+
+#: ../src/main.c:325
+#, c-format
+msgid "\tdbus not included in orage. \n"
+msgstr "\tdbus es pas inclús dins Orage. \n"
+
+#: ../src/main.c:326
+#, c-format
+msgid ""
+"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
+"when starting orage \n"
+msgstr "\tsens [fichièrs] dbus e las opcions fichièr extèrnes (-a et-r) pòdon èsser solament utilizadas al moment de l'aviada d'orage \n"
+
+#: ../src/main.c:535
+#, c-format
+msgid ""
+"\n"
+"Unknown option %s\n"
+"\n"
+msgstr "\nOpcion desconeguda %s\n\n"
+
+#: ../src/mainbox.c:305
+msgid "_Exchange data"
+msgstr "Es_cambiar de donadas"
+
+#. Edit menu
+#: ../src/mainbox.c:316
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../src/mainbox.c:326
+msgid "View selected _date"
+msgstr "Veire lo _jorn causit"
+
+#: ../src/mainbox.c:329
+msgid "View selected _week"
+msgstr "Veire la _setmana causida"
+
+#: ../src/mainbox.c:335
+msgid "Select _Today"
+msgstr "Causir _uèi"
+
+#: ../src/mainbox.c:341
+msgid "Show _Globaltime"
+msgstr "Veire l'ora globala"
+
+#. Help menu
+#: ../src/mainbox.c:345
+msgid "_Help"
+msgstr "_Ajuda"
+
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Pas de títol definit"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr " Emplaçament : %s \n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n Nòta :\n%s"
+
+#: ../src/mainbox.c:489
+msgid "Never"
+msgstr "Pas jamai"
+
+#: ../src/mainbox.c:495
+#, c-format
+msgid ""
+"Title: %s\n"
+"%s Start:\t%s\n"
+" Due:\t%s\n"
+" Done:\t%s%s"
+msgstr "Títol : %s\n%s Començament :\t%s\n Escasença :\t%s\n Fach :\t%s%s"
+
+#: ../src/mainbox.c:503
+#, c-format
+msgid ""
+"Title: %s\n"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Títol: %s \n%s Començament : \t%s\n Fin : \t%s%s"
+
+#: ../src/mainbox.c:613
+msgid "<b>To do:</b>"
+msgstr "<b>A far :</b>"
+
+#: ../src/mainbox.c:649
+#, c-format
+msgid "<b>Events for %s:</b>"
+msgstr "<b>Eveniments per %s :<b>"
+
+#: ../src/mainbox.c:660
+#, c-format
+msgid "<b>Events for %s - %s:</b>"
+msgstr "<b>Eveniments per %s - %s :<b>"
+
+#: ../src/parameters.c:492
+msgid "Main settings"
+msgstr "Paramètres principals"
+
+#: ../src/parameters.c:498
+msgid "Timezone"
+msgstr "Fus orari"
+
+#: ../src/parameters.c:513
+msgid "You should always define your local timezone."
+msgstr "Vos cal totjorn definir vòstre fus orari local."
+
+#: ../src/parameters.c:521
+msgid "Archive threshold (months)"
+msgstr "Durada d'archivar (meses)"
+
+#: ../src/parameters.c:531
+msgid "(0 = no archiving)"
+msgstr "(0 = pas d'archivatge)"
+
+#: ../src/parameters.c:534
+msgid "Archiving is used to save time and space when handling events."
+msgstr "L'archivatge es utilizat per ganhar del temps e de l'espaci al moment de la manipulacion dels eveniments."
+
+#: ../src/parameters.c:542
+msgid "Sound command"
+msgstr "Comanda per jogar un son"
+
+#: ../src/parameters.c:557
+msgid "This command is given to shell to make sound in alarms."
+msgstr "Aquesta comanda es donada a un interpretador de comanda per far sonar las alarmas."
+
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Fenèstra calendièr"
+
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Detalhs visuals del calendièr  "
+
+#: ../src/parameters.c:609
+msgid "Show borders"
+msgstr "Afichar la bordadura de fenèstra"
+
+#: ../src/parameters.c:614
+msgid "Show menu"
+msgstr "Afichar la barra de menú"
+
+#: ../src/parameters.c:622
+msgid "Show day names"
+msgstr "Afichar lo nom del jorn"
+
+#: ../src/parameters.c:627
+msgid "Show week numbers"
+msgstr "Afichar los numèros de setmana"
+
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Afichar lo mes e l'annada"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Calendièr de las bóstias info"
+
+#: ../src/parameters.c:660
+msgid "Show todo list"
+msgstr "Afichar la lista a far"
+
+#: ../src/parameters.c:667
+msgid "Number of days to show in event window"
+msgstr "Nombre de jorns d'afichar dins la fenèstra d’eveniments"
+
+#: ../src/parameters.c:673
+msgid "0 = do not show event list at all"
+msgstr "0 = afichar pas la lista dels eveniments"
+
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Visibilitat calendièr "
+
+#: ../src/parameters.c:691
+msgid "Show on all desktops"
+msgstr "Afichar sus totes los burèus"
+
+#: ../src/parameters.c:696
+msgid "Keep on top"
+msgstr "Totjorn en dessús"
+
+#: ../src/parameters.c:704
+msgid "Show in taskbar"
+msgstr "Afichar dins la barra dels prètzfaches"
+
+#: ../src/parameters.c:709
+msgid "Show in pager"
+msgstr "Afichar dins lo pager"
+
+#: ../src/parameters.c:717
+msgid "Show in systray"
+msgstr "Afichar dins la zòna de notificacion"
+
+#: ../src/parameters.c:738
+msgid "Calendar start"
+msgstr "Afichatge del calendièr a l'aviada"
+
+#: ../src/parameters.c:743
+msgid "Show"
+msgstr "Afichar"
+
+#: ../src/parameters.c:755
+msgid "Hide"
+msgstr "Amagar"
+
+#: ../src/parameters.c:767
+msgid "Minimized"
+msgstr "Redusir"
+
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "Sus la fenèstra dobèrta del calendièr "
+
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Seleccionar la data d'uèi"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Seleccionar la data seleccionada precedentament"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Calendièr de la jornada clic doble per veire"
+
+#: ../src/parameters.c:828
+msgid "Days view"
+msgstr "Vista dels jorns"
+
+#: ../src/parameters.c:840
+msgid "Event list"
+msgstr "Lista dels eveniments"
+
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Paramètres suplementaris"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Fenèstra de la lista dels eveniments"
+
+#: ../src/parameters.c:874
+msgid "Number of extra days to show in event list"
+msgstr "Nombre de jorns suplementaris per mostrar dins la lista dels eveniments"
+
+#: ../src/parameters.c:883
+msgid ""
+"This is just the default value, you can change it in the actual eventlist "
+"window."
+msgstr "Es juste la valor per defaut, podètz la modificar dins la fenèstra de la lista dels eveniments actuals."
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Veire solament la primièra repeticion de l’eveniment"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Jorn vist de la fenèstra per defaut del primièr jorn"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Primièr jorn de la setmana"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Jorn seleccionat"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Utilizar la barra dels prètzfaches dinamica"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Utilizar una icòna dinamica"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "L'icòna dinamica aficha lo mes corrent e lo jorn del mes."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
+msgid "Use wakeup timer"
+msgstr "Utilizar la minutariá del revelh"
+
+#: ../src/parameters.c:973
+msgid ""
+"Use this timer if Orage has problems waking up properly after suspend or "
+"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "Utilizar aquesta minutariá se Orage aviá de problèmas per s'activar corrèctament aprèp una mesa en velha o una mesa en ivernacion. (Per exemple, l'icòna es pas mesas à jorn o las alarmas son pas activadas)"
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Fichièr extèrne per defaut de l'alarma visuala "
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Fenèstra Orage "
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Senhalar la notificacion"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Totjorn quitar quand se demanda de tampar."
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Totjorn quitar"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Per defaut Orage demòra dobèrt en rèire plan quand se demanda de tampar. Aquesta opcion modifica Orage quitar e demorar pas jamai en rèire plan quand se demande de tampar."
+
+#: ../src/parameters.c:1045
+msgid "Orage Preferences"
+msgstr "Preferéncias d'Orage"
+
+#: ../src/parameters.c:1157
+msgid "First Orage start. Searching default timezone."
+msgstr "Primièra aviada d'Orage. Recèrca del fus orari per defaut."
+
+#: ../src/parameters.c:1176
+#, c-format
+msgid "Default timezone set to %s."
+msgstr "Fus orari definit a %s per defaut."
+
+#: ../src/parameters.c:1179
+msgid "Default timezone not found, please, set it manually."
+msgstr "Fus orari per defaut pas trobat, se vos plai, seleccionatz-lo manualament."
+
+#: ../src/reminder.c:562
+msgid "Reminder "
+msgstr "Rapèl"
+
+#: ../src/reminder.c:591
+msgid "Open"
+msgstr "Dobrir"
+
+#: ../src/reminder.c:719
+msgid "Reminder - Orage"
+msgstr "Rapèl - Orage"
+
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Raportar"
+
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
+msgstr "Rapelatz-me aprèp lo relambi especificat"
+
+#: ../src/reminder.c:1091
+msgid "Next active alarms:"
+msgstr "Alarmas activas que venon :"
+
+#: ../src/reminder.c:1145
+#, c-format
+msgid ""
+"\n"
+"%02d d %02d h %02d min to: %s"
+msgstr "\n%02d j %02d h %02d min a : %s"
+
+#: ../src/reminder.c:1154
+#, c-format
+msgid ""
+"\n"
+"No active alarms found"
+msgstr "\nPas d'alarma activa trobada"
+
+#: ../src/timezone_names.c:36
+msgid "Africa"
+msgstr "Africa"
+
+#: ../src/timezone_names.c:37
+msgid "Africa/Abidjan"
+msgstr "Africa/Abidjan"
+
+#: ../src/timezone_names.c:38
+msgid "Africa/Accra"
+msgstr "Africa/Accra"
+
+#: ../src/timezone_names.c:39
+msgid "Africa/Addis_Ababa"
+msgstr "Africa/Adis_Abeba"
+
+#: ../src/timezone_names.c:40
+msgid "Africa/Algiers"
+msgstr "Africa/Argièr"
+
+#: ../src/timezone_names.c:41
+msgid "Africa/Asmara"
+msgstr "Africa/Asmara"
+
+#: ../src/timezone_names.c:42
+msgid "Africa/Asmera"
+msgstr "Africa/Asmara"
+
+#: ../src/timezone_names.c:43
+msgid "Africa/Bamako"
+msgstr "Africa/Bamako"
+
+#: ../src/timezone_names.c:44
+msgid "Africa/Bangui"
+msgstr "Africa/Bangui"
+
+#: ../src/timezone_names.c:45
+msgid "Africa/Banjul"
+msgstr "Africa/Banjul"
+
+#: ../src/timezone_names.c:46
+msgid "Africa/Bissau"
+msgstr "Africa/Bissau"
+
+#: ../src/timezone_names.c:47
+msgid "Africa/Blantyre"
+msgstr "Africa/Blantyre"
+
+#: ../src/timezone_names.c:48
+msgid "Africa/Brazzaville"
+msgstr "Africa/Brazzaville"
+
+#: ../src/timezone_names.c:49
+msgid "Africa/Bujumbura"
+msgstr "Africa/Boujoumboura"
+
+#: ../src/timezone_names.c:50
+msgid "Africa/Cairo"
+msgstr "Africa/Le_Caire"
+
+#: ../src/timezone_names.c:51
+msgid "Africa/Casablanca"
+msgstr "Africa/Casablanca"
+
+#: ../src/timezone_names.c:52
+msgid "Africa/Ceuta"
+msgstr "Africa/Ceuta"
+
+#: ../src/timezone_names.c:53
+msgid "Africa/Conakry"
+msgstr "Africa/Conakry"
+
+#: ../src/timezone_names.c:54
+msgid "Africa/Dakar"
+msgstr "Africa/Dakar"
+
+#: ../src/timezone_names.c:55
+msgid "Africa/Dar_es_Salaam"
+msgstr "Africa/Dar_es_Salaam"
+
+#: ../src/timezone_names.c:56
+msgid "Africa/Djibouti"
+msgstr "Africa/Giboti"
+
+#: ../src/timezone_names.c:57
+msgid "Africa/Douala"
+msgstr "Africa/Douala"
+
+#: ../src/timezone_names.c:58
+msgid "Africa/El_Aaiun"
+msgstr "Africa/El_Aaiun"
+
+#: ../src/timezone_names.c:59
+msgid "Africa/Freetown"
+msgstr "Africa/Freetown"
+
+#: ../src/timezone_names.c:60
+msgid "Africa/Gaborone"
+msgstr "Africa/Gaborone"
+
+#: ../src/timezone_names.c:61
+msgid "Africa/Harare"
+msgstr "Africa/Harare"
+
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "Africa/Juba"
+
+#: ../src/timezone_names.c:63
+msgid "Africa/Johannesburg"
+msgstr "Africa/Johannesburg"
+
+#: ../src/timezone_names.c:64
+msgid "Africa/Kampala"
+msgstr "Africa/Kampala"
+
+#: ../src/timezone_names.c:65
+msgid "Africa/Khartoum"
+msgstr "Africa/Khartoum"
+
+#: ../src/timezone_names.c:66
+msgid "Africa/Kigali"
+msgstr "Africa/Kigali"
+
+#: ../src/timezone_names.c:67
+msgid "Africa/Kinshasa"
+msgstr "Africa/Kinshasa"
+
+#: ../src/timezone_names.c:68
+msgid "Africa/Lagos"
+msgstr "Africa/Lagos"
+
+#: ../src/timezone_names.c:69
+msgid "Africa/Libreville"
+msgstr "Africa/Libreville"
+
+#: ../src/timezone_names.c:70
+msgid "Africa/Lome"
+msgstr "Africa/Lome"
+
+#: ../src/timezone_names.c:71
+msgid "Africa/Luanda"
+msgstr "Africa/Luanda"
+
+#: ../src/timezone_names.c:72
+msgid "Africa/Lubumbashi"
+msgstr "Africa/Lubumbashi"
+
+#: ../src/timezone_names.c:73
+msgid "Africa/Lusaka"
+msgstr "Africa/Lusaka"
+
+#: ../src/timezone_names.c:74
+msgid "Africa/Malabo"
+msgstr "Africa/Malabo"
+
+#: ../src/timezone_names.c:75
+msgid "Africa/Maputo"
+msgstr "Africa/Maputo"
+
+#: ../src/timezone_names.c:76
+msgid "Africa/Maseru"
+msgstr "Africa/Maseru"
+
+#: ../src/timezone_names.c:77
+msgid "Africa/Mbabane"
+msgstr "Africa/Mbabane"
+
+#: ../src/timezone_names.c:78
+msgid "Africa/Mogadishu"
+msgstr "Africa/Mogadiscio"
+
+#: ../src/timezone_names.c:79
+msgid "Africa/Monrovia"
+msgstr "Africa/Monrovia"
+
+#: ../src/timezone_names.c:80
+msgid "Africa/Nairobi"
+msgstr "Africa/Nairobi"
+
+#: ../src/timezone_names.c:81
+msgid "Africa/Ndjamena"
+msgstr "Africa/Ndjamena"
+
+#: ../src/timezone_names.c:82
+msgid "Africa/Niamey"
+msgstr "Africa/Niamey"
+
+#: ../src/timezone_names.c:83
+msgid "Africa/Nouakchott"
+msgstr "Africa/Nouakchott"
+
+#: ../src/timezone_names.c:84
+msgid "Africa/Ouagadougou"
+msgstr "Africa/Ouagadougou"
+
+#: ../src/timezone_names.c:85
+msgid "Africa/Porto-Novo"
+msgstr "Africa/Porto-Novo"
+
+#: ../src/timezone_names.c:86
+msgid "Africa/Sao_Tome"
+msgstr "Africa/Sao_Tome"
+
+#: ../src/timezone_names.c:87
+msgid "Africa/Timbuktu"
+msgstr "Africa/Tombouctou"
+
+#: ../src/timezone_names.c:88
+msgid "Africa/Tripoli"
+msgstr "Africa/Tripoli"
+
+#: ../src/timezone_names.c:89
+msgid "Africa/Tunis"
+msgstr "Africa/Tunis"
+
+#: ../src/timezone_names.c:90
+msgid "Africa/Windhoek"
+msgstr "Africa/Windhoek"
+
+#: ../src/timezone_names.c:91
+msgid "America"
+msgstr "America"
+
+#: ../src/timezone_names.c:92
+msgid "America/Adak"
+msgstr "America/Adak"
+
+#: ../src/timezone_names.c:93
+msgid "America/Anchorage"
+msgstr "America/Anchorage"
+
+#: ../src/timezone_names.c:94
+msgid "America/Anguilla"
+msgstr "America/Anguilla"
+
+#: ../src/timezone_names.c:95
+msgid "America/Antigua"
+msgstr "America/Antigua"
+
+#: ../src/timezone_names.c:96
+msgid "America/Araguaina"
+msgstr "America/Araguaia"
+
+#: ../src/timezone_names.c:97
+msgid "America/Argentina/Buenos_Aires"
+msgstr "America/Argentina/Buenos_Aires"
+
+#: ../src/timezone_names.c:98
+msgid "America/Argentina/Catamarca"
+msgstr "America/Argentina/Catamarca"
+
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "America/Argentina/ComodRivadavia"
+
+#: ../src/timezone_names.c:100
+msgid "America/Argentina/Cordoba"
+msgstr "America/Argentina/Cordoba"
+
+#: ../src/timezone_names.c:101
+msgid "America/Argentina/Jujuy"
+msgstr "America/Argentina/Jujuy"
+
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "America/Argentina/La_Rioja"
+
+#: ../src/timezone_names.c:103
+msgid "America/Argentina/Mendoza"
+msgstr "America/Argentina/Mendoza"
+
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "America/Argentina/Rio_Gallegos"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "America/Argentina/Salta"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "America/Argentina/San_Juan"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "America/Argentina/San_Luis"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "America/Argentina/Tucuman"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "America/Argentina/Ushuaia"
+
+#: ../src/timezone_names.c:110
+msgid "America/Aruba"
+msgstr "America/Aruba"
+
+#: ../src/timezone_names.c:111
+msgid "America/Asuncion"
+msgstr "America/Asuncion"
+
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "America/Atikokan"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "America/Atka"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "America/Bahia"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "America/Bahia_Banderas"
+
+#: ../src/timezone_names.c:116
+msgid "America/Barbados"
+msgstr "America/Barbade"
+
+#: ../src/timezone_names.c:117
+msgid "America/Belem"
+msgstr "America/Belém"
+
+#: ../src/timezone_names.c:118
+msgid "America/Belize"
+msgstr "America/Belize"
+
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "America/Blanc-Sablon"
+
+#: ../src/timezone_names.c:120
+msgid "America/Boa_Vista"
+msgstr "America/Boa_Vista"
+
+#: ../src/timezone_names.c:121
+msgid "America/Bogota"
+msgstr "America/Bogota"
+
+#: ../src/timezone_names.c:122
+msgid "America/Boise"
+msgstr "America/Boise"
+
+#: ../src/timezone_names.c:123
+msgid "America/Buenos_Aires"
+msgstr "America/Buenos_Aires"
+
+#: ../src/timezone_names.c:124
+msgid "America/Cambridge_Bay"
+msgstr "America/Cambridge_Bay"
+
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "America/Campo_Grande"
+
+#: ../src/timezone_names.c:126
+msgid "America/Cancun"
+msgstr "America/Cancun"
+
+#: ../src/timezone_names.c:127
+msgid "America/Caracas"
+msgstr "America/Caracas"
+
+#: ../src/timezone_names.c:128
+msgid "America/Catamarca"
+msgstr "America/Catamarca"
+
+#: ../src/timezone_names.c:129
+msgid "America/Cayenne"
+msgstr "America/Cayenne"
+
+#: ../src/timezone_names.c:130
+msgid "America/Cayman"
+msgstr "America/Caïman"
+
+#: ../src/timezone_names.c:131
+msgid "America/Chicago"
+msgstr "America/Chicago"
+
+#: ../src/timezone_names.c:132
+msgid "America/Chihuahua"
+msgstr "America/Chihuahua"
+
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "America/Coral_Harbour"
+
+#: ../src/timezone_names.c:134
+msgid "America/Cordoba"
+msgstr "America/Cordoba"
+
+#: ../src/timezone_names.c:135
+msgid "America/Costa_Rica"
+msgstr "America/Costa_Rica"
+
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "America/Creston"
+
+#: ../src/timezone_names.c:137
+msgid "America/Cuiaba"
+msgstr "America/Cuiabà"
+
+#: ../src/timezone_names.c:138
+msgid "America/Curacao"
+msgstr "America/Curaçao"
+
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "America/Danmarkshavn"
+
+#: ../src/timezone_names.c:140
+msgid "America/Dawson"
+msgstr "America/Dawson"
+
+#: ../src/timezone_names.c:141
+msgid "America/Dawson_Creek"
+msgstr "America/Dawson_Creek"
+
+#: ../src/timezone_names.c:142
+msgid "America/Denver"
+msgstr "America/Denver"
+
+#: ../src/timezone_names.c:143
+msgid "America/Detroit"
+msgstr "America/Detroit"
+
+#: ../src/timezone_names.c:144
+msgid "America/Dominica"
+msgstr "America/Dominique"
+
+#: ../src/timezone_names.c:145
+msgid "America/Edmonton"
+msgstr "America/Edmonton"
+
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "America/Ensenada"
+
+#: ../src/timezone_names.c:147
+msgid "America/Eirunepe"
+msgstr "America/Eirunepé"
+
+#: ../src/timezone_names.c:148
+msgid "America/El_Salvador"
+msgstr "America/San_Salvador"
+
+#: ../src/timezone_names.c:149
+msgid "America/Fortaleza"
+msgstr "America/Fortaleza"
+
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "America/Fort_Wayne"
+
+#: ../src/timezone_names.c:151
+msgid "America/Glace_Bay"
+msgstr "America/Glace_Bay"
+
+#: ../src/timezone_names.c:152
+msgid "America/Godthab"
+msgstr "America/Godthab"
+
+#: ../src/timezone_names.c:153
+msgid "America/Goose_Bay"
+msgstr "America/Goose_Bay"
+
+#: ../src/timezone_names.c:154
+msgid "America/Grand_Turk"
+msgstr "America/Grand_Turk"
+
+#: ../src/timezone_names.c:155
+msgid "America/Grenada"
+msgstr "America/Grenade"
+
+#: ../src/timezone_names.c:156
+msgid "America/Guadeloupe"
+msgstr "America/Guadeloupe"
+
+#: ../src/timezone_names.c:157
+msgid "America/Guatemala"
+msgstr "America/Guatemala"
+
+#: ../src/timezone_names.c:158
+msgid "America/Guayaquil"
+msgstr "America/Guayaquil"
+
+#: ../src/timezone_names.c:159
+msgid "America/Guyana"
+msgstr "America/Guyana"
+
+#: ../src/timezone_names.c:160
+msgid "America/Halifax"
+msgstr "America/Halifax"
+
+#: ../src/timezone_names.c:161
+msgid "America/Havana"
+msgstr "America/La_Havane"
+
+#: ../src/timezone_names.c:162
+msgid "America/Hermosillo"
+msgstr "America/Hermosillo"
+
+#: ../src/timezone_names.c:163
+msgid "America/Indiana/Indianapolis"
+msgstr "America/Indiana/Indianapolis"
+
+#: ../src/timezone_names.c:164
+msgid "America/Indiana/Knox"
+msgstr "America/Indiana/Knox"
+
+#: ../src/timezone_names.c:165
+msgid "America/Indiana/Marengo"
+msgstr "America/Indiana/Marengo"
+
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "America/Indiana/Petersburg"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "America/Indiana/Tell_City"
+
+#: ../src/timezone_names.c:168
+msgid "America/Indiana/Vevay"
+msgstr "America/Indiana/Vevay"
+
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "America/Indiana/Vincennes"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "America/Indiana/Winamac"
+
+#: ../src/timezone_names.c:171
+msgid "America/Indianapolis"
+msgstr "America/Indianapolis"
+
+#: ../src/timezone_names.c:172
+msgid "America/Inuvik"
+msgstr "America/Inuvik"
+
+#: ../src/timezone_names.c:173
+msgid "America/Iqaluit"
+msgstr "America/Iqaluit"
+
+#: ../src/timezone_names.c:174
+msgid "America/Jamaica"
+msgstr "America/Jamaïca"
+
+#: ../src/timezone_names.c:175
+msgid "America/Jujuy"
+msgstr "America/Jujuy"
+
+#: ../src/timezone_names.c:176
+msgid "America/Juneau"
+msgstr "America/Juneau"
+
+#: ../src/timezone_names.c:177
+msgid "America/Kentucky/Louisville"
+msgstr "America/Kentucky/Louisville"
+
+#: ../src/timezone_names.c:178
+msgid "America/Kentucky/Monticello"
+msgstr "America/Kentucky/Monticello"
+
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "America/Knox_IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "America/Kralendijk"
+
+#: ../src/timezone_names.c:181
+msgid "America/La_Paz"
+msgstr "America/La_Paz"
+
+#: ../src/timezone_names.c:182
+msgid "America/Lima"
+msgstr "America/Lima"
+
+#: ../src/timezone_names.c:183
+msgid "America/Los_Angeles"
+msgstr "America/Los_Angeles"
+
+#: ../src/timezone_names.c:184
+msgid "America/Louisville"
+msgstr "America/Louisville"
+
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "America/Lower_Princes"
+
+#: ../src/timezone_names.c:186
+msgid "America/Maceio"
+msgstr "America/Maceio"
+
+#: ../src/timezone_names.c:187
+msgid "America/Managua"
+msgstr "America/Managua"
+
+#: ../src/timezone_names.c:188
+msgid "America/Manaus"
+msgstr "America/Manaus"
+
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "America/Marigot"
+
+#: ../src/timezone_names.c:190
+msgid "America/Martinique"
+msgstr "America/Martinica"
+
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "America/Matamoros"
+
+#: ../src/timezone_names.c:192
+msgid "America/Mazatlan"
+msgstr "America/Mazatlan"
+
+#: ../src/timezone_names.c:193
+msgid "America/Mendoza"
+msgstr "America/Mendoza"
+
+#: ../src/timezone_names.c:194
+msgid "America/Menominee"
+msgstr "America/Menominee"
+
+#: ../src/timezone_names.c:195
+msgid "America/Merida"
+msgstr "America/Mérida"
+
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "America/Metlakatla"
+
+#: ../src/timezone_names.c:197
+msgid "America/Mexico_City"
+msgstr "America/Mexico"
+
+#: ../src/timezone_names.c:198
+msgid "America/Miquelon"
+msgstr "America/Miquelon"
+
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "America/Moncton"
+
+#: ../src/timezone_names.c:200
+msgid "America/Monterrey"
+msgstr "America/Monterrey"
+
+#: ../src/timezone_names.c:201
+msgid "America/Montevideo"
+msgstr "America/Montevideo"
+
+#: ../src/timezone_names.c:202
+msgid "America/Montreal"
+msgstr "America/Montréal"
+
+#: ../src/timezone_names.c:203
+msgid "America/Montserrat"
+msgstr "America/Montserrat"
+
+#: ../src/timezone_names.c:204
+msgid "America/Nassau"
+msgstr "America/Nassau"
+
+#: ../src/timezone_names.c:205
+msgid "America/New_York"
+msgstr "America/New_York"
+
+#: ../src/timezone_names.c:206
+msgid "America/Nipigon"
+msgstr "America/Nipigon"
+
+#: ../src/timezone_names.c:207
+msgid "America/Nome"
+msgstr "America/Nome"
+
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "America/North_Dakota/Center"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "America/North_Dakota/Center"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "America/North_Dakota/New_Salem"
+
+#: ../src/timezone_names.c:211
+msgid "America/Noronha"
+msgstr "America/Noronha"
+
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "America/Ojinaga"
+
+#: ../src/timezone_names.c:213
+msgid "America/Panama"
+msgstr "America/Panama"
+
+#: ../src/timezone_names.c:214
+msgid "America/Pangnirtung"
+msgstr "America/Pangnirtung"
+
+#: ../src/timezone_names.c:215
+msgid "America/Paramaribo"
+msgstr "America/Paramaribo"
+
+#: ../src/timezone_names.c:216
+msgid "America/Phoenix"
+msgstr "America/Phoenix"
+
+#: ../src/timezone_names.c:217
+msgid "America/Port-au-Prince"
+msgstr "America/Port-au-Prince"
+
+#: ../src/timezone_names.c:218
+msgid "America/Port_of_Spain"
+msgstr "America/Port_of_Spain"
+
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "America/Porto_Acre"
+
+#: ../src/timezone_names.c:220
+msgid "America/Porto_Velho"
+msgstr "America/Pôrto_Velho"
+
+#: ../src/timezone_names.c:221
+msgid "America/Puerto_Rico"
+msgstr "America/Porto_Rico"
+
+#: ../src/timezone_names.c:222
+msgid "America/Rainy_River"
+msgstr "America/Rainy_River"
+
+#: ../src/timezone_names.c:223
+msgid "America/Rankin_Inlet"
+msgstr "America/Rankin_Inlet"
+
+#: ../src/timezone_names.c:224
+msgid "America/Recife"
+msgstr "America/Recife"
+
+#: ../src/timezone_names.c:225
+msgid "America/Regina"
+msgstr "America/Regina"
+
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "America/Resolute"
+
+#: ../src/timezone_names.c:227
+msgid "America/Rio_Branco"
+msgstr "America/Rio_Branco"
+
+#: ../src/timezone_names.c:228
+msgid "America/Rosario"
+msgstr "America/Rosario"
+
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "America/Santa_Isabel"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "America/Santarem"
+
+#: ../src/timezone_names.c:231
+msgid "America/Santiago"
+msgstr "America/Santiago"
+
+#: ../src/timezone_names.c:232
+msgid "America/Santo_Domingo"
+msgstr "America/Santo_Domingo"
+
+#: ../src/timezone_names.c:233
+msgid "America/Sao_Paulo"
+msgstr "America/Sao_Paulo"
+
+#: ../src/timezone_names.c:234
+msgid "America/Scoresbysund"
+msgstr "America/Scoresbysund"
+
+#: ../src/timezone_names.c:235
+msgid "America/Shiprock"
+msgstr "America/Shiprock"
+
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "America/Sitka"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "America/St_Barthelemy"
+
+#: ../src/timezone_names.c:238
+msgid "America/St_Johns"
+msgstr "America/St_Johns"
+
+#: ../src/timezone_names.c:239
+msgid "America/St_Kitts"
+msgstr "America/St_Kitts"
+
+#: ../src/timezone_names.c:240
+msgid "America/St_Lucia"
+msgstr "America/Ste_Lucie"
+
+#: ../src/timezone_names.c:241
+msgid "America/St_Thomas"
+msgstr "America/St_Thomas"
+
+#: ../src/timezone_names.c:242
+msgid "America/St_Vincent"
+msgstr "America/St_Vincent"
+
+#: ../src/timezone_names.c:243
+msgid "America/Swift_Current"
+msgstr "America/Swift_Current"
+
+#: ../src/timezone_names.c:244
+msgid "America/Tegucigalpa"
+msgstr "America/Tegucigalpa"
+
+#: ../src/timezone_names.c:245
+msgid "America/Thule"
+msgstr "America/Thule"
+
+#: ../src/timezone_names.c:246
+msgid "America/Thunder_Bay"
+msgstr "America/Thunder_Bay"
+
+#: ../src/timezone_names.c:247
+msgid "America/Tijuana"
+msgstr "America/Tijuana"
+
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "America/Toronto"
+
+#: ../src/timezone_names.c:249
+msgid "America/Tortola"
+msgstr "America/Tortola"
+
+#: ../src/timezone_names.c:250
+msgid "America/Vancouver"
+msgstr "America/Vancouver"
+
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "America/Virgin"
+
+#: ../src/timezone_names.c:252
+msgid "America/Whitehorse"
+msgstr "America/Whitehorse"
+
+#: ../src/timezone_names.c:253
+msgid "America/Winnipeg"
+msgstr "America/Winnipeg"
+
+#: ../src/timezone_names.c:254
+msgid "America/Yakutat"
+msgstr "America/Yakutat"
+
+#: ../src/timezone_names.c:255
+msgid "America/Yellowknife"
+msgstr "America/Yellowknife"
+
+#: ../src/timezone_names.c:256
+msgid "Antarctica"
+msgstr "Antarctica"
+
+#: ../src/timezone_names.c:257
+msgid "Antarctica/Casey"
+msgstr "Antarctica/Casey"
+
+#: ../src/timezone_names.c:258
+msgid "Antarctica/Davis"
+msgstr "Antarctica/Davis"
+
+#: ../src/timezone_names.c:259
+msgid "Antarctica/DumontDUrville"
+msgstr "Antarctica/Dumont_D'Urville"
+
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Antarctica/Macquarie"
+
+#: ../src/timezone_names.c:261
+msgid "Antarctica/Mawson"
+msgstr "Antarctica/Mawson"
+
+#: ../src/timezone_names.c:262
+msgid "Antarctica/McMurdo"
+msgstr "Antarctica/McMurdo"
+
+#: ../src/timezone_names.c:263
+msgid "Antarctica/Palmer"
+msgstr "Antarctica/Palmer"
+
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Antarctica/Rothera"
+
+#: ../src/timezone_names.c:265
+msgid "Antarctica/South_Pole"
+msgstr "Antarctica/Pôle_Sud"
+
+#: ../src/timezone_names.c:266
+msgid "Antarctica/Syowa"
+msgstr "Antarctica/Syowa"
+
+#: ../src/timezone_names.c:267
+msgid "Antarctica/Vostok"
+msgstr "Antarctica/Vostok"
+
+#: ../src/timezone_names.c:268
+msgid "Arctic"
+msgstr "Arctica"
+
+#: ../src/timezone_names.c:269
+msgid "Arctic/Longyearbyen"
+msgstr "Arctica/Longyearbyen"
+
+#: ../src/timezone_names.c:270
+msgid "Asia"
+msgstr "Asia"
+
+#: ../src/timezone_names.c:271
+msgid "Asia/Aden"
+msgstr "Asia/Aden"
+
+#: ../src/timezone_names.c:272
+msgid "Asia/Almaty"
+msgstr "Asia/Almati"
+
+#: ../src/timezone_names.c:273
+msgid "Asia/Amman"
+msgstr "Asia/Amman"
+
+#: ../src/timezone_names.c:274
+msgid "Asia/Anadyr"
+msgstr "Asia/Anadyr"
+
+#: ../src/timezone_names.c:275
+msgid "Asia/Aqtau"
+msgstr "Asia/Aktaou"
+
+#: ../src/timezone_names.c:276
+msgid "Asia/Aqtobe"
+msgstr "Asia/Aktioubinsk"
+
+#: ../src/timezone_names.c:277
+msgid "Asia/Ashgabat"
+msgstr "Asia/Achkhabad"
+
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Asia/Ashkhabad"
+
+#: ../src/timezone_names.c:279
+msgid "Asia/Baghdad"
+msgstr "Asia/Baghdad"
+
+#: ../src/timezone_names.c:280
+msgid "Asia/Bahrain"
+msgstr "Asia/Bahrein"
+
+#: ../src/timezone_names.c:281
+msgid "Asia/Baku"
+msgstr "Asia/Bakou"
+
+#: ../src/timezone_names.c:282
+msgid "Asia/Bangkok"
+msgstr "Asia/Bangkok"
+
+#: ../src/timezone_names.c:283
+msgid "Asia/Beirut"
+msgstr "Asia/Beyrouth"
+
+#: ../src/timezone_names.c:284
+msgid "Asia/Bishkek"
+msgstr "Asia/Bishkek"
+
+#: ../src/timezone_names.c:285
+msgid "Asia/Brunei"
+msgstr "Asia/Brunei"
+
+#: ../src/timezone_names.c:286
+msgid "Asia/Calcutta"
+msgstr "Asia/Calcutta"
+
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Asia/Choibalsan"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "Asia/Chongqing"
+
+#: ../src/timezone_names.c:289
+msgid "Asia/Chungking"
+msgstr "Asia/Chongqing"
+
+#: ../src/timezone_names.c:290
+msgid "Asia/Colombo"
+msgstr "Asia/Colombo"
+
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Asia/Dacca"
+
+#: ../src/timezone_names.c:292
+msgid "Asia/Damascus"
+msgstr "Asia/Damas"
+
+#: ../src/timezone_names.c:293
+msgid "Asia/Dhaka"
+msgstr "Asia/Dhaka"
+
+#: ../src/timezone_names.c:294
+msgid "Asia/Dili"
+msgstr "Asia/Dili"
+
+#: ../src/timezone_names.c:295
+msgid "Asia/Dubai"
+msgstr "Asia/Doubaï"
+
+#: ../src/timezone_names.c:296
+msgid "Asia/Dushanbe"
+msgstr "Asia/Douchanbé"
+
+#: ../src/timezone_names.c:297
+msgid "Asia/Gaza"
+msgstr "Asia/Gaza"
+
+#: ../src/timezone_names.c:298
+msgid "Asia/Harbin"
+msgstr "Asia/Harbin"
+
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Asia/Hebron"
+
+#: ../src/timezone_names.c:300
+msgid "Asia/Hong_Kong"
+msgstr "Asia/Hong_Kong"
+
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Asia/Ho_Chi_Minh"
+
+#: ../src/timezone_names.c:302
+msgid "Asia/Hovd"
+msgstr "Asia/Hovd"
+
+#: ../src/timezone_names.c:303
+msgid "Asia/Irkutsk"
+msgstr "Asia/Irkoutsk"
+
+#: ../src/timezone_names.c:304
+msgid "Asia/Istanbul"
+msgstr "Asia/Istanbul"
+
+#: ../src/timezone_names.c:305
+msgid "Asia/Jakarta"
+msgstr "Asia/Djakarta"
+
+#: ../src/timezone_names.c:306
+msgid "Asia/Jayapura"
+msgstr "Asia/Jayapura"
+
+#: ../src/timezone_names.c:307
+msgid "Asia/Jerusalem"
+msgstr "Asia/Jerusalem"
+
+#: ../src/timezone_names.c:308
+msgid "Asia/Kabul"
+msgstr "Asia/Kaboul"
+
+#: ../src/timezone_names.c:309
+msgid "Asia/Kamchatka"
+msgstr "Asia/Kamchatka"
+
+#: ../src/timezone_names.c:310
+msgid "Asia/Karachi"
+msgstr "Asia/Karachi"
+
+#: ../src/timezone_names.c:311
+msgid "Asia/Kashgar"
+msgstr "Asia/Kashgar"
+
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Asia/Kathmandu"
+
+#: ../src/timezone_names.c:313
+msgid "Asia/Katmandu"
+msgstr "Asia/Kathmandu"
+
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Asia/Khandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Asia/Kolkata"
+
+#: ../src/timezone_names.c:316
+msgid "Asia/Krasnoyarsk"
+msgstr "Asia/Krasnoyarsk"
+
+#: ../src/timezone_names.c:317
+msgid "Asia/Kuala_Lumpur"
+msgstr "Asia/Kuala_Lumpur"
+
+#: ../src/timezone_names.c:318
+msgid "Asia/Kuching"
+msgstr "Asia/Kuching"
+
+#: ../src/timezone_names.c:319
+msgid "Asia/Kuwait"
+msgstr "Asia/Kowait"
+
+#: ../src/timezone_names.c:320
+msgid "Asia/Macao"
+msgstr "Asia/Macao"
+
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Asia/Macau"
+
+#: ../src/timezone_names.c:322
+msgid "Asia/Magadan"
+msgstr "Asia/Magadan"
+
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Asia/Makassar"
+
+#: ../src/timezone_names.c:324
+msgid "Asia/Manila"
+msgstr "Asia/Manilha"
+
+#: ../src/timezone_names.c:325
+msgid "Asia/Muscat"
+msgstr "Asia/Muscat"
+
+#: ../src/timezone_names.c:326
+msgid "Asia/Nicosia"
+msgstr "Asia/Nicosia"
+
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Asia/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
+msgid "Asia/Novosibirsk"
+msgstr "Asia/Novosibirsk"
+
+#: ../src/timezone_names.c:329
+msgid "Asia/Omsk"
+msgstr "Asia/Omsk"
+
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Asia/Oral"
+
+#: ../src/timezone_names.c:331
+msgid "Asia/Phnom_Penh"
+msgstr "Asia/Phnom_Penh"
+
+#: ../src/timezone_names.c:332
+msgid "Asia/Pontianak"
+msgstr "Asia/Pontianak"
+
+#: ../src/timezone_names.c:333
+msgid "Asia/Pyongyang"
+msgstr "Asia/Pyongyang"
+
+#: ../src/timezone_names.c:334
+msgid "Asia/Qatar"
+msgstr "Asia/Qatar"
+
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Asia/Qyzylorda"
+
+#: ../src/timezone_names.c:336
+msgid "Asia/Rangoon"
+msgstr "Asia/Rangoon"
+
+#: ../src/timezone_names.c:337
+msgid "Asia/Riyadh"
+msgstr "Asia/Riad"
+
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Asia/Riyadh87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Asia/Riyadh88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Asia/Riyadh89"
+
+#: ../src/timezone_names.c:341
+msgid "Asia/Saigon"
+msgstr "Asia/Saïgon"
+
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Asia/Sakhalin"
+
+#: ../src/timezone_names.c:343
+msgid "Asia/Samarkand"
+msgstr "Asia/Samarkand"
+
+#: ../src/timezone_names.c:344
+msgid "Asia/Seoul"
+msgstr "Asia/Séoul"
+
+#: ../src/timezone_names.c:345
+msgid "Asia/Shanghai"
+msgstr "Asia/Shanghai"
+
+#: ../src/timezone_names.c:346
+msgid "Asia/Singapore"
+msgstr "Asia/Singapour"
+
+#: ../src/timezone_names.c:347
+msgid "Asia/Taipei"
+msgstr "Asia/Taipei"
+
+#: ../src/timezone_names.c:348
+msgid "Asia/Tashkent"
+msgstr "Asia/Tachkent"
+
+#: ../src/timezone_names.c:349
+msgid "Asia/Tbilisi"
+msgstr "Asia/Tbilisi"
+
+#: ../src/timezone_names.c:350
+msgid "Asia/Tehran"
+msgstr "Asia/Téhéran"
+
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Asia/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Asia/Thimbu"
+
+#: ../src/timezone_names.c:353
+msgid "Asia/Thimphu"
+msgstr "Asia/Thimbu"
+
+#: ../src/timezone_names.c:354
+msgid "Asia/Tokyo"
+msgstr "Asia/Tokyo"
+
+#: ../src/timezone_names.c:355
+msgid "Asia/Ujung_Pandang"
+msgstr "Asia/Ujung_Pandang"
+
+#: ../src/timezone_names.c:356
+msgid "Asia/Ulaanbaatar"
+msgstr "Asia/Oulan_Bator"
+
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Asia/Ulan_Bator"
+
+#: ../src/timezone_names.c:358
+msgid "Asia/Urumqi"
+msgstr "Asia/Tihoua"
+
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Asia/Ust-Nera"
+
+#: ../src/timezone_names.c:360
+msgid "Asia/Vientiane"
+msgstr "Asia/Vientiane"
+
+#: ../src/timezone_names.c:361
+msgid "Asia/Vladivostok"
+msgstr "Asia/Vladivostok"
+
+#: ../src/timezone_names.c:362
+msgid "Asia/Yakutsk"
+msgstr "Asia/Iakoutsk"
+
+#: ../src/timezone_names.c:363
+msgid "Asia/Yekaterinburg"
+msgstr "Asia/Sverdlovsk"
+
+#: ../src/timezone_names.c:364
+msgid "Asia/Yerevan"
+msgstr "Asia/Erevan"
+
+#: ../src/timezone_names.c:365
+msgid "Atlantic"
+msgstr "Atlantic"
+
+#: ../src/timezone_names.c:366
+msgid "Atlantic/Azores"
+msgstr "Atlantic/Açores"
+
+#: ../src/timezone_names.c:367
+msgid "Atlantic/Bermuda"
+msgstr "Atlantic/Bermudes"
+
+#: ../src/timezone_names.c:368
+msgid "Atlantic/Canary"
+msgstr "Atlantic/Canaries"
+
+#: ../src/timezone_names.c:369
+msgid "Atlantic/Cape_Verde"
+msgstr "Atlantic/Cap_Vert"
+
+#: ../src/timezone_names.c:370
+msgid "Atlantic/Faeroe"
+msgstr "Atlantic/Feròe"
+
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlantic/Feròe"
+
+#: ../src/timezone_names.c:372
+msgid "Atlantic/Jan_Mayen"
+msgstr "Atlantic/Jan_Mayen"
+
+#: ../src/timezone_names.c:373
+msgid "Atlantic/Madeira"
+msgstr "Atlantic/Madère"
+
+#: ../src/timezone_names.c:374
+msgid "Atlantic/Reykjavik"
+msgstr "Atlantic/Reykjavik"
+
+#: ../src/timezone_names.c:375
+msgid "Atlantic/South_Georgia"
+msgstr "Atlantic/Georgia_del_Sud"
+
+#: ../src/timezone_names.c:376
+msgid "Atlantic/St_Helena"
+msgstr "Atlantic/Ste_Hélène"
+
+#: ../src/timezone_names.c:377
+msgid "Atlantic/Stanley"
+msgstr "Atlantic/Stanley"
+
+#: ../src/timezone_names.c:378
+msgid "Australia"
+msgstr "Austràlia"
+
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Austràlia/ACT"
+
+#: ../src/timezone_names.c:380
+msgid "Australia/Adelaide"
+msgstr "Austràlia/Adelaïde"
+
+#: ../src/timezone_names.c:381
+msgid "Australia/Brisbane"
+msgstr "Austràlia/Brisbane"
+
+#: ../src/timezone_names.c:382
+msgid "Australia/Broken_Hill"
+msgstr "Austràlia/Broken_Hill"
+
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Austràlia/Currie"
+
+#: ../src/timezone_names.c:384
+msgid "Australia/Darwin"
+msgstr "Austràlia/Darwin"
+
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Austràlia/Eucla"
+
+#: ../src/timezone_names.c:386
+msgid "Australia/Hobart"
+msgstr "Austràlia/Hobart"
+
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr "Austràlia/Lindeman"
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr "Austràlia/Lord_Howe"
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "Austràlia/Melbourne"
+
+#: ../src/timezone_names.c:390
+msgid "Australia/Perth"
+msgstr "Austràlia/Perth"
+
+#: ../src/timezone_names.c:391
+msgid "Australia/Sydney"
+msgstr "Austràlia/Sydney"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brasil"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brasil/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brasil/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brasil/Èst"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brasil/Oèst"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Canadà"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Canadà/Atlantic"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Canadà/Atlantic"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Canadà/Saskatchewan de l'Èst"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Canadà/Oriental"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Canadà/Montanha"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Canadà/Newfoundland"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Canadà/Pacific"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Canadà/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Canadà/Yukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Chile"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Chile/Continental"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Chile/EasterIsland"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Universal"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Zulu"
+
+#: ../src/timezone_names.c:446
+msgid "Europe"
+msgstr "Euròpa"
+
+#: ../src/timezone_names.c:447
+msgid "Europe/Amsterdam"
+msgstr "Euròpa/Amsterdam"
+
+#: ../src/timezone_names.c:448
+msgid "Europe/Andorra"
+msgstr "Euròpa/Andòrra"
+
+#: ../src/timezone_names.c:449
+msgid "Europe/Athens"
+msgstr "Euròpa/Atènas"
+
+#: ../src/timezone_names.c:450
+msgid "Europe/Belfast"
+msgstr "Euròpa/Belfast"
+
+#: ../src/timezone_names.c:451
+msgid "Europe/Belgrade"
+msgstr "Euròpa/Belgrad"
+
+#: ../src/timezone_names.c:452
+msgid "Europe/Berlin"
+msgstr "Euròpa/Berlin"
+
+#: ../src/timezone_names.c:453
+msgid "Europe/Bratislava"
+msgstr "Euròpa/Bratislava"
+
+#: ../src/timezone_names.c:454
+msgid "Europe/Brussels"
+msgstr "Euròpa/Brussèllas"
+
+#: ../src/timezone_names.c:455
+msgid "Europe/Bucharest"
+msgstr "Euròpa/Bucarèst"
+
+#: ../src/timezone_names.c:456
+msgid "Europe/Budapest"
+msgstr "Euròpa/Budapèst"
+
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Euròpa/Busingen"
+
+#: ../src/timezone_names.c:458
+msgid "Europe/Chisinau"
+msgstr "Euròpa/Chisinau"
+
+#: ../src/timezone_names.c:459
+msgid "Europe/Copenhagen"
+msgstr "Euròpa/Copenaga"
+
+#: ../src/timezone_names.c:460
+msgid "Europe/Dublin"
+msgstr "Euròpa/Dublin"
+
+#: ../src/timezone_names.c:461
+msgid "Europe/Gibraltar"
+msgstr "Euròpa/Gibraltar"
+
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Euròpa/Guernesei"
+
+#: ../src/timezone_names.c:463
+msgid "Europe/Helsinki"
+msgstr "Euròpa/Helsinki"
+
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Euròpa/Illa_de_Man"
+
+#: ../src/timezone_names.c:465
+msgid "Europe/Istanbul"
+msgstr "Euròpa/Istanbul"
+
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Euròpa/Jersei"
+
+#: ../src/timezone_names.c:467
+msgid "Europe/Kaliningrad"
+msgstr "Euròpa/Kaliningrad"
+
+#: ../src/timezone_names.c:468
+msgid "Europe/Kiev"
+msgstr "Euròpa/Kiev"
+
+#: ../src/timezone_names.c:469
+msgid "Europe/Lisbon"
+msgstr "Euròpa/Lisbona"
+
+#: ../src/timezone_names.c:470
+msgid "Europe/Ljubljana"
+msgstr "Euròpa/Ljubljana"
+
+#: ../src/timezone_names.c:471
+msgid "Europe/London"
+msgstr "Euròpa/Londres"
+
+#: ../src/timezone_names.c:472
+msgid "Europe/Luxembourg"
+msgstr "Euròpa/Luxemborg"
+
+#: ../src/timezone_names.c:473
+msgid "Europe/Madrid"
+msgstr "Euròpa/Madrid"
+
+#: ../src/timezone_names.c:474
+msgid "Europe/Malta"
+msgstr "Euròpa/Malta"
+
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Euròpa/Mariehamn"
+
+#: ../src/timezone_names.c:476
+msgid "Europe/Minsk"
+msgstr "Euròpa/Minsk"
+
+#: ../src/timezone_names.c:477
+msgid "Europe/Monaco"
+msgstr "Euròpa/Mónegue"
+
+#: ../src/timezone_names.c:478
+msgid "Europe/Moscow"
+msgstr "Euròpa/Moscòu"
+
+#: ../src/timezone_names.c:479
+msgid "Europe/Nicosia"
+msgstr "Euròpa/Nicosia"
+
+#: ../src/timezone_names.c:480
+msgid "Europe/Oslo"
+msgstr "Euròpa/Oslo"
+
+#: ../src/timezone_names.c:481
+msgid "Europe/Paris"
+msgstr "Euròpa/París"
+
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Euròpa/Podgorica"
+
+#: ../src/timezone_names.c:483
+msgid "Europe/Prague"
+msgstr "Euròpa/Praga"
+
+#: ../src/timezone_names.c:484
+msgid "Europe/Riga"
+msgstr "Euròpa/Riga"
+
+#: ../src/timezone_names.c:485
+msgid "Europe/Rome"
+msgstr "Euròpa/Roma"
+
+#: ../src/timezone_names.c:486
+msgid "Europe/Samara"
+msgstr "Euròpa/Samara"
+
+#: ../src/timezone_names.c:487
+msgid "Europe/San_Marino"
+msgstr "Euròpa/Sant_Marin"
+
+#: ../src/timezone_names.c:488
+msgid "Europe/Sarajevo"
+msgstr "Euròpa/Sarajevo"
+
+#: ../src/timezone_names.c:489
+msgid "Europe/Simferopol"
+msgstr "Euròpa/Simferopol"
+
+#: ../src/timezone_names.c:490
+msgid "Europe/Skopje"
+msgstr "Euròpa/Skopje"
+
+#: ../src/timezone_names.c:491
+msgid "Europe/Sofia"
+msgstr "Euròpa/Sofia"
+
+#: ../src/timezone_names.c:492
+msgid "Europe/Stockholm"
+msgstr "Euròpa/Estocòlme"
+
+#: ../src/timezone_names.c:493
+msgid "Europe/Tallinn"
+msgstr "Euròpa/Tallinn"
+
+#: ../src/timezone_names.c:494
+msgid "Europe/Tirane"
+msgstr "Euròpa/Tirana"
+
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Euròpa/Tiraspol"
+
+#: ../src/timezone_names.c:496
+msgid "Europe/Uzhgorod"
+msgstr "Euròpa/Oujgorod"
+
+#: ../src/timezone_names.c:497
+msgid "Europe/Vaduz"
+msgstr "Euròpa/Vaduz"
+
+#: ../src/timezone_names.c:498
+msgid "Europe/Vatican"
+msgstr "Euròpa/Vatican"
+
+#: ../src/timezone_names.c:499
+msgid "Europe/Vienna"
+msgstr "Euròpa/Viena"
+
+#: ../src/timezone_names.c:500
+msgid "Europe/Vilnius"
+msgstr "Euròpa/Vilnius"
+
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Euròpa/Volgograd"
+
+#: ../src/timezone_names.c:502
+msgid "Europe/Warsaw"
+msgstr "Euròpa/Varsòvia"
+
+#: ../src/timezone_names.c:503
+msgid "Europe/Zagreb"
+msgstr "Euròpa/Zagrèb"
+
+#: ../src/timezone_names.c:504
+msgid "Europe/Zaporozhye"
+msgstr "Euròpa/Zaporijjya"
+
+#: ../src/timezone_names.c:505
+msgid "Europe/Zurich"
+msgstr "Euròpa/Zuric"
+
+#: ../src/timezone_names.c:506
+msgid "Indian"
+msgstr "Indian"
+
+#: ../src/timezone_names.c:507
+msgid "Indian/Antananarivo"
+msgstr "Indian/Antananarive"
+
+#: ../src/timezone_names.c:508
+msgid "Indian/Chagos"
+msgstr "Indian/Chagos"
+
+#: ../src/timezone_names.c:509
+msgid "Indian/Christmas"
+msgstr "Indian/Christmas"
+
+#: ../src/timezone_names.c:510
+msgid "Indian/Cocos"
+msgstr "Indian/Cocos"
+
+#: ../src/timezone_names.c:511
+msgid "Indian/Comoro"
+msgstr "Indian/Comòras"
+
+#: ../src/timezone_names.c:512
+msgid "Indian/Kerguelen"
+msgstr "Indian/Kerguelen"
+
+#: ../src/timezone_names.c:513
+msgid "Indian/Mahe"
+msgstr "Indian/Mahé"
+
+#: ../src/timezone_names.c:514
+msgid "Indian/Maldives"
+msgstr "Indian/Maldivas"
+
+#: ../src/timezone_names.c:515
+msgid "Indian/Mauritius"
+msgstr "Indian/Maurici"
+
+#: ../src/timezone_names.c:516
+msgid "Indian/Mayotte"
+msgstr "Indian/Maiòta"
+
+#: ../src/timezone_names.c:517
+msgid "Indian/Reunion"
+msgstr "Indian/Reünion"
+
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Mexic"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Mexic/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Mexic/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Mexic/General"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Orient_Mejan"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Orient_Mejan/Riyadh87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Orient_Mejan/Riyadh88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Orient_Mejan/Riyadh89"
+
+#: ../src/timezone_names.c:526
+msgid "Pacific"
+msgstr "Pacific"
+
+#: ../src/timezone_names.c:527
+msgid "Pacific/Apia"
+msgstr "Pacific/Apia"
+
+#: ../src/timezone_names.c:528
+msgid "Pacific/Auckland"
+msgstr "Pacific/Auckland"
+
+#: ../src/timezone_names.c:529
+msgid "Pacific/Chatham"
+msgstr "Pacific/Chatham"
+
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Pacific/Chuuk"
+
+#: ../src/timezone_names.c:531
+msgid "Pacific/Easter"
+msgstr "Pacific/Pâques"
+
+#: ../src/timezone_names.c:532
+msgid "Pacific/Efate"
+msgstr "Pacific/Efate"
+
+#: ../src/timezone_names.c:533
+msgid "Pacific/Enderbury"
+msgstr "Pacific/Enderbury"
+
+#: ../src/timezone_names.c:534
+msgid "Pacific/Fakaofo"
+msgstr "Pacific/Fakaofo"
+
+#: ../src/timezone_names.c:535
+msgid "Pacific/Fiji"
+msgstr "Pacific/Fidji"
+
+#: ../src/timezone_names.c:536
+msgid "Pacific/Funafuti"
+msgstr "Pacific/Funafuti"
+
+#: ../src/timezone_names.c:537
+msgid "Pacific/Galapagos"
+msgstr "Pacific/Galapagos"
+
+#: ../src/timezone_names.c:538
+msgid "Pacific/Gambier"
+msgstr "Pacific/Gambier"
+
+#: ../src/timezone_names.c:539
+msgid "Pacific/Guadalcanal"
+msgstr "Pacific/Guadalcanal"
+
+#: ../src/timezone_names.c:540
+msgid "Pacific/Guam"
+msgstr "Pacific/Guam"
+
+#: ../src/timezone_names.c:541
+msgid "Pacific/Honolulu"
+msgstr "Pacific/Honolulu"
+
+#: ../src/timezone_names.c:542
+msgid "Pacific/Johnston"
+msgstr "Pacific/Johnston"
+
+#: ../src/timezone_names.c:543
+msgid "Pacific/Kiritimati"
+msgstr "Pacific/Kiritimati"
+
+#: ../src/timezone_names.c:544
+msgid "Pacific/Kosrae"
+msgstr "Pacific/Kosrae"
+
+#: ../src/timezone_names.c:545
+msgid "Pacific/Kwajalein"
+msgstr "Pacific/Kwajalein"
+
+#: ../src/timezone_names.c:546
+msgid "Pacific/Majuro"
+msgstr "Pacific/Majuro"
+
+#: ../src/timezone_names.c:547
+msgid "Pacific/Marquesas"
+msgstr "Pacific/Marquesas"
+
+#: ../src/timezone_names.c:548
+msgid "Pacific/Midway"
+msgstr "Pacific/Midway"
+
+#: ../src/timezone_names.c:549
+msgid "Pacific/Nauru"
+msgstr "Pacific/Nauru"
+
+#: ../src/timezone_names.c:550
+msgid "Pacific/Niue"
+msgstr "Pacific/Niue"
+
+#: ../src/timezone_names.c:551
+msgid "Pacific/Norfolk"
+msgstr "Pacific/Norfolk"
+
+#: ../src/timezone_names.c:552
+msgid "Pacific/Noumea"
+msgstr "Pacific/Nouméa"
+
+#: ../src/timezone_names.c:553
+msgid "Pacific/Pago_Pago"
+msgstr "Pacific/Pago_Pago"
+
+#: ../src/timezone_names.c:554
+msgid "Pacific/Palau"
+msgstr "Pacific/Palaos"
+
+#: ../src/timezone_names.c:555
+msgid "Pacific/Pitcairn"
+msgstr "Pacific/Pitcairn"
+
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Pacific/Pohnpei"
+
+#: ../src/timezone_names.c:557
+msgid "Pacific/Ponape"
+msgstr "Pacific/Ponape"
+
+#: ../src/timezone_names.c:558
+msgid "Pacific/Port_Moresby"
+msgstr "Pacific/Port_Moresby"
+
+#: ../src/timezone_names.c:559
+msgid "Pacific/Rarotonga"
+msgstr "Pacific/Rarotonga"
+
+#: ../src/timezone_names.c:560
+msgid "Pacific/Saipan"
+msgstr "Pacific/Saipan"
+
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pacific/Samoa"
+
+#: ../src/timezone_names.c:562
+msgid "Pacific/Tahiti"
+msgstr "Pacific/Tahiti"
+
+#: ../src/timezone_names.c:563
+msgid "Pacific/Tarawa"
+msgstr "Pacific/Tarawa"
+
+#: ../src/timezone_names.c:564
+msgid "Pacific/Tongatapu"
+msgstr "Pacific/Tongatapu"
+
+#: ../src/timezone_names.c:565
+msgid "Pacific/Truk"
+msgstr "Pacific/Truk"
+
+#: ../src/timezone_names.c:566
+msgid "Pacific/Wake"
+msgstr "Pacific/Wake"
+
+#: ../src/timezone_names.c:567
+msgid "Pacific/Wallis"
+msgstr "Pacific/Wallis"
+
+#: ../src/timezone_names.c:568
+msgid "Pacific/Yap"
+msgstr "Pacific/Yap"
+
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "US"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "US/Alaska"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "US/Aleutian"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "US/Arizòna"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "US/Central"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "US/Eastern"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "US/East-Indiana"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "US/Hawaii"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "US/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "US/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "US/Mountain"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "US/Pacific"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "US/Pacific-New"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "US/Samoa"
+
+#: ../src/tray_icon.c:469
+msgid "New appointment"
+msgstr "Novèl rendètz-vos"
+
+#: ../src/tray_icon.c:485
+msgid "About Orage"
+msgstr "A prepaus d'Orage"
+
+#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
+msgid "Orage Panel Clock"
+msgstr "Relòtge del panèl Orage"
+
+#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
+msgid "Show time and date?"
+msgstr "Afichar l'ora e la data ?"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
+msgid "Orage preferences"
+msgstr "Preferéncias d'Orage"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr "Paramètres per l'Aplicacion Calendièr de Xfce 4 (Orage)"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Preferéncias calendièr Orage"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Calendièr"
+
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr "Calendièr - Orage"
+
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Calendièr del burèu"
diff -Nru orage-4.8.3/po/pl.po orage-4.12.1/po/pl.po
--- orage-4.8.3/po/pl.po	2012-01-03 12:01:08.000000000 +0000
+++ orage-4.12.1/po/pl.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,34 +1,55 @@
-# Polish translations for orage package.
-# Polskie tłumaczenia dla pakietu orage.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Marek Piechut (mco) <mco@o2.pl>, 2005.
-# Piotr Maliński <riklaunim@gmail.com>, 2006.
-# Szymon Kałasz <szymon_maestro@gazeta.pl>, 2006.
-# Piotr Sokół <piotr.sokol@10g.pl>, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Adam Stachowicz <saibamenppl@gmail.com>, 2015
+# Dawid <hoek@hoek.pl>, 2015
+# ised, 2014
+# Kamil "elder" P. <elderlinx@riseup.net>, 2013
+# Marek Piechut (mco) <mco@o2.pl>, 2005
+# Paweł Klimek <pawelklimek102@gmail.com>, 2014
+# Piotr Maliński <riklaunim@gmail.com>, 2006
+# Piotr Sokół <psokol@jabster.pl>, 2009,2013
+# Piotr Strębski <strebski@o2.pl>, 2013-2015
+# Szymon Kałasz <szymon_maestro@gazeta.pl>, 2006
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.5.92\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2009-03-08 15:02+0100\n"
-"Last-Translator: Piotr Sokół <piotr.sokol@10g.pl>\n"
-"Language-Team: Polish\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2015-03-05 08:14+0000\n"
+"Last-Translator: Piotr Strębski <strebski@o2.pl>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/xfce-apps/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "bez podkreślenia"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "pojedyncze"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "podwójne"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "niskie"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr ""
+msgstr "Otwieranie okna czasu światowego"
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
-msgstr ""
+msgstr "Nieudane otworzenie okna czasu światowego"
 
 #. ********** timezone tooltip **********
 #: ../globaltime/globaltime.c:277
@@ -36,7 +57,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
+msgstr "%s\nProszę kliknąć, aby zmodyfikować zegar"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -46,82 +67,85 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
+msgstr "przycisk 1 do zmiany preferencji \nprzycisk 2 do ustawienia czasu zegarów"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
-msgstr ""
+msgstr "Dostosowanie godziny"
 
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
+msgstr "Dostosowanie minut. Kliknij strzałki za pomocą drugiego przycisku, aby zmienić tylko 1 minutę"
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Czas globalny"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
-msgstr ""
+msgstr "NOWY"
 
 #: ../globaltime/gt_prefs.c:289
 msgid "NEW COPY"
-msgstr ""
+msgstr "NOWA KOPIA"
 
 #: ../globaltime/gt_prefs.c:310
 msgid "Not possible to delete the last clock."
-msgstr ""
+msgstr "Brak możliwości skasowania ostatniego zegara"
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
-msgstr ""
+msgstr "zaktualizuj zegar"
 
 #: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
 msgid "add new empty clock"
-msgstr ""
+msgstr "dodaj nowy pusty zegar"
 
 #: ../globaltime/gt_prefs.c:526
 msgid "add new clock using this clock as model"
-msgstr ""
+msgstr "dodaj nowy zegar przy użyciu tego zegara, jako modelu"
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
-msgstr ""
+msgstr "usuń ten zegar"
 
 #: ../globaltime/gt_prefs.c:539
 msgid "move this clock first"
-msgstr ""
+msgstr "przesuń ten zegra, jako pierwszy"
 
 #: ../globaltime/gt_prefs.c:544
 msgid "move this clock left"
-msgstr ""
+msgstr "przesuń zegar w lewo"
 
 #: ../globaltime/gt_prefs.c:549
 msgid "move this clock right"
-msgstr ""
+msgstr "przesuń zegar w prawo"
 
 #: ../globaltime/gt_prefs.c:554
 msgid "move this clock last"
-msgstr ""
+msgstr "przesuń zegar, jako ostatni"
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
-msgstr ""
+msgstr "ustaw strefę czasową, jako lokalną"
 
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
-msgstr ""
+msgstr "zamknij okno i wyjdź"
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "zaktualizuj ustawienia"
+msgstr "Ustawienia czasu globalnego"
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
 msgid "Clock Parameters"
-msgstr ""
+msgstr "Parametry zegara"
 
 #: ../globaltime/gt_prefs.c:607
 msgid "Name of the clock:"
-msgstr ""
+msgstr "Nazwa zegara:"
 
 #: ../globaltime/gt_prefs.c:613
 msgid "enter name of clock"
@@ -129,7 +153,7 @@
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
-msgstr ""
+msgstr "Sterfa czasowa zegara:"
 
 #: ../globaltime/gt_prefs.c:643
 msgid "Text Formatting"
@@ -142,7 +166,7 @@
 
 #: ../globaltime/gt_prefs.c:656
 msgid "Click to change background colour for clock"
-msgstr ""
+msgstr "Naciśnij, aby zmienić kolor tła zegara"
 
 #: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
 #: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
@@ -156,7 +180,7 @@
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
 #: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
 msgid "Cross this to use default instead of selected value"
-msgstr ""
+msgstr "Zaznaczenie spowoduje użycie ustawień systemowych"
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
@@ -165,82 +189,81 @@
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
-msgstr ""
+msgstr "Kliknij, aby zmienić przedni kolor zegara"
 
 #. ------------------------name font-------------------------
 #: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
 msgid "Font for name of clock:"
-msgstr ""
+msgstr "Czcionka używana w nazwie zegara:"
 
 #: ../globaltime/gt_prefs.c:720
 msgid "Click to change font for clock name"
-msgstr ""
+msgstr "Naciśnij, aby zmienić czcionkę używana w nazwie zegara"
 
 #. ------------------------time font-------------------------
 #: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
 msgid "Font for time of clock:"
-msgstr ""
+msgstr "Czcionka używana do wyświetlania czasu na zegarze"
 
 #: ../globaltime/gt_prefs.c:753
 msgid "Click to change font for clock time"
-msgstr ""
+msgstr "Naciśnij, aby zmienić czcionke używaną do wyświetlania czasu na zegarze"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:780
 msgid "Underline name of clock:"
-msgstr ""
+msgstr "Podkreśl nazwę zegara:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:810
 msgid "Underline time of clock:"
-msgstr ""
+msgstr "Podkreśl godzinę zegara:"
 
 #: ../globaltime/gt_prefs.c:850
 msgid "Text Default Formatting"
-msgstr ""
+msgstr "Domyślne formatowanie czcionki"
 
 #: ../globaltime/gt_prefs.c:863
 msgid "Click to change default background colour for clocks"
-msgstr ""
+msgstr "Naciśnij, aby zmienić domyślny kolor tła dla zegara"
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
+msgstr "Zaznaczenie spowoduje użycie ustawień systemowych"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
-msgstr ""
+msgstr "Naciśnij, aby zmienić domyślny kolor teksty na zegarze"
 
 #: ../globaltime/gt_prefs.c:929
 msgid "Click to change default font for clock name"
-msgstr ""
+msgstr "Naciśnij, aby zmienić domyślnią czcionkę w nazwie zegara"
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
+msgstr "Zaznaczenie spowoduje użycie ustawień systemowych"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
-msgstr ""
+msgstr "Naciśni, aby zmienić domyślnią czcionkę, używaną do wyświetlania czasu na zegarze"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:990
 msgid "Underline for name of clock:"
-msgstr ""
+msgstr "Podkreślenie w nazwie zegara:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:1004
 msgid "Underline for time of clock:"
-msgstr ""
+msgstr "Podkreślenie wyświetlanego czasu:"
 
 #: ../globaltime/gt_prefs.c:1027
 msgid "update preferences"
 msgstr "zaktualizuj ustawienia"
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "Ustawienia Orage"
+msgstr "Ustawienia czasu światowego"
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
@@ -257,11 +280,15 @@
 
 #: ../globaltime/gt_prefs.c:1083
 msgid "Use normal decorations"
-msgstr ""
+msgstr "Używaj normalnych dekoracji"
+
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Brak"
 
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
-msgstr ""
+msgstr "Nie pokazuj dekoracji okien (obramowanie)"
 
 #: ../globaltime/gt_prefs.c:1100
 msgid "Clock size:"
@@ -269,11 +296,11 @@
 
 #: ../globaltime/gt_prefs.c:1101
 msgid "Equal"
-msgstr ""
+msgstr "Odpowiedni"
 
 #: ../globaltime/gt_prefs.c:1106
 msgid "All clocks have same size"
-msgstr ""
+msgstr "Wszystkie zegary mają tą samą wielkość"
 
 #: ../globaltime/gt_prefs.c:1111
 msgid "Varying"
@@ -281,7 +308,7 @@
 
 #: ../globaltime/gt_prefs.c:1116
 msgid "Clock sizes vary"
-msgstr ""
+msgstr "Zmiana rozmiarów zegara"
 
 #: ../globaltime/gt_prefs.c:1122
 msgid "Local timezone:"
@@ -290,70 +317,69 @@
 #: ../globaltime/timezone_selection.c:101
 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
 msgid " Other"
-msgstr ""
+msgstr "Inny"
 
 #: ../globaltime/timezone_selection.c:156
 #: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
 #, c-format
 msgid "%d hour %d mins"
-msgstr ""
+msgstr "Godzina %d minut %d"
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
-msgstr "godzin"
+msgstr "Godzina %d"
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "%d mins"
-msgstr "minut"
+msgstr "Minuta %d"
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
 msgid "backward"
-msgstr ""
+msgstr "Cofnij"
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-#, fuzzy
 msgid "forward"
-msgstr "Przechodzi do następnego dnia"
+msgstr "Do przodu"
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
 msgid "not changed"
-msgstr ""
+msgstr "niezmieniony"
 
 #: ../globaltime/timezone_selection.c:195
 #: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
 msgid "not changing"
-msgstr ""
+msgstr "nie zmieniaj"
 
 #. location
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
-msgstr "Położenie:"
+msgstr "Lokalizacja:"
 
 #: ../globaltime/timezone_selection.c:258
 #: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
 msgid "GMT Offset"
-msgstr ""
+msgstr "Odchylenie GMT"
 
 #: ../globaltime/timezone_selection.c:264
 #: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
 msgid "Previous/Next Change"
-msgstr ""
+msgstr "Zmień"
 
 #: ../globaltime/timezone_selection.c:269
 #: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
 msgid "Country"
-msgstr ""
+msgstr "Kraj"
 
 #. We are actually setting the g_par parameter. In other words
 #. we are setting the global default timezone for Orage. This is
@@ -374,7 +400,7 @@
 #: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
 #: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
 msgid "Change mode"
-msgstr ""
+msgstr "Zmień tryb"
 
 #: ../globaltime/timezone_selection.c:303
 #: ../globaltime/timezone_selection.c:313
@@ -396,85 +422,99 @@
 msgid "floating"
 msgstr "Zmienna"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "Czas lokalny"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "Kalendarz Orage"
+msgstr "Światowy czas Orage"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
-msgstr ""
+msgstr "Pokaż "
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Czas światowy"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Bez obrotu"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Obróć w lewo"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Obróć w prawo"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "Wygląd"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
-msgstr "_Ramka"
+msgstr "_Obramowanie"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
 msgstr "Kolor _czcionki:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
 msgstr "Kolor _tła:"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
 msgstr "_Wysokość:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
+msgstr "Nie można zmienić wysokości poziomych paneli"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
 msgstr "_Szerokość:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
+msgstr "Nie można zmienić szerokości pionowych paneli"
+
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
 msgstr ""
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "Wskazania"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
 msgstr "Strefa czasowa:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
-msgstr ""
+msgstr "Linia %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
 msgstr "Wprowadza dowolny poprawny parametr funkcji strftime"
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
 msgstr "Podpowiedź:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
 msgstr "Poprawianie czasu po uśpieniu/hibernacji"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
@@ -483,7 +523,7 @@
 "features from working.)"
 msgstr ""
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -493,23 +533,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Ten program do pobierania czasu używa funkcji strftime.\n"
-"Można użyć dowolnego poprawnego parametru tej funkcji.\n"
-"Część składni tej funkcji wygląda następująco:\n"
-"\n"
-"\t%A ‒ dzień tygodnia,\t\t%B ‒ miesiąc,\n"
-"\t%c ‒ data i czas,\t\t\t%R ‒ godzina i minuty,\n"
-"\t%V ‒ numer tygodnia,\t\t%Z ‒ strefa czasowa,\n"
-"\t%H ‒ godzina,\t\t\t\t%M ‒ minuty,\n"
-"\t%X ‒ czas lokalny,\t\t\t%x ‒ lokalna data."
+msgstr "Ten program do pobierania czasu używa funkcji strftime.\nMożna użyć dowolnego poprawnego parametru tej funkcji.\nCzęść składni tej funkcji wygląda następująco:\n\n\t%A ‒ dzień tygodnia,\t\t%B ‒ miesiąc,\n\t%c ‒ data i czas,\t\t\t%R ‒ godzina i minuty,\n\t%V ‒ numer tygodnia,\t\t%Z ‒ strefa czasowa,\n\t%H ‒ godzina,\t\t\t\t%M ‒ minuty,\n\t%X ‒ czas lokalny,\t\t\t%x ‒ lokalna data."
 
-#: ../panel-plugin/oc_config.c:457
-#, fuzzy
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
 msgstr "Preferencje programu"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -518,24 +547,22 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
 
 #: ../src/about-xfcalendar.c:40
 msgid "Maintainer"
-msgstr ""
+msgstr "Opiekun"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
 msgstr "Zarządzanie czasem dla środowiska Xfce"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Koniec:"
 
@@ -543,13 +570,13 @@
 msgid "Due"
 msgstr "Do"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Wybór pliku"
 
@@ -557,225 +584,281 @@
 msgid "Sound Files"
 msgstr "Pliki dźwiękowe"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
-msgstr "Akcja została zmodyfikowana."
+msgstr "Zmodyfikowano wydarzenie."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "Kontynuować?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Nie, nie wychodź"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Tak, ignoruj zmiany i wyjdź"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
-msgstr "Koniec spotkania jest przed jego początkiem"
+msgstr "Zakończenie wydarzenia występuje przed jego rozpoczęciem."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
-msgstr "Nie ustawiono"
+msgstr "Nie ustalono"
+
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Dodaj nowe spotkanie do tego pliku."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Domyślny plik Orage"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Dodawanie spotkania nie powiodło się."
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Wystąpił błąd podczas dodawania spotkania. Więcej szczegółów znajdziesz w logu."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Aktualizacja spotkania nie powiodła się."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Zobacz więcej szczegółów w pliku dziennika. (Być może plik został zaktualizowany poza programem Orage?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
 msgstr "Wydarzenie zostanie usunięte."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Nie, anuluj usunięcie"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Tak, usuń to"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Wybór daty"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Zaznacz bieżący dzień"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
-msgstr "Wydarzeie nie istnieje."
+msgstr "Wydarzenie nie istnieje."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
-msgstr ""
+msgstr "Wydarzenie zostało prawdopodobnie usunięte. Proszę wczytać listę ponownie."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Bieżące kategorie"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Nowa kategoria i jej kolor"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Kategoria:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Kolory kategorii – Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
-msgstr ""
+msgstr " *** KOPIUJ ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "Dodawanie akcji ‒ Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Plik"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "Z_apisz i zamknij"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
-msgstr "Z_duplikuj"
+msgstr "_Powiel"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
-msgstr "Zapisuje akcję"
+msgstr "Zapisuje wydarzenie"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
-msgstr "Zapisuje akcję i zamyka okno"
+msgstr "Zapisuje wydarzenie i zamyka okno"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Cofa dokonane zmiany"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
-msgstr "Duplikuje akcję"
+msgstr "Tworzy kopię wydarzenia"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
-msgstr "Usuwa akcję"
+msgstr "Usuwa wydarzenie"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Wolne"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Zajęte"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Ogólne"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Typ:"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
-msgstr "Wydarzenia"
+msgstr "Wydarzenie"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Definiuje typ akcji jako wydarzenie, które ma nastąpić. Np.: spotkanie, "
-"urodziny lub program telewizyjny."
+msgstr "Definiuje typ akcji jako wydarzenie, które ma nastąpić. Np.: spotkanie, urodziny lub program telewizyjny."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
-msgstr "Przypomnienia"
+msgstr "Przypomnienie"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Definiuje akcje jako przypomnienie o czymś, co należy zrobić o określonym "
-"czasie. Np.: „umyj samochód” albo „przetestuj nową wersję Orage”."
+msgstr "Definiuje akcje jako przypomnienie o czymś, co należy zrobić o określonym czasie. Np.: „umyj samochód” albo „przetestuj nową wersję Orage”."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Dziennik"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Definiuje akcję jako notatkę dziennika. Np.: notatka o telefonie twojej "
-"matki lub nadejściu pierwszego śniegu."
+msgstr "Definiuje akcję jako notatkę dziennika. Np.: notatka o telefonie twojej matki lub nadejściu pierwszego śniegu."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
-msgstr "Tytuł:"
+msgstr "Nazwa:"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "Wydarzenie całodniowe"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Początek:"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
-msgstr ""
+msgstr "Ustaw"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Czas trwania"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "dni"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "godzin"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "minut"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Dostępność:"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Stan:"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "Wykonano"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Kategoria:"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
 msgstr "Przypisuje akcjom kolory kategorii"
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "Przypisuje kategoriom kolory"
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
+msgstr "Priorytet:"
+
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
 msgstr ""
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Opis:"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -784,132 +867,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "przed uruchomieniem"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "przed zakończeniem"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "po uruchomieniu"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "po zakończeniu"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Alarm"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Czas alarmu:"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Wybiera moment alarmu.\n"
-"Najczęściej wykorzystywane:\n"
-"1. przed uruchomieniem wydarzenia,\n"
-"2. przed zakończeniem przypomnienia,\n"
-"3. po uruchomieniu przypomnienia."
+msgstr "Wybiera moment alarmu.\nNajczęściej wykorzystywane:\n1. przed uruchomieniem wydarzenia,\n2. przed zakończeniem przypomnienia,\n3. po uruchomieniu przypomnienia."
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr "Alarm nieprzemijający"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Przypomina nawet jeśli czas alarmu minął, podczas gdy program nie był "
-"uruchomiony"
+msgstr "Przypomina nawet jeśli czas alarmu minął, podczas gdy program nie był uruchomiony"
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Dźwięk:"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "Używanie"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
 msgstr "Używa alarmu dźwiękowego"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "Powtarzanie dźwięku alarmu"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "razy"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "Interwał"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
-msgstr "Wizja:"
+msgstr "Wyświetlanie:"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Okno programu"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
 msgstr "Używa alarmu wizualnego"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
-msgstr ""
+msgstr "Powiadomienia"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
-msgstr ""
+msgstr "Wyświetla powiadomienia alarmu"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
-msgstr "Ustaw limit czasowy"
+msgstr "Ograniczenie czasu"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
-msgstr ""
+msgstr "Odwołuje powiadomienie w sposób automatyczny po określonym czasie"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
-msgstr ""
+msgstr "0 = domyślny czas wygaśnięcia"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "sekund"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Procedura:"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
 msgstr "Używa procedury lub skryptu alarmowego"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -921,151 +996,144 @@
 "\t<&ET> appointment end time"
 msgstr ""
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
-msgstr ""
+msgstr "Testuje alarm"
 
-#: ../src/appointment.c:3101
-#, fuzzy
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
-msgstr "Domyślny:"
+msgstr "<b>Domyślny alarm:</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
 msgstr "Zapisuje bieżące ustawienia jako domyślne"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
 msgstr "Przywraca ustawienia domyślne"
 
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Brak"
-
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Codziennie"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Tygodniowo"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Miesięcznie"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Rocznie"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
-msgstr ""
+msgstr "Co godzinę"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Pon"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Wto"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Śro"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Czw"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Pią"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "Sob"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "Nie"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Rekurencja"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Złożoność:"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Podstawowa"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
-msgstr "Zaawansowana"
+msgstr "Złożona"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "Używa prostych zasad powtarzania akcji"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Używa zaawansowanych zasad powtarzania akcji, np.: „w każdą sobotę albo "
-"niedzielę” lub „w pierwszy wtorek każdego miesiąca”."
+msgstr "Używa zaawansowanych zasad powtarzania akcji, np.: „w każdą sobotę albo niedzielę” lub „w pierwszy wtorek każdego miesiąca”."
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Częstotliwość:"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Każdego"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "wystąpienia"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
+msgstr "Ogranicza częstotliwość do pewnego odstępu.\n Na przykład Co trzeci dzień:\n Częstotliwość = Codziennie i w odstępie = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Limit:"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Powtarzanie w nieskończoność"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Powtarzanie "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Powtarzanie do "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Dni tygodnia:"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
-msgstr "Wystąpienie:"
+msgstr "Wystąpienia:"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1073,182 +1141,208 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Określa dzień tygodnia dla comiesięcznych i corocznych zdarzeń (np.: „drugą "
-"środę każdego miesiąca”):\n"
-"Częstotliwość – codziennie,\n"
-"Dni tygodnia – tylko środa,\n"
-"Którego dnia – liczba 2 z pola pod środą."
+msgstr "Określa dzień tygodnia dla comiesięcznych i corocznych zdarzeń (np.: „drugą środę każdego miesiąca”):\nCzęstotliwość – codziennie,\nDni tygodnia – tylko środa,\nKtórego dnia – liczba 2 z pola pod środą."
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
-msgstr ""
+msgstr "Baza TODO"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
 msgstr ""
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 
 #. exceptions
-#: ../src/appointment.c:3361
-#, fuzzy
+#: ../src/appointment.c:3471
 msgid "Exceptions"
-msgstr "Opcje:"
+msgstr "Wyjątki:"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
 msgstr ""
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr ""
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr ""
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
 msgstr ""
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
 msgstr ""
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
-#, fuzzy
+#: ../src/appointment.c:3516
 msgid "Action dates"
-msgstr "Opcje: "
+msgstr "Daty wydarzenia"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Widok"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "P_rzejdź"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
-msgstr "Tworzy nową akcję"
+msgstr "Tworzy nowe wydarzenie"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Przechodzi do poprzedniego dnia"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Cofnij jeden tydzień"
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Przechodzi do dzisiejszego dnia"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Cofnij jeden dzień"
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Przechodzi do następnego dnia"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Naprzód jeden dzień"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Naprzód jeden tydzień"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Wczytuje ponownie zawartość"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Zamyka okno"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
-msgstr ""
+msgstr "Nieznany"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
-msgstr ""
+msgstr "Ilość wyświetlanych dni:"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Widok dni – Orage"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Cały dzień"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Czas"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
-msgstr ""
+msgstr "Nie zaznaczono żadnego wiersza."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
-msgstr ""
+msgstr "Aby skopiować wiersz, należy go zaznaczyć."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr "Zaznaczone akcje zostaną usunięte."
+msgstr "Zaznaczone wydarzenia zostaną usunięte."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Tak, usuń je"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Przechodzi do poprzedniego dnia"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Przechodzi do następnego dnia"
+
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Wyszukuje ciąg znaków"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "Otwiera widok dni"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Dodatkowo wyświetlane dni:"
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Ilość dodatkowo wyświetlanych dni:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "tylko pierwsze powtórzenie"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr ""
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "także stary"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr ""
+
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "Pierwszy wpis dziennika:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
-msgstr "Znajdowanie"
+msgstr "Wyszukiwanie"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
-msgstr "Znajdź tekst:"
+msgstr "Tekst:"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Flagi"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
-msgstr "Tytuł"
+msgstr "Nazwa"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
@@ -1256,89 +1350,92 @@
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
 
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Wybór daty"
-
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
-msgstr ""
+msgstr "Zakończono rekurencję. Przenoszenie do pliku archiwum."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
-msgstr ""
+msgstr "Archiwizacja nie włączona. Kończenie działania."
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Zakres archiwizacji: %d miesięcy"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr "\tArchiwizowanie akcji starszych niż: %04d-%02d-%02d"
+msgstr "\tArchiwizowanie wydarzeń starszych niż: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Archiwizowanie UID: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr ""
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr ""
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Zakończono archiwizowanie\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Rozpoczęto usuwanie archiwum"
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr ""
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr ""
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Zakończono usuwanie archiwum\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Domyślny alarm orage"
 
-#: ../src/ical-code.c:3115
-#, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
 msgstr ""
 
-#: ../src/ical-code.c:3117
-#, fuzzy, c-format
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Stworzono listę alarmów dla zewnętrznego pliku: %s (%s)"
+
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "⇥Dodano %d alarmów. Przetworzono %d zdarzeń."
+
+#: ../src/ical-code.c:3185
+#, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tZnaleziono %d alarmów of which %d are active. (Searched %d recurring "
-"alarms.)"
+msgstr "\tZnaleziono %d alarmów of which %d are active. (Searched %d recurring alarms.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
-msgstr ""
+msgstr "Rozpoczynam wstępne importowanie pliku"
 
 #: ../src/ical-expimp.c:158
 msgid "... Patched DCREATED to be CREATED."
@@ -1346,13 +1443,22 @@
 
 #: ../src/ical-expimp.c:197
 msgid "... Patched timezone to Orage format."
-msgstr ""
+msgstr "Konwertuję datę do formatu Orage."
 
 #: ../src/ical-expimp.c:206
 msgid "Import file preprocessing done"
+msgstr "Zakończono wstępne formatowanie pliku"
+
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Znaleziono zewnętrzną aktualizację dla pliku %s."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
 msgstr ""
 
-#: ../src/interface.c:284
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Pliki kalendarza"
 
@@ -1360,611 +1466,670 @@
 msgid "Current foreign files"
 msgstr "Pliki zewnętrzne"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "TYLKO DO ODCZYTU"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "TYLKO DO ZAPISU"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "— Brak —"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Dodawanie zewnętrznego pliku nie powiodło się."
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Nazwa pliku jest pusta."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Nazwa jest pusta."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Plik nie istnieje."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Taka sama nazwa pliku już występuje w Orage."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Taka sama nazwa już występuje w Orage."
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Import/eksport"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Importowanie"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Wczytanie z pliku:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Wprowadza nazwy plików rozdzielone przecinkami. Uwaga: znak przecinka nie "
-"jest poprawnie rozpoznawany w nazwach plików."
+msgstr "Wprowadza nazwy plików rozdzielone przecinkami. Uwaga: znak przecinka nie jest poprawnie rozpoznawany w nazwach plików."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Eksportowanie"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Zapisanie do pliku:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Wybranie"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "wszystkich akcji"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "akcji o nazwach: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Wybiera do wyeksportowania wszyskie akcje z głównego pliku kalendarza. Akcje "
-"z archiwum oraz zewnętrznych plików nie zostaną zapisane."
+msgstr "Wybiera do wyeksportowania wszyskie akcje z głównego pliku kalendarza. Akcje z archiwum oraz zewnętrznych plików nie zostaną zapisane."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
+msgstr "Tylko główne terminy z pliku będą czytane.\nNieznane wydarzenia nie będą eksportowane."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "Wybiera do wyeksportowania jedynie określone akcje"
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
-msgstr ""
-"Wprowadza identyfikatory UID akcji rozdzielone przecinkami. Akcje można "
-"przeciągnąć z listy akcji wyświetlanej w widoku dnia."
+msgstr "Wprowadza identyfikatory UID akcji rozdzielone przecinkami. Akcje można przeciągnąć z listy akcji wyświetlanej w widoku dnia."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Archiwum"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Archiwizacja (zakres: %d miesięcy)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
-msgstr ""
-"Archiwizuje wprowadzone akcje. Zakres archiwizacji można zmienić w oknie "
-"preferencji programu."
+msgstr "Archiwizuje wprowadzone akcje. Zakres archiwizacji można zmienić w oknie preferencji programu."
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Przywrócenie zarchiwizowanych akcji"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Przywraca wszystkie zarchiwizowane akcje do głównego pliku programu i usuwa "
-"archiwum. Opcja przydatna np. podczas eksportowania i przenoszenia "
-"zapisanych akcji do innego systemu."
+msgstr "Przywraca wszystkie zarchiwizowane akcje do głównego pliku programu i usuwa archiwum. Opcja przydatna np. podczas eksportowania i przenoszenia zapisanych akcji do innego systemu."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Pliki programu"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Plik kalendarza"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Bieżący:"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Nowy:"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Opcje: "
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Bieżący plik:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Nowy plik:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Opcje działań: "
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Zmiana nazwy"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
 msgstr "Zmienia nazwę bieżącego pliku. Nowy plik musi istnieć."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Skopiowanie"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr "Kopiuje bieżący plik do nowego położenia"
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Przeniesienie"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "Przenosi bieżący plik do nowego położenia"
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Plik archiwum"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Pliki zewnętrzne"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Nowy plik"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Plik zewnętrzny:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Opcje:"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Widoczna nazwa:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Tylko do odczytu"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Uniemożliwia programowi modyfikowanie pliku. Modyfikacja plików zewnętrznych "
-"może sprawić, że staną się one niekompatybilne z programami, w których "
-"zostały utworzone."
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Uniemożliwia programowi modyfikowanie pliku. Modyfikacja plików zewnętrznych może sprawić, że staną się one niekompatybilne z programami, w których zostały utworzone."
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Ta nazwa wewnętrzna jest wyświetlana użytkownikowi zamiast nazwy pliku."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Wymiana danych ‒ Orage"
 
-#: ../src/main.c:268
-#, fuzzy, c-format
+#: ../src/main.c:275
+#, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\t%s wersja %s dla środowiska Xfce %s\n"
-"\n"
+msgstr "\tTo jest wersja %s dla środowiska Xfce %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tWydany na zasadach licencji GNU General Public License.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tSkompilowany dla GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "używa GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tUżywa DBUS do importowania.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tNie używa DBUS. Importowanie działa tylko częściowo.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tUżywa libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tNie używa libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tUżywa automatycznego archiwizowania.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tNie używa automatycznego archiwizowania.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
-msgstr ""
+msgstr "\tUżycie systemowej biblioteki libical.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
+msgstr "\tUżycie lokalnej wersji biblioteki libical.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Użycie: orage [OPCJE] [PLIKI]\n"
-"\n"
+msgstr "Użycie: orage [OPCJE] [PLIKI]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Opcje:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
-msgstr "  --version (-v) \t\tWypisuje informacje o wersji i kończy\n"
+msgstr "--version (-v) \t\t\t\tWypisuje informacje o wersji i kończy\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
-msgstr "  --help (-h) \t\t\tWypisuje komunikat pomocy\n"
+msgstr "--help (-h) \t\t\t\tWypisuje komunikat pomocy\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
-msgstr "  --preferences (-p) \t\tWyświetla okno preferencji\n"
+msgstr "--preferences (-p) \t\t\tOtwiera okno preferencji\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr "  --toggle (-t) \t\tWyświetla/ukrywa główne okno programu\n"
+msgstr "--toggle (-t) \t\t\t\tPrzełącza wyświetlanie głównego okna programu\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "  --add-foreign (-a) plik [RW] \tDodaje plik zewnętrzny\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) plik [RW] [nazwa] \tDodaje plik zewnętrzny\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr "  --remove-foreign (-r) plik \tUsuwa plik zewnętrzny\n"
+msgstr "--remove-foreign (-r) plik \tUsuwa plik zewnętrzny\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--export (-e) file [appointment...] \tEksportuje wydarzenia do pliku\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "PLIKI - wczytywane pliki ical\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
-msgstr ""
+msgstr "\tdbus nie jest dołączone w orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
 msgstr ""
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Nieznana opcja %s\n"
-"\n"
+msgstr "\nNieznana opcja %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Wymień dane..."
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Wyświetl zaznaczony _dzień"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Wyświetl zaznaczony _tydzień"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
-msgstr "Zaznacz _dzisiejszy dzień"
+msgstr "Zaznacz _bieżący dzień"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Czas lokalny"
+msgstr "Wyświetl czas ś_wiatowy"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Nie zdefiniowano tytułu"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr "Położenie: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n Notatka:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Nigdy"
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:495
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
+" Done:\t%s%s"
+msgstr "Tytuł: %s\n%s Rozpoczęto:\t%s\n Przez:\t%s\n Ukończono:\t%s%s"
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Tytuł: %s\n%s Rozpoczęto:\t%s\n Koniec:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Przypomnienia:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Wydarzenia w dn. %s:</b>"
 
-#: ../src/mainbox.c:593
-#, fuzzy, c-format
+#: ../src/mainbox.c:660
+#, c-format
 msgid "<b>Events for %s - %s:</b>"
-msgstr "<b>Wydarzenia w dn. %s:</b>"
+msgstr "<b>Wydarzenia dla %s - %s:</b>"
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "Ogólne"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Strefa czasowa"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "Wybiera lokalną strefę czasową."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "Zakres archiwizacji (miesiące)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 ‒ wyłączenie archiwizacji)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
 msgstr ""
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
-msgstr "Polecenie dźwiękowe"
+msgstr "Polecenie odtwarzania dźwięku"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-"Wprowadza polecenie przekazywane powłoce w celu wygenerowania dźwięku "
-"podczas alarmu."
+msgstr "Wprowadza polecenie przekazywane powłoce w celu wygenerowania dźwięku podczas alarmu"
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Wyświetlane"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
+#: ../src/parameters.c:596
+msgid "Calendar window"
 msgstr "Okno kalendarza"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Szczegóły wizualne kalendarza"
+
+#: ../src/parameters.c:609
 msgid "Show borders"
-msgstr "_Obramowanie"
+msgstr "Obramowanie"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
-msgstr "_Menu"
-
-#: ../src/parameters.c:632
-#, fuzzy
-msgid "Show month and year"
-msgstr "W pagerze"
+msgstr "Pasek menu"
 
-#: ../src/parameters.c:639
-#, fuzzy
+#: ../src/parameters.c:622
 msgid "Show day names"
-msgstr "_Ramka"
+msgstr "Nazwy dni"
 
-#: ../src/parameters.c:646
-#, fuzzy
+#: ../src/parameters.c:627
 msgid "Show week numbers"
-msgstr "_Obramowanie"
+msgstr "Numery tygodni"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Miesiąc i rok"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Pola informacyjne kalendarza"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "Przypomnienia"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
-msgstr ""
+msgstr "Ilość dni w oknie wydarzenia"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
-msgstr ""
+msgstr "0 = nie pokazuj wszystkich wydarzeń na liście"
+
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Widoczność kalendarza"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
-msgstr ""
+msgstr "Na wszystkich obszarach roboczych"
 
-#: ../src/parameters.c:683
-#, fuzzy
+#: ../src/parameters.c:696
 msgid "Keep on top"
-msgstr "Zawsze na wierzchu"
+msgstr "Utrzymywanie na wierzchu"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
-msgstr "W liście okien"
+msgstr "Na liście okien"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
-msgstr "W pagerze"
+msgstr "W podglądzie obszarów roboczych"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "W obszarze powiadamiania"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
-msgstr "Uruchamianie"
+msgstr "Czynność uruchamiania"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
-msgstr "Widoczny"
+msgstr "Wyświetlenie"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
-msgstr "Ukryty"
+msgstr "Ukrycie"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
-msgstr "Zminimalizowany"
+msgstr "Zminimalizowanie"
+
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "Czynność otwierania okna kalendarza"
 
-#: ../src/parameters.c:793
-#, fuzzy
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Zaznacz dzisiejszą datę"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Zaznacz poprzednio zaznaczoną datę"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Czynność dwukrotnego kliknięcia na dniu kalendarza"
+
+#: ../src/parameters.c:828
+msgid "Days view"
+msgstr "Wyświetlenie widoku dni"
+
+#: ../src/parameters.c:840
+msgid "Event list"
+msgstr "Wyświetlenie wydarzeń"
+
+#: ../src/parameters.c:862
 msgid "Extra settings"
 msgstr "Dodatkowe"
 
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Okno kalendarza"
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Okno wydarzeń"
 
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "Zaznacz _dzisiejszy dzień"
+#: ../src/parameters.c:874
+msgid "Number of extra days to show in event list"
+msgstr "Ilość dodatkowych dni wyświetlana na liście wydarzeń:"
+
+#: ../src/parameters.c:883
+msgid ""
+"This is just the default value, you can change it in the actual eventlist "
+"window."
+msgstr "Ustala domyślną ilość wyświetlanych dni, którą można zmodyfikować w oknie aktualnych wydarzeń"
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Pokaż tylko jedno powtarzające się wydarzenie"
 
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
 msgstr ""
 
-#: ../src/parameters.c:836
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Pierwszy dzień tygodnia"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Zaznaczony dzień"
+
+#: ../src/parameters.c:943
 msgid "Use dynamic tray icon"
-msgstr ""
+msgstr "Dynamiczna ikona obszaru powiadamiania"
 
-#: ../src/parameters.c:841
-#, fuzzy
+#: ../src/parameters.c:948
 msgid "Use dynamic icon"
-msgstr "Dynamiczny rozmiar ikony"
+msgstr "Wyświetlanie"
 
-#: ../src/parameters.c:847
+#: ../src/parameters.c:954
 msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
+msgstr "Wyświetla bieżący miesiąc i dzień w ikonie obszaru powiadamiania"
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Podwójne kliknięcie w oknie kalendarza"
+#: ../src/parameters.c:962 ../src/parameters.c:967
+msgid "Use wakeup timer"
+msgstr "Użycie stopera wybudzania"
 
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr "Widok dni"
+#: ../src/parameters.c:973
+msgid ""
+"Use this timer if Orage has problems waking up properly after suspend or "
+"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "Należy użyć tego zegara jeśli Orage ma kłopoty z prawidłowym przywracaniem po wstrzymaniu lub hibernacji. (Na przykład ikona powiadamiania nie odświeża się lub alarm się nie uruchamia.)"
 
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr "Wydarzenia"
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr ""
 
-#: ../src/parameters.c:890
-#, fuzzy
-msgid "Eventlist window"
-msgstr "Wydarzenia"
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Okno Orage"
 
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
+#: ../src/parameters.c:1000
+msgid "Notify notification"
 msgstr ""
 
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
 msgstr ""
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Zawsze wychodź"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:1029
 msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
-msgstr "Preferencje programu"
+msgstr "Preferencje Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
-msgstr "Pierwsze uruchomienie. Wyszukiwanie domyślnej strefy czasowej."
+msgstr "Pierwsze uruchomienie programu. Wyszukiwanie domyślnej strefy czasowej."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
-msgstr "Domyślną strefę czasową ustawiono na %s."
+msgstr "Domyślną strefę czasową ustalono jako %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
 msgstr "Nie znaleziono domyślnej strefy czasowej. Proszę ustawić ją ręcznie."
 
@@ -1974,42 +2139,37 @@
 
 #: ../src/reminder.c:591
 msgid "Open"
-msgstr ""
+msgstr "Otwórz"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Przypomnienie – Orange"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Odłóż"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
+msgstr "Powiadom mnie po określonym czasie"
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Kolejne aktywne alarmy:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d d %02d h %02d min do: %s"
+msgstr "\n%02d d %02d h %02d min do: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Nie znaleziono aktywnych alarmów"
+msgstr "\nNie odnaleziono aktywnych alarmów"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2032,1751 +2192,2266 @@
 msgstr "Afryka/Algier"
 
 #: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
+msgid "Africa/Asmara"
 msgstr "Afryka/Asmara"
 
 #: ../src/timezone_names.c:42
+msgid "Africa/Asmera"
+msgstr "Afryka/Asmara"
+
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "Afryka/Bamako"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "Afryka/Bangi"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "Afryka/Bandźul"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "Afryka/Bissau"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "Afryka/Blantyre"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "Afryka/Brazzaville"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "Afryka/Bużumbura"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "Afryka/Kair"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "Afryka/Casablanca"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "Afryka/Ceuta"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "Afryka/Konakri"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "Afryka/Dakar"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afryka/Dar_es-Salaam"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "Afryka/Dżibuti"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "Afryka/Douala"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "Afryka/El_Aaiun"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "Afryka/Freetown"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "Afryka/Gaborne"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "Afryka/Harara"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "Afryka/Dżuba"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "Afryka/Johannesburg"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "Afryka/Kampala"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "Afryka/Chartum"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "Afryka/Kigali"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "Afryka/Kinszasa"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "Afryka/Lagos"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "Afryka/Libreville"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "Afryka/Lome"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "Afryka/Luanda"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "Afryka/Lubumbashi"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "Afryka/Lusaka"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "Afryka/Malabo"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "Afryka/Maputo"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "Afryka/Maseru"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "Afryka/Mbabane"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "Afryka/Mogadiszu"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "Afryka/Monrovia"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "Afryka/Nairobi"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "Afryka/Ndżamena"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "Afryka/Niamej"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "Afryka/Nawakszut"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "Afryka/Wagadugu"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "Afryka/Porto_Novo"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "Afryka/Sao_Tome"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "Afryka/Timbuktu"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "Afryka/Trypolis"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "Afryka/Tunis"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "Afryka/Windhuk"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "Ameryka"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "Ameryka/Adak"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "Ameryka/Anchorage"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "Ameryka/Anguilla"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "Ameryka/Antiqua"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "Ameryka/Araguaina"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "Ameryka/Argentyna/Buenos_Aires"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "Ameryka/Argentyna/Catamarca"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "Ameryka/Argentyna/ComodRivadavia"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "Ameryka/Argentyna/Cordoba"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "Ameryka/Argentyna/Jujuy"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "Ameryka/Argentyna/La_Rioja"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "Ameryka/Argentyna/Mendoza"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "Ameryka/Argentyna/Rio_Gallegos"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "Ameryka/Argentyna/Salta"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "Ameryka/Argentyna/San_Juan"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "Ameryka/Argentyna/San_Luis"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "Ameryka/Argentyna/Tucuman"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "Ameryka/Argentyna/Ushuaia"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "Ameryka/Aruba"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "Ameryka/Asuncion"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "Ameryka/Atiokan"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "Ameryka/Atka"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "Ameryka/Bahia"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "America/Bahia_Banderas"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "Ameryka/Barbados"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "Ameryka/Belem"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "Ameryka/Belize"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "America/Blanc-Sablon"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "Ameryka/Boa_Vista"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "Ameryka/Bogota"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "Ameryka/Boise"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "Ameryka/Buenos_Aires"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "Ameryka/Cambridge_Bay"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "America/Campo_Grande"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "Ameryka/Cancun"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "Ameryka/Caracas"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "Ameryka/Catamarca"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "Ameryka/Kajenna"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "Ameryka/Kajmany"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "Ameryka/Chicago"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "Ameryka/Chihuahua"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "America/Coral_Harbour"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "Ameryka/Cordoba"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "Ameryka/Kostaryka"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "America/Creston"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "Ameryka/Cuiaba"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "Ameryka/Curacao"
 
-#: ../src/timezone_names.c:121
-msgid "America/Dawson"
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "America/Danmarkshavn"
+
+#: ../src/timezone_names.c:140
+msgid "America/Dawson"
 msgstr "Ameryka/Dawson"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "Ameryka/Dawson_Creek"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "Ameryka/Denver"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "Ameryka/Detroit"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "Ameryka/Dominika"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "Ameryka/Edmonton"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "America/Ensenada"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "Ameryka/Eirunepe"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "Ameryka/Salvador"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "Ameryka/Fortaleza"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "America/Fort_Wayne"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "Ameryka/Glace_Bay"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "Ameryka/Godthab"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "Ameryka/Goose_Bay"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "Ameryka/Grand_Turk"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "Ameryka/Grenada"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "Ameryka/Gwadelupa"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "Ameryka/Gwatemala"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "Ameryka/Guayaquil"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "Ameryka/Gujana"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "Ameryka/Halifax"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "Ameryka/Hawana"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "Ameryka/Hermosillo"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "Ameryka/Indiana/Indianapolis"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "Ameryka/Indiana/Knox"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "Ameryka/Indiana/Marengo"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "Ameryka/Indiana/Petersburg"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "America/Indiana/Tell_City"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "Ameryka/Indiana/Vevay"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "America/Indiana/Vincennes"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "America/Indiana/Winamac"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "Ameryka/Indianapolis"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "Ameryka/Inuvik"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "Ameryka/Iqaluit"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "Ameryka/Jamajka"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "Ameryka/Jujuy"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "Ameryka/Juneau"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "Ameryka/Kentucky/Louisville"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "Ameryka/Kentucky/Monticello"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "America/Knox_IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "America/Kralendijk"
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "Ameryka/La_Paz"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "Ameryka/Lima"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "Ameryka/Los_Angeles"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "Ameryka/Louisville"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "America/Lower_Princes"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "Ameryka/Maceio"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "Ameryka/Managua"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "Ameryka/Manaus"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "America/Marigot"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "Ameryka/Martynika"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "America/Matamoros"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "Ameryka/Mazaltan"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "Ameryka/Mendoza"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "Ameryka/Menominee"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "Ameryka/Merida"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "America/Metlakatla"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "Ameryka/Meksyk"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "Ameryka/Miquelon"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "America/Moncton"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "Ameryka/Monterrey"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "Ameryka/Montevideo"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "Ameryka/Montreal"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "Ameryka/Montserrat"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "Ameryka/Nassau"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "Ameryka/Nowy_Jork"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "Ameryka/Nipigon"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "Ameryka/Nome"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "America/North_Dakota/Beulah"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "America/North_Dakota/Center"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "America/North_Dakota/New_Salem"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "Ameryka/Noronha"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "America/Ojinaga"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "Ameryka/Panama"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "Ameryka/Pangnirtung"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "Ameryka/Paramaribo"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "Ameryka/Phoenix"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "Ameryka/Port-au-Prince"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "Ameryka/Port-of-Spain"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "America/Porto_Acre"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "Ameryka/Porto_Velho"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "Ameryka/Portoryko"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "Ameryka/Rainy_River"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "Ameryka/Rankin_Inlet"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "Ameryka/Recife"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "Ameryka/Regina"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "America/Resolute"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "Ameryka/Rio_Branco"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "Ameryka/Rosario"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "Ameryka/Santa_Isabel"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "America/Santarem"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "Ameryka/Santiago"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "Ameryka/Santo_Domingo"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "Ameryka/Sao_Paulo"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "Ameryka/Scoresbysund"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "Ameryka/Shiprock"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "Ameryka/Sitka"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "Ameryka/Św_Bartłomiej"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "Ameryka/St_Johns"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "Ameryka/St_Kitts"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "Ameryka/St_Lucia"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "Ameryka/St_Thomas"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "Ameryka/St_Vincent"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "Ameryka/Swift_Current"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "Ameryka/Tegucigalpa"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "Ameryka/Thule"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "Ameryka/Thunder_Bay"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "Ameryka/Tijuana"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "Ameryka/Toronto"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "Ameryka/Tortola"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "Ameryka/Vancouver"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "Ameryka/Virginia"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "Ameryka/Whitehorse"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "Ameryka/Winnipeg"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "Ameryka/Yakutat"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "Ameryka/Yellowknife"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Antarktyda"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Antarktyda/Casey"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Antarktyda/Davis"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktyda/Dumont_DUrville"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Antarctica/Macquarie"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Antarktyda/Mawson"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Antarktyda/McMurdo"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Antarktyda/Palmer"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Antarctica/Rothera"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Antarktyda/Biegun_Południowy"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "Antarktyda/Syowa"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Antarktyda/Wostok"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Arktyka"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Arktyka/Longyearbyen"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Azja"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Azja/Aden"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Azja/Ałma_Ata"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Azja/Amman"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Azja/Anadyr"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Azja/Aqtau"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Azja/Aktyubińsk"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "Azja/Aszchabad"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Asia/Ashkhabad"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "Azja/Bagdad"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Azja/Bahrajn"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Azja/Baku"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Azja/Bangkok"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Azja/Bejrut"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Azja/Biszkek"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Azja/Brunei"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Azja/Kalkuta"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Asia/Choibalsan"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "Asia/Chongqing"
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "Azja/Czungcing"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Azja/Kolombo"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Asia/Dacca"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "Azja/Damaszek"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Azja/Dhaka"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Azja/Dili"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Azja/Dubaj"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Azja/Duszanbe"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Azja/Gaza"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Azja/Harbin"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Asia/Hebron"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Azja/Hongkong"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Asia/Ho_Chi_Minh"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Azja/Hovd"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Azja/Irkuck"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Azja/Stambuł"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Azja/Dżakarta"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Azja/Jayapura"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Azja/Jerozolima"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Azja/Kabul"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Azja/Kamczatka"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Azja/Karaczi"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Azja/Kashgar"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Asia/Kathmandu"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Azja/Katmandu"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Asia/Khandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Azja/Kalkuta"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Azja/Krasnojarsk"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Azja/Kuala_Lumpur"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Azja/Kuczing"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Azja/Kuwejt"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Azja/Makao"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Azja/Macau"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Azja/Magadan"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Asia/Makassar"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Azja/Manila"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Azja/Maskat"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Azja/Nikozja"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Asia/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Azja/Nowosybirsk"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Azja/Omsk"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Asia/Oral"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Azja/Phnom_Penh"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Azja/Pontianak"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Azja/Pyongyang"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Azja/Katar"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Asia/Qyzylorda"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Azja/Rangun"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Azja/Rijad"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Asia/Riyadh87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Asia/Riyadh88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Asia/Riyadh89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Azja/Sajgon"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Asia/Sakhalin"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Azja/Samarkanda"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Azja/Seul"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Azja/Szanghaj"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Azja/Singapur"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Azja/Tajepj"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Azja/Taszkient"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Tbilisi"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Azja/Teheran"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Azja/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Asia/Thimbu"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Azja/Thimpu"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Azja/Tokio"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "Azja/Makasar"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Azja/Ułan_Bator"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Azja/Ułan_Bator"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Azja/Urumczi"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Asia/Ust-Nera"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Azja/Vientiane"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Azja/Władywostok"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Azja/Jakuck"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Azja/Jekaterinburg"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Azja/Erewań"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Atlantyk"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Atlantyk/Azory"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Atlantyk/Bermudy"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Atlantyk/Kanary"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantyk/Wyspy_Zielonego_Przylądka"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "Atlantyk/Wyspy_Owcze"
 
-#: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr "Atlantyk/Jan_Mayen"
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlantic/Faroe"
+
+#: ../src/timezone_names.c:372
+msgid "Atlantic/Jan_Mayen"
+msgstr "Atlantyk/Jan_Mayen"
+
+#: ../src/timezone_names.c:373
+msgid "Atlantic/Madeira"
+msgstr "Atlantyk/Madera"
+
+#: ../src/timezone_names.c:374
+msgid "Atlantic/Reykjavik"
+msgstr "Atlantyk/Rejkiawik"
+
+#: ../src/timezone_names.c:375
+msgid "Atlantic/South_Georgia"
+msgstr "Atlantyk/Georgia_Południowa"
+
+#: ../src/timezone_names.c:376
+msgid "Atlantic/St_Helena"
+msgstr "Atlantyk/Św_Helena"
+
+#: ../src/timezone_names.c:377
+msgid "Atlantic/Stanley"
+msgstr "Atlantyk/Stanley"
+
+#: ../src/timezone_names.c:378
+msgid "Australia"
+msgstr "Australia"
+
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Australia/ACT"
+
+#: ../src/timezone_names.c:380
+msgid "Australia/Adelaide"
+msgstr "Australia/Adelajda"
+
+#: ../src/timezone_names.c:381
+msgid "Australia/Brisbane"
+msgstr "Australia/Brisbane"
+
+#: ../src/timezone_names.c:382
+msgid "Australia/Broken_Hill"
+msgstr "Australia/Broken_Hill"
+
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Australia/Currie"
+
+#: ../src/timezone_names.c:384
+msgid "Australia/Darwin"
+msgstr "Australia/Darwin"
+
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Australia/Eucla"
+
+#: ../src/timezone_names.c:386
+msgid "Australia/Hobart"
+msgstr "Australia/Hobart"
+
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr "Australia/Lindeman"
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr "Australia/Lord_Howe"
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "Australia/Melbourne"
+
+#: ../src/timezone_names.c:390
+msgid "Australia/Perth"
+msgstr "Australia/Perth"
+
+#: ../src/timezone_names.c:391
+msgid "Australia/Sydney"
+msgstr "Australia/Sydney"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brazylia"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brazylia/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brazylia/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brazylia/Wschód"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brazylia/Zachód"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Kanada/Atlantycka"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Kanada/Centralna"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Canada/East-Saskatchewan"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Kanada/Wschodnia"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Kanada/Góry"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Kanada/Nowa_Fundlandia"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Kanada/Pacyficzny"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Kanada/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Kanada/Jukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Chile"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Chile/Kontynentalne"
 
-#: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr "Atlantyk/Madera"
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Chile/Wyspa_Wielkanocna"
 
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr "Atlantyk/Rejkiawik"
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
 
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr "Atlantyk/Georgia_Południowa"
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
 
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr "Atlantyk/Św_Helena"
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
 
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr "Atlantyk/Stanley"
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
 
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr "Australia"
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
 
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr "Australia/Adelajda"
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
 
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr "Australia/Brisbane"
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
 
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr "Australia/Broken_Hill"
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
 
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr "Australia/Darwin"
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
 
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr "Australia/Hobart"
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
 
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr "Australia/Lindeman"
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
 
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr "Australia/Lord_Howe"
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
 
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr "Australia/Melbourne"
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
 
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr "Australia/Perth"
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
 
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr "Australia/Sydney"
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Uniwersalny"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Zulu"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Europa"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Europa/Andora"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Europa/Ateny"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrad"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Europa/Berlin"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratysława"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Europa/Bruksela"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Europa/Bukareszt"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Europa/Budapeszt"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Europa/Busingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Europa/Kiszyniów"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Europa/Kopenhaga"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Europa/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Europa/Wyspa_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Europa/Stambuł"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Europa/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Europa/Kijów"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Europa/Lizbona"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "Europa/Lublana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Europa/Londyn"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luksemburg"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Europa/Madryt"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Europa/Maarianhamina"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Europa/Mińsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Europa/Monako"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Europa/Moskwa"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "Europa/Nikozja"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Europa/Paryż"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Europa/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Europa/Praga"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Europa/Ryga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Europa/Rzym"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajewo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "Europa/Symferopol"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Europa/Sztokholm"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallin"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Europa/Tyraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Użhorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Europa/Watykan"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Europa/Wiedeń"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "Europa/Wilno"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Europa/Wołgograd"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "Europa/Warszawa"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagrzeb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporoże"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "Europa/Zurych"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Ocean_Indyjski"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "Ocean_Indyjski/Antananarywa"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "Ocean_Indyjski/Czagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "Ocean_Indyjski/Wyspa_Bożego_Narodzenia"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "Ocean_Indyjski/Wyspy_Kokosowe"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "Ocean_Indyjski/Komory"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "Ocean_Indyjski/Wyspy_Kerguelena"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "Ocean_Indyjski/Mahe"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "Ocean_Indyjski/Malediwy"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "Ocean_Indyjski/Mauritius"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "Ocean_Indyjski/Majotta"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "Ocean_Indyjski/Reunion"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Meksyk"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Meksyk/Kalifornia_Dolna"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Meksyk/Kalifornia_Dolna_Południowa"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Meksyk/Ogólny"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Bliski_Wschód"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Mideast/Riyadh87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Mideast/Riyadh88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Mideast/Riyadh89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Pacyfik"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "Pacyfik/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Pacyfik/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Pacyfik/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Pacific/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "Pacyfik/Wyspa_Wielkanocna"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "Pacyfik/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "Pacyfik/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Pacyfik/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "Pacyfik/Fidżi"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Pacyfik/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Pacyfik/Galapagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Pacyfik/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "Pacyfik/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Pacyfik/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Pacyfik/Honolulu"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Pacyfik/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "Pacyfik/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "Pacyfik/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "Pacyfik/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Pacyfik/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Pacyfik/Marquesas"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Pacyfik/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Pacyfik/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Pacyfik/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Pacyfik/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "Pacyfik/Numea"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Pacyfik/Pago_Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Pacyfik/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "Pacyfik/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Pacific/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "Pacyfik/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Pacyfik/Port_Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Pacyfik/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Pacyfik/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pacific/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Pacyfik/Tahiti"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Pacyfik/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Pacyfik/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Pacyfik/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Pacyfik/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Pacyfik/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "Pacyfik/Yap"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "Stany_Zjednoczone"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "Stany_Zjednoczone/Alaska"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "US/Aleutian"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "Stany_Zjednoczone/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "USA/Centralny"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "USA/Wschodni"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "US/East-Indiana"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "Stany_Zjednoczone/Hawaje"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "US/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "Stany_Zjednoczone/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "USA/Góry"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "Stany_Zjednoczone/Pacyfik"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "US/Pacific-New"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "Stany_Zjednoczone/Samoa"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
-msgstr "Nowa akcja"
+msgstr "Nowe zdarzenie"
 
 #: ../src/tray_icon.c:485
 msgid "About Orage"
 msgstr "O programie"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Orage Panel Clock"
-msgstr "Zegar Orage"
+msgstr "Panel zegara"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
 msgid "Show time and date?"
-msgstr "Wyświetla czas i datę"
+msgstr "Wyświetlić datę i czas?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Kalendarz"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Preferencje programu"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
 msgid "Orage preferences"
-msgstr "Preferencje programu"
+msgstr "Preferencje Orage"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Konfiguruje ustawienia kalendarza Orange"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Kalendarz pulpitu"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Ustawienia Kalendarza"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
-#, fuzzy
+msgid "Calendar"
+msgstr "Kalendarz"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Kalendarz Orage"
 
-#~ msgid "Orage clock"
-#~ msgstr "Zegar Orage"
-
-#~ msgid "Contributor"
-#~ msgstr "Współpracownik"
-
-#~ msgid "Warning"
-#~ msgstr "Ostrzeżenie"
-
-#~ msgid "Error"
-#~ msgstr "Błąd"
-
-#~ msgid "Display"
-#~ msgstr "Wyświetlanie"
-
-#~ msgid "Set sticked"
-#~ msgstr "Na wszystkich obszarach roboczych"
-
-#~ msgid "Select always today"
-#~ msgstr "Zaznaczanie bieżącego dnia"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr "Zaznacza bieżący dzień po otwarciu okna kalendarza"
-
-#~ msgid "Vary"
-#~ msgstr "Zmienne"
-
-#~ msgid "Select timezone"
-#~ msgstr "Wybór strefy czasowej"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Zmodyfikuj preferencje"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr "Wprowadza strefę czasową (=SC) lub umożliwia jej wybór z listy"
-
-#~ msgid "show line _1:"
-#~ msgstr "Wiersz _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "Wiersz _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "Wiersz _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Preferencje programu"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Nie udało się uruchomić polecenia „orage -p”"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> – wstawia bieżącą datę w formacie lokalnym,\n"
-#~ "<T> – wstawia czas,\n"
-#~ "<DT> – wstawia datę i czas."
-
-#~ msgid "Show event list"
-#~ msgstr "Wydarzenia"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 ‒ ikona statyczna)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Wyświetla bieżący dzień i miesiąc w formie ikony obszaru powiadamiania. "
-#~ "Jeśli rozmiar obszaru powiadamiania jest zbyt mały, użyta zostanie ikona "
-#~ "statyczna."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Ustawienia kalendarza"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Ustawienia kalendarza Xfce 4"
-
-#, fuzzy
-#~ msgid "Monday"
-#~ msgstr "Dziś"
-
-#, fuzzy
-#~ msgid "Tuesday"
-#~ msgstr "Dziś"
-
-#, fuzzy
-#~ msgid "Wednesday"
-#~ msgstr "Dni tygodnia"
-
-#, fuzzy
-#~ msgid "Thursday"
-#~ msgstr "Dziś"
-
-#, fuzzy
-#~ msgid "Friday"
-#~ msgstr "pią"
-
-#, fuzzy
-#~ msgid "Sunday"
-#~ msgstr "Dźwięk"
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "dni"
-
-#, fuzzy
-#~ msgid "normal"
-#~ msgstr "Ogólne"
-
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%m/%d/%Y"
-
-#, fuzzy
-#~ msgid "Calendar Files"
-#~ msgstr "Pliki kalendarza"
-
-#~ msgid "Calendar borders"
-#~ msgstr "Obramowanie kalendarza"
-
-#~ msgid "Hidden"
-#~ msgstr "Ukryte"
-
-#~ msgid "3 months"
-#~ msgstr "3 miesiące"
-
-#~ msgid "6 months"
-#~ msgstr "6 miesięcy"
-
-#~ msgid "1 year"
-#~ msgstr "1 rok"
-
-#~ msgid "Application"
-#~ msgstr "Aplikacja"
-
-#~ msgid "Button Label|Orage"
-#~ msgstr "Orage"
-
-#~ msgid "Core developer"
-#~ msgstr "Główny programista"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Usuniesz wszystkie informacje \n"
-#~ "związane z tym dniem."
-
-#~ msgid "Clear"
-#~ msgstr "Wyczyść"
-
-#~ msgid "uid"
-#~ msgstr "uid"
-
-#~ msgid "This should not happen"
-#~ msgstr "To nie powinno się wydarzyć"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Nie można utworzyć kanału klienta MCS"
-
-#~ msgid "Open archive file..."
-#~ msgstr "Otwórz plik archiwum..."
-
-#~ msgid "Close archive file"
-#~ msgstr "Zamknij plik archiwum"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Kalendarz pulpitu"
diff -Nru orage-4.8.3/po/POTFILES.in orage-4.12.1/po/POTFILES.in
--- orage-4.8.3/po/POTFILES.in	2010-12-17 15:34:06.000000000 +0000
+++ orage-4.12.1/po/POTFILES.in	2015-04-10 10:26:26.000000000 +0000
@@ -29,6 +29,6 @@
 src/tz_zoneinfo_read.c
 
 # files added by intltool-prepare.
-panel-plugin/xfce4-orageclock-plugin.desktop.in.in
+panel-plugin/xfce4-orageclock-plugin.desktop.in
 plugin/xfce-xfcalendar-settings.desktop.in
 xfcalendar.desktop.in
diff -Nru orage-4.8.3/po/pt_BR.po orage-4.12.1/po/pt_BR.po
--- orage-4.8.3/po/pt_BR.po	2012-01-03 12:01:08.000000000 +0000
+++ orage-4.12.1/po/pt_BR.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,31 +1,52 @@
-# Portuguese/Brazil translation of orage.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Felix da Silva Costa <felix@online.eti.br>, 2004.
-# Adriano Winter Bess <awbess@gmail.com>, 2005.
-# Og Maciel <ogmaciel@gnome.org>, 2008, 2009.
-# Fábio Nogueira <deb-user-ba@ubuntu.com>, 2008.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Adriano Winter Bess <awbess@gmail.com>, 2005
+# André Miranda <andreldm1989@gmail.com>, 2014
+# Fábio Nogueira <deb-user-ba@ubuntu.com>, 2008
+# Felix da Silva Costa <felix@online.eti.br>, 2004
+# Henrique P. Machado <zehrique@gmail.com>, 2013
+# Og Maciel <ogmaciel@gnome.org>, 2008-2009
+# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2009-04-25 09:36-0500\n"
-"Last-Translator: Og Maciel <ogmaciel@gnome.org>\n"
-"Language-Team: Brazilian Portuguese <ldp-br@bazar2.conectiva.com.br>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2014-09-26 02:35+0000\n"
+"Last-Translator: André Miranda <andreldm1989@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/xfce-apps/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "sem sublinhado"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "simples"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "duplo"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "abaixo"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr "Levantando a janela HorárioGlobal..."
+msgstr "Levantando a janela Horário Mundial..."
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
-msgstr "Falha ao levantar a janela HorárioGlobal"
+msgstr "Falha ao levantar a janela Horário Mundial"
 
 #. ********** timezone tooltip **********
 #: ../globaltime/globaltime.c:277
@@ -33,9 +54,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"clique para modificar o relógio"
+msgstr "%s\nclique para modificar o relógio"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -45,9 +64,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"botão 1 para modificar as preferências \n"
-"botão 2 para ajustar o horário dos relógios"
+msgstr "botão 1 para modificar as preferências \nbotão 2 para ajustar o horário dos relógios"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -56,7 +73,11 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
+msgstr "ajuste para modificar os minutos. Clique na setas com o botão 2 para modificar somente 1 minuto."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Horário Mundial"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -112,7 +133,7 @@
 
 #: ../globaltime/gt_prefs.c:590
 msgid "Globaltime preferences "
-msgstr "preferências de horário global"
+msgstr "preferências de horário mundial"
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -217,8 +238,7 @@
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"Marque isto para usar a fonte padrão do sistema invés da fonte selecionada"
+msgstr "Marque isto para usar a fonte padrão do sistema invés da fonte selecionada"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -240,7 +260,7 @@
 
 #: ../globaltime/gt_prefs.c:1062
 msgid "Globaltime Preferences"
-msgstr "Preferências de horário global"
+msgstr "Preferências de horário mundial"
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
@@ -259,6 +279,10 @@
 msgid "Use normal decorations"
 msgstr "Usar decorações normais"
 
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Nenhuma"
+
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
 msgstr "Não mostrar decorações de janelas (bordas)"
@@ -328,13 +352,13 @@
 #: ../globaltime/timezone_selection.c:195
 #: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
 msgid "not changing"
-msgstr ""
+msgstr "nenhuma alteração"
 
 #. location
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Local"
@@ -347,7 +371,7 @@
 #: ../globaltime/timezone_selection.c:264
 #: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
 msgid "Previous/Next Change"
-msgstr ""
+msgstr "Anterior/Próxima Mudança"
 
 #: ../globaltime/timezone_selection.c:269
 #: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
@@ -395,97 +419,108 @@
 msgid "floating"
 msgstr "flutuante"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
+#: ../globaltime/globaltime.desktop.in.h:1
+msgid "Orage Globaltime"
+msgstr "Horário mundial do Orage"
+
+#: ../globaltime/globaltime.desktop.in.h:2
+msgid "Show clocks from different countries"
+msgstr "Mostrar relógios de diferentes países"
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
 msgid "Globaltime"
 msgstr "Horário mundial"
 
-#: ../globaltime/globaltime.desktop.in.h:2
-msgid "Orage Globaltime"
-msgstr "Horário global Orage"
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Não girar"
 
-#: ../globaltime/globaltime.desktop.in.h:3
-msgid "Show clocks from different countries"
-msgstr ""
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Girar à esquerda"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Girar à direita"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "Aparência"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
 msgstr "Mostrar _borda"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
 msgstr "ajustar cor de _primeiro plano:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
 msgstr "ajustar cor de _fundo:"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
 msgstr "definir _altura:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
+msgstr "Note que você não pode alterar a altura dos painéis horizontais"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
 msgstr "definir _largura:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
-msgstr ""
+msgstr "Note que você não pode alterar a altura dos painéis verticais"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Mostrar linhas _verticalmente"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "Opções do Relógio"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
 msgstr "ajustar fuso horário para:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "Linha %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
 msgstr "Entre qualquer parâmetro válido da função strftime."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
 msgstr "Dica de ferramenta:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
 msgstr "corrigir o horário depois de suspender/hibernar"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Você só precisa disso se você suspende ou hiberna (por menos de 5 horas) e o "
-"seu tempo de visibilidade não inclui segundos. Sob estas circunstâncias é "
-"possível que o relógio do Orage mostre o horário de forma incorreta caso "
-"você não tenha isso selecionado. (Selecionando isso previne que recursos de "
-"economia de cpu e interrupt funcionem.)"
+msgstr "Você só precisa disso se você suspende ou hiberna (por menos de 5 horas) e o seu tempo de visibilidade não inclui segundos. Sob estas circunstâncias é possível que o relógio do Orage mostre o horário de forma incorreta caso você não tenha isso selecionado. (Selecionando isso previne o CPU e interrompe os recursos de economia de funcionarem.)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -495,21 +530,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Este programa usa a função strftime para obter o tempo.\n"
-"Use qualquer código válido para obter o tempo no formato\n"
-"preferido. Alguns códidos comuns são:\n"
-"\t%A = dia da semana\t\t%B = mês\n"
-"\t%c = data & hora\t\t\t%R = hora & minuto\n"
-"\t%V = número da semana\t%Z = fuso horário em uso\n"
-"\t%H = horas\t\t\t\t%M = minuto\n"
-"\t%X = horário local\t\t%x = data local"
+msgstr "Este programa usa a função strftime para obter o tempo.\nUse qualquer código válido para obter o tempo no formato\npreferido. Alguns códigos comuns são:\n\t%A = dia da semana\t\t%B = mês\n\t%c = data & hora\t\t\t%R = hora & minuto\n\t%V = número da semana\t%Z = fuso horário em uso\n\t%H = horas\t\t\t\t%M = minuto\n\t%X = horário local\t\t%x = data local"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
 msgstr "Preferências do relógio do Orage"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -518,8 +544,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
 msgstr "%d de %B de %Y"
 
@@ -534,7 +559,7 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Fim"
 
@@ -542,13 +567,13 @@
 msgid "Due"
 msgstr "Prazo"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Selecione um arquivo..."
 
@@ -556,227 +581,281 @@
 msgid "Sound Files"
 msgstr "Arquivos de Som"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Todos os Arquivos"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "A informação do compromisso foi modificada."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "Você deseja continuar?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Não, não sair"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Sim, ignorar modificações e sair"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "O final deste compromisso é anterior ao começo."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "Não definido"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Adiciona novo compromisso a este arquivo."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "arquivo padrão do Orage"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Falha ao adicionar compromisso."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Ocorreu um erro ao adicionar compromisso. Veja mais detalhes no arquivo de log."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Falha ao atualizar compromisso."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Veja mais detalhes no arquivo de log. (talvez o arquivo foi atualizado externo ao Orage?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
 msgstr "Este compromisso será removido permanentemente."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Não, cancelar a remoção"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Sim, removê-lo"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Escolha a data"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Hoje"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "Este compromisso não existe."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
 msgstr "Foi provavelmente removido, por favor recarregue sua rela."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Categorias atuais"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Adicionar nova categoria com cor"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Categoria:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Cores de categorias - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr "*** CÓPIA ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "Novo compromisso - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "Salvar e f_echar"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "D_uplicar"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Salvar"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Salvar e fechar"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Reverter"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Apagar"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Livre"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Geral"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Tipo"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Evento futuro. Por exemplo:\n"
-"Reunião ou aniversário ou programa de TV."
+msgstr "Evento futuro. Por exemplo:\nReunião ou aniversário ou programa de TV."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "Tarefa"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Algo que você deveria fazer em um futuro próximo. Por exemplo:\n"
-"Lavar o seu carro ou testar a nova versão do Orage."
+msgstr "Algo que você deveria fazer em um futuro próximo. Por exemplo:\nLavar o seu carro ou testar a nova versão do Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Diário"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Fazer uma observação que algo aconteceu. Por exemplo:\n"
-"Lembrar que sua mãe ligou ou que caiu neve pela primeira vez."
+msgstr "Fazer uma observação que algo aconteceu. Por exemplo:\nLembrar que sua mãe ligou ou que caiu neve pela primeira vez."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Título "
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "Evento de um dia inteiro"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Início"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Definir"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Duração"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "dias"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "horas"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "minutos"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Disponibilidade"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Completado"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "Concluído"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Categorias"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Esta é uma categoria especial, que pode ser usada para colorir este "
-"compromisso em visões de lista."
+msgstr "Esta é uma categoria especial, que pode ser usada para colorir este compromisso em visões de lista."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "atualizar cores para as categorias."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "Prioridade"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Se você definir isso como 8 ou mair, o compromisso NÃO será mostrado nas janelas de lista.\nVocê pode usar o recurso para desconfundir as janelas de lista, mas ele deixa mais difícil localizar este compromisso.\n(Alarmes vão tocar normalmente.)\n(há parâmetro não documentado de forma que você possa alterar o limite padrão de 8.)"
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Nota"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -785,131 +864,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Estes comandos têm efeitos imediatos:\n    <D> insere data atual no formato local\n    <T> insere home e\n    <DT> insere data e hora.\n\nEstes apenas serão convertidos apenas quando forem vistos:\n    <&Ynnnn> é traduzido para o ano atual menos nnnn.\n(Pode ser utilizado em lembretes de aniversários para informar quantos anos a pessoa terá.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "Antes de Iniciar"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "Antes de Finalizar"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "Depois de Iniciar"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "Depois de Finalizar"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Alarme"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Horário do alarme"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Geralmente você deseja receber uma notificação:\n"
-" 1) antes do Evento começar\n"
-" 2) antes da Tarefa terminar\n"
-" 3) depois da Tarefa terminar"
+msgstr "Geralmente você deseja receber uma notificação:\n 1) antes do Evento começar\n 2) antes da Tarefa terminar\n 3) depois da Tarefa terminar"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr "Alarme insistente"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Selecione isto se você deseja que o Orage te notifique mesmo que ele não "
-"esteja ativado quando a notificação aconteceu."
+msgstr "Selecione isto se você deseja que o Orage te notifique mesmo que ele não esteja ativado quando a notificação aconteceu."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Som"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "Usar"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
 msgstr "Selecione isto se você deseja um alarme sonoro"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "Repetir som do alarme"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "vezes"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "intervalo de seg"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "Visual"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Usar a janela do Orage"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
 msgstr "Selecione isto se você deseja uma notificação na janela do Orage"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Usar notificação"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
 msgstr "Selecione isto se você deseja uma notificação de alarme"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "Definir tempo de espera"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
 msgstr "Selecione isto se você deseja que a notificação expire automaticamente"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 = tempo de expiração padrão do sistema"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "segundos"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Procedimento"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
 msgstr "Selecione isto se você deseja um alarme por procedimento ou script"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -919,156 +991,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
+msgstr "Você deve inserir todos os caracteres de especiais manualmente.\nEsta linha é enviada ao terminal para processar.\nOs seguintes comandos especiais serão substituídos durante a execução:\n\t<&T>  título do compromisso\n\t<&D>  descrição do compromisso\n\t<&AT> hora do alarme\n\t<&ST> início do compromisso\n\t<&ET> final do compromisso"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
 msgstr "Teste este alarme agora"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "<b>Alarme padrão</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
 msgstr "Salvar as configurações atuais como alarme padrão"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
 msgstr "Definir configurações atuais a partir do alarme padrão"
 
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Nenhuma"
-
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Diária"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Semanal"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Mensal"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Anual"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
 msgstr "Hora em hora"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Seg"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Ter"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Qua"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Qui"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Sex"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "Sáb"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "Dom"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Recorrência"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Complexidade"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Básico"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Avançado"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "Use isto se você deseja eventos com repetição regular"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Use isto se você precisa de horários complexos como:\n"
-"Todo sábado e domingo ou \n"
-"A primeira terça de cada mês"
+msgstr "Use isto se você precisa de horários complexos como:\nTodo sábado e domingo ou \nA primeira terça de cada mês"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Frequência"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Cada"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "Recorrência"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Limitar a frequência à certos intervalos.\n"
-"Por exemplo: Todo terceiro dia.\n"
-"Frequência = Diariamente e Intervalo = 3"
+msgstr "Limitar a frequência à certos intervalos.\nPor exemplo: Todo terceiro dia.\nFrequência = Diariamente e Intervalo = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Limitar"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Repetir para sempre"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Repetir "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Repetir até "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Dias da semana"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "Qual dia"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1076,287 +1138,297 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Especificar qual dia da semana para eventos mensais e anuais.\n"
-" Por exemplo:\n"
-" Segunda quarta de cada mês:\n"
-"\tFrequência = Mensal,\n"
-"\tDias da semana = checar somente na quarta,\n"
-"\tQual dia = selecionar 2 do número abaixo de quarta"
+msgstr "Especificar qual dia da semana para eventos mensais e anuais.\n Por exemplo:\n Segunda quarta de cada mês:\n\tFrequência = Mensal,\n\tDias da semana = checar somente na quarta,\n\tQual dia = selecionar 2 do número abaixo de quarta"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr "Tarefa base"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"Uma TAREFA ocorre regularmente começando no horário inicial e repetindo a "
-"cada intervalo sem levar em conta quando foi a última vez concluída"
+msgstr "Uma TAREFA ocorre regularmente começando no horário inicial e repetindo a cada intervalo sem levar em conta quando foi a última vez concluída"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"A ocorrência de uma TAREFA é baseada no horário concluído e repete depois "
-"que o intervalo conta a partir de quando foi a última vez concluída.\n"
-"(Note que não é possível entender o histórico das TAREFAS já que a base de "
-"occorrência muda depois de cada conclusão.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "A ocorrência de uma TAREFA é baseada no horário concluído e repete depois que o intervalo conta a partir de quando foi a última vez concluída.\n(Note que não é possível entender o histórico das TAREFAS já que a base de ocorrência muda depois de cada conclusão.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "Exceções"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
+msgstr "Adicione mais datas de exceção clicando nos dias do calendário abaixo.\nUma exceção pode ser de exclusão(-) ou inclusão(+) dependendo da seleção.\nRemova clicando na data."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr "Adicionar data excluída (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
+msgstr "Os dias excluídos são os dias em que este compromisso não ocorre"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
 msgstr "Adicionar hora incluída (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
+msgstr "As horas incluídas têm o mesmo fuso horário da hora inicial, mas podem ter horas diferentes"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
 msgstr "Datas de ação"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Ver"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Novo"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Voltar"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Hoje"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Avançar"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Voltar uma semana"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Voltar um dia"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Avançar um dia"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Avançar uma semana"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Fechar"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "Número de dias para mostrar"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - visão do dia"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Todo o dia"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Horário"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "Nenhuma fila foi selecionada."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Clique em uma fila para selecioná-la para que você possa copiá-la."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"Você vai permanentemente excluir todos\n"
-"compromissos selecionados."
+msgstr "Você vai permanentemente excluir todos\ncompromissos selecionados."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Sim, removê-los"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Voltar"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Avançar"
+
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Localizar"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "Visão do dia"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Dias adicionais para mostrar"
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Dias extras para mostrar:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "apenas primeiro repetido"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Marque isso apenas se você deseja ver o primeiro evento repetido. Por padrão, todos são mostrados.\nNote que isso também mostra todas as urgências.\nNote que eventos repetidos podem aparecer antes na lista como a primeira ocorrência é apenas listada."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "também antigo"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Marque isso se você deseja ver eventos antigos também. Isso só pode estar selecionado após \"apenas primeiro repetido\" estar habilitado para evitar listas muito longas.\nNote que a seleção de \"dias extras\" ainda define se novos compromisso estão listados."
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "Entradas no diário começando em:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Pesquisar"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "Pesquisar pelo texto"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Opções"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Título"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Clique duas vezes na linha para editá-la.\n"
-"\n"
-"Sinalizadores em ordem:\n"
-"\t 1. Alarme: n=nenhum alarme\n"
-"\t\t A=Alarm visual S=também alarme sonoro\n"
-"\t 2. Recorrência: n=nenhuma repetição\n"
-"\t\t D=Diariamente W=Semanalmente M=Mensalmente Y=Anualmente\n"
-"\t 3. Tipo: f=livre B=ocupado\n"
-"\t 4. Localizado em arquivo:\n"
-"\t\tO=Orage A=Arquivo F=Entrevista\n"
-"\t 5. Tipos de compromisso:\n"
-"\t\tE=Evento T=Tarefa J=Diário"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Escolha a data"
+msgstr "Clique duplo na linha para editá-la.\n\nSinalizadores em ordem:\n     1. Alarme:\n          n=Nenhum alarme\n          A=Alarme definido\n          P=alarme persistente\n     2. Recorrência:\n          n=nenhuma recorrência M=Mensalmente\n          H=cada Hora           W=Semanalmente\n          D=Diariamente         Y=Anualmente\n     3. Tipo:\n          f=livre               B=ocupado\n     4. Localizado em arquivo:\n          O=Orage               A=Arquivo\n          F=Externo\n     5. Tipos de compromisso:\n          E=Evento              T=Tarefa\n          J=Diário"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tOcorrência finalizada, movendo para arquivamento."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Arquivamento não está habilitado. Saindo"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Limite para arquivamento: %d mê(ese)s"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tArquivando eventos que são mais velhos que: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "UID de arquivamento: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tO VTODO não está concluído; não arquivado"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tRepetindo. Final do ano: %04d, mês: %02d, dia: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Arquivamento concluído\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Iniciando remoção de arquivamento."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tFASE 1: restaurar compromissos frequentes"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tFASE 2: retorna compromissos arquivados"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Remoção de arquivamento concluído\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Alarme padrão do Orage"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Lista de alarmes criada a para o arquivo principal do Orage:"
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Criada lista de alarme para arquivo externo: %s (%s)"
+
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "Lista de alarmes: %d alarmes adicionados. %d eventos processados."
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\tAdicionado %d alarmes. Processados %d eventos."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\t%d alarmes encontrados dos quais %d estão ativos. (Pesquisou por %d "
-"alarmes recorrentes.)"
+msgstr "\t%d alarmes encontrados dos quais %d estão ativos. (Pesquisou por %d alarmes recorrentes.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1374,7 +1446,16 @@
 msgid "Import file preprocessing done"
 msgstr "Pré-processamento de importação de arquivo concluído"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Encontrada atualização externa no arquivo %s."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Renovando alarmes e agenda por causa de atualização externa no arquivo."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Arquivos de calendário"
 
@@ -1382,630 +1463,672 @@
 msgid "Current foreign files"
 msgstr "Arquivos atuais desconhecidos"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "SOMENTE LEITURA"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "SOMENTE ESCRITA"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Nenhum arquivo desconhecido *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Falha ao adicionar arquivo externo"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage pode lidar com apenas 10 arquivos externos. Limite alcançado."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Nome de arquivo está vazio."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Nome está vazio."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Arquivo não existe."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "O mesmo nome de arquivo existe no Orage."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "O mesmo nome existe no Orage."
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Importar/exportar"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Ler do arquivo:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Separar nomes de arquivos com vírgulas(,).\n"
-"OBSERVAÇÃO: vírgulas não são caracteres válidos em nomes de arquivos no "
-"Orage."
+msgstr "Separar nomes de arquivos com vírgulas(,).\nOBSERVAÇÃO: vírgulas não são caracteres válidos em nomes de arquivos no Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Exportar"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Salvar no arquivo:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Selecionar"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Todos compromissos"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Compromissos chamados:"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Observe que somente compromissos no arquivo principal são lidos.\n"
-"Eventos desconhecidos e arquivados não são exportados."
+msgstr "Observe que somente compromissos no arquivo principal são lidos.\nEventos desconhecidos e arquivados não são exportados."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Observe que somente compromissos no arquivo principal são lidos.\n"
-"Eventos desconhecidos não são exportados."
+msgstr "Observe que somente compromissos no arquivo principal são lidos.\nEventos desconhecidos não são exportados."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "Você pode facilmente arrastá-los da janela de lista de eventos."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "UID de compromissos do Orage separados por vírgulas."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Arquivar"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Arquivar agora (limite: %d meses)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Você pode modificar o limite de arquivamento nos parâmetros"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Reverter o arquivamento agora"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Retorna todos eventos arquivados ao arquivo principal do Orage e remove o "
-"arquivamento.\n"
-"Isto é útil por exemplo quando exportando e movendo compromissos\n"
-"do Orage para outro sistema."
+msgstr "Retorna todos eventos arquivados ao arquivo principal do Orage e remove o arquivamento.\nIsto é útil por exemplo quando exportando e movendo compromissos\ndo Orage para outro sistema."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Arquivos do Orage"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Arquivo de calendário principal do Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Arquivo de atual"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Novo arquivo"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Opções de ação"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Arquivo atual:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Arquivo novo:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Opções de ação:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Renomear"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Renomear somente arquivos internos do Orage.\n"
-"Não afeta de forma alguma os arquivos externos do sistema.\n"
-"Novo arquivo deve existir."
+msgstr "Renomear somente arquivos internos do Orage.\nNão afeta de forma alguma os arquivos externos do sistema.\nNovo arquivo deve existir."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-"O arquivo atual é copiado e permanece sem modificações no local original."
+msgstr "O arquivo atual é copiado e permanece sem modificações no local original."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Mover"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "O arquivo atual é movido e desaparece do local original."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Arquivar o arquivo"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Arquivos desconhecidos"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Adicionar um novo arquivo desconhecido"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Arquivo desconhecido:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Opções"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Nome visível:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Somente leitura"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Marque isto se você deseja  certificar-se que este arquivo nunca será "
-"modificado pelo Orage.\n"
-"Observe que modificando arquivos desconhecidos pode torná-los incompatíveis "
-"com a ferramenta original, de onde eles vieram!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Marque isto se você deseja  certificar-se que este arquivo nunca será modificado pelo Orage.\nObserve que modificando arquivos desconhecidos pode torná-los incompatíveis com a ferramenta original, de onde eles vieram!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Este nome interno é exibido para o usuário em vez do nome de arquivo."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Trocar dados - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tIsto é %s versão %s para o Xfce %s\n"
-"\n"
+msgstr "\tEste é %s versão %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tLançado sob os termos da Licença Pública Geral GNU.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tCompilado com GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "usando GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tUsando DBUS para importação.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tNão usando DBUS. Importação funcionando parcialmente.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tUsando libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tNão usando libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tUsando arquivamento automático.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tNão usando arquivamento.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tUsando o pacote libical do sistema operacional.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tUsando versão local do Orage do libical.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Uso: orage [opções] [arquivos]\n"
-"\n"
+msgstr "Uso: orage [opções] [arquivos]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Opções:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tmostra a versão do orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\timprime este texto\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \tmostra o formulário de preferências\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\ttorna o orage visível/invisível\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) arquivo [RW] \tadiciona um arquivo desconhecido\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) file [RW] [nome] \tadiciona um arquivo externo\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) arquivo \tremove um arquivo desconhecido\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--export (-e) arquivo [compromisso...] \texportar compromissos do Orage para arquivo\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "arquivo=arquivos ical para carregar no orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tdbus não incluído no orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tsem dbus [arquivos] e opções para arquivos desconhecidos(-a & -r) só podem "
-"ser usados quando iniciando o Orage \n"
+msgstr "\tsem dbus [arquivos] e opções para arquivos desconhecidos(-a & -r) só podem ser usados quando iniciando o Orage \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Opção desconhecida %s\n"
-"\n"
+msgstr "\nOpção desconhecida %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Trocar dados"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Ver _data selecionada"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Ver s_emana selecionada"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Selecionar Ho_je"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Mostrar _Horário Global"
+msgstr "Mostrar _Horário Mundial"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "A_juda"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Nenhum título definido"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr " Localização: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n Nota:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Nunca"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Título: %s\n"
-" Início:\t%s\n"
-" Fim:\t%s\n"
-" Nota:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "Título: %s\n%s Início:\t%s\n Fim:\t%s\n Concluído:\t%s%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Título: %s\n"
-" Início:\t%s\n"
-" Fim:\t%s\n"
-" Nota:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Título: %s\n%s Início:\t%s\n Fim:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Tarefa:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Eventos para %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>Eventos for %s - %s:</b>"
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "Configurações principais"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Fuso horário"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "Você deveria sempre definir seu fuso horário local."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "Limite de arquivamento (meses)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = sem arquivamento)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Arquivamento é usado para salvar tempo e espaço quando lidando com eventos."
+msgstr "Arquivamento é usado para salvar tempo e espaço quando lidando com eventos."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Comando de áudio"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
 msgstr "Este comando é passado ao shell para fazer alarmes sonoros."
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Mostradas"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Janela principal do calendário"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Janela do calendário"
+
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Detalhes visuais do calendário"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "Mostrar bordas"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "Mostrar menu"
 
-#: ../src/parameters.c:632
-#, fuzzy
-msgid "Show month and year"
-msgstr "Mostrar no paginador"
-
-#: ../src/parameters.c:639
-#, fuzzy
+#: ../src/parameters.c:622
 msgid "Show day names"
-msgstr "Mostrar _borda"
+msgstr "Mostrar nomes dos dias"
 
-#: ../src/parameters.c:646
-#, fuzzy
+#: ../src/parameters.c:627
 msgid "Show week numbers"
-msgstr "Mostrar bordas"
+msgstr "Mostrar números das semanas"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Mostrar mês e ano"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Caixas de informações do calendário"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "Mostrar lista de tarefas"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
-msgstr ""
+msgstr "Número de dias a mostrar na janela de eventos"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
-msgstr ""
+msgstr "0 = não mostrar a lista de eventos"
+
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Visibilidade do calendário"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
-msgstr ""
+msgstr "Mostrar em todas as áreas de trabalho"
 
-#: ../src/parameters.c:683
-#, fuzzy
+#: ../src/parameters.c:696
 msgid "Keep on top"
-msgstr "Definir acima"
+msgstr "Manter acima"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "Mostrar na barra de tarefas"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "Mostrar no paginador"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "Mostrar na bandeja do sistema"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "Inicialização do calendário"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Esconder"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Minimizado"
 
-#: ../src/parameters.c:793
-#, fuzzy
-msgid "Extra settings"
-msgstr "Configurações adicionais"
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Janela principal do calendário"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "Selecionar Ho_je"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
-
-#: ../src/parameters.c:841
-#, fuzzy
-msgid "Use dynamic icon"
-msgstr "Tamanho de ícone dinâmico"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Mostrar o calendário principal com um clique duplo"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "Ao abrir a janela do calendário"
+
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Selecionar data de hoje"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Selecionar data anteriormente selecionada"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "clique-duplo no dia do calendário mostra"
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
 msgstr "Visão dos dias"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
 msgstr "Lista de eventos"
 
-#: ../src/parameters.c:890
-#, fuzzy
-msgid "Eventlist window"
-msgstr "Lista de eventos"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Configurações adicionais"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Janela de lista de eventos"
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
-msgstr ""
+msgstr "Número de dias extra a mostrar na lista de eventos"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
-msgstr ""
+msgstr "Este é apenas o valor padrão, você pode alterá-lo na atual janela da lista de eventos."
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Mostra apenas o primeiro evento repetido"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Primeiro dia padrão na janela de visão de dia"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Primeiro dia da semana"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Dia selecionado"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Usar ícone de bandeja dinâmico"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Usar ícone dinâmico"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Ícone dinâmico mostra o atual mês e dia do mês."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
-msgstr ""
+msgstr "Utilize temporizador de inicialização"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
+msgstr "Utilize este temporizador se o Orage encontrar problemas ao inicializar após a suspensão ou hibernação. (Por exemplo, ícone na bandeja não atualizado ou alarmes funcionando.)"
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Alarme visual padrão de arquivo externo"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Janela do orage"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Notificar notificação"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Sempre sair quando perguntado pelo fechamento"
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Sempre sair"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Por padrão, o Orage permanece aberto em segundo-plano quando perguntado pelo fechamento. Esta opção faz com que o Orage feche e não permaneça mais em segundo-plano quando perguntado pelo fechamento."
+
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Preferências do Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
-msgstr ""
-"Orage iniciado pela primeira vez. Pesquisando pelo fuso horário padrão."
+msgstr "Orage iniciado pela primeira vez. Pesquisando pelo fuso horário padrão."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Fuso horário padrão definido para %s"
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
-msgstr ""
-"O fuso horário padrão não foi encontrado, por favor definí-lo manualmente."
+msgstr "O fuso horário padrão não foi encontrado, por favor definí-lo manualmente."
 
 #: ../src/reminder.c:562
 msgid "Reminder "
@@ -2015,40 +2138,35 @@
 msgid "Open"
 msgstr "Abrir"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Notificação - Orage"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Adiar"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
+msgstr "Lembre-me novamente após a hora especificada"
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Próximo alarmes ativos:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d d %02d h %02d min para: %s"
+msgstr "\n%02d d %02d h %02d min para: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Nenhum alarme ativo encontrado"
+msgstr "\nNenhum alarme ativo encontrado"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2071,1537 +2189,2229 @@
 msgstr "África/Algiers"
 
 #: ../src/timezone_names.c:41
+msgid "Africa/Asmara"
+msgstr "África/Asmara"
+
+#: ../src/timezone_names.c:42
 msgid "Africa/Asmera"
 msgstr "África/Asmera"
 
-#: ../src/timezone_names.c:42
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "África/Bamako"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "África/Bangui"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "África/Banjul"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "África/Bissau"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "África/Blantyre"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "África/Brazzaville"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "África/Bujumbura"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "África/Cairo"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "África/Casablanca"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "África/Ceuta"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "África/Conakry"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "África/Dakar"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "África/Dar es Salaam"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "África/Djibouti"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "África/Douala"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "África/El_Aaiun"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "África/Freetown"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "África/Gaborone"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "África/Harare"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "África/Juba"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "África/Johannesburg"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "África/Kampala"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "África/Khartoum"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "África/Kigali"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "África/Kinshasa"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "África/Lagos"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "África/Libreville"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "África/Lome"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "África/Luanda"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "África/Lubumbashi"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "África/Lusaka"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "África/Malabo"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "África/Maputo"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "África/Maseru"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "África/Mbabane"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "África/Mogadishu"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "África/Monrovia"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "África/Nairobi"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "África/Ndjamena"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "África/Niamey"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "África/Nouakchott"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "África/Ouagadougou"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "África/Porto-Novo"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "África/São_Tomé"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "África/Timbuktu"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "África/Tripoli"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "África/Tunis"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "África/Windhoek"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "América"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "América/Adak"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "América/Anchorage"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "América/Anguilla"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "América/Antigua"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "América/Araguaina"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "América/Argentina/Buenos_Aires"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "América/Argentina/Catamarca"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "América/Argentina/ComodRivadavia"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "América/Argentina/Cordoba"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "América/Argentina/Jujuy"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "América/Argentina/La_Rioja"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "América/Argentina/Mendoza"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "América/Argentina/Rio_Gallegos"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "América/Argentina/Salta"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "América/Argentina/San_Juan"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "América/Argentina/San_Luis"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "América/Argentina/Tucuman"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "América/Argentina/Ushuaia"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "América/Aruba"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "América/Asuncion"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "América/Atikokan"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "América/Atka"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "América/Bahia"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "América/Bahia_Banderas"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "América/Barbados"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "América/Belém"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "América/Belize"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "América/Blanc-Sablon"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "América/Boa_Vista"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "América/Bogotá"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "América/Boise"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "América/Buenos_Aires"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "América/Cambridge_Bay"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "América/Campo_Grande"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "América/Cancun"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "América/Caracas"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "América/Catamarca"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "América/Cayenne"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "América/Cayman"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "América/Chicago"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "América/Chihuahua"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "América/Coral_Harbour"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "América/Cordoba"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "América/Costa_Rica"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "América/Creston"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "América/Cuiabá"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "América/Curacao"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "América/Danmarkshavn"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "América/Dawson"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "América/Dawson_Creek"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "América/Denver"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "América/Detroit"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "América/Dominica"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "América/Edmonton"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "América/Ensenada"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "América/Eirunepe"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "América/El_Salvador"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "América/Fortaleza"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "América/Fort Wayne"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "América/Glace_Bay"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "América/Godthab"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "América/Goose_Bay"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "América/Grand_Turk"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "América/Grenada"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "América/Guadeloupe"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "América/Guatemala"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "América/Guayaquil"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "América/Guyana"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "América/Halifax"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "América/Havana"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "América/Hermosillo"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "América/Indiana/Indianapolis"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "América/Indiana/Knox"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "América/Indiana/Marengo"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "América/Indiana/Petersburg"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "América/Indiana/Tell_City"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "América/Indiana/Vevay"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "América/Indiana/Vincennes"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "América/Indiana/Winamac"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "América/Indianapolis"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "América/Inuvik"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "América/Iqaluit"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "América/Jamaica"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "América/Jujuy"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "América/Juneau"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "América/Kentucky/Louisville"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "América/Kentucky/Monticello"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "América/Knox IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "América/Kralendijk"
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "América/La_Paz"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "América/Lima"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "América/Los_Angeles"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "América/Louisville"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "América/Lower_Princes"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "América/Maceió"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "América/Managua"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "América/Manaus"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "América/Marigot"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "América/Martinique"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "America/Matamoros"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "América/Mazatlan"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "América/Mendoza"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "América/Menominee"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "América/Merida"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "América/Metlakatla"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "América/Mexico_City"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "América/Miquelon"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "América/Moncton"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "América/Monterrey"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "América/Montevideo"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "América/Montreal"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "América/Montserrat"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "América/Nassau"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "América/Nova_York"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "América/Nipigon"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "América/Nome"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "América/Dakota_do_Norte/Beulah"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "América/Dakota_do_Norte/Centro"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "América/Dakota_do_Norte/Nova_Salém"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "América/Noronha"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "America/Ojinaga"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "América/Panamá"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "América/Pangnirtung"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "América/Paramaribo"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "América/Phoenix"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "América/Port-au-Prince"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "América/Port_of_Spain"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "América/Porto_Acre"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "América/Porto_Velho"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "América/Porto_Rico"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "América/Rainy_River"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "América/Rankin_Inlet"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "América/Recife"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "América/Regina"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "América/Resolute"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "América/Rio_Branco"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "América/Rosário"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "América/Santa_Isabel"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "América/Santarém"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "América/Santiago"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "América/Santo_Domingo"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "América/São_Paulo"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "América/Scoresbysund"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "América/Shiprock"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "América/Sitka"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "América/St_Barthelemy"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "América/St_Johns"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "América/St_Kitts"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "América/St_Lucia"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "América/St_Thomas"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "América/St_Vincent"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "América/Swift_Current"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "América/Tegucigalpa"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "América/Thule"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "América/Thunder_Bay"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "América/Tijuana"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "América/Toronto"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "América/Tortola"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "América/Vancouver"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "América/Virgin"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "América/Whitehorse"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "América/Winnipeg"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "América/Yakutat"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "América/Yellowknife"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Antártica"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Antártica/Casey"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Antártica/Davis"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Antártica/DumontDUrville"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Antártica/Macquarie"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Antártica/Mawson"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Antártica/McMurdo"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Antártica/Palmer"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Antártica/Rothera"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Antártica/South_Pole"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "Antártica/Syowa"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Antártica/Vostok"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Ártico"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Ártico/Longyearbyen"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Ásia"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Ásia/Aden"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Ásia/Almaty"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Ásia/Amman"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Ásia/Anadyr"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Ásia/Aqtau"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Ásia/Aqtobe"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "Ásia/Ashgabat"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Ásia/Ashkhabad"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "Ásia/Baghdad"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Ásia/Bahrain"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Ásia/Baku"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Ásia/Bangkok"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Ásia/Beirut"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Ásia/Bishkek"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Ásia/Brunei"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Ásia/Calcutta"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Ásia/Choibalsan"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "Ásia/Chongqing"
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "Ásia/Chungking"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Ásia/Colombo"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Ásia/Daca"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "Ásia/Damascus"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Ásia/Dhaka"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Ásia/Dili"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Ásia/Dubai"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Ásia/Dushanbe"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Ásia/Gaza"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Ásia/Harbin"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Ásia/Hebron"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Ásia/Hong_Kong"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Ásia/Ho_Chi_Minh"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Ásia/Hovd"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Ásia/Irkutsk"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Ásia/Istanbul"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Ásia/Jakarta"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Ásia/Jayapura"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Ásia/Jerusalém"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Ásia/Kabul"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Ásia/Kamchatka"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Ásia/Karachi"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Ásia/Kashgar"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Ásia/Kathmandu"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Ásia/Katmandu"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Ásia/Khandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Ásia/Kolkata"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Ásia/Krasnoyarsk"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Ásia/Kuala_Lumpur"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Ásia/Kuching"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Ásia/Kuwait"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Ásia/Macao"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Ásia/Macau"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Ásia/Magadan"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Ásia/Makassar"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Ásia/Manila"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Ásia/Muscat"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Ásia/Nicosia"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Ásia/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Ásia/Novosibirsk"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Ásia/Omsk"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Ásia/Oral"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Ásia/Phnom_Penh"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Ásia/Pontianak"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Ásia/Pyongyang"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Ásia/Qatar"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Ásia/Qyzylorda"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Ásia/Rangoon"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Ásia/Riyadh"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Ásia/Riad87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Ásia/Riad88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Ásia/Riad89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Ásia/Saigon"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Ásia/Sakhalin"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Ásia/Samarkand"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Ásia/Seoul"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Ásia/Shanghai"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Ásia/Singapore"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Ásia/Taipei"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Ásia/Tashkent"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Ásia/Tbilisi"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Ásia/Tehran"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Ásia/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Ásia/Timbu"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Ásia/Thimphu"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Ásia/Tokyo"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "Ásia/Ujung_Pandang"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Ásia/Ulaanbaatar"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Ásia/Ulan_Bator"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Ásia/Urumqi"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Ásia/Ust-Nera"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Ásia/Vientiane"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Ásia/Vladivostok"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Ásia/Yakutsk"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Ásia/Yekaterinburg"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Ásia/Yerevan"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Atlântico"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Atlântico/Açores"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Atlântico/Bermudas"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Atlântico/Canary"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlântico/Cabo_Verde"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "Atlântico/Faeroe"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlântico/Faroe"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlântico/Jan_Mayen"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "Atlântico/Madeira"
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
 msgstr "Atlântico/Reykjavik"
 
-#: ../src/timezone_names.c:306
+#: ../src/timezone_names.c:375
 msgid "Atlantic/South_Georgia"
 msgstr "Atlântico/South_Georgia"
 
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr "Atlântico/St_Helena"
+#: ../src/timezone_names.c:376
+msgid "Atlantic/St_Helena"
+msgstr "Atlântico/St_Helena"
+
+#: ../src/timezone_names.c:377
+msgid "Atlantic/Stanley"
+msgstr "Atlântico/Stanley"
+
+#: ../src/timezone_names.c:378
+msgid "Australia"
+msgstr "Austrália"
+
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Austrália/ACT"
+
+#: ../src/timezone_names.c:380
+msgid "Australia/Adelaide"
+msgstr "Austrália/Adelaide"
+
+#: ../src/timezone_names.c:381
+msgid "Australia/Brisbane"
+msgstr "Austrália/Brisbane"
+
+#: ../src/timezone_names.c:382
+msgid "Australia/Broken_Hill"
+msgstr "Austrália/Broken_Hill"
+
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Austrália/Currie"
+
+#: ../src/timezone_names.c:384
+msgid "Australia/Darwin"
+msgstr "Austrália/Darwin"
+
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Austrália/Eucla"
+
+#: ../src/timezone_names.c:386
+msgid "Australia/Hobart"
+msgstr "Austrália/Hobart"
+
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr "Austrália/Lindeman"
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr "Austrália/Lord_Howe"
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "Austrália/Melbourne"
+
+#: ../src/timezone_names.c:390
+msgid "Australia/Perth"
+msgstr "Austrália/Perth"
+
+#: ../src/timezone_names.c:391
+msgid "Australia/Sydney"
+msgstr "Austrália/Sydney"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brasil"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brasil/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brasil/Fernando de Noronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brasil/Leste"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brasil/Oeste"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Canadá"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Canadá/Atlântico"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Canadá/Central"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Canadá/Leste-Saskatchewan"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Canadá/Leste"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Canadá/Montanhas"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Canadá/Terra_Nova"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Canadá/Pacífico"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Canadá/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Canadá/Yukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Chile"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Chile/Continental"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Chile/Ilha_de_Páscoa"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
 
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr "Atlântico/Stanley"
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
 
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr "Austrália"
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
 
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr "Austrália/Adelaide"
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
 
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr "Austrália/Brisbane"
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
 
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr "Austrália/Broken_Hill"
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
 
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr "Austrália/Darwin"
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
 
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr "Austrália/Hobart"
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
 
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr "Austrália/Lindeman"
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
 
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr "Austrália/Lord_Howe"
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
 
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr "Austrália/Melbourne"
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
 
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr "Austrália/Perth"
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
 
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr "Austrália/Sydney"
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Universal"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Zulu"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Europa"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Europa/Athens"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrade"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Europa/Berlin"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Europa/Bruxelas"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Europa/Bucharest"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Europa/Budapeste"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Europa/Amsterdã"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Europa/Copenhagen"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Europa/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Europa/Ilha_de_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Europa/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisbon"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Europa/London"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxembourg"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Europa/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Europa/Moscow"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Europa/Paris"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Europa/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Europa/Praga"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Europa/São_Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Europa/Stockholm"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Europa/Tirane"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Europa/Tiraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Europa/Vatican"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Europa/Vienna"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Europa/Volgogrado"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "Europa/Warsaw"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "Europa/Zurich"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Índico"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "Índico/Antananarivo"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "Índico/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "Índico/Christmas"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "Índico/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "Índico/Comoro"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "Índico/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "Índico/Mahe"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "Índico/Maldivas"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "Índico/Mauritius"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "Índico/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "Índico/Reunion"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "México"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "México/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "México/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "México/Geral"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Oriente Médio"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Oriente_Médio/Riad87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Oriente_Médio/Riad88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Oriente_Médio/Riad89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Pacífico"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "Pacífico/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Pacífico/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Pacífico/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Pacífico/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "Pacífico/Easter"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "Pacífico/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "Pacífico/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Pacífico/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "Pacífico/Fiji"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Pacífico/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Pacífico/Galapagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Pacífico/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "Pacífico/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Pacífico/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Pacífico/Honolulu"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Pacífico/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "Pacífico/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "Pacífico/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "Pacífico/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Pacífico/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Pacífico/Marquesas"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Pacífico/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Pacífico/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Pacífico/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Pacífico/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "Pacífico/Noumea"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Pacífico/Pago_Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Pacífico/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "Pacífico/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Pacífico/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "Pacífico/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Pacífico/Port_Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Pacífico/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Pacífico/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pacífico/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Pacífico/Tahiti"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Pacífico/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Pacífico/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Pacífico/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Pacífico/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Pacífico/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "US"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "US/Alasca"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "US/Ilhas_Aleutas"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "US/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "US/Central"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "US/Leste"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "US/Leste-Indiana"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "US/Havai"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "US/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "US/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "US/Montanhas"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "US/Pacífico"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "US/Novo-Pacífico"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "US/Samoa"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "Novo compromisso"
@@ -3611,289 +4421,34 @@
 msgstr "Sobre o Orage"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Orage Panel Clock"
-msgstr "Relógio do Orage"
+msgstr "Relógio de painel Orage"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
 msgid "Show time and date?"
-msgstr "Que horas e data é agora?"
+msgstr "Mostrar horas e data?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Calendário"
+msgid "Orage preferences"
+msgstr "Preferências do Orage"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Preferências do Orage"
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr "Configurações para o Aplicativo de Calendário do Xfce 4(Orage)"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Preferências do Orage"
+msgid "Orage Calendar Preferences"
+msgstr "Preferências do calendário Orage"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Configurações para a Aplicação de Calendário do Xfce 4"
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Calendário"
+
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr "Orage Calendário"
 
 #: ../xfcalendar.desktop.in.h:2
 msgid "Desktop calendar"
 msgstr "Calendário do Ambiente de Trabalho"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "Orage - Calendário"
-
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Título: %s\n"
-#~ " Início:\t%s\n"
-#~ " Prazo:\t%s\n"
-#~ " Concluído:\t%s\n"
-#~ "Nota:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Você deve entrar todos os caracteres de escape manualmente.\n"
-#~ "Este texto é passado direramente ao shell para processamento"
-
-#~ msgid "Orage clock"
-#~ msgstr "Relógio do Orage"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Criador original, mantenedor aposentado"
-
-#~ msgid "Contributor"
-#~ msgstr "Contribuidor"
-
-#~ msgid "Info"
-#~ msgstr "Informação"
-
-#~ msgid "Warning"
-#~ msgstr "Aviso"
-
-#~ msgid "Error"
-#~ msgstr "Erro"
-
-#~ msgid "Display"
-#~ msgstr "Exibição"
-
-#~ msgid "Set sticked"
-#~ msgstr "Definir como aderente"
-
-#~ msgid "Select always today"
-#~ msgstr "Selecionar hoje sempre"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Quando mostrando o calendário principal, posicionar o cursor no dia "
-#~ "anterior ao dia selecionado ou sempre no dia atual."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Terminando modo de correção do horário"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Iniciando mode de correção do horário"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "ajuste para modificar os minutos"
-
-#~ msgid "Vary"
-#~ msgstr "Variar"
-
-#~ msgid "Select timezone"
-#~ msgstr "Escolha o fuso horário"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Modificar Relógio"
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "digite o fuso horário do relógio,\n"
-#~ "(=qualquer valor TZ válido)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Modificar Preferências"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Digite o fuso horário local. (usado para mostrar o horário se o horário "
-#~ "estiver na data anterior(-) ou seguinte(+) adicionando um +/- depois do "
-#~ "horário)"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr "Ajuste qualquer valor de fuso horário ou escolha um da lista."
-
-#~ msgid "show line _1:"
-#~ msgstr "mostrar linha _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "mostrar linha _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "mostrar linha _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Propriedades"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Falhou ao executar \"orage -p\""
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> insere a data atual no formato de data local.\n"
-#~ "<T> insere o horário e\n"
-#~ "<DT> insere a data e horário."
-
-#~ msgid "Show event list"
-#~ msgstr "Mostrar lista de eventos"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = usar ícone estático)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Ícone dinâmico mostra o dia e mês atual. Só é visível na bandeja. Se a "
-#~ "bandeja for muito pequena para o tamanho do ícone dinâmico, o Orage muda "
-#~ "automaticamente para o ícone estático."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Configurações do Calendário"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Configurações do Calendário do Xfce 4"
-
-#~ msgid "(0 = undefined, 1 = highest, 9 = lowest)"
-#~ msgstr "(0 = indefinido, 1 = mais alta, 9 = mais baixa)"
-
-#~ msgid "Generated UID %s"
-#~ msgstr "UID %s gerado"
-
-#~ msgid "import: adding component %s"
-#~ msgstr "importando: adicionando componente %s"
-
-#~ msgid "\timport: Unarchived component"
-#~ msgstr "\timportando: Componente não arquivado"
-
-#~ msgid "\timport: component exists already"
-#~ msgstr "\timportando: componente já existe"
-
-#~ msgid "\timport: new last modified time %s old last modified time %s"
-#~ msgstr ""
-#~ "\timportando: nova data de modificação %s data antiga de modificação %s"
-
-#~ msgid "import: Not added as the new appointment is not newer than the old"
-#~ msgstr ""
-#~ "importando: Não foi adicionado já que o novo compromisso não é mais novo "
-#~ "que o antigo"
-
-#~ msgid "import: added"
-#~ msgstr "importando: adicionado"
-
-#~ msgid "Imported %d calendars including %d appointments"
-#~ msgstr "%d calendários importados incluindo %d compromissos"
-
-#~ msgid "Monday"
-#~ msgstr "Hoje"
-
-#~ msgid "Tuesday"
-#~ msgstr "Hoje"
-
-#~ msgid "Wednesday"
-#~ msgstr "Semanal"
-
-#~ msgid "Thursday"
-#~ msgstr "Hoje"
-
-#~ msgid "Friday"
-#~ msgstr "dias"
-
-#~ msgid "Sunday"
-#~ msgstr "Som"
-
-#~ msgid "Days"
-#~ msgstr "dias"
-
-#~ msgid "normal"
-#~ msgstr "Geral"
-
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%d/%m/%Y"
-
-#~ msgid "Calendar Files"
-#~ msgstr "Arquivos de calendário"
-
-#~ msgid "Calendar borders"
-#~ msgstr "Bordas do calendário"
-
-#~ msgid "Hidden"
-#~ msgstr "Escondidas"
-
-#~ msgid "3 months"
-#~ msgstr "3 meses"
-
-#~ msgid "6 months"
-#~ msgstr "6 meses"
-
-#~ msgid "1 year"
-#~ msgstr "1 ano"
-
-#~ msgid "Application"
-#~ msgstr "Aplicação"
-
-#~ msgid "Button Label|Orage"
-#~ msgstr "Orage"
-
-#~ msgid "Core developer"
-#~ msgstr "Desenvolvedor principal"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Você removerá todas as informações \n"
-#~ "associadas a esta data."
-
-#~ msgid "Clear"
-#~ msgstr "Limpar"
-
-#~ msgid "uid"
-#~ msgstr "uid"
-
-#~ msgid "This should not happen"
-#~ msgstr "Isto não deveria acontecer"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Não é possível criar o canal do cliente MCS"
-
-#~ msgid "Open archive file..."
-#~ msgstr "Abrir arquivo de fichário..."
-
-#~ msgid "Close archive file"
-#~ msgstr "Fechar arquivo de fichário"
diff -Nru orage-4.8.3/po/pt.po orage-4.12.1/po/pt.po
--- orage-4.8.3/po/pt.po	2012-01-04 08:11:13.000000000 +0000
+++ orage-4.12.1/po/pt.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,31 +1,48 @@
-# Portuguese translation of orage.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Nuno Donato <nunodonato@gmail.com>, 2004.
-# Nuno Miguel <nunis@netcabo.pt>
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+# Nuno Donato <nunodonato@gmail.com>, 2004
+# Nuno Miguel <nunomgue@gmail.com>, 2013-2014
+# Sérgio Marques <smarquespt@gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.6.1\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2010-12-23 17:07+0100\n"
-"Last-Translator: Nuno Miguel <nunis@netcabo.pt>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2014-12-20 17:23+0000\n"
+"Last-Translator: Nuno Miguel <nunomgue@gmail.com>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/xfce-apps/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Poedit-Language: Portuguese\n"
-"X-Poedit-Country: PORTUGAL\n"
+"Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "sem sublinhado"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "simples"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "duplo"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "baixo"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr "Subindo a janela Horário Global..."
+msgstr "Subindo a janela Horário global..."
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
-msgstr "Falha ao subir a janela Horário Global"
+msgstr "Falha ao subir a janela Horário global"
 
 #. ********** timezone tooltip **********
 #: ../globaltime/globaltime.c:277
@@ -33,9 +50,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"clique para mudar o relógio"
+msgstr "%s\nclique para mudar o relógio"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -45,9 +60,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"botão 1 para mudar preferências \n"
-"botão 2 para ajustar a hora"
+msgstr "botão 1 para mudar preferências \nbotão 2 para ajustar a hora"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -56,9 +69,11 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"ajuste para mudar os minutos. Clique nas setas com o botão 2 para mudar 1 "
-"minuto."
+msgstr "ajuste para mudar os minutos. Clique nas setas com o botão 2 para mudar 1 minuto."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Horário Global"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -74,7 +89,7 @@
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
-msgstr "actualizar este relógio"
+msgstr "atualizar este relógio"
 
 #: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
 msgid "add new empty clock"
@@ -82,11 +97,11 @@
 
 #: ../globaltime/gt_prefs.c:526
 msgid "add new clock using this clock as model"
-msgstr "adicionar novo relógio usando este relógio como modelo"
+msgstr "adicionar novo relógio tendo este relógio como modelo"
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
-msgstr "Apagar este relógio"
+msgstr "apagar este relógio"
 
 #: ../globaltime/gt_prefs.c:539
 msgid "move this clock first"
@@ -106,7 +121,7 @@
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
-msgstr "definir o fuso horário deste relógio como hora local"
+msgstr "definir o fuso horário deste relógio para ser a hora local"
 
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
@@ -114,7 +129,7 @@
 
 #: ../globaltime/gt_prefs.c:590
 msgid "Globaltime preferences "
-msgstr "Preferências da hora global"
+msgstr "Preferências da Hora global"
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -152,7 +167,7 @@
 #: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
 #: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
 msgid "Use default"
-msgstr "Utilizar as omissões"
+msgstr "Utilizar omissões"
 
 #: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
@@ -172,20 +187,20 @@
 #. ------------------------name font-------------------------
 #: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
 msgid "Font for name of clock:"
-msgstr "Fonte para o nome do relógio:"
+msgstr "Tipo de letra para o nome do relógio:"
 
 #: ../globaltime/gt_prefs.c:720
 msgid "Click to change font for clock name"
-msgstr "Clique para mudar a fonte do nome do relógio"
+msgstr "Clique para mudar o tipo de letra do nome do relógio"
 
 #. ------------------------time font-------------------------
 #: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
 msgid "Font for time of clock:"
-msgstr "Fonte para a hora do relógio:"
+msgstr "Tipo de letra para a hora do relógio:"
 
 #: ../globaltime/gt_prefs.c:753
 msgid "Click to change font for clock time"
-msgstr "Clique para mudar a fonte do relógio"
+msgstr "Clique para mudar o tipo de letra do relógio"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:780
@@ -203,11 +218,11 @@
 
 #: ../globaltime/gt_prefs.c:863
 msgid "Click to change default background colour for clocks"
-msgstr "Clique para mudar a cor de fundo por omissão para os relógios"
+msgstr "Clique para mudar a cor de fundo por omissão dos relógios"
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr "Cruzar isto para usar a omissão do sistema em vez da cor seleccionada"
+msgstr "Cruzar isto para utilizar a omissão do sistema em vez da cor selecionada"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
@@ -215,17 +230,15 @@
 
 #: ../globaltime/gt_prefs.c:929
 msgid "Click to change default font for clock name"
-msgstr "Clique para mudar a fonte por omissão para o nome do relógio"
+msgstr "Clique para mudar o tipo de letra por omissão para o nome do relógio"
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"Cruzar isto para usar a fonte por omissão do sistema em vez da fonte "
-"seleccionada"
+msgstr "Cruzar isto para usar a fonte por omissão do sistema em vez da fonte seleccionada"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
-msgstr "Clique para mudar a fonte por omissão para o relógio"
+msgstr "Clique para mudar o tipo de letra por omissão para o relógio"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:990
@@ -239,11 +252,11 @@
 
 #: ../globaltime/gt_prefs.c:1027
 msgid "update preferences"
-msgstr "actualizar preferências"
+msgstr "atualizar preferências"
 
 #: ../globaltime/gt_prefs.c:1062
 msgid "Globaltime Preferences"
-msgstr "Preferências da hora global"
+msgstr "Preferências do horário global"
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
@@ -260,7 +273,11 @@
 
 #: ../globaltime/gt_prefs.c:1083
 msgid "Use normal decorations"
-msgstr "Usar decorações normais"
+msgstr "Utilizar decorações normais"
+
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Nenhum"
 
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
@@ -280,15 +297,15 @@
 
 #: ../globaltime/gt_prefs.c:1111
 msgid "Varying"
-msgstr "Variações"
+msgstr "Variável"
 
 #: ../globaltime/gt_prefs.c:1116
 msgid "Clock sizes vary"
-msgstr "Tamanhos dos relógios variam"
+msgstr "O tamanho dos relógios varia"
 
 #: ../globaltime/gt_prefs.c:1122
 msgid "Local timezone:"
-msgstr "Fuso local:"
+msgstr "Fuso horário local:"
 
 #: ../globaltime/timezone_selection.c:101
 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
@@ -299,13 +316,13 @@
 #: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
 #, c-format
 msgid "%d hour %d mins"
-msgstr "%d hora %d mins"
+msgstr "%d hora %d minutos"
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
 #, c-format
 msgid "%d hour"
-msgstr "%d horas"
+msgstr "%d hora"
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
@@ -337,7 +354,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Localização"
@@ -398,97 +415,108 @@
 msgid "floating"
 msgstr "flutuar"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Hora global"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "Hora global Orage"
+msgstr "Horário global Orage"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "Mostrar relógios de outros países"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Horário global"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Sem rotação"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Rodar para a esquerda"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Rodar para a direita"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "Aparência"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
 msgstr "Mostrar _janela"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
-msgstr "definir a _cor principal:"
+msgstr "definir _cor principal:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
-msgstr "definir a cor _secundária:"
+msgstr "definir cor _secundária:"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
-msgstr "definir a _altura:"
+msgstr "definir _altura:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
 msgstr "Tenha em atenção que não pode alterar a altura dos painéis horizontais"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
 msgstr "definir _largura:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
 msgstr "Tenha em atenção que não pode alterar a largura dos painéis verticais"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Mostrar linhas _verticalmente"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "Opções do relógio"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
 msgstr "definir fuso para:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "Linha %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
-msgstr "Coloque qualquer parâmetro válido da função strftime."
+msgstr "Coloque qualquer parâmetro strftime válido."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
 msgstr "Dica:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
 msgstr "corrigir hora após suspender/hibernar"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Apenas precisa disto se suspender ou hibernar (por menos de 5 horas) e se o "
-"seu tempo de visibilidade não incluir segundos. Nestas circunstâncias é "
-"possível que o relógio do Orage mostre o horário de forma incorrecta caso "
-"não tenha esta opção seleccionada. (A opção impede que os recursos de "
-"poupança de energia e interrupção funcionem.)"
+msgstr "Apenas precisa disto se suspender ou hibernar (por menos de 5 horas) e se o seu tempo de visibilidade não incluir segundos. Nestas circunstâncias, é possível que o relógio do Orage mostre o horário de forma incorreta caso não tenha esta opção selecionada. (A opção impede que os recursos de poupança de energia e interrupção funcionem.)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -498,21 +526,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Este programa usa a função strftime para obter as horas.\n"
-"Use qualquer código válido para obter o tempo no formato preferido.\n"
-"Alguns códigos são:\n"
-"\t%A = dia da semana\t\t%B = mês\n"
-"\t%c = data & hora\t\t\t%R = hora & minuto\n"
-"\t%V = número da semana\t%Z = fuso horário\n"
-"\t%H = horas\t\t\t\t%M = minuto\n"
-"\t%X = horário local\t\t%x = data local"
+msgstr "Este programa usa a função strftime para obter as horas.\nUse qualquer código válido para obter a hora no formato preferido.\nAlguns códigos são:\n\t%A = dia da semana\t\t%B = mês\n\t%c = data e hora\t\t\t%R = hora e minuto\n\t%V = número da semana\t%Z = fuso horário\n\t%H = horas\t\t\t\t%M = minuto\n\t%X = horário local\t\t%x = data local"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
 msgstr "Preferências do relógio Orage"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -521,10 +540,9 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#. 
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
-msgstr "%A %d %B %Y/%V"
+msgstr "%A %d de %B de %Y/%V"
 
 #: ../src/about-xfcalendar.c:40
 msgid "Maintainer"
@@ -532,12 +550,12 @@
 
 #: ../src/about-xfcalendar.c:47
 msgid "Manage your time with Orage"
-msgstr "Faça a gestão do seu tempo com o Orage"
+msgstr "Gestão de horários com o Orage"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Fim"
 
@@ -545,241 +563,295 @@
 msgid "Due"
 msgstr "Vence"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
-msgstr "Seleccione um ficheiro..."
+msgstr "Selecione um ficheiro..."
 
 #: ../src/appointment.c:680
 msgid "Sound Files"
 msgstr "Ficheiros de som"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "A informação do compromisso foi alterada."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "Deseja continuar?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Não, não sair"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Sim, ignonrar modificações e sair"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
-msgstr "O fim deste compromisso é anterior ao seu início"
+msgstr "O final deste compromisso é anterior ao seu início."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "Não definido"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Adicionar novo compromisso a este ficheiro."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Ficheiro por omissão do Orage"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Falha ao adicionar compromisso."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Ocorreu um erro ao criar o compromisso. Pode ver os detalhes do erro no ficheiro de registo."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Falha ao atualizar compromisso."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Saiba mais detalhes no ficheiro de registo. (Será que o ficheiro foi editado com outra aplicação?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
-msgstr "Este compromisso será removido para sempre."
+msgstr "Este compromisso será removido permanentemente."
+
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Não, cancelar a remoção"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Sim, remover"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Escolha a data"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Hoje"
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "Este compromisso não existe."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
-msgstr "Provavelmente removido. Por favor, actualize o ecrã."
+msgstr "Provavelmente removido. Por favor atualize o ecrã."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
-msgstr "Categorias actuais"
+msgstr "Categorias atuais"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Adicionar nova categoria com cor"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Categoria:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Categoria de cores - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr "*** COPIAR ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "Novo compromisso - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
-msgstr "Grava_r e fechar"
+msgstr "Gravar _e fechar"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "D_uplicar"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Gravar"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Gravar e fechar"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Reverter"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
-msgstr "Duplicado"
+msgstr "Duplicar"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Apagar"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Livre"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Geral"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Tipo"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Evento que irá ocorrer. Por exemplo:\n"
-"Encontro, aniversário ou programa de TV."
+msgstr "Evento que irá ocorrer. Por exemplo:\nEncontro, aniversário ou programa de TV."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "Tarefa"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Algo que deve fazer algumas vezes. Por exemplo:\n"
-"Lavar o carro ou testar uma nova versão do Orage."
+msgstr "Algo que deve fazer algumas vezes. Por exemplo:\nLavar o carro ou testar uma nova versão do Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Periódico"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Faça uma nota de que algo aconteceu. Por exemplo:\n"
-"Observar que a sua mãe telefonou ou a primeira neve a cair."
+msgstr "Faça uma nota de que algo aconteceu. Por exemplo:\nLembrar que a sua mãe telefonou ou o primeiro dia em que nevou."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Título"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
-msgstr "Evento preenche o dia todo"
+msgstr "Evento para todo o dia"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
-msgstr "Começo"
+msgstr "Inicio"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Definir"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Duração"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "dias"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "horas"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "minutos"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Disponibilidade"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Concluído"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
-msgstr "Feito"
+msgstr "Terminado"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Categorias"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Esta é a categoria especial que pode ser usada para colorir este compromisso "
-"na lista de vistas."
+msgstr "Esta é a categoria especial que pode ser usada para colorir este compromisso na lista de vistas."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "actualizar cores para categorias."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "Prioridade"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Se colocar aqui 8 ou maior, o compromisso NÃO será mostrado nas janelas de lista.\nPode usar aquela funcionalidade para limpar as janelas de lista, mas faz com que seja mais difícil de encontrar este compromisso.\n(Alarmes continuam a disparar normalmente.)\n(Existe parâmetro ilegal para permitir que altere o limite de 8.)"
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Nota"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -788,140 +860,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"Estes comandos têm efeitos imediatos:\n"
-"    <D> insere data actual no formato local\n"
-"    <T> insere horas e\n"
-"    <DT> insere data e horas.\n"
-"\n"
-"Estas apenas serão convertidas quando forem vistas:\n"
-"    <&Ynnnn> é traduzido para o ano actual menos nnnn.\n"
-"(Pode ser utilizado em lembretes de aniversários para informar a idade da "
-"pessoa.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Estes comandos têm efeitos imediatos:\n    <D> insere a data atual no formato local\n    <T> insere as horas e\n    <DT> insere a data e as horas.\n\nEstas apenas serão convertidas quando forem vistas:\n    <&Ynnnn> é traduzido para o ano atual menos nnnn.\n(Pode ser utilizado em lembretes de aniversários para informar a idade da pessoa.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "Antes de iniciar"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
-msgstr "Antes de acabar"
+msgstr "Antes de terminar"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "Depois de iniciar"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
-msgstr "Depois de acabar"
+msgstr "Depois de terminar"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Alarme"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Hora do alarme"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Frequência do alarme:\n"
-" 1) antes de iniciar o evento\n"
-" 2) antes de terminar a tarefa\n"
-" 3) depois de iniciar a tarefa"
+msgstr "Frequência do alarme:\n 1) antes de iniciar o evento\n 2) antes de terminar a tarefa\n 3) depois de iniciar a tarefa"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr "Alarme persistente"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Seleccione isto se quiser quiser que o Orage lhe lembre mesmo que não tenha "
-"estado activo quando o alarme ocorreu. "
+msgstr "Selecione isto se quiser quiser que o Orage lhe lembre mesmo que não tenha estado activo quando o alarme ocorreu. "
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Som"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
-msgstr "Usar"
+msgstr "Utilizar"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
-msgstr "Seleccione isto se deseja alarme audível"
+msgstr "Selecione esta opção se quiser alarme audível"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
-msgstr "Repetir som de alarme"
+msgstr "Repetir alarme"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
-msgstr "tempos"
+msgstr "vezes"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "intervalo"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "Visual"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
-msgstr "Utilizar a janela Orage"
+msgstr "Utilizar janela Orage"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
-msgstr "Seleccione isto se deseja a janela do alarme Orage"
+msgstr "Selecione esta opção se quiser a janela do alarme Orage"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Utilizar notificação"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
-msgstr "Seleccione isto se deseja um alarme de notificação"
+msgstr "Selecione esta opção se quiser um alarme de notificação"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
-msgstr "Definir a expiração"
+msgstr "Definir término"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
-msgstr "Seleccione isto se quer que a notificação expire automaticamente"
+msgstr "Selecione esta opção se quiser que a notificação termine automaticamente"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
-msgstr "0= tempo de expiração por omissão do sistema"
+msgstr "0= tempo limite por omissão do sistema"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "segundos"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Procedimento"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
-msgstr "Seleccione  isto se quer procedimento ou alarme \"script\""
+msgstr "Selecione esta opção se quiser um procedimento ou alarme \"script\""
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -931,164 +987,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
-"Tem que introduzir os caracteres manualmente.\n"
-"Esta linha é enviada ao terminal para processar.\n"
-"Estes comandos especiais serão substituídos durante a execução:\n"
-"\t<&T> título do compromisso\n"
-"\t<&D> descrição do compromisso\n"
-"\t<&AT> hora do alarme\n"
-"\t<&ST> início do compromisso\n"
-"\t<&ET> final do compromisso"
+msgstr "Tem que introduzir os caracteres manualmente.\nEsta linha é enviada ao terminal para processar.\nEstes comandos especiais serão substituídos durante a execução:\n\t<&T> título do compromisso\n\t<&D> descrição do compromisso\n\t<&AT> hora do alarme\n\t<&ST> início do compromisso\n\t<&ET> final do compromisso"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
-msgstr "Testar este alarme ao elevá-lo agora"
+msgstr "Testar este alarme agora"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "<b>Alarme por omissão</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
-msgstr "Gravar definições actuais como alarme por omissão"
+msgstr "Gravar definições atuais como alarme por omissão"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
-msgstr "Definir definições actuais do alarme por omissão"
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Nenhum"
+msgstr "Definir definições atuais do alarme por omissão"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Diariamente"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Mensalmente"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Anualmente"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
 msgstr "De hora a hora"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Seg"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Ter"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Qua"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Qui"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Sex"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "Sab"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "Dom"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Recorrência"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Complexidade"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Básico"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Avançado"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
-msgstr "Usar isto se quiser eventos repetidos regulares"
+msgstr "Utilize esta opção se quiser eventos recorrentes"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Use isto se precisar de horários mais complexos como:\n"
-" a cada sábado e domingo ou \n"
-" a primeira terça de cada mês"
+msgstr "Use isto se precisar de horários mais complexos como:\n a cada sábado e domingo ou \n a primeira terça de cada mês"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Frequência"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Cada"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
-msgstr "ocurrência"
+msgstr "ocorrência"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Limita a frequência a um determinado intervalo.\n"
-" Por exemplo: a cada terceiro dia:\n"
-" Frequência = diária e intervalo = 3"
+msgstr "Limita a frequência a um determinado intervalo.\nPor exemplo: a cada terceiro dia:\nFrequência = diária e intervalo = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Limite"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Repetir eternamente"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Repetir"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Repetir até"
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Dias da semana"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
-msgstr "Qual dia"
+msgstr "Dia"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1096,298 +1134,301 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Especifica qual o dia da semana para eventos mensais e anuais.\n"
-" Por exemplo:\n"
-" segunda Quarta de cada mês:\n"
-"\tFrequência = mensal,\n"
-"\tDias da semana = marcar apenas Quarta,\n"
-"\tQual dia = seleccione 2 a partir do número abaixo de Quarta"
+msgstr "Especifica qual o dia da semana para eventos mensais e anuais.\nPor exemplo:\nsegunda quarta-feira de cada mês:\n\tFrequência = mensal,\n\tDias da semana = marcar apenas quarta-feira\n\tDia = seleccione 2 a partir do número abaixo de quarta-feira"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr "Por fazer"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"Por fazer ocorre regularmente desde a hora inicial e repete após cada "
-"intervalo, independentemente da conclusão"
+msgstr "Por fazer ocorre regularmente desde a hora inicial e repete após cada intervalo, independentemente da conclusão"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"A recorrência baseia-se na hora total e repete após o intervalo contado "
-"desde a última hora de conclusão.\n"
-"(Tenha em atenção que não pode saber nada sobre o histórico já que a base de "
-"recorrência muda após cada conclusão.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "A recorrência baseia-se na hora total e repete após o intervalo contado desde a última hora de conclusão.\n(Tenha em atenção que não pode saber nada sobre o histórico já que a base de recorrência muda após cada conclusão.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
-msgstr "Excepções"
+msgstr "Exceções"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"Adicione mais excepções de datas ao clicar nos dias de calendário em baixo.\n"
-"Excepções podem ser de exclusão (-) ou inclusão (+) dependendo da selecção.\n"
-"Remova-as ao clicar na data."
+msgstr "Adicione mais exceções de datas ao clicar nos dias de calendário em baixo.\nExceções podem ser de exclusão (-) ou inclusão (+) dependendo da selecção.\nRemova-as ao clicar na data."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
-msgstr "Adicionar datas excluídas (-)"
+msgstr "Adicionar datas de exclusão (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr "Os dias exluídos são os dias em que este compromisso não ocorre"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
-msgstr "Adicionar hora incluída (+)"
+msgstr "Adicionar hora de inclusão (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"As hora incluídas têm a mesma zona horária que a hora inicial, mas podem ter "
-"horas diferentes"
+msgstr "As hora incluídas têm a mesma zona horária que a hora inicial, mas podem ter horas diferentes"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
-msgstr "Datas de acção"
+msgstr "Datas de ação"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Ver"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Novo"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Recuar"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Hoje"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Avançar"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Uma semana atrás"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Um dia atrás"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Avançar um dia"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Avançar uma semana"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
-msgstr "Actualizar"
+msgstr "Atualizar"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Fechar"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
-msgstr "       Número de dias a mostrar"
+msgstr "Número de dias a mostrar"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - visualização do dia"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Todo o dia"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
-msgstr "Nenhum linha foi seleccionada."
+msgstr "Nenhum linha foi selecionada."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
-msgstr "Clique numa linha para a seleccionar e em seguida pode copiá-la."
+msgstr "Clique numa linha para a selecionar e em seguida pode copiá-la."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"Irá remover para sempre todos\n"
-"os compromissos seleccionados."
+msgstr "Irá remover para sempre todos\nos compromissos selecionados."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Sim, removê-los"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Recuar"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Avançar"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1189
 msgid "Find"
-msgstr "Procurar"
+msgstr "Localizar"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "Visualização do dia"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Dias extra a mostrar"
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Dias extra a mostrar:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "apenas primeira repetição"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Marque isto se apenas quiser ver o primeiro acontecimento repetitivo. Por omissão todos são listados.\nNote que isto mostra também todos os prioritários.\nNote que repetir acontecimentos podem aparecer mais cedo na lista como a primeira ocorrência apenas é listada."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "também antigos"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Marque isto se quer ver também antigos acontecimentos. Isto pode ser apenas selecionado depois de ligar 'apenas primeira repetição' para evitar listas muito longas.\nNote que selecionar dias extra ainda define se novos compromissos são listados."
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "Entradas periódicas começam em:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Procurar"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "Texto a procurar"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Indicadores"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Título"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Duplo clique na linha para editar.\n"
-"\n"
-"Indicadores em ordem:\n"
-"\t 1. Alarme n=sem alarme\n"
-"\t\tA=Alarme visual S=Alarme sonoro\n"
-"\t 2. Recorrente: n=sem recorrência\n"
-"\t\t D=Diariamente W=Semanalmente M=Mensalmente Y=Anualmente\n"
-"\t 3. Tipo: f=livre B=Ocupado\n"
-"\t 4. Localizado no ficheiro:\n"
-"\t\tO=Orage A=Arquivo F=Estrangeiro\n"
-"\t 5. Tipo de apontamento:\n"
-"\t\tE=Evento T=Tarefa J=Periódico"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Escolha a data"
+msgstr "Duplo clique na linha para editar.\n\nSinalizadores por ordem:\n    1. Alarme: n=sem alarme\n      A=Alarme ativo P=Alarme persistente ativo\n    2. Recorrência: n=sem recorrência\n       H=Toda a hora D=Diariamente W=Semanalmente M=Mensalmente Y=Anualmente\n    3. Tipo: f=livre B=Ocupado\n    4. Colocado no ficheiro:\n       O=Orage A=Arquivo F=Estrangeiro\n    5. Tipo de apontamento:\n       E=Acontecimento T=A fazer J=Periódico"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
-msgstr "\tOcorrência terminada, movendo para o arquivo."
+msgstr "\tOcorrência terminada, a mover para o arquivo."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
-msgstr "Arquivamento desligado. Saindo"
+msgstr "Arquivamento desligado. A sair..."
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
-msgstr "Limite do arquivo:%d meses(s)"
+msgstr "Limite do arquivo: %d meses(s)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tArquivar eventos mais antigos que: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Uid de arquivamento: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
-msgstr "\tVTarefa não completa; não arquivada"
+msgstr "\tVTarefa não terminada e não arquivada"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr "\tRecorrência. Fim de ano: %04d, mês: %02d, dia: %02d"
+msgstr "\tRecorrência. Ano: %04d, mês: %02d, dia: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
-msgstr "Arquivamento feito\n"
+msgstr "Arquivamento terminado\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
-msgstr "Iniciando a remoção de arquivo."
+msgstr "A iniciar remoção de arquivo."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
-msgstr "\tFASE 1: restaurar compromissos"
+msgstr "\tFase 1: restaurar compromissos"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
-msgstr "\tFASE 2: retornar compromissos arquivados"
+msgstr "\tFase 2: retornar compromissos arquivados"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Concluída a remoção de arquivo\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
-msgstr "Alarme omisso do Orage"
+msgstr "Alarme por omissão do Orage"
+
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Criada lista de alarmes no ficheiro principal do Orage:"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-"Construir lista de alarmes: Adicionados %d alarmes. Processados %d eventos."
-"acontecimentos."
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Criada lista de alarmes para ficheiro externo: %s (%s)"
+
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\tAdicionados %d alarmes. %d eventos processados."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tEncontrados %d alarmes dos quais %d estão activos. (Encontrados %d alarmes "
-"recorrentes.)"
+msgstr "\tEncontrados %d alarmes dos quais %d ativos. (Encontrados %d alarmes recorrentes.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
-msgstr "Iniciando o processamento da importação de ficheiro"
+msgstr "A iniciar importação de ficheiro"
 
 #: ../src/ical-expimp.c:158
 msgid "... Patched DCREATED to be CREATED."
@@ -1395,676 +1436,733 @@
 
 #: ../src/ical-expimp.c:197
 msgid "... Patched timezone to Orage format."
-msgstr "... Mudou fuso horário para o formato do Orage."
+msgstr "... Mudou o fuso horário para o formato do Orage."
 
 #: ../src/ical-expimp.c:206
 msgid "Import file preprocessing done"
-msgstr "Terminado o processamento de importação de ficheiro"
+msgstr "Importação de ficheiro terminada"
+
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Encontrada atualização externa no ficheiro %s."
 
-#: ../src/interface.c:284
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Atualizando alarmes e calendários em virtude da atualização externa."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
-msgstr "Ficheiros do calendário"
+msgstr "Ficheiros de calendário"
 
 #: ../src/interface.c:631
 msgid "Current foreign files"
-msgstr "Ficheiros estrangeiros actuais"
+msgstr "Ficheiros estrangeiros atuais"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "APENAS LEITURA"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "APENAS ESCRITA"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Sem ficheiros estrangeiros *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Falha ao adicionar ficheiro externo"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "O Orage só consegue manipular 10 ficheiros externos. Atingiu o limite."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Nome de ficheiro vazio."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Nome vazio."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Ficheiro inexistente."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Este nome de ficheiro já existe no Orage."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Este nome já existe no Orage."
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Importar/exportar"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
-msgstr "Ler de ficheiro:"
+msgstr "Ler do ficheiro:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Separar nomes de ficheiros com vírgula(,).\n"
-" NOTA: vírgula não é um carácter válido em ficheiros para Orage."
+msgstr "Separar nomes de ficheiros com vírgula(,).\nNOTA: vírgula não é um carácter válido em ficheiros para Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Exportar"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
-msgstr "Escrever para ficheiro:"
+msgstr "Escrever no ficheiro:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
-msgstr "Seleccionar"
+msgstr "Selecionar"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
-msgstr "Todos os apontamentos"
+msgstr "Todos os compromissos"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
-msgstr "Compromissos nomeados:"
+msgstr "Compromissos com nome:"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Atenção que apenas os compromissos do ficheiro principal são lidas.\n"
-"Os eventos arquivados não são exportados."
+msgstr "Atenção que apenas os compromissos do ficheiro principal são lidos.\nOs eventos arquivados e estrangeiros não são exportados."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Atenção que apenas os compromissos do ficheiro principal são lidas.\n"
-"Os eventos estrangeiros não são exportados."
+msgstr "Atenção que apenas os compromissos do ficheiro principal são lidos.\nOs eventos estrangeiros não são exportados."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
-msgstr "Pode facilmente arrastar estes da janela da lista de eventos."
+msgstr "Pode-os arrastar facilmente da janela da lista de eventos."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "UIDs dos compromissos Orage separados por vírgulas."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Arquivo"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Arquivar agora (limitar a: %d meses)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Pode mudar o limite do arquivo nos parâmetros"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
-msgstr "Reverter o arquivo agora"
+msgstr "Reverter arquivo agora"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Reverter todos os eventos arquivados para o ficheiro principal do Orage e "
-"remover o ficheiro arquivo.\n"
-"Isto é útil ao fazer a exportação e mover os compromissos do Orage\n"
-"para outro sistema."
+msgstr "Reverter todos os eventos arquivados para o ficheiro principal do Orage e remover o ficheiro de arquivo.\nÚtil ao fazer a exportação e mover os compromissos do Orage\npara outro sistema."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Ficheiros Orage"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Ficheiro de calendário principal Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Ficheiro actual"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Novo ficheiro"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Opções de acção"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Ficheiro atual:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Novo ficheiro:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Opções da ação:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Renomear"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Renomear apenas o ficheiro Orage interno.\n"
-"Não mexer no sistema de ficheiros.\n"
-"Novo ficheiro tem de existir."
+msgstr "Renomear apenas o ficheiro Orage interno.\nNão mexer no sistema de ficheiros.\nNovo ficheiro tem de existir."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr "O ficheiro actual foi copiado e permanece inalterado no local antigo."
+msgstr "O ficheiro atual foi copiado e permanece inalterado no local antigo."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Mover"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
-msgstr "O ficheiro actual foi movido e desapareceu do local antigo."
+msgstr "O ficheiro atual foi movido e desapareceu do local antigo."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
-msgstr "Ficheiro de rquivo"
+msgstr "Ficheiro de arquivo"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Ficheiros estrangeiros"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Adicionar novo ficheiro estrangeiro"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Ficheiro estrangeiro:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Opções"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Nome visível:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Apenas leitura"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Marque isto se quiser certificar-se que este ficheiro nunca será modificado "
-"pelo Orage.\n"
-"Atenção que se modificar ficheiros estrangeiros pode torná-los incompatíveis "
-"com a aplicação original!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Marque isto se quiser certificar-se que este ficheiro nunca será modificado pelo Orage.\nAtenção que se modificar ficheiros estrangeiros pode torná-los incompatíveis com a aplicação original!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Este nome será exibido ao utilizador em vez do nome do ficheiro."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Trocar dados - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tEsta é o %s versão %s\n"
-"\n"
+msgstr "\tEsta é o %s versão %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr "\tDistribuído nos termos da GNU General Public License.\n"
+msgstr "\tDisponibilizado nos termos da GNU General Public License.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tCompilado com GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
-msgstr "utilizando GTK+-%d.%d.%d.\n"
+msgstr "utiliza GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tUtiliza DBUS para importações.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tNão utiliza DBUS. As importações funcionam parcialmente.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
-msgstr "\tUtilizando \"libnotify\".\n"
+msgstr "\tUtiliza \"libnotify\".\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tNão utiliza \"libnotify\".\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tUtiliza o arquivamento automático.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tNão utiliza arquivamento.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tUtiliza pacote de sistema operativo \"libical\".\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tUtiliza a versão local do \"libical\" para Orage.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Utilização: orage [opções] [ficheiros]\n"
-"\n"
+msgstr "Utilização: orage [opções] [ficheiros]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Opções:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tmostra a versão do orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h)\t\timprime este texto\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \tmostra a janela de preferências\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\ttorna o orage visível/invisível\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) file [RW] \tadiciona um ficheiro estrangeiro\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) ficheiro [RW] [nome] \tadiciona um ficheiro externo\n\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) file \tremove um ficheiro estrangeiro\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
-"--export (-e) ficheiro [compromisso...] \texportar compromissos do Orage "
-"para um ficheiro\n"
+msgstr "--export (-e) ficheiro [compromisso...] \texportar compromissos do Orage para um ficheiro\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
-msgstr "files=ficheiros ical para carregar para o orage\n"
+msgstr "files=ficheiros ical para carregar no orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tdbus não incluído no orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tsem [ficheiros] dbus e opções de ficheiro estrangeiro(-a & -r) só podem "
-"ser utilizadas se iniciar o orage \n"
+msgstr "\tsem [ficheiros] dbus e opções de ficheiro estrangeiro(-a & -r) só podem ser utilizadas se iniciar o orage \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Opção desconhecida %s\n"
-"\n"
+msgstr "\nOpção desconhecida %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Trocar dados"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
-msgstr "Ver _data seleccionada"
+msgstr "Ver _data selecionada"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
-msgstr "Ver _semana seleccionada"
+msgstr "Ver _semana selecionada"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
-msgstr "Seleccionar _hoje"
+msgstr "Selecionar _hoje"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Mostrar hora _global"
+msgstr "Mostrar horário _global"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Sem título definido"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr "Localização: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\nNota:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Nunca"
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:495
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Título: %s\n"
-" Inicia:\t%s\n"
-" Termina:\t%s\n"
-" Nota:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "Título: %s\n%s Início:   %s\nComeço:   %s\nTerminado:   %s%s"
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Título: %s\n"
-" Inicia:\t%s\n"
-" Termina:\t%s\n"
-" Nota:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Título: %s\n%s Início:   %s\nFim:   %s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>A fazer:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Eventos para %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>Eventos para %s - %s:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "Definições principais"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Fuso horário"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "Deve sempre definir a sua zona horária."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "Limite de arquivo (meses)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = sem arquivamento)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr "Arquivamento é usado para poupar tempo e espaço ao manipular eventos."
+msgstr "O arquivo é utilizado para poupar tempo e espaço ao manipular eventos."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Comando de som"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr "Este comando é dado à \"shell\" para tocar o som dos alarmes."
+msgstr "Este comando é enviado à \"shell\" para tocar o som dos alarmes."
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "Definições de exibição"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Janela de calendário"
 
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Janela principal de calendário"
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Detalhes visuais de calendário"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "Mostrar contornos"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
-msgstr "Mostrar Menu"
-
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Mostrar mês e ano"
+msgstr "Mostrar menu"
 
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
-msgstr "Mostrar nome de dias"
+msgstr "Mostrar nome dos dias"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
 msgstr "Mostrar número das semanas"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Mostrar mês e ano"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Caixas de informação de calendário"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "Mostrar lista de tarefas"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
 msgstr "Número de dias a mostrar na janela de eventos"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
 msgstr "0 = não mostrar a lista de eventos"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Visibilidade do calendário"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
 msgstr "Mostrar em todos os ambientes de trabalho"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
-msgstr "Manter no topo"
+msgstr "Manter por cima"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "Mostrar na barra de tarefas"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "Mostrar no paginador"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "Mostrar na área de notificação"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
-msgstr "Começo do calendário"
+msgstr "Inicio do calendário"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Ocultar"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Minimizado"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr "Definições extra"
-
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr "Ao abrir a janela do calendário"
-
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "Seleccionar a data de hoje"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr "Seleccionar a data anteriormente seleccionada"
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "Utilizar ícone de notificação dinâmico"
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "Utilizar ícone dinâmico"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "O ícone dinâmico mostra o mês actual e o dia do mês."
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Duplo clique no calendário principal mostra"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "Ao abrir a janela de calendário"
+
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Selecionar a data de hoje"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Selecionar data anterior"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Duplo clique no calendário mostra"
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
 msgstr "Visualização dos dias"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
 msgstr "Lista de eventos"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr "Janela de eventos"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Definições extra"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Janela da lista de eventos"
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
 msgstr "Número de dias extra a mostrar na lista de eventos"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
 msgstr "Este é o valor por omissão e você pode alterá-lo na janela de eventos"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Mostrar apenas a primeira repetição"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Janela de vista de dia para primeiro dia por omissão"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Primeiro dia da semana"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Selecionar dia"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Utilizar ícone de notificação dinâmico"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Utilizar ícone dinâmico"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "O ícone dinâmico mostra o mês atual e o dia do mês."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
 msgstr "Utilizar temporizador de arranque"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-"Utilize este temporizador se o Orage encontrar problemas ao arrancar após a "
-"suspensão ou hibernação. (Por exemplo: ícone na bandeja não actualizado ou "
-"alarmes não funcionando)"
+msgstr "Utilize este temporizador se o Orage encontrar problemas ao arrancar após a suspensão ou hibernação. (Por exemplo: ícone na bandeja não actualizado ou alarmes não funcionando)"
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Alarme visual para ficheiro estrangeiro por omissão"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Janela Orage"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Notificar notificação"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Sair sempre quando pedir para fechar"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Sair sempre"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Por omissão, o Orage permanece aberto em segundo plano quando pedir para fechar. Esta opção muda o Orage para sair e nunca ficar em segundo plano quando pedir para fechar."
+
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Preferências do Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
 msgstr "Primeira utilização do Orage. A procurar o fuso horário."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Fuso horário omisso definido para %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
 msgstr "Fuso horário não encontrado. Por favor, defina-o manualmente."
 
 #: ../src/reminder.c:562
 msgid "Reminder "
-msgstr "Chamada de atenção"
+msgstr "Lembrete"
 
 #: ../src/reminder.c:591
 msgid "Open"
 msgstr "Abrir"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
-msgstr "Chamada de atenção - Orage"
+msgstr "Lembrete - Orage"
+
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Adiar"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "Lembrar-me novamente após um intervalo especificado"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr "Prima <Executar> para lembrar-me novamente após o período específico:"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
-msgstr "Próximos alarmes activos:"
+msgstr "Próximos alarmes ativos:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d d %02d h %02d min para: %s"
+msgstr "\n%02d d %02d h %02d min para: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Sem alarmes activos"
+msgstr "\nSem alarmes activos"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2087,1537 +2185,2229 @@
 msgstr "África/Algiers"
 
 #: ../src/timezone_names.c:41
+msgid "Africa/Asmara"
+msgstr "África/Asmara"
+
+#: ../src/timezone_names.c:42
 msgid "Africa/Asmera"
 msgstr "África/Asmera"
 
-#: ../src/timezone_names.c:42
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "África/Bamako"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "África/Bangui"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "África/Banjul"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "África/Bissau"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "África/Blantyre"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "África/Brazzaville"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "África/Bujumbura"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "África/Cairo"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "África/Casablanca"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "África/Ceuta"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "África/Conakry"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "África/Dakar"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "África/Dar_es_Salaam"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "África/Djibouti"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "África/Douala"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "África/El_Aaiun"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "África/Freetown"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "África/Gaborone"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "África/Harare"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "Africa/Juba"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
-msgstr "África/Johannesburg"
+msgstr "África/Joanesburgo"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "África/Kampala"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "África/Khartoum"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "África/Kigali"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "África/Kinshasa"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "África/Lagos"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "África/Libreville"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "África/Lome"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "África/Luanda"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "África/Lubumbashi"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "África/Lusaka"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "África/Malabo"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "África/Maputo"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "África/Maseru"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "África/Mbabane"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "África/Mogadishu"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "África/Monrovia"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "África/Nairobi"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "África/Ndjamena"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "África/Niamey"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "África/Nouakchott"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "África/Ouagadougou"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "África/Porto-Novo"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "África/São_Tomé"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "África/Timbuktu"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "África/Tripoli"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "África/Tunis"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "África/Windhoek"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "América"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "América/Adak"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "América/Anchorage"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "América/Anguilla"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "América/Antigua"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "América/Araguaina"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "América/Argentina/Buenos_Aires"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "América/Argentina/Catamarca"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "America/Argentina/ComodRivadavia"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
-msgstr "América/Argentina/Cordoba"
+msgstr "América/Argentina/Córdoba"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "América/Argentina/Jujuy"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "America/Argentina/La_Rioja"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "América/Argentina/Mendoza"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "America/Argentina/Rio_Gallegos"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "America/Argentina/Salta"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "America/Argentina/San_Juan"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "America/Argentina/San_Luis"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "America/Argentina/Tucuman"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "America/Argentina/Ushuaia"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "América/Aruba"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
-msgstr "América/Asuncion"
+msgstr "América/Assunção"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "America/Atikokan"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "America/Atka"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "America/Bahia"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "America/Bahia_Banderas"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "América/Barbados"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "América/Belém"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "América/Belize"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "America/Blanc-Sablon"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "América/Boa_Vista"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "América/Bogotá"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "América/Boise"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "América/Buenos_Aires"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "América/Cambridge_Bay"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "America/Campo_Grande"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "América/Cancun"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "América/Caracas"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "América/Catamarca"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "América/Cayenne"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "América/Cayman"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "América/Chicago"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "América/Chihuahua"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "America/Coral_Harbour"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "América/Cordoba"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "América/Costa_Rica"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "América/Creston"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "América/Cuiabá"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "América/Curacao"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "América/Danmarkshavn"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "América/Dawson"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "América/Dawson_Creek"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "América/Denver"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "América/Detroit"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "América/Dominica"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "América/Edmonton"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "América/Ensenada"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "América/Eirunepe"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "América/El_Salvador"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "América/Fortaleza"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "América/Fort_Wayne"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "América/Glace_Bay"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "América/Godthab"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "América/Goose_Bay"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "América/Grand_Turk"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "América/Grenada"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "América/Guadeloupe"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "América/Guatemala"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "América/Guayaquil"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "América/Guyana"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "América/Halifax"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "América/Havana"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "América/Hermosillo"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "América/Indiana/Indianapolis"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "América/Indiana/Knox"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "América/Indiana/Marengo"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "América/Indiana/Petersburg"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "América/Indiana/Tell_City"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "América/Indiana/Vevay"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "América/Indiana/Vincennes"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "América/Indiana/Winamac"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "América/Indianapolis"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "América/Inuvik"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "América/Iqaluit"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "América/Jamaica"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "América/Jujuy"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "América/Juneau"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "América/Kentucky/Louisville"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "América/Kentucky/Monticello"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "América/Knox_IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "América/Kralendijk"
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "América/La_Paz"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "América/Lima"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "América/Los_Angeles"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "América/Louisville"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "América/Lower_Princes"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "América/Maceió"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "América/Managua"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "América/Manaus"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "América/Marigot"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "América/Martinique"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "América/Matamoros"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "América/Mazatlan"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "América/Mendoza"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "América/Menominee"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "América/Merida"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "América/Metlakatla"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "América/Mexico_City"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "América/Miquelon"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "América/Moncton"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "América/Monterrey"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "América/Montevideo"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "América/Montreal"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "América/Montserrat"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "América/Nassau"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "América/Nova_York"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "América/Nipigon"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "América/Nome"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "América/Norte_Dakota/Beulah"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "América/Norte_Dakota/Center"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "América/Norte_Dakota/Nova_Salem"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "América/Noronha"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "América/Ojinaga"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "América/Panamá"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "América/Pangnirtung"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "América/Paramaribo"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "América/Phoenix"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "América/Port-au-Prince"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "América/Port_of_Spain"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "América/Porto_Acre"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "América/Porto_Velho"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "América/Porto_Rico"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "América/Rainy_River"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "América/Rankin_Inlet"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "América/Recife"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "América/Regina"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "América/Resolute"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "América/Rio_Branco"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "América/Rosário"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "América/Santa_Isabel"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "América/Santarem"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "América/Santiago"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "América/Santo_Domingo"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "América/São_Paulo"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "América/Scoresbysund"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "América/Shiprock"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "América/Sitka"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "América/St_Barthelemy"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "América/St_Johns"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "América/St_Kitts"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "América/St_Lucia"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "América/St_Thomas"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "América/St_Vincent"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "América/Swift_Current"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "América/Tegucigalpa"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "América/Thule"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "América/Thunder_Bay"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "América/Tijuana"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "América/Toronto"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "América/Tortola"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "América/Vancouver"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "América/Virgin"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "América/Whitehorse"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "América/Winnipeg"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "América/Yakutat"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "América/Yellowknife"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
-msgstr "Antárctica"
+msgstr "Antártica"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
-msgstr "Antárctica/Casey"
+msgstr "Antártica/Casey"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
-msgstr "Antárctica/Davis"
+msgstr "Antártica/Davis"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Antártica/DumontDUrville"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Antártida/Macquarie"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
-msgstr "Antárctica/Mawson"
+msgstr "Antártica/Mawson"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
-msgstr "Antárctica/McMurdo"
+msgstr "Antártica/McMurdo"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
-msgstr "Antárctica/Palmer"
+msgstr "Antártica/Palmer"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Antártida/Rothera"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
-msgstr "Antárctica/South_Pole"
+msgstr "Antártica/South_Pole"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
-msgstr "Antárctica/Syowa"
+msgstr "Antártica/Syowa"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
-msgstr "Antárctica/Vostok"
+msgstr "Antártica/Vostok"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Ártico"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Ártico/Longyearbyen"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Ásia"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Ásia/Aden"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Ásia/Almaty"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Ásia/Amman"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Ásia/Anadyr"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Ásia/Aqtau"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Ásia/Aqtobe"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "Ásia/Ashgabat"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Ásia/Ashkhabad"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
-msgstr "Ásia/Baghdad"
+msgstr "Ásia/Bagdade"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Ásia/Bahrain"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Ásia/Baku"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
-msgstr "Ásia/Bangkok"
+msgstr "Ásia/Banguecoque"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Ásia/Beirute"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Ásia/Bishkek"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Ásia/Brunei"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Ásia/Calcutá"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Ásia/Choibalsan"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "Ásia/Chongqing"
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "Ásia/Chungking"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Ásia/Colombo"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Ásia/Dacca"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
-msgstr "Ásia/Damascus"
+msgstr "Ásia/Damasco"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Ásia/Dhaka"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Ásia/Dili"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Ásia/Dubai"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Ásia/Dushanbe"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Ásia/Gaza"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Ásia/Harbin"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Ásia/Hebron"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Ásia/Hong_Kong"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Ásia/Ho_Chi_Minh"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Ásia/Hovd"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Ásia/Irkutsk"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Ásia/Istambul"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Ásia/Jakarta"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Ásia/Jayapura"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Ásia/Jerusalém"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Ásia/Kabul"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Ásia/Kamchatka"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Ásia/Karachi"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Ásia/Kashgar"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Ásia/Kathmandu"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Ásia/Katmandu"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Ásia/Khandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Ásia/Kolkata"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Ásia/Krasnoyarsk"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Ásia/Kuala_Lumpur"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Ásia/Kuching"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Ásia/Kuwait"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Ásia/Macau"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Ásia/Macau"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Ásia/Magadan"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Ásia/Makassar"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Ásia/Manila"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Ásia/Muscat"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Ásia/Nicosia"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Ásia/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Ásia/Novosibirsk"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Ásia/Omsk"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Ásia/Oral"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Ásia/Phnom_Penh"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Ásia/Pontianak"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Ásia/Pyongyang"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Ásia/Qatar"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Ásia/Qyzylorda"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Ásia/Rangoon"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
-msgstr "Ásia/Riyadh"
+msgstr "Ásia/Riade"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Ásia/Riyadh87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Ásia/Riyadh88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Ásia/Riyadh89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Ásia/Saigon"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Ásia/Sakhalin"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Ásia/Samarkand"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Ásia/Seoul"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
-msgstr "Ásia/Shanghai"
+msgstr "Ásia/Xangai"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
-msgstr "Ásia/Singapore"
+msgstr "Ásia/Singapura"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Ásia/Taipei"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Ásia/Tashkent"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Ásia/Tbilisi"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Ásia/Tehran"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Ásia/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Ásia/Thimbu"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Ásia/Thimphu"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
-msgstr "Ásia/Tokyo"
+msgstr "Ásia/Tóquio"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "Ásia/Ujung_Pandang"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Ásia/Ulaanbaatar"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Ásia/Ulan_Bator"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Ásia/Urumqi"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Ásia/Ust-Nera"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Ásia/Vientiane"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Ásia/Vladivostok"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Ásia/Yakutsk"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Ásia/Yekaterinburg"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Ásia/Yerevan"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Atlântico"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Atlântico/Açores"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Atlântico/Bermudas"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
-msgstr "Atlântico/Canary"
+msgstr "Atlântico/Canárias"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlântico/Cabo_Verde"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
-msgstr "Atlântico/Faeroe"
+msgstr "Atlântico/Faroé"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlântico/Faroé"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlântico/Jan_Mayen"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "Atlântico/Madeira"
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
 msgstr "Atlântico/Reykjavik"
 
-#: ../src/timezone_names.c:306
+#: ../src/timezone_names.c:375
 msgid "Atlantic/South_Georgia"
 msgstr "Atlântico/South_Georgia"
 
-#: ../src/timezone_names.c:307
+#: ../src/timezone_names.c:376
 msgid "Atlantic/St_Helena"
 msgstr "Atlântico/St_Helena"
 
-#: ../src/timezone_names.c:308
+#: ../src/timezone_names.c:377
 msgid "Atlantic/Stanley"
 msgstr "Atlântico/Stanley"
 
-#: ../src/timezone_names.c:309
+#: ../src/timezone_names.c:378
 msgid "Australia"
 msgstr "Austrália"
 
-#: ../src/timezone_names.c:310
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Australia/ACT"
+
+#: ../src/timezone_names.c:380
 msgid "Australia/Adelaide"
 msgstr "Austrália/Adelaide"
 
-#: ../src/timezone_names.c:311
+#: ../src/timezone_names.c:381
 msgid "Australia/Brisbane"
 msgstr "Austrália/Brisbane"
 
-#: ../src/timezone_names.c:312
+#: ../src/timezone_names.c:382
 msgid "Australia/Broken_Hill"
 msgstr "Austrália/Broken_Hill"
 
-#: ../src/timezone_names.c:313
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Australia/Currie"
+
+#: ../src/timezone_names.c:384
 msgid "Australia/Darwin"
 msgstr "Austrália/Darwin"
 
-#: ../src/timezone_names.c:314
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Australia/Eucla"
+
+#: ../src/timezone_names.c:386
 msgid "Australia/Hobart"
 msgstr "Austrália/Hobart"
 
-#: ../src/timezone_names.c:315
+#: ../src/timezone_names.c:387
 msgid "Australia/Lindeman"
 msgstr "Austrália/Lindeman"
 
-#: ../src/timezone_names.c:316
+#: ../src/timezone_names.c:388
 msgid "Australia/Lord_Howe"
 msgstr "Austrália/Lord_Howe"
 
-#: ../src/timezone_names.c:317
+#: ../src/timezone_names.c:389
 msgid "Australia/Melbourne"
 msgstr "Austrália/Melbourne"
 
-#: ../src/timezone_names.c:318
+#: ../src/timezone_names.c:390
 msgid "Australia/Perth"
 msgstr "Austrália/Perth"
 
-#: ../src/timezone_names.c:319
+#: ../src/timezone_names.c:391
 msgid "Australia/Sydney"
-msgstr "Austrália/Sydney"
+msgstr "Austrália/Sidney"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brazil"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brazil/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brazil/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brasil/Este"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brasil/Oeste"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Canadá"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Canadá/Atlantico"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Canadá/Central"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Canadá/East-Saskatchewan"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Canadá/Oriental"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Canadá/Mountain"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Canadá/Newfoundland"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Canadá/Pacifico"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Canadá/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Canadá/Yukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Chile"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Chile/Continental"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Chile/EasterIsland"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Universal"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Zulu"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Europa"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
-msgstr "Europa/Amsterdão"
+msgstr "Europa/Amesterdão"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Europa/Atenas"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrado"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Europa/Berlim"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Europa/Bruxelas"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Europa/Bucareste"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Europa/Budapeste"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Europa/Busingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Europa/Copenhaga"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Europa/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsínquia"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Europa/Isle_of_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Europa/Istambul"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Europa/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
-msgstr "Europa/Kaliningrad"
+msgstr "Europa/Leninegrado"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisboa"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Europa/Londres"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxemburgo"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Europa/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Europa/Mónaco"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Europa/Moscovo"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicósia"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Europa/Paris"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Europa/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Europa/Praga"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Europa/São_Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
-msgstr "Europa/Stockholm"
+msgstr "Europa/Estocolmo"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Europa/Tirane"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Europa/Tiraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
-msgstr "Europa/Vatican"
+msgstr "Europa/Vaticano"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
-msgstr "Europa/Vienna"
+msgstr "Europa/Viena"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Europa/Volgograd"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
-msgstr "Europa/Warsaw"
+msgstr "Europa/Varsóvia"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "Europa/Zurique"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Índico"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "Índico/Antananarivo"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "Índico/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
-msgstr "Índico/Christmas"
+msgstr "Índico/Natal"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "Índico/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "Índico/Comoro"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "Índico/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "Índico/Mahe"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "Índico/Maldivas"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
-msgstr "Índico/Mauritius"
+msgstr "Índico/Maurícias"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "Índico/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
-msgstr "Índico/Reunion"
+msgstr "Índico/Reunião"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Mexico"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Mexico/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Mexico/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Mexico/Geral"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Médio Oriente"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Médio Oriente/Riyadh87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Médio Oriente/Riyadh88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Médio Oriente/Riyadh89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Pacífico"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "Pacífico/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Pacífico/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Pacífico/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Pacífico/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "Pacífico/Easter"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "Pacífico/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "Pacífico/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Pacífico/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "Pacífico/Fiji"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Pacífico/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Pacífico/Galapagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Pacífico/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "Pacífico/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Pacífico/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Pacífico/Honolulu"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Pacífico/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "Pacífico/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "Pacífico/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "Pacífico/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Pacífico/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Pacífico/Marquesas"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Pacífico/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Pacífico/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Pacífico/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Pacífico/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "Pacífico/Noumea"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Pacífico/Pago_Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Pacífico/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "Pacífico/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Pacífico/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "Pacífico/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Pacífico/Port_Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Pacífico/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Pacífico/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pacífico/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Pacífico/Tahiti"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Pacífico/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Pacífico/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Pacífico/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Pacífico/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Pacífico/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "EUA"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "EUA/Alaska"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "EUA/Aleutian"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "EUA/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "EUA/Central"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "EUA/Oriental"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "EUA/Indiana oriental"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "EUA/Hawaii"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "EUA/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "EUA/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "EU/Mountains"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "EUA/Pacifico"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "EU/Novo-Pacífco"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "EUA/Samoa"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "Novo compromisso"
@@ -3635,79 +4425,26 @@
 msgstr "Mostrar hora e data?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Calendário"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Preferências do calendário Orage"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Preferências do Orage"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Definições para a aplicação de calendário Xfce 4 (Orage)"
+msgstr "Definições para o calendário do Xfce 4 (Orage)"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Calendário do ambiente de trabalho"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Preferências do calendário Orage"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Calendário"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Calendário Orage"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Título: %s\n"
-#~ " Começa:\t%s\n"
-#~ " termina:\t%s\n"
-#~ " Feita:\t%s\n"
-#~ "Nota:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Tem de introduzir todos os caracteres de escape.\n"
-#~ " Esta linha apenas é dada pela \"shell\" para a execução."
-
-#~ msgid "Orage clock"
-#~ msgstr "Relógio Orage"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Criador original e criador retirado"
-
-#~ msgid "Contributor"
-#~ msgstr "Contribuidor"
-
-#~ msgid "Info"
-#~ msgstr "Informação"
-
-#~ msgid "Warning"
-#~ msgstr "Aviso"
-
-#~ msgid "Error"
-#~ msgstr "Erro"
-
-#~ msgid "Set sticked"
-#~ msgstr "Fixar"
-
-#~ msgid "Select always today"
-#~ msgstr "Seleccionar sempre dia actual"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Ao mostrar o calendário principal, ajusta o ponteiro para o dia "
-#~ "previamente seleccionado ou para o dia actual."
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Calendário do ambiente de trabalho"
diff -Nru orage-4.8.3/po/ro.po orage-4.12.1/po/ro.po
--- orage-4.8.3/po/ro.po	2012-01-03 12:01:08.000000000 +0000
+++ orage-4.12.1/po/ro.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,22 +1,21 @@
-# Romanian translation of orage.
-# Copyright (C) 2003-2009 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Mișu Moldovan <dumol@xfce.org>, 2004-2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: xfcalendar 4.6.1\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2009-05-30 14:29+0300\n"
-"Last-Translator: Mișu Moldovan <dumol@xfce.org>\n"
-"Language-Team: Romanian <xfce-i18n@xfce.org>\n"
+"POT-Creation-Date: 2013-11-18 18:30+0100\n"
+"PO-Revision-Date: 2013-11-19 15:56+0000\n"
+"Last-Translator: Xfce <transifex@xfce.org>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/xfce/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ro\n"
-"Plural-Forms: nplurals=3;plural=(n==1?0:(n==0||((n%100)>0&&(n%100)<20))?"
-"1:2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -35,17 +34,14 @@
 msgstr ""
 
 #: ../globaltime/globaltime.c:386
-#, fuzzy
 msgid "Localtime"
-msgstr "Locație"
+msgstr ""
 
 #: ../globaltime/globaltime.c:464
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"butonul 1 pentru schimbarea opțiunilor \n"
-"butonul 2 pentru fixarea ceasurilor"
+msgstr "butonul 1 pentru schimbarea opțiunilor \nbutonul 2 pentru fixarea ceasurilor"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -109,9 +105,8 @@
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "actualizare preferințe"
+msgstr ""
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -123,9 +118,8 @@
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:613
-#, fuzzy
 msgid "enter name of clock"
-msgstr "Ceas Orage"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
@@ -238,9 +232,8 @@
 msgstr "actualizare preferințe"
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "Preferințe generice"
+msgstr ""
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
@@ -300,15 +293,15 @@
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
-msgstr "ore"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "%d mins"
-msgstr "minute"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
@@ -317,9 +310,8 @@
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-#, fuzzy
 msgid "forward"
-msgstr "Înainte"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
@@ -335,7 +327,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2771
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Locație"
@@ -396,20 +388,18 @@
 msgid "floating"
 msgstr "floating"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "Locație"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "Orage - Calendar"
+msgstr ""
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr ""
 
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr ""
+
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
 msgstr "Aspect"
@@ -493,20 +483,11 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Acest program utilizează funcția „strftime” pentru a obține datele.\n"
-"Utilizați orice parametru valid pentru formatul dorit.\n"
-"Exemple de parametri uzuali:\n"
-"\t%A = zi a săptămânii\t\t\t%B = lună\n"
-"\t%c = dată și oră\t\t%R = oră și minut\n"
-"\t%V = numărul săptămânii\t\t%Z = fus orar\n"
-"\t%H = ore \t\t\t%M = minute\n"
-"\t%X = timp local\t\t\t%x = dată locală"
+msgstr "Acest program utilizează funcția „strftime” pentru a obține datele.\nUtilizați orice parametru valid pentru formatul dorit.\nExemple de parametri uzuali:\n\t%A = zi a săptămânii\t\t\t%B = lună\n\t%c = dată și oră\t\t%R = oră și minut\n\t%V = numărul săptămânii\t\t%Z = fus orar\n\t%H = ore \t\t\t%M = minute\n\t%X = timp local\t\t\t%x = dată locală"
 
 #: ../panel-plugin/oc_config.c:457
-#, fuzzy
 msgid "Orage clock Preferences"
-msgstr "Preferințe Orage"
+msgstr ""
 
 #. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
@@ -517,7 +498,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y"
@@ -527,29 +508,27 @@
 msgstr "Dezvoltator"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "Administrați-vă timpul cu Xfce4"
+msgstr ""
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2800
 msgid "End"
 msgstr "Sfârșit"
 
 #: ../src/appointment.c:333
-#, fuzzy
 msgid "Due"
-msgstr "Ma"
+msgstr ""
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Selectați un fișier..."
 
@@ -557,221 +536,273 @@
 msgid "Sound Files"
 msgstr "Fișiere de sunet"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Toate fișierele"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Detaliile evenimentului au fost modificate."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1282 ../src/event-list.c:921
 msgid "Do you want to continue?"
 msgstr "Doriți să continuați?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr ""
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr ""
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "Evenimentul pare să se termine înainte de a începe."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1918
 msgid "Not set"
 msgstr "Neprecizate"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1220
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1221
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1231
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1232
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1281
 msgid "This appointment will be permanently removed."
 msgstr "Acest eveniment va fi șters definitiv."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1283 ../src/event-list.c:922
+msgid "No, cancel the removal"
+msgstr ""
+
+#: ../src/appointment.c:1284
+msgid "Yes, remove it"
+msgstr ""
+
+#: ../src/appointment.c:1373 ../src/appointment.c:1388 ../src/day-view.c:457
+#: ../src/event-list.c:980
+msgid "Pick the date"
+msgstr "Alegeți o dată..."
+
+#: ../src/appointment.c:1375 ../src/appointment.c:1390 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:982 ../src/event-list.c:1132
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Azi"
+
+#: ../src/appointment.c:1798
 msgid "This appointment does not exist."
 msgstr "Acest eveniment nu există."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1799
 msgid "It was probably removed, please refresh your screen."
 msgstr "A fost probabil eliminat, reactualizați fereastra."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2100
 msgid "Current categories"
 msgstr "Categorii curente"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2115
 msgid "Add new category with color"
 msgstr "Adaugă o nouă categorie colorată"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2119
 msgid "Category:"
 msgstr "Categorie:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2150
 msgid "Colors of categories - Orage"
 msgstr "Culori de categorii - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2196
 msgid " *** COPY ***"
 msgstr " *** COPIERE ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2461
 msgid "New appointment - Orage"
 msgstr "Eveniment nou - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2491 ../src/day-view.c:279 ../src/event-list.c:1033
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Fișier"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2497
 msgid "Sav_e and close"
 msgstr "Sal_vează și închide"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2510 ../src/event-list.c:1039
 msgid "D_uplicate"
 msgstr "D_uplică"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2697
 msgid "Save"
 msgstr "Salvează"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2699
 msgid "Save and close"
 msgstr "Salvează și închide"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2704
 msgid "Revert"
 msgstr "Revino"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2706 ../src/event-list.c:1123
 msgid "Duplicate"
 msgstr "Duplică"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2711 ../src/event-list.c:1125
 msgid "Delete"
 msgstr "Șterge"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Free"
 msgstr "Liber"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Busy"
 msgstr "Ocupat"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2733
 msgid "General"
 msgstr "Generale"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2739
 msgid "Type "
 msgstr "Tip"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2741 ../src/event-list.c:1176
 msgid "Event"
 msgstr "Eveniment"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2744
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
 msgstr ""
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2747 ../src/event-list.c:1196
 msgid "Todo"
 msgstr "Sarcini"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2750
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
 msgstr ""
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2753 ../src/event-list.c:1209
 msgid "Journal"
 msgstr "Jurnal"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2757
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
 msgstr ""
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2764
 msgid "Title "
 msgstr "Titlu "
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2779
 msgid "All day event"
 msgstr "Eveniment pentru toată ziua"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2785 ../src/appointment.c:3446 ../src/day-view.c:801
 msgid "Start"
 msgstr "Început"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2805
 msgid "Set      "
 msgstr ""
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2826
 msgid "Duration"
 msgstr "Durată"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2830 ../src/appointment.c:3020 ../src/reminder.c:758
 msgid "days"
 msgstr "zile"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2832 ../src/appointment.c:3022 ../src/reminder.c:760
 msgid "hours"
 msgstr "ore"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2834 ../src/appointment.c:3024 ../src/reminder.c:762
 msgid "mins"
 msgstr "minute"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2846
 msgid "Availability"
 msgstr "Disponibilitate"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
-#, fuzzy
+#: ../src/appointment.c:2854 ../src/appointment.c:3452
 msgid "Completed"
-msgstr "Complexitate"
+msgstr ""
 
-#: ../src/appointment.c:2749
-#, fuzzy
+#: ../src/appointment.c:2857
 msgid "Done"
-msgstr "Niciuna"
+msgstr ""
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2878
 msgid "Categories"
 msgstr "Categorii"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2890
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
 msgstr ""
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2895
 msgid "update colors for categories."
 msgstr ""
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2901
 msgid "Priority"
 msgstr ""
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2911
 msgid "Note"
 msgstr "Notă"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2932
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -780,36 +811,35 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before Start"
 msgstr "Înainte de a începe"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before End"
 msgstr "Înainte de a se termina"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After Start"
 msgstr "După începere"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After End"
 msgstr "După terminare"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3011
 msgid "Alarm"
 msgstr "Alarmă"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3017
 msgid "Alarm time"
 msgstr "Alarmare"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3041
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
@@ -817,90 +847,88 @@
 " 3) after Todo start"
 msgstr ""
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3046
 msgid "Persistent alarm"
 msgstr "Alarmă persistentă"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3048
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
 msgstr ""
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3057
 msgid "Sound"
 msgstr "Sunet"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3061 ../src/appointment.c:3181
 msgid "Use"
 msgstr ""
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3063
 msgid "Select this if you want audible alarm"
 msgstr ""
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3080
 msgid "Repeat alarm sound"
 msgstr "Repetă sunetul de alarmă"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3096 ../src/appointment.c:3395
 msgid "times"
 msgstr "ori"
 
-#: ../src/appointment.c:3004
-#, fuzzy
+#: ../src/appointment.c:3112
 msgid "sec interval"
-msgstr "Interval"
+msgstr ""
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3122
 msgid "Visual"
 msgstr "Vizualizare"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3126
 msgid "Use Orage window"
 msgstr "Utilizează fereastra Orage"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3128
 msgid "Select this if you want Orage window alarm"
 msgstr ""
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3140
 msgid "Use notification"
 msgstr "Arată notificare"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3142
 msgid "Select this if you want notification alarm"
 msgstr ""
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3148
 msgid "Set timeout"
 msgstr "Time-out"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3150
 msgid "Select this if you want notification to expire automatically"
 msgstr ""
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3161
 msgid "0 = system default expiration time"
 msgstr ""
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3166
 msgid "seconds"
 msgstr "secunde"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3177
 msgid "Procedure"
 msgstr "Procedură"
 
-#: ../src/appointment.c:3076
-#, fuzzy
+#: ../src/appointment.c:3183
 msgid "Select this if you want procedure or script alarm"
-msgstr "Utilizați-o dacă doriți repetarea unui eveniment obișnuit"
+msgstr ""
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3189
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -912,157 +940,148 @@
 "\t<&ET> appointment end time"
 msgstr ""
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3201
 msgid "Test this alarm by raising it now"
 msgstr ""
 
-#: ../src/appointment.c:3101
-#, fuzzy
+#: ../src/appointment.c:3208
 msgid "<b>Default alarm</b>"
-msgstr "Alarmă implicită"
+msgstr ""
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3216
 msgid "Store current settings as default alarm"
 msgstr ""
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3221
 msgid "Set current settings from default alarm"
 msgstr ""
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "None"
 msgstr "Niciuna"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Daily"
 msgstr "Zilnic"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Weekly"
 msgstr "Săptămânal"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Monthly"
 msgstr "Lunar"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Yearly"
 msgstr "Anual"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Hourly"
 msgstr ""
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Mon"
 msgstr "Lu"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Tue"
 msgstr "Ma"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Wed"
 msgstr "Mi"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Thu"
 msgstr "Jo"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Fri"
 msgstr "Vi"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sat"
 msgstr "Sb"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sun"
 msgstr "Du"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3290
 msgid "Recurrence"
 msgstr "Recurență"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3296
 msgid "Complexity"
 msgstr "Complexitate"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3299
 msgid "Basic"
 msgstr "Standard"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3305
 msgid "Advanced"
 msgstr "Avansat"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3309
 msgid "Use this if you want regular repeating event"
 msgstr "Utilizați-o dacă doriți repetarea unui eveniment obișnuit"
 
-#: ../src/appointment.c:3204
-#, fuzzy
+#: ../src/appointment.c:3311
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
 msgstr ""
-"Utilizați-o dacă doriți opțiuni complexe de tipul:\n"
-"În fiecare a doua săptămână sau \n"
-"În fiecare sâmbătă și duminică sau \n"
-"În prima zi de marți a fiecărei luni"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3317
 msgid "Frequency"
 msgstr "Frecvență"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3323
 msgid "Each"
 msgstr "Fiecare"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3330
 msgid "occurrence"
 msgstr "apariție"
 
-#: ../src/appointment.c:3228
-#, fuzzy
+#: ../src/appointment.c:3334
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
 msgstr ""
-"Limitează frecvența la un anumit interval. De exemplu:\n"
-" În fiecare a treia zi: Frecvență = Zilnică și Interval = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3379
 msgid "Limit"
 msgstr "Limită"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3381
 msgid "Repeat forever"
 msgstr "Repetă la infinit"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3387
 msgid "Repeat "
 msgstr "Repetă de "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3403
 msgid "Repeat until "
 msgstr "Repetă până la "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3416
 msgid "Weekdays"
 msgstr "zile din săptămână"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3428
 msgid "Which day"
 msgstr "În ce zi"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3436
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1070,116 +1089,108 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Specificați ziua săptămânii pentru evenimentele lunare și anuale.\n"
-" De exemplu:\n"
-" Pentru a doua zi de miercuri din fiecare lună:\n"
-"\tFrecvență = Lunară,\n"
-"\tZile ale săptămânii = doar Miercuri,\n"
-"\tCare zi de miercuri = selectați „2” din numărul de sub numele zilei"
+msgstr "Specificați ziua săptămânii pentru evenimentele lunare și anuale.\n De exemplu:\n Pentru a doua zi de miercuri din fiecare lună:\n\tFrecvență = Lunară,\n\tZile ale săptămânii = doar Miercuri,\n\tCare zi de miercuri = selectați „2” din numărul de sub numele zilei"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3443
 msgid "TODO base"
 msgstr ""
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3456
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
 msgstr ""
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3458
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 
 #. exceptions
-#: ../src/appointment.c:3361
-#, fuzzy
+#: ../src/appointment.c:3464
 msgid "Exceptions"
-msgstr "Opțiuni"
+msgstr ""
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3477
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
 msgstr ""
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3482
 msgid "Add excluded date (-)"
 msgstr ""
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3484
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr ""
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3490
 msgid "Add included time (+)"
 msgstr ""
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3492
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
 msgstr ""
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
-#, fuzzy
+#: ../src/appointment.c:3509
 msgid "Action dates"
-msgstr "Acțiuni posibile:"
+msgstr ""
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1056 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Vizualizare"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1075
 msgid "_Go"
 msgstr "_Du-te"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1121
 msgid "New"
 msgstr "Nouă"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Înapoi"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr ""
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Azi"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Înainte"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
+
+#: ../src/day-view.c:395 ../src/event-list.c:1139
 msgid "Refresh"
 msgstr "Reactualizare"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1146 ../src/interface.c:834
 msgid "Close"
 msgstr "Închide"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr ""
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - vizualizare zi"
 
@@ -1188,159 +1199,162 @@
 msgid "All day"
 msgstr "Toată ziua"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:583 ../src/event-list.c:1292
 msgid "Time"
 msgstr "Oră"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:751
 msgid "No rows have been selected."
 msgstr "Nu s-a selectat nici un rând"
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:752
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Clic pe un rând pentru a-l selecta, apoi puteți să-l copiați."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:920
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
+msgstr "Urmează să ștergeți definitiv\ntoate evenimentele selectate."
+
+#: ../src/event-list.c:923
+msgid "Yes, remove them"
 msgstr ""
-"Urmează să ștergeți definitiv\n"
-"toate evenimentele selectate."
 
 #: ../src/event-list.c:1130
+msgid "Back"
+msgstr "Înapoi"
+
+#: ../src/event-list.c:1134
+msgid "Forward"
+msgstr "Înainte"
+
+#: ../src/event-list.c:1141
 msgid "Find"
 msgstr "Caută"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1148
 msgid "Dayview"
 msgstr "Vizualizare zi"
 
-#: ../src/event-list.c:1170
+#: ../src/event-list.c:1181
 msgid "Extra days to show "
 msgstr "Zile extra de afișat"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1212
 msgid "Journal entries starting from:"
 msgstr "Intrări în jurnal începând cu:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1232
 msgid "Search"
 msgstr "Căutare"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1235
 msgid "Search text "
 msgstr "Cautare text "
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1300
 msgid "Flags"
 msgstr "Indicatori"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1308
 msgid "Title"
 msgstr "Titlu"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1334
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
-"Clic dublu pe linie pentru editare.\n"
-"\n"
-"Indicatorii în ordine:\n"
-"\t 1. Alarmă: n=fără alarmă\n"
-"\t\t A=Alarmă vizuală S=plus alarmă Sonoră\n"
-"\t 2. Recurență: n=fără recurență\n"
-"\t\t D=Zilnic W=Săptămânal M=Lunar Y=Anual\n"
-"\t 3. Tip: f=liber B=ocupat\t 4. Located in file:\n"
-"\t\tO=Orage A=Arhivă F=Extern\n"
-"\t 5. Tip eveniment:\n"
-"\t\tE=Eveniment T=Sarcină J=Journal"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Alegeți o dată..."
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr ""
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr ""
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Limită de arhivare: %d luni"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr ""
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr ""
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr ""
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr ""
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Arhivare finalizată\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr ""
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr ""
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr ""
 
-#: ../src/ical-archive.c:470
-#, fuzzy
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
-msgstr "Limită de arhivare"
+msgstr ""
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Alarmă implicită Orage"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
+msgid "Created alarm list for foreign file: %s (%s)"
 msgstr ""
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr ""
+
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
@@ -1362,7 +1376,16 @@
 msgid "Import file preprocessing done"
 msgstr ""
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Fișiere calendar"
 
@@ -1370,601 +1393,667 @@
 msgid "Current foreign files"
 msgstr ""
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr ""
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr ""
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr ""
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr ""
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr ""
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Import"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Citește din fișierul:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
 msgstr ""
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Export"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Scrie în fișierul:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Selectare"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Toate evenimentele"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Evenimente denumite: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr ""
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr ""
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Arhivare"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Arhivează acum (limită: %d luni)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Puteți schimba limita de arhivare în parametri"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Anulează ultima arhivare"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
 msgstr ""
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Fișiere Orage"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Fișiere calendar principal Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Fișier curent"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Fișier nou"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Acțiuni posibile:"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Redenumire"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
 msgstr ""
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Copiere"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr ""
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Mutare"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr ""
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Fișier cu arhive"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Fișiere externe"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Adăugare fișiere externe"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Fișier extern:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Opțiuni"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Doar citire"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr ""
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
 msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Schimb de date - Orage"
 
-#: ../src/main.c:268
-#, fuzzy, c-format
+#: ../src/main.c:275
+#, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
 msgstr ""
-"\tAcesta este %s versiunea %s pentru Xfce %s\n"
-"\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tPublicat în termenii licenței GNU General Public License.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tCompilat cu versiunea GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "utilizând GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tUtilizând DBUS pentru import.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tFără suport DBUS, importul funcționează doar parțial.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tUtilizând libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tUtilizând libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tUtilizând arhivare automată.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tFără arhivare.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr ""
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr ""
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Utilizare: orage [opțiuni] [fișiere]\n"
-"\n"
+msgstr "Utilizare: orage [opțiuni] [fișiere]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Opțiuni:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tarată versinea curentă\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tarată aceste informații\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \tarată fereastra cu opțiuni\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\tface orage vizibil/invizibil\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) fișier [RW] \tadaugă un fișier extern\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) file \telimină un fișier extern\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
 msgstr ""
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "fișiere = fișiere ical de încărcat în orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tdbus nu este inclus în orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tfără dbus opțiunea [fișiere] și opțiunile pentru fișiere externe (-a & -r) "
-"pot fi folosite doar la pornirea orage \n"
+msgstr "\tfără dbus opțiunea [fișiere] și opțiunile pentru fișiere externe (-a & -r) pot fi folosite doar la pornirea orage \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Opțiune necunoscută %s\n"
-"\n"
+msgstr "\nOpțiune necunoscută %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Schimb de date"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Editare"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Arată _data selectată"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Arată _săptămâna selectată"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "_Ziua de azi"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Locație"
+msgstr ""
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Ajutor"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr ""
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr ""
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr ""
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Niciodată"
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:495
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Sarcini:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Evenimente în %s:</b>"
 
-#: ../src/mainbox.c:593
-#, fuzzy, c-format
+#: ../src/mainbox.c:660
+#, c-format
 msgid "<b>Events for %s - %s:</b>"
-msgstr "<b>Evenimente în %s:</b>"
+msgstr ""
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:486
 msgid "Main settings"
-msgstr "Opțiuni de bază"
+msgstr ""
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:492
 msgid "Timezone"
 msgstr "Fus orar"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:507
 msgid "You should always define your local timezone."
 msgstr "E foarte important să aveți fusul orar bine definit."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:515
 msgid "Archive threshold (months)"
 msgstr "Limită de arhivare (în luni de zile)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:525
 msgid "(0 = no archiving)"
 msgstr "(0 = fără arhivare)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:528
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Arhivarea se face pentru a economisi timp și spațiu la gestionarea "
-"evenimentelor."
+msgstr "Arhivarea se face pentru a economisi timp și spațiu la gestionarea evenimentelor."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:536
 msgid "Sound command"
 msgstr "Comandă de redare a sunetului"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:551
 msgid "This command is given to shell to make sound in alarms."
+msgstr "Această comandă va fi executată în shell pentru a genera sunetele asociate alarmelor"
+
+#: ../src/parameters.c:590
+msgid "Calendar window"
 msgstr ""
-"Această comandă va fi executată în shell pentru a genera sunetele asociate "
-"alarmelor"
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Afișare"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Fereastră calendar principală"
+#: ../src/parameters.c:597
+msgid "Calendar visual details"
+msgstr ""
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:603
 msgid "Show borders"
 msgstr "Arată decorațiunile"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:608
 msgid "Show menu"
 msgstr "Arată meniul"
 
-#: ../src/parameters.c:632
-#, fuzzy
-msgid "Show month and year"
-msgstr "Arată în comutator"
-
-#: ../src/parameters.c:639
-#, fuzzy
+#: ../src/parameters.c:616
 msgid "Show day names"
-msgstr "Arată ca_drul"
+msgstr ""
 
-#: ../src/parameters.c:646
-#, fuzzy
+#: ../src/parameters.c:621
 msgid "Show week numbers"
-msgstr "Arată decorațiunile"
+msgstr ""
+
+#: ../src/parameters.c:629
+msgid "Show month and year"
+msgstr ""
+
+#: ../src/parameters.c:649
+msgid "Calendar info boxes"
+msgstr ""
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:654
 msgid "Show todo list"
 msgstr "Arată lista sarcinilor"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:661
 msgid "Number of days to show in event window"
 msgstr ""
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:667
 msgid "0 = do not show event list at all"
 msgstr ""
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:680
+msgid "Calendar visibility"
+msgstr ""
+
+#: ../src/parameters.c:685
 msgid "Show on all desktops"
 msgstr ""
 
-#: ../src/parameters.c:683
-#, fuzzy
+#: ../src/parameters.c:690
 msgid "Keep on top"
-msgstr "Ține fereastra în starea „deasupra”"
+msgstr ""
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:698
 msgid "Show in taskbar"
 msgstr "Arată în bara aplicațiilor"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:703
 msgid "Show in pager"
 msgstr "Arată în comutator"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:711
 msgid "Show in systray"
 msgstr "Arată în zona de notificare"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:732
 msgid "Calendar start"
 msgstr "Vizibilitate la pornire"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:737
 msgid "Show"
 msgstr "Vizibil"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:749
 msgid "Hide"
 msgstr "Ascuns"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:761
 msgid "Minimized"
 msgstr "Minimizat"
 
-#: ../src/parameters.c:793
-#, fuzzy
-msgid "Extra settings"
-msgstr "Opțiuni extra"
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Fereastră calendar principală"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "_Ziua de azi"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:781
+msgid "On calendar window open"
 msgstr ""
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
+#: ../src/parameters.c:786
+msgid "Select today's date"
 msgstr ""
 
-#: ../src/parameters.c:841
-#, fuzzy
-msgid "Use dynamic icon"
-msgstr "Mărime dinamică pentru iconiță"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
+#: ../src/parameters.c:799
+msgid "Select previously selected date"
 msgstr ""
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Clicul dublu pe calendarul principal deschide:"
+#: ../src/parameters.c:817
+msgid "Calendar day double click shows"
+msgstr ""
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:822
 msgid "Days view"
 msgstr "Vizualizarea zilelor"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:834
 msgid "Event list"
 msgstr "Lista evenimentelor"
 
-#: ../src/parameters.c:890
-#, fuzzy
-msgid "Eventlist window"
-msgstr "Lista evenimentelor"
+#: ../src/parameters.c:856
+msgid "Extra settings"
+msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:863
+msgid "Event list window extra days"
+msgstr ""
+
+#: ../src/parameters.c:868
 msgid "Number of extra days to show in event list"
 msgstr ""
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:876
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
 msgstr ""
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:886
+msgid "Day view window default first day"
+msgstr ""
+
+#: ../src/parameters.c:891
+msgid "First day of week"
+msgstr ""
+
+#: ../src/parameters.c:904
+msgid "Selected day"
+msgstr ""
+
+#: ../src/parameters.c:922
+msgid "Use dynamic tray icon"
+msgstr ""
+
+#: ../src/parameters.c:927
+msgid "Use dynamic icon"
+msgstr ""
+
+#: ../src/parameters.c:933
+msgid "Dynamic icon shows current month and day of the month."
+msgstr ""
+
+#: ../src/parameters.c:941 ../src/parameters.c:946
 msgid "Use wakeup timer"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:952
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:961
+msgid "Foreign file default visual alarm"
+msgstr ""
+
+#: ../src/parameters.c:966
+msgid "Orage window"
+msgstr ""
+
+#: ../src/parameters.c:979
+msgid "Notify notification"
+msgstr ""
+
+#: ../src/parameters.c:997
+msgid "Always quit when asked to close"
+msgstr ""
+
+#: ../src/parameters.c:1002
+msgid "Always quit"
+msgstr ""
+
+#: ../src/parameters.c:1008
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr ""
+
+#: ../src/parameters.c:1024
 msgid "Orage Preferences"
 msgstr "Preferințe Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1136
 msgid "First Orage start. Searching default timezone."
 msgstr ""
 
-#: ../src/parameters.c:1069
-#, fuzzy, c-format
+#: ../src/parameters.c:1155
+#, c-format
 msgid "Default timezone set to %s."
-msgstr "Fus orar:"
+msgstr ""
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1158
 msgid "Default timezone not found, please, set it manually."
 msgstr ""
 
@@ -1976,41 +2065,35 @@
 msgid "Open"
 msgstr ""
 
-#: ../src/reminder.c:722
-#, fuzzy
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
-msgstr "Reamintire "
+msgstr ""
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
+#: ../src/reminder.c:803
+msgid "Postpone"
 msgstr ""
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
 msgstr ""
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Următoarele alarme active:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d z %02d o %02d min. până la: %s"
+msgstr "\n%02d z %02d o %02d min. până la: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Nu există alarme active"
+msgstr "\nNu există alarme active"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -3573,113 +3656,34 @@
 msgstr "Despre Orage"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Orage Panel Clock"
-msgstr "Ceasul Orage"
+msgstr ""
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
 msgid "Show time and date?"
-msgstr "Ce oră și dată este?"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Calendar"
+msgid "Orage preferences"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Preferințe Orage"
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Preferințe Orage"
+msgid "Orage Calendar Preferences"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Opțiuni pentru calendarul Xfce 4"
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Calendar"
+
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr ""
 
 #: ../xfcalendar.desktop.in.h:2
 msgid "Desktop calendar"
 msgstr "Calendar desktop"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "Orage - Calendar"
-
-#~ msgid "Orage clock"
-#~ msgstr "Ceas Orage"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Prim autor, dezvoltator retras"
-
-#~ msgid "Contributor"
-#~ msgstr "Contribuitor"
-
-#~ msgid "Info"
-#~ msgstr "Detalii"
-
-#~ msgid "Warning"
-#~ msgstr "Avertizare"
-
-#~ msgid "Error"
-#~ msgstr "Eroare"
-
-#~ msgid "Set sticked"
-#~ msgstr "Lipește fereastra"
-
-#~ msgid "Select always today"
-#~ msgstr "Ziua curentă e întotdeauna selectată"
-
-#, fuzzy
-#~ msgid "Vary"
-#~ msgstr "Anual"
-
-#~ msgid "Select timezone"
-#~ msgstr "Selectare zonă orară"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Modificare preferințe"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr "Precizați un fus orar valid (=TZ) sau alegeți unul din listă."
-
-#~ msgid "show line _1:"
-#~ msgstr "Linia _1"
-
-#~ msgid "show line _2:"
-#~ msgstr "Linia _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "Linia _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Proprietăți"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Nu s-a putut pornit „orage -p”"
-
-#~ msgid "Show event list"
-#~ msgstr "Arată lista evenimentelor"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = iconiță statică)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Iconița dinamică, vizibilă doar în zona de notificare, arată ziua și luna "
-#~ "curentă. Dacă zona de notificare este prea mică pentru o mărime dinamică, "
-#~ "se va folosi o iconiță statică."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Opțiuni calendar"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Opțiuni calendar Xfce 4"
diff -Nru orage-4.8.3/po/ru.po orage-4.12.1/po/ru.po
--- orage-4.8.3/po/ru.po	2012-01-03 12:01:09.000000000 +0000
+++ orage-4.12.1/po/ru.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,27 +1,48 @@
-# translation of ru.po to ru_RU
-# Russian translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Poul Ionkin <wizzard@nmg.lv>, 2003.
-# Anthony Ivanoff <a-i@bk.ru>, 2004.
-# Sergey Fedoseev <fedoseev.sergey@gmail.com>, 2006.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Andrei Stepanov, 2014
+# Aleksandr P <davian818@gmail.com>, 2013
 # Andrey Fedoseev <andrey.fedoseev@gmail.com>, 2006
+# Anthony Ivanoff <a-i@bk.ru>, 2004
+# Sergey Alyoshin <alyoshin.s@gmail.com>, 2013
+# Degit22, 2014
+# AlexanderFilev <ifillrok@gmail.com>, 2014
 # Ilya Shestopalov <yast4ik@yahoo.com>, 2009
+# Poul Ionkin <wizzard@nmg.lv>, 2003
+# Sergey Alyoshin <alyoshin.s@gmail.com>, 2013-2014
+# Sergey Fedoseev <fedoseev.sergey@gmail.com>, 2006
 msgid ""
 msgstr ""
-"Project-Id-Version: ru\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2011-02-28 00:38+0300\n"
-"Last-Translator: Dmitrij Smirnov <arch@cnc-parts.info>\n"
-"Language-Team: ru_RU <ru@li.org>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2014-12-03 17:55+0000\n"
+"Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/xfce-apps/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "без подчёркивания"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "одинарное"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "двойное"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "снизу"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -37,9 +58,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"кликните для изменения временной метки"
+msgstr "%s\nкликните для изменения временной метки"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -49,18 +68,20 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"Кнопка 1 для изменения параметров \n"
-"Кнопка 2 для изменения времени метки"
+msgstr "Кнопка 1 для изменения параметров \nКнопка 2 для изменения времени метки"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
-msgstr "изменить часы"
+msgstr "Изменить час"
 
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr "изменяет минуту. Щелчок кнопкой 2 изменяет минуту с шагом 1."
+msgstr "Изменить минуту. Щелчок кнопкой 2 изменяет минуту с шагом 1."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Мировое время"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -76,47 +97,47 @@
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
-msgstr "обновить эту метку"
+msgstr "Обновить эту метку"
 
 #: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
 msgid "add new empty clock"
-msgstr "добавить пустую метку"
+msgstr "Добавить пустую метку"
 
 #: ../globaltime/gt_prefs.c:526
 msgid "add new clock using this clock as model"
-msgstr "добавить новую метку на основе этой"
+msgstr "Добавить новую метку на основе этой"
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
-msgstr "удалить эту метку"
+msgstr "Удалить эту метку"
 
 #: ../globaltime/gt_prefs.c:539
 msgid "move this clock first"
-msgstr "переместить метку в начало"
+msgstr "Переместить метку в начало"
 
 #: ../globaltime/gt_prefs.c:544
 msgid "move this clock left"
-msgstr "переместить метку влево"
+msgstr "Переместить метку влево"
 
 #: ../globaltime/gt_prefs.c:549
 msgid "move this clock right"
-msgstr "переместить метку вправо"
+msgstr "Переместить метку вправо"
 
 #: ../globaltime/gt_prefs.c:554
 msgid "move this clock last"
-msgstr "переместить метку в конец"
+msgstr "Переместить метку в конец"
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
-msgstr "установить часовой пояс этой временной метки в местное время"
+msgstr "Установить часовой пояс этой временной метки в местное время"
 
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
-msgstr "закрыть окно в выйти"
+msgstr "Закрыть окно и выйти"
 
 #: ../globaltime/gt_prefs.c:590
 msgid "Globaltime preferences "
-msgstr "Настройки всемирного времени"
+msgstr "Настройки всемирного времени "
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -129,7 +150,7 @@
 
 #: ../globaltime/gt_prefs.c:613
 msgid "enter name of clock"
-msgstr "введите имя метки"
+msgstr "Введите имя метки"
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
@@ -154,18 +175,18 @@
 #: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
 #: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
 msgid "Use default"
-msgstr "Значение по умолчанию"
+msgstr "По умолчанию"
 
 #: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
 #: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
 msgid "Cross this to use default instead of selected value"
-msgstr "Пометьте для использования значение по умолчанию вместо указанного"
+msgstr "Отметьте для использования значение по умолчанию вместо указанного"
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
 msgid "Foreground (=text) color:"
-msgstr "цвет _шрифта:"
+msgstr "Цвет шрифта:"
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
@@ -192,12 +213,12 @@
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:780
 msgid "Underline name of clock:"
-msgstr "Подчеркивать имя метки:"
+msgstr "Подчёркивание имени метки:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:810
 msgid "Underline time of clock:"
-msgstr "Подчеркивать время метки:"
+msgstr "Подчёркивание времени метки:"
 
 #: ../globaltime/gt_prefs.c:850
 msgid "Text Default Formatting"
@@ -225,25 +246,25 @@
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
-msgstr "Кликните для изменения цвета времени по умолчанию"
+msgstr "Кликните для изменения шрифта времени по умолчанию"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:990
 msgid "Underline for name of clock:"
-msgstr "Подчеркивать имя метки:"
+msgstr "Подчёркивание имени метки:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:1004
 msgid "Underline for time of clock:"
-msgstr "Подчеркивать время метки:"
+msgstr "Подчёркивание времени метки:"
 
 #: ../globaltime/gt_prefs.c:1027
 msgid "update preferences"
-msgstr "обновить настройки"
+msgstr "Обновить настройки"
 
 #: ../globaltime/gt_prefs.c:1062
 msgid "Globaltime Preferences"
-msgstr "Настройки всемирного времени"
+msgstr "Настройки мирового времени"
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
@@ -262,6 +283,10 @@
 msgid "Use normal decorations"
 msgstr "Использовать обычное оформление"
 
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Нет"
+
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
 msgstr "Не показывать оформление окон (границы)"
@@ -284,7 +309,7 @@
 
 #: ../globaltime/gt_prefs.c:1116
 msgid "Clock sizes vary"
-msgstr "Плавающий размер метки "
+msgstr "Плавающий размер метки"
 
 #: ../globaltime/gt_prefs.c:1122
 msgid "Local timezone:"
@@ -321,7 +346,7 @@
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
 msgid "forward"
-msgstr "вперед"
+msgstr "вперёд"
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
@@ -337,10 +362,10 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
-msgstr "Место проведения"
+msgstr "Расположение"
 
 #: ../globaltime/timezone_selection.c:258
 #: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
@@ -398,97 +423,108 @@
 msgid "floating"
 msgstr "плавающий"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Мировое время"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Мировое время Orage"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "Показывать время других стран"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Мировое время"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Не поворачивать"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Повернуть влево"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Повернуть вправо"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "Внешний вид"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
 msgstr "Показывать _рамку"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
-msgstr "цвет _шрифта:"
+msgstr "Цвет _шрифта:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
-msgstr "цвет _фона:"
+msgstr "Цвет _фона:"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
-msgstr "установить высоту:"
+msgstr "_Высота:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
 msgstr "Учтите, что нельзя изменить высоту горизонтальных панелей"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
-msgstr "установить ширину:"
+msgstr "Ши_рина:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
 msgstr "Учтите, что нельзя изменить ширину вертикальных панелей"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Располагать строки вер_тикально"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "Параметры метки"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
-msgstr "часовой пояс:"
+msgstr "Часовой пояс:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "Строка %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
 msgstr "Укажите параметр для функции stftime."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
-msgstr "Подсказки:"
+msgstr "Подсказка:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
 msgstr "Исправлять время после спящего/ждущего режимов"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Это нужно только если вы выключаете на короткий срок (менее 5 часов) "
-"включаете ждущий или спящий режим и в отображаемое время не включаются "
-"секунды. В этих условиях Orageclock возможно будет неаккуратно показывать "
-"время, если не выбрать этот пункт. (Выбор пункта мешает процессору и "
-"прерывает функции сохранения.)"
+msgstr "Это нужно только если вы выключаете на короткий срок (менее 5 часов), включаете ждущий или спящий режим и в отображаемое время не включаются секунды. В этих условиях Orage возможно будет неаккуратно показывать время, если не выбрать этот пункт. (Выбор пункта мешает процессору и прерывает функции сохранения.)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -498,22 +534,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Эта программа использует функцию strftime для\n"
-"отображения времени. Вы можете указать формат,\n"
-"в котором будет отображено время и дата.\n"
-"Часто используемые параметры:\n"
-"\t%A = день недели\t\t\t%B = месяц\n"
-"\t%c = дата и время\t\t%R = часы и минуты\n"
-"\t%V = номер недели\t\t%Z = часовой пояс\n"
-"\t%H = часы\t\t\t\t\t%M = минуты\n"
-"\t%X = местное время\t\t%x = местная дата"
+msgstr "Эта программа использует функцию strftime для\nотображения времени. Вы можете указать формат,\nв котором будет отображено время и дата.\nЧасто используемые параметры:\n\t%A — день недели\t\t%B — месяц\n\t%c — дата и время\t\t%R — часы и минуты\n\t%V — номер недели\t\t%Z — часовой пояс\n\t%H — часы\t\t\t\t%M — минуты\n\t%X — местное время\t\t%x — местная дата"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
 msgstr "Настройки часов Orage"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -522,23 +548,22 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
 msgstr "%A, %d %b, %Y"
 
 #: ../src/about-xfcalendar.c:40
 msgid "Maintainer"
-msgstr "Разработчик"
+msgstr "Сопровождающий"
 
 #: ../src/about-xfcalendar.c:47
 msgid "Manage your time with Orage"
-msgstr "Программа-ежедневник для Xfce4"
+msgstr "Управляйте вашим временем с Orage"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Завершение"
 
@@ -546,13 +571,13 @@
 msgid "Due"
 msgstr "Через"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
-msgstr "Календарь"
+msgstr "Календарь Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Выбор файла..."
 
@@ -560,227 +585,281 @@
 msgid "Sound Files"
 msgstr "Звуковые файлы"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Все файлы"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Информация о встрече была изменена."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
-msgstr "Продолжить?"
+msgstr "Хотите продолжить?"
+
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Нет, не закрывать"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Да, игнорировать изменения и закрыть"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
-msgstr "Время окончания раньше времени начала."
+msgstr "Время окончания встречи раньше времени начала."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "Не установлено"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Добавить новую встречу в данный файл."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Файл Orage по умолчанию"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Не удалось добавить встречу."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "В ходе добавления встречи возникли ошибки. Дополнительные сведения содержатся в файле журнала."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Не удалось обновить встречу."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "См. подробности в файле журнала. (Вероятно, файл был внешне изменён?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
-msgstr "Это событие будет окончательно удалено."
+msgstr "Эта встреча будет окончательно удалена."
+
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Нет, отменить удаление"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Да, удалить"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Выбор даты"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Сегодня"
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
-msgstr "Это событие не существует."
+msgstr "Эта встреча не существует."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
 msgstr "Вероятно, она была удалена, пожалуйста, обновите экран."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Текущие категории"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Добавить новую категорию и цвет"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Категория:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
-msgstr "Цвета категорий - Orage"
+msgstr "Цвета категорий — Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr " *** КОПИЯ ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
-msgstr "Новое событие - Orage"
+msgstr "Новая встреча — Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Файл"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "_Сохранить и закрыть"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "_Дублировать"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Сохранить"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Сохранить и закрыть"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Восстановить"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Дублировать"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Удалить"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Свободен"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Занят"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Основное"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
-msgstr "Тип"
+msgstr "Тип "
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Событие"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Событие, которое когда-либо случится. Например:\n"
-"встреча, день рождения или телевизионная передача."
+msgstr "Событие, которое когда-либо случится. Например:\nвстреча, день рождения или телевизионная передача."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "Задача"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Что-либо, что необходимо когда-либо сделать. Например,\n"
-"помыть машину или протестировать новую версию Orage."
+msgstr "Что-либо, что необходимо когда-либо сделать. Например,\nпомыть машину или протестировать новую версию Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Дневник"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Сделать запись о чем-то случившемся. Например, \n"
-"пометка, что мама поздравила с первым снегом."
+msgstr "Сделать запись о чем-то случившемся. Например, \nпометка, что позвонила мама или выпал первый снег."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Название "
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "Событие на весь день"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
-msgstr "Начинается"
+msgstr "Начало"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Установить      "
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Продолжительность"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "дней"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "часов"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "минут"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Занятость"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Закончено"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "Готово"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Категории"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Это особая категория, которая используется для выделения цветом встреч в "
-"спсике."
+msgstr "Это особая категория, которая используется для выделения цветом встреч в списке."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
-msgstr "обновить цвета категорий."
+msgstr "Обновить цвета категорий."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "Приоритет"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Если вы установите значение 8 или более, встреча НЕ БУДЕТ показана в окнах списка.\nВы может использовать эту особенность для очистки ваших окон списка, но такие встречи сложнее найти.\n(Извещения будут работать нормально.)\n(Есть недокументированный параметр для изменения ограничения по умолчанию 8.)"
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Примечание"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -789,139 +868,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"Эти сокращения раскрываются немедленно:\n"
-"    <D> текущая дата в местном формате,\n"
-"    <T> текущее время, и\n"
-"    <DT> дата и время.\n"
-"\n"
-"Это сокращение ракрывается только в сообщении:\n"
-"    <&Ynnnn> текущий год минус nnnn.\n"
-"(Например, для вычисления возраста в сообщении о юбилее.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Эти сокращения раскрываются немедленно:\n    <D> текущая дата в местном формате,\n    <T> текущее время, и\n    <DT> дата и время.\n\nЭто сокращение раскрывается только в сообщении:\n    <&Ynnnn> текущий год минус nnnn.\n(Например, для вычисления возраста в сообщении о юбилее.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "Перед началом"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "Перед окончанием"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "После начала"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "После окончания"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Будильник"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Время будильника"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Обычно будильник необходим:\n"
-" 1) перед началом события\n"
-" 2) перед завершением задачи\n"
-" 3) после начала задачи"
+msgstr "Обычно будильник необходим:\n 1) перед началом события\n 2) перед завершением задачи\n 3) после начала задачи"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr "Постоянный будильник"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Выберите, если хотите, чтобы срабатывал будильник Orage, даже если "
-"приложение не активно."
+msgstr "Выберите, если хотите, чтобы срабатывал будильник Orage, даже если приложение не активно."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Звук"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
-msgstr "Использование"
+msgstr "Использовать"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
 msgstr "Выберите, если необходим слышимый будильник"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "Повторять звук будильника"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "раз"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "интервал в секундах"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "Визуальный"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Использовать окно Orage"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
 msgstr "Укажите, если хотите использовать окно будильника Orage"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Уведомление об использовании"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
 msgstr "Укажите, если хотите будильник с уведомлениями"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "Установить тайм-аут"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
 msgstr "Выберите, если хотите, чтобы уведомления заканчивались автоматически"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
-msgstr "0 = системное время действия"
+msgstr "0 — системное время действия"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "секунд"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Процедура"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
 msgstr "Укажите, если хотите использовать процедуру или сценарий будильника"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -931,164 +995,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
-"Позаботьтесь о верном экранировании символов.\n"
-"Введенная строка передается оболочке в неизменном виде.\n"
-"Будут заменены лишь следующие команды:\n"
-"\t<&T> Название события\n"
-"\t<&D> описание события\n"
-"\t<&AT> время оповещения\n"
-"\t<&ST> время начала\n"
-"\t<&ET> время окончания"
+msgstr "Позаботьтесь о верном экранировании символов.\nВведённая строка передаётся оболочке в неизменном виде.\nБудут заменены лишь следующие команды:\n\t<&T> Название события\n\t<&D> описание события\n\t<&AT> время оповещения\n\t<&ST> время начала\n\t<&ET> время окончания"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
 msgstr "Проверка установленного сигнала"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
-msgstr "<b>Сигнал по умолчанию</b>"
+msgstr "<b>Будильник по умолчанию</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
 msgstr "Установить текущие настройки как будильник по умолчанию"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
 msgstr "Установить текущие настройки из будильника по умолчанию"
 
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Нет"
-
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Ежедневно"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Еженедельно"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Ежемесячно"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Ежегодно"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
 msgstr "Каждый час"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Пн"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Вт"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Ср"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Чт"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Пт"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "Сб"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "Вс"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Повтор"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Шаблон"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Простой"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Расширенный"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "Используйте, если хотите регулярного повторения события"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Используйте, если необходимо сложное время, например:\n"
-" Каждое воскресенье и субботу или\n"
-" Первую среду каждого месяца"
+msgstr "Используйте, если необходимо сложное время, например:\n Каждое воскресенье и субботу или\n Первую среду каждого месяца"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Повторяемость"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Каждый"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "интервал"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Ограничить частоту конкретным интервалом.\n"
-" Например, каждый третий день.\n"
-" Частота = Ежедневно и Интервал = 3"
+msgstr "Ограничить частоту конкретным интервалом.\n Например, каждый третий день.\n Частота — Ежедневно и Интервал — 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Ограничение"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Повторять бесконечно"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
-msgstr "Повторять"
+msgstr "Повторять "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
-msgstr "Повторять до"
+msgstr "Повторять до "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Дни недели"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "В какой день"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1096,292 +1142,297 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Укажите, в какой день недели наступает ежемесячное или ежегодное событие.\n"
-" Например,\n"
-" Вторая среда каждого месяца:\n"
-" Частота = Ежемесячно,\n"
-" Дни недели = отметьте только среду,\n"
-" В какой день = укажите 2 в поле для среды"
+msgstr "Укажите, в какой день недели наступает ежемесячное или ежегодное событие.\nНапример, вторая среда каждого месяца:\n\tЧастота — Ежемесячно,\n\tДни недели — отметьте только среду,\n\tВ какой день — укажите 2 в поле для среды."
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr "Начальная дата задачи"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"Время повтора задачи отсчитывается от времени ее начала, и не зависит от "
-"того, была ли задача выполнена"
+msgstr "Время повтора задачи отсчитывается от времени её начала, и не зависит от того, была ли задача выполнена"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"Время повтора задачи отсчитывается от времени ее выполнения.\n"
-"(Учтите, что начальная дата задачи будет изменяться с каждым повторением.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "Время повтора задачи отсчитывается от времени её выполнения.\n(Учтите, что начальная дата задачи будет изменяться с каждым повторением.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "Исключения"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"Можно добавить исключения, щелкая по дням в календаре.\n"
-"Исключения — это включения (-) или исключения (+).\n"
-"Щелкните по дате, чтобы их удалить."
+msgstr "Можно добавить исключения, щёлкая по дням в календаре.\nИсключения могут быть исключёнными (-) или включёнными (+).\nЩёлкните по дате, чтобы их удалить."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
-msgstr "Добавить исключенную дату (-)"
+msgstr "Добавить исключённую дату (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr "В исключенные дни событие не наступает"
+msgstr "В исключённые дни событие не наступает."
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
-msgstr "Добавить включенное время (+)"
+msgstr "Добавить включённое время (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"Событие происходит также во включенное время. Оно задается в том же часовом "
-"поясе, что и время начала события."
+msgstr "Событие происходит также во включённое время. Оно задаётся в том же часовом поясе, что и время начала события."
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
 msgstr "Даты событий"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Вид"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "_Перейти"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Создать"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Назад"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Сегодня"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Вперёд"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Назад на одну неделю"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Назад на один день"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Вперёд на один день"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Вперёд на одну неделю"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Обновить"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Закрыть"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "       Число дней"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
-msgstr "Orage - Просмотр дней"
+msgstr "Просмотр дней — Orage"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Весь день"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Время"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "Не выбрано ни одной строки"
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Кликните на строке перед её копированием."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"Вы окончательно удалите все\n"
-"выбранные встречи."
+msgstr "Вы окончательно удалите все\nвыбранные встречи."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Да, удалить"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Назад"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Вперёд"
+
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Найти"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
-msgstr "Дневной вид"
+msgstr "Просмотр дней"
+
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Показывать дополнительно дней:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "Только первое повторяющееся"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Включать последующие дни"
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Выберите если хотите видеть только первое из повторяющихся событий. По умолчанию отображаются все события.\nЗаметьте, что это также отобрази все срочные события.\nУчтите, что при отображении только первого из повторяющихся событий, повторяющиеся события могут быть в списке ранее."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "Также старые"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Выберите если хотите видеть также и старые события. Параметр может быть выбран только при выбранном параметре «только первое повторяющееся» для предотвращения очень длинных списков.\nЗаметьте, что выбор дополнительных дней по прежнему определяет отображение новых встреч."
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "Записи в дневнике, начиная с:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Поиск"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
-msgstr "Текст поиска"
+msgstr "Текст поиска "
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Флаги"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Название"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Дважды кликните на строке для изменения.\n"
-"\n"
-"Флаги (по порядку):\n"
-"\t 1. Будильник: n=без будильника\n"
-"\t\t A=визуальный будильник S=также звуковой будильник\n"
-"\t 2. Повторяемость: n=без повторения\n"
-"\t\t D=ежедневно W=еженедельно M=ежемесячно Y=ежегодно\n"
-"\t 3. Тип: f=свободный B=занятый\n"
-"\t 4. Расположение:\n"
-"\t\tO=Orage A=Архив F=Внешний файл\n"
-"\t 5. Тип встречи:\n"
-"\t\tE=Событие T=Задача J=Дневник"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Выбор даты"
+msgstr "Двойной щелчок для изменения строки.\n\nФлаги по порядку:\n\t1. Будильник: n — «нет будильника»,\n\t\tA — «будильник установлен», P — «установлен постоянный будильник»\n\t2. Повтор: n — «не повторять»,\n\t\tH — «ежечасно», D — «ежедневно», W — «еженедельно»,\n\t\tM — «ежемесячно», Y — «ежегодно»\n\t3. Тип: f — «свободен», B — «занят»\n\t4. Файл расположения:\n\t\tO — «Orage», A — «архив», F — «внешний»,\n\t5. Тип события:\n\t\tE — «событие», T — «задача», J — «дневник»"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
-msgstr "\tПросмотр завершен, поренос в файл архива."
+msgstr "\tПовтор завершён, перенос в файл архива."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Архивирование не включено. Завершение."
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Хранение в архиве: %d месяцев"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tАрхивирование событий старших чем: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
-msgstr "Uid архивирования: %s"
+msgstr "UID архивирования: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tVTODO не выполнен, не архивирован."
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tПовторяется. Конечный год: %04d, месяц: %02d, день: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Архивирование завершено\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Начать удаление архива."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
-msgstr "\tФАЗА 1: сброс рекурсивных встреч"
+msgstr "\tФАЗА 1: сброс повторяющихся встреч"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tФАЗА 2: возврат архивированных встреч"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Удаление архива завершено\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Будильник по умолчанию"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Созданный список будильников для основного файла Orage:"
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-"Построение списка будильников: добавлено %d будильников, обработано %d "
-"событий."
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Создан список извещений для внешнего файла: %s (%s)"
+
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\tДобавлено будильников: %d. Обработано событий: %d."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tНайдено %d будильников, из них активных: %d (просмотрено %d повторяющихся "
-"будильников)."
+msgstr "\tНайдено будильников: %d, из них активных: %d (просмотрено %d повторяющихся будильников)."
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1399,7 +1450,16 @@
 msgid "Import file preprocessing done"
 msgstr "Предварительная обработка файла импорта завершена."
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Обнаружено внешнее изменение файла %s."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Обновление будильников и календаря из-за внешнего изменения файла."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Файлы календаря"
 
@@ -1407,621 +1467,672 @@
 msgid "Current foreign files"
 msgstr "Текущие внешние файлы"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "ТОЛЬКО ДЛЯ ЧТЕНИЯ"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "ЧТЕНИЕ И ЗАПИСЬ"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Нет внешних файлов *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Ошибка при добавлении внешнего файла"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage не поддерживает более 10 внешних файлов."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Пустое имя файла."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Пустое имя."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Файл не существует."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Файл с таким именем уже существует в Orage."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Такое имя уже существует в Orage."
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Импорт/экспорт"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Импорт"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Прочитать из файла:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Разделите имена файлов запятыми(,).\n"
-" Внимание! запятые недопустимы в именах файлов Orage."
+msgstr "Разделите имена файлов запятыми.\nВнимание! Запятые недопустимы в именах файлов Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Экспорт"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Записать в файл:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Выбрать"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Все встречи"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
-msgstr "Поименованные встречи:"
+msgstr "Поименованные встречи: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Внимание! Прочитан только основной файл встреч.\n"
-"Архивные и внешние события не экспортированы."
+msgstr "Внимание! Прочитан только основной файл встреч.\nАрхивные и внешние события не экспортированы."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Внимание! Прочитан только основной файл встреч.\n"
-"Внешние события не экспортированы."
+msgstr "Внимание! Прочитан только основной файл встреч.\nВнешние события не экспортированы."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
-msgstr "Можно легко перетащить эти события из окна со списокм событий."
+msgstr "Можно легко перетащить эти события из окна со списком событий."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
-msgstr "UID встреч Orage, разделенных запятыми."
+msgstr "UID встреч Orage, разделённых запятыми."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Архивировать"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Архивировать сейчас (время хранения: %d месяцев)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Время хранения в архиве можно изменить в параметрах"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Обратить архив сейчас"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Вернуть всех архивированные события в главный файл Orage и удалить файл "
-"архива.\n"
-"Это полезно, например, при экспорте и перемещении событий Orage \n"
-"на другие системы."
+msgstr "Вернуть всех архивированные события в главный файл Orage и удалить файл архива.\nЭто полезно, например, при экспорте и перемещении событий Orage \nна другие системы."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Файлы Orage"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Главный файл календаря Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Текущий файл"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Новый файл"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Параметры действия"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Текущий файл:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Новый файл:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Параметры события:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Переименовать"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Переименование только внутренних файлов Orage.\n"
-"Не затрагивает внешнюю файловую систему.\n"
-"Новый файл должен существовать."
+msgstr "Переименование только внутренних файлов Orage.\nНе затрагивает внешнюю файловую систему.\nНовый файл должен существовать."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Копировать"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr "Текущий файл был скопирован и остался не измененным на старом месте."
+msgstr "Текущий файл был скопирован и остался не изменённым на старом месте."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Переместить"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
-msgstr "Текущий файл был перемещен и удален со старого места."
+msgstr "Текущий файл был перемещён и удалён со старого места."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Файл архива"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Внешние файлы"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Добавить новый внешний файл"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Внешний файл:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Параметры"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Отображаемое имя:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Только для чтения"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Установите, если необходимо убедиться, что это файл никогда не будет изменет "
-"Orage.\n"
-"Внимание! Изменение внешних файлов может сделать их недоступными для "
-"исходной утилиты, с помощью которой они созданы."
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Установите, если необходимо убедиться, что это файл никогда не будет изменён Orage.\nВнимание! Изменение внешних файлов может сделать их недоступными для исходной утилиты, с помощью которой они были созданы."
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Используется это внутреннее имя для отображения вместо имени файла."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
-msgstr "Обмен данными - Orage"
+msgstr "Обмен данными — Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tЭто %s версия %s \n"
-"\n"
+msgstr "\t%s версии %s\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tРаспространяется согласно условиям GNU General Public License.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tСкомпилирован с GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "используется GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tИспользуется DBUS для импорта.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tНе используется DBUS. Импорт работает частично.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tИспользуется libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tНе используется libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tИспользуется автоматическое архивирование.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tНе используется архивирование.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
-msgstr "\tИспользцется системная библиотека libical.\n"
+msgstr "\tИспользуется системная библиотека libical.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tИспользуется версия Orage библиотеки libical.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Использование: orage [параметры] [файлы]\n"
-"\n"
+msgstr "Использование: orage [параметры] [файлы]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Параметры:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tвывести версию Orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
-msgstr "--help (-h) \t\tвывести этот текст\n"
+msgstr "--help (-h) \t\tвывести это описание\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
-msgstr "--preferences (-p) \tпоказать форму параметров\n"
+msgstr "--preferences (-p) \tпоказать окно настроек\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr "--toggle (-t) \t\tпоказать/спрятать orage\n"
+msgstr "--toggle (-t) \t\tпоказать/спрятать Orage\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) файл [RW] \tдобавить внешний файл\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) ФАЙЛ [RW] [ИМЯ] \tдобавить внешний файл\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr "--remove-foreign (-r) файл \tудалить внешний файл\n"
+msgstr "--remove-foreign (-r) ФАЙЛ \t\tудалить внешний файл\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
-"--export (-e) ФАЙЛ [ВСТРЕЧА...] \tэкспорт данных о встречах из Orage в файл\n"
+msgstr "--export (-e) ФАЙЛ [ВСТРЕЧА...] \tэкспорт данных о встречах из Orage в файл\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
-msgstr "files=файлы ical для загрузки в orage\n"
+msgstr "Файлы — файлы ical для загрузки в Orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
-msgstr "\tdbus не включён в orage. \n"
+msgstr "\tdbus не включён в Orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tбез dbus [files] и опции внешних файлов (-a & -r) можно использовать "
-"только при запуске orage \n"
+msgstr "\tбез dbus [файлы] и внешнего файла опции (-a & -r) можно использовать только при запуске Orage \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Неизвестный параметр %s\n"
-"\n"
+msgstr "\nНеизвестный параметр %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "Об_мен данными"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
-msgstr "Просмотреть выбранную _дату"
+msgstr "Просмотр выбранной _даты"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
-msgstr "Просмотреть выбранную _неделю"
+msgstr "Просмотр выбранной _недели"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Перейти к _сегодняшнему дню"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Мировое время"
+msgstr "_Мировое время"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Справка"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Без названия"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr " Расположение: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n Примечание:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Никогда"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Заголовок: %s\n"
-" Начало:\t%s\n"
-" Конец:\t%s\n"
-" Примечание:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "Название: %s\n%s Начало:\t%s\n Длительность:\t%s\n Окончание:\t%s%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Заголовок: %s\n"
-" Начало:\t%s\n"
-" Конец:\t%s\n"
-" Примечание:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Название: %s\n%s Начало:\t%s\n Окончание:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Сделать:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>События для %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>События с %s по %s:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "Основные"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Часовой пояс"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
-msgstr "Необходимо всегда определить местный часовой пояс."
+msgstr "Местный часовой пояс должен быть всегда определён."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "Период хранения в архиве (месяцев)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
-msgstr "(0 = не архивировать)"
+msgstr "(введите 0, чтобы не архивировать)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Архивирование используется для сохранения времени и места при обработке "
-"событий."
+msgstr "Архивирование используется для сохранения времени и места при обработке событий."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Звуковая команда"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-"Эта команда передается оболочке для воспроизведения звука в будильнике."
+msgstr "Эта команда передаётся оболочке для воспроизведения звука будильника."
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "Отображение"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Окно календаря"
 
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Главное окно календаря"
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Визуальные элементы календаря"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "Показывать _рамки"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "Показывать _меню"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Месяц и год"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
-msgstr "Дни недели"
+msgstr "_Дни недели"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
-msgstr "Номера недель"
+msgstr "_Номера недель"
 
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr "Показывать _задачи"
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Месяц и _год"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Информационные таблички календаря"
 
 #: ../src/parameters.c:660
+msgid "Show todo list"
+msgstr "Показывать зада_чи"
+
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
 msgstr "Число дней в окне событий"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
-msgstr "0 = не отображать список событий"
+msgstr "0 — не отображать список событий"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Отображение календаря"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
 msgstr "Показывать на всех рабочих столах"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
 msgstr "Поверх всех окон"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "Показывать в панели задач"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "Показывать в переключателе рабочих мест"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "Показывать в области уведомления"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "При запуске"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Показать"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Скрыть"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
-msgstr "Свёрнуть"
-
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr "Дополнительно"
+msgstr "Свернуть"
 
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr "При открытии окна календаря"
-
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "Перейти к сегодняшнему дню"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr "Перейти к предыдущей, выбранной, дате"
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "Использовать динамический значок"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "При открытии календаря"
 
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "Динамический значок"
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Выбрать сегодняшнюю дату"
 
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-"Динамическая иконка показывает текущие месяц и число. Она используется "
-"только на панели оповещений."
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Выбрать предыдущую выбранную дату"
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Двойной щелчок в окне календаря показывает"
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Двойной щелчок в календаре показывает"
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
 msgstr "Дни"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
 msgstr "События"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Дополнительно"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
 msgstr "Окно списка событий"
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
 msgstr "Число последующих дней в списке событий"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
-msgstr ""
-"Это просто значение по умолчанию, его можно изменить в окне списка событий."
+msgstr "Это просто значение по умолчанию, его можно изменить в окне списка событий."
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Показывать только первое из повторяющихся событий"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Первый день по умолчанию для дневного вида"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Первый день недели"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Выбранный день"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Использовать динамический значок"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Динамический значок"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Динамический значок показывает текущие месяц и число. Используется только на панели оповещений."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
-msgstr ""
+msgstr "Использовать таймер пробуждения"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
+msgstr "Используйте, если возникают проблемы с Orage после выхода из ждущего или спящего режима. (Например, не обновляется значок или не работают оповещения)."
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Визуальный будильник по умолчанию для внешнего файла"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Окно Orage"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Извещающее уведомление"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Всегда выходить при закрытии"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Всегда выходить"
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "По умолчанию Orage продолжает работу в фоновом режиме по команде выйти. С этим параметром Orage действительно завершает работу по команде выйти."
+
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Настройки Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
 msgstr "Первый запуск Orage. Поиск используемого часового пояса."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Выбран часовой пояс: %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
-msgstr "Используемый часовой пояс не найден, задайте его вручную."
+msgstr "Не найден используемый часовой пояс, задайте его вручную."
 
 #: ../src/reminder.c:562
 msgid "Reminder "
@@ -2031,40 +2142,35 @@
 msgid "Open"
 msgstr "Открыть"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
-msgstr "Напоминания - Orage"
+msgstr "Напоминания — Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Отложить"
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "Напомнить через заданное время"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr "Щелните <Выполнить>, чтобы напомнить снова через указанное время:"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Следующий активный будильник:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d д %02d ч %02d мин до: %s"
+msgstr "\n%02d д %02d ч %02d мин до: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Не найдено активных будильников"
+msgstr "\nНе найдено активных будильников"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2087,1536 +2193,2228 @@
 msgstr "Африка/Алжир"
 
 #: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
+msgid "Africa/Asmara"
 msgstr "Африка/Асмэра"
 
 #: ../src/timezone_names.c:42
+msgid "Africa/Asmera"
+msgstr "Африка/Асмэра"
+
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "Африка/Бамако"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "Африка/Банги"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "Африка/Банжул"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "Африка/Бисау"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
-msgstr "Африка/Блантир"
+msgstr "Африка/Блантайр"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "Африка/Браззавиль"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "Африка/Бужумбура"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "Африка/Каир"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "Африка/Касабланка"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
-msgstr "Африка/Конакри"
+msgstr "Африка/Сеута"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "Африка/Конакри"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "Африка/Дакар"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "Африка/Дар-эс-Салам"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "Африка/Джибути"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "Африка/Дуала"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "Африка/Эль-Аюн"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "Африка/Фритаун"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "Африка/Габороне"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "Африка/Хараре"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "Африка/Джуба"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
-msgstr "Африка/Йоханесбург"
+msgstr "Африка/Йоханнесбург"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "Африка/Кампала"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "Африка/Хартум"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "Африка/Кигали"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "Африка/Киншаса"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "Африка/Лагос"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "Африка/Либревиль"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "Африка/Ломе"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "Африка/Луанда"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "Африка/Лубумбаши"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "Африка/Лусака"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "Африка/Малабо"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "Африка/Мапуту"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "Африка/Масеру"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "Африка/Мбабане"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "Африка/Магадишо"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "Африка/Монровия"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "Африка/Найроби"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "Африка/Нджамена"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "Африка/Ниамей"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "Африка/Нуакшот"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "Африка/Уагадугу"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "Африка/Порто-Ново"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
-msgstr "Африка/Сао Томе"
+msgstr "Африка/Сан-Томе"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "Африка/Тимбукту"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "Африка/Триполи"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "Африка/Тунис"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "Африка/Виндхук"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "Америка"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "Америка/Адак"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "Америка/Анкоридж"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "Америка/Ангилья"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "Америка/Антигуа"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
-msgstr "Америка/Арагвайа"
+msgstr "Америка/Арагуаина"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "Америка/Аргентина/Буэнос-Айрес"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "Америка/Аргентина/Катамарка"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "Америка/Аргентина/Комодоро-Ривадавия"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
-msgstr "Америка/Аргентина/Кордоба"
+msgstr "Америка/Аргентина/Кордова"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "Америка/Аргентина/Жужуй"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "Америка/Аргентина/Ла-Риоха"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
-msgstr "Америка/Аргентина/Мендоза"
+msgstr "Америка/Аргентина/Мендоса"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "Америка/Аргентина/Рио-Гальегос"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "Америка/Аргентина/Сальта"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "Америка/Аргентина/Сан-Хуан"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "Америка/Аргентина/Сан-Луис"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "Америка/Аргентина/Тукуман"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "Америка/Аргентина/Ушуая"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "Америка/Аруба"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "Америка/Асунсьон"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "Америка/Атикокан"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "Америка/Атка"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "Америка/Байя"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "Америка/Байя-де-Бандерас"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "Америка/Барбадос"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "Америка/Белен"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "Америка/Белиз"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "Америка/Бланк-Саблон"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "Америка/Боа-Виста"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "Америка/Богота"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "Америка/Бойсе"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "Америка/Буэнос-Айрес"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
-msgstr "Америка/Камбридж-Бей"
+msgstr "Америка/Кеймбридж-Бей"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "Америка/Кампо-Гранде"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "Америка/Канкун"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "Америка/Каракас"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "Америка/Катамарка"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
-msgstr "Америка/Кайенн"
+msgstr "Америка/Кайенна"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "Америка/Кайманы"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "Америка/Чикаго"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
-msgstr "Америка/Чихуахуа"
+msgstr "Америка/Чиуауа"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "Америка/Корал-Харбор"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
-msgstr "Америка/Кордоба"
+msgstr "Америка/Кордова"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "Америка/Коста-Рика"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "Америка/Крестон"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
-msgstr "Америка/Куйаба"
+msgstr "Америка/Куяба"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
-msgstr "Америка/Куракао"
+msgstr "Америка/Кюрасао"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "Америка/Денмаркшавн"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "Америка/Доусон"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
-msgstr "Америка/Бухта Доусона"
+msgstr "Америка/Досон-Крик"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "Америка/Денвер"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "Америка/Детройт"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "Америка/Доминика"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "Америка/Эдмонтон"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "Америка/Енсенада"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "Америка/Эйрунепе"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "Америка/Сальвадор"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "Америка/Форталеза"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "Америка/Форт-Уэйн"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "Америка/Глейс-Бей"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "Америка/Готхоб"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
-msgstr "Америка/Гуз-Бей"
+msgstr "Америка/Гус-Бей"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
-msgstr "Америка/Гранд_Турк"
+msgstr "Америка/Гранд-Турк"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "Америка/Гренада"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "Америка/Гваделупа"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "Америка/Гватемала"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "Америка/Гуаякиль"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "Америка/Гайана"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "Америка/Галифакс"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "Америка/Гавана"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "Америка/Эрмосильо"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "Америка/Индиана/Индианаполис"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "Америка/Индиана/Нокс"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "Америка/Индиана/Маренго"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "Америка/Индиана/Петербург"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "Америка/Индиана/Петербург"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
-msgstr "Америка/Индиана/Вевей"
+msgstr "Америка/Индиана/Веве"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "Америка/Индиана/Винсенс"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "Америка/Индиана/Винамак"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "Америка/Индианаполис"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
-msgstr "Амеркиа/Инувик"
+msgstr "Америка/Инувик"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
-msgstr "Америка/Иквалюит"
+msgstr "Америка/Икалуит"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "Америка/Ямайка"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "Америка/Жужуй"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "Америка/Джуно"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
-msgstr "Америка/Кентуки/Луисвиль"
+msgstr "Америка/Кентукки/Луисвилл"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
-msgstr "Америка/Кентуки/Монтичелло"
+msgstr "Америка/Кентукки/Монтичелло"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "Америка/Кнокс-Ин"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "Америка/Кралендейк"
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "Америка/Ла-Пас"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "Америка/Лима"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "Америка/Лос-Анджелес"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
-msgstr "Америка/Луисвиль"
+msgstr "Америка/Луисвилл"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "Америка/Синт-Мартен"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "Америка/Масейо"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "Америка/Манагуа"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "Америка/Манаус"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "Америка/Маригот"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "Америка/Мартиника"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "Америка/Матаморос"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
-msgstr "Америка/Мазатлан"
+msgstr "Америка/Масатлан"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
-msgstr "Америка/Мендоза"
+msgstr "Америка/Мендоса"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
-msgstr "Амеркиа/Меномини"
+msgstr "Америка/Меномини"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "Америка/Мерида"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "Америка/Метлакатла"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "Америка/Мехико"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
-msgstr "Америка/Миквелон"
+msgstr "Америка/Микелон"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "Америка/Монктон"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "Америка/Монтеррей"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "Америка/Монтевидео"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "Америка/Монреаль"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "Америка/Монтсеррат"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "Америка/Нассау"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "Америка/Нью-Йорк"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "Америка/Нипигон"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "Америка/Ном"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "Америка/Северная Дакота/Бьюла"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "Америка/Северная Дакота/Центр"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "Америка/Северная_Дакота/Нью Салем"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
-msgstr "Америка/Норона"
+msgstr "Америка/Норонья"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "Америка/Охинага"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "Америка/Панама"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
-msgstr "Америка/Пангниртунг"
+msgstr "Америка/Пангниртанг"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "Америка/Парамарибо"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "Америка/Феникс"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "Америка/Порт-о-Пренс"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "Америка/Порт-оф-Спейн"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "Америка/Порт Акра"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "Америка/Порту-Велью"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "Америка/Пуэрто-Рико"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "Америка/Рейни-Ривер"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
-msgstr "Америка/Ренкин-Инлет"
+msgstr "Америка/Ранкин-Инлет"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
-msgstr "Америка/Ресифе"
+msgstr "Америка/Ресифи"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "Америка/Регина"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "Америка/Резолют"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "Америка/Риу-Бранку"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
-msgstr "Америка/Розарио"
+msgstr "Америка/Росарио"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "Америка/Санта-Изабел"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "Америка/Сантарем"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "Америка/Сантьяго"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "Америка/Санто-Доминго"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "Америка/Сан-Паулу"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "Америка/Скорсбисунн"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "Америка/Шипрок"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "Америка/Ситка"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "Америка/Сен-Бартелеми"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "Америка/Сент-Джонс"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "Америка/Сент-Китс"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "Америка/Сент-Люсия"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "Америка/Сент-Томас"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "Америка/Сент-Винсент"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "Америка/Свифт-Карент"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "Америка/Тегусигальпа"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "Америка/Туле"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "Америка/Тандер-Бей"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "Америка/Тихуана"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "Америка/Торонто"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "Америка/Тортола"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "Америка/Ванкувер"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "Америка/Вирджин"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "Америка/Уайтхорс"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "Америка/Виннипег"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "Америка/Якутат"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "Америка/Йеллоунайф"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Антарктика"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Антарктика/Кейси"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Антарктика/Дейвис"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Антарктика/Дюмон-д'Юрвиль"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Антарктика/Маккуори"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Антарктика/Моусон"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Антарктика/Мак-Мердо"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Антарктика/Палмер"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Антарктика/Ротера"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Антарктика/Южный полюс"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
-msgstr "Антарктика/Сева"
+msgstr "Антарктика/Сёва"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Антарктика/Восток"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Арктика"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Арктика/Лонгйир"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Азия"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Азия/Аден"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Азия/Алматы"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Азия/Амман"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Азия/Анадырь"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Азия/Актау"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Азия/Актюбинск"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
+msgstr "Азия/Ашгабад"
+
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
 msgstr "Азия/Ашхабад"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "Азия/Багдад"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Азия/Бахрейн"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Азия/Баку"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Азия/Бангкок"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Азия/Бейрут"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Азия/Бишкек"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Азия/Бруней"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Азия/Калькутта"
 
-#: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Азия/Чойбалсан"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
 msgstr "Азия/Чунцин"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:289
+msgid "Asia/Chungking"
+msgstr "Азия/Чункинг"
+
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Азия/Коломбо"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Азия/Дака"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "Азия/Дамаск"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Азия/Дакка"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Азия/Дили"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Азия/Дубай"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Азия/Душанбе"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Азия/Газа"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Азия/Харбин"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Азия/Хеврон"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
-msgstr "Азия/Гонг-Конг"
+msgstr "Азия/Гонконг"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Азия/Хо-Чи-Мин"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Азия/Ховд"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Азия/Иркутск"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Азия/Стамбул"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Азия/Джакарта"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
-msgstr "Азия/Джайпур"
+msgstr "Азия/Джаяпура"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Азия/Иерусалим"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Азия/Кабул"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Азия/Камчатка"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Азия/Карачи"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Азия/Кашгар"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Азия/Катманду"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Азия/Катманду"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Азия/Хандыга"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Азия/Калькутта"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Азия/Красноярск"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Азия/Куала-Лумпур"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Азия/Кучинг"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Азия/Кувейт"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Азия/Макао"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Азия/Макао"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Азия/Магадан"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Азия/Макасар"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Азия/Манила"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Азия/Маскат"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
-msgstr "Азия/Никосия"
+msgstr "Азия/Никозия"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Азия/Новокузнецк"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Азия/Новосибирск"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Азия/Омск"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Азия/Уральск"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Азия/Пномпень"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Азия/Понтианак"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Азия/Пхеньян"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Азия/Катар"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Азия/Кзыл-Орда"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Азия/Рангун"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Азия/Эр-Рияд"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Азия/Эр-Рияд87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Азия/Эр-Рияд88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Азия/Эр-Рияд89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Азия/Сайгон"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Азия/Сахалин"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Азия/Самарканд"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Азия/Сеул"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Азия/Шанхай"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Азия/Сингапур"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Азия/Тайпей"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Азия/Ташкент"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Азия/Тбилиси"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Азия/Тегеран"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Азия/Тель-Авив"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Азия/Тхимпху"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Азия/Тхимпху"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Азия/Токио"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "Азия/Уджунгпанданг"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Азия/Улан-Батор"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Азия/Улан Батор"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Азия/Урумчи"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Азия/Усть-Нера"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Азия/Вьентьян"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Азия/Владивосток"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Азия/Якутск"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Азия/Екатеринбург"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Азия/Ереван"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Атлантика"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Атлантика/Азорские о-ва"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Атлантика/Бермуды"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Атлантика/Канарские о-ва"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
-msgstr "Атлантика/Острова Зеленого Мыса"
+msgstr "Атлантика/Острова Зелёного Мыса"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "Атлантика/Фарерские острова"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Атлантический океан/Фарерские острова"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "Атлантика/Ян-Майен, о-в"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "Атлантика/Мадейра, о-в"
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
 msgstr "Атлантика/Рейкьявик"
 
-#: ../src/timezone_names.c:306
+#: ../src/timezone_names.c:375
 msgid "Atlantic/South_Georgia"
 msgstr "Атлантика/Ю.Джорджия и Ю.Сэндвинчевы о-ва"
 
-#: ../src/timezone_names.c:307
+#: ../src/timezone_names.c:376
 msgid "Atlantic/St_Helena"
 msgstr "Атлантика/Св. Елены, о-в"
 
-#: ../src/timezone_names.c:308
+#: ../src/timezone_names.c:377
 msgid "Atlantic/Stanley"
-msgstr "Атлантика/Стэнли"
+msgstr "Атлантический океан/Фолклендские о-ва"
 
-#: ../src/timezone_names.c:309
+#: ../src/timezone_names.c:378
 msgid "Australia"
 msgstr "Австралия"
 
-#: ../src/timezone_names.c:310
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Австралия/ACT"
+
+#: ../src/timezone_names.c:380
 msgid "Australia/Adelaide"
 msgstr "Австралия/Аделаида"
 
-#: ../src/timezone_names.c:311
+#: ../src/timezone_names.c:381
 msgid "Australia/Brisbane"
 msgstr "Австралия/Брисбен"
 
-#: ../src/timezone_names.c:312
+#: ../src/timezone_names.c:382
 msgid "Australia/Broken_Hill"
 msgstr "Австралия/Брокен-Хилл"
 
-#: ../src/timezone_names.c:313
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Австралия/Кернс"
+
+#: ../src/timezone_names.c:384
 msgid "Australia/Darwin"
 msgstr "Австралия/Дарвин"
 
-#: ../src/timezone_names.c:314
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Австралия/Юкла"
+
+#: ../src/timezone_names.c:386
 msgid "Australia/Hobart"
 msgstr "Австралия/Хобарт"
 
-#: ../src/timezone_names.c:315
+#: ../src/timezone_names.c:387
 msgid "Australia/Lindeman"
 msgstr "Австралия/Линдеман"
 
-#: ../src/timezone_names.c:316
+#: ../src/timezone_names.c:388
 msgid "Australia/Lord_Howe"
 msgstr "Австралия/Лорд-Хау, о-в"
 
-#: ../src/timezone_names.c:317
+#: ../src/timezone_names.c:389
 msgid "Australia/Melbourne"
 msgstr "Австралия/Мельбурн"
 
-#: ../src/timezone_names.c:318
+#: ../src/timezone_names.c:390
 msgid "Australia/Perth"
 msgstr "Австралия/Перт"
 
-#: ../src/timezone_names.c:319
+#: ../src/timezone_names.c:391
 msgid "Australia/Sydney"
 msgstr "Австралия/Сидней"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Бразилия"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Бразилия/Акри"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Бразилия/ДеНоронья"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Бразилия/Восток"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Бразилия/Запад"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Канада"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Канада/Атлантика"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Канада/Центр"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Канада/Восточный Саскачеван"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Канада/Восток"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Канада/Горы"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Канада/Ньюфаундленд"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Канада/Тихий океан"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Канада/Саскачеван"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Канада/Юкон"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Чили"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Чили/Континентальный"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Чили/Остров Пасхи"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Прочее"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Прочее/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Прочее/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Прочее/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Прочее/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Прочее/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Прочее/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Прочее/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Прочее/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Прочее/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Прочее/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Прочее/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Прочее/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Прочее/GMT+8"
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Прочее/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Прочее/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Прочее/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Прочее/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Прочее/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Прочее/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Прочее/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Прочее/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Прочее/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Прочее/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Прочее/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Прочее/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Прочее/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Прочее/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Прочее/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Прочее/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Прочее/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Прочее/Гринвич"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Прочее/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Прочее/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Прочее/Universal"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Прочее/Зулу"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Европа"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "Европа/Амстердам"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Европа/Андорра"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Европа/Афины"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Европа/Белфаст"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Европа/Белград"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Европа/Берлин"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Европа/Братислава"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Европа/Брюссель"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Европа/Бухарест"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Европа/Будапешт"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Европа/Бюзинген"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Европа/Кишинёв"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Европа/Копенгаген"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "Европа/Дублин"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Европа/Гибралтар"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Европа/Гернси"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Европа/Хельсинки"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Европа/Остров Мэн"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Европа/Стамбул"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Европа/Джерси"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Европа/Калининград"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Европа/Киев"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Европа/Лиссабон"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "Европа/Любляна"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Европа/Лондон"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Европа/Люксембург"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Европа/Мадрид"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Европа/Мальта"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Европа/Мариехамн"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Европа/Минск"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Европа/Монако"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Европа/Москва"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
-msgstr "Европа/Никосия"
+msgstr "Европа/Никозия"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Европа/Осло"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Европа/Париж"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Европа/Подгорица"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Европа/Прага"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Европа/Рига"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Европа/Рим"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Европа/Самара"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Европа/Сан-Марино"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Европа/Сараево"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "Европа/Симферополь"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "Европа/Скопье"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Европа/София"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Европа/Стокгольм"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Европа/Таллин"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Европа/Тирана"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Европа/Тирасполь"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "Европа/Ужгород"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Европа/Вадуц"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Европа/Ватикан"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Европа/Вена"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "Европа/Вильнюс"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Европа/Волгоград"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "Европа/Варшава"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Европа/Загреб"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "Европа/Запорожье"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "Европа/Цюрих"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Индия"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "Индия/Антананариву"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "Индия/Чагос"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
-msgstr "Индия/Крисмас"
+msgstr "Индия/Остров Рождества"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
-msgstr "Индия/Кокосовые острова"
+msgstr "Индия/Кокосовые о-ва"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
-msgstr "Индия/Коморские острова"
+msgstr "Индия/Коморские о-ва"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "Индия/Кергелен"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "Индия/Маэ"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "Индия/Мальдивы"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "Индия/Маврикий"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
-msgstr "Индия/Майорка"
+msgstr "Индия/Майотта"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "Индия/Реюньон"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Мексика"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Мексика/Нижняя Калифорния"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Мексика/Южная Нижняя Калифорния"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Мексика/Основная"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Средняя Азия"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Средняя Азия/Рияд87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Средняя Азия/Рияд88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Средняя Азия/Рияд89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Тихий океан"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
-msgstr "Тихий океан/Апия"
+msgstr "Тихий океан/Апиа"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Тихий океан/Окленд"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Тихий океан/Чатем, о-в"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Тихий океан/Чуук"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
-msgstr "Тихий океан/Пасхи, о-в"
+msgstr "Тихий океан/Остров Пасхи"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "Тихий океан/Эфате"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "Тихий океан/Эндербери, о-в"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Тихий океан/Факаофо"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "Тихий океан/Фиджи"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Тихий океан/Фунафути"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Тихий океан/Галапагос, о-ва"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Тихий океан/Гамбье, о-ва"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
-msgstr "Тихий океан/Гвадалканал"
+msgstr "Тихий океан/Гуадалканал"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Тихий океан/Гуам"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Тихий океан/Гонолулу"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Тихий океан/Джонстон, ат."
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
-msgstr "Тихий океан/Киритимати"
+msgstr "Тихий океан/Остров Рождества"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
-msgstr "Тихий океан/Косрае"
+msgstr "Тихий океан/Кусаие, о-в"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "Тихий океан/Кваджалейн"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Тихий океан/Маджуро"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Тихий океан/Маркизские о-ва"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Тихий океан/Мидуэй, о-ва"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Тихий океан/Науру"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Тихий океан/Ниуэ"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Тихий океан/Норфолк"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "Тихий океан/Нумеа"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Тихий океан/Паго-Паго"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Тихий океан/Палау"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
-msgstr "Тихий океан/Питкерн"
+msgstr "Тихий океан/Питкерн, о-ва"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Тихий океан/Понпеи"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "Тихий океан/Понапе, о-в"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Тихий океан/Порт-Морсби"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Тихий океан/Раротонга"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Тихий океан/Сайпан"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Тихий океан/Самоа"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Тихий океан/Таити, о-в"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Тихий океан/Тарава"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Тихий океан/Тонгатапу"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Тихий океан/Трук, о-ва"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Тихий океан/Уэйк, о-в"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Тихий океан/Уоллис"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
-msgstr "Тихий океан/Яп. о-ва"
+msgstr "Тихий океан/Яп, о-ва"
+
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "США"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "США/Аляска"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "США/Алеутские о-ва"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "США/Аризона"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "США/Центр"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "США/Восток"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "США/Восточная Индиана"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "США/Гавайи"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "США/Индиана-Старк"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "США/Мичиган"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "США/Горы"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "США/Тихий океан"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "США/Тихий океан (новый)"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "США/Самоа"
 
 #: ../src/tray_icon.c:469
 msgid "New appointment"
@@ -3628,169 +4426,33 @@
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
 msgid "Orage Panel Clock"
-msgstr "Часы с датой"
+msgstr "Часы с датой Orage"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
 msgid "Show time and date?"
 msgstr "Дата и время"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Календарь"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Параметры календаря Orage"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Настройки Orage"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Параметры календаря Xfce 4 (Orage)"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Простой календарь"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Параметры календаря Orage"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Календарь"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Календарь Orage"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Заголовок: %s\n"
-#~ " Начало:\t%s\n"
-#~ " Конец:\t%s\n"
-#~ " Завершён:\t%s\n"
-#~ "Примечание:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Следует ввести все escape-последовательности вручную. \n"
-#~ "Эта строка будет передана оболочке."
-
-#~ msgid "Orage clock"
-#~ msgstr "Часы с датой"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Первоначальный создатель, в прошлом разработчик"
-
-#~ msgid "Contributor"
-#~ msgstr "Сделал вклад"
-
-#~ msgid "Info"
-#~ msgstr "Информация"
-
-#~ msgid "Warning"
-#~ msgstr "Предупреждение"
-
-#~ msgid "Error"
-#~ msgstr "Ошибка"
-
-#~ msgid "Set sticked"
-#~ msgstr "Сделать липким"
-
-#~ msgid "Select always today"
-#~ msgstr "Всегда выбирать сегодняшний день"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "При открытии главного календаря, указатель будет установлен на предыдущий "
-#~ "выбранный день или на сегодня."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Режим изменения времени окончания"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Режим изменения времени начала"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "изменить минуты"
-
-#~ msgid "Vary"
-#~ msgstr "Плавающий"
-
-#~ msgid "Select timezone"
-#~ msgstr "Выбор часового пояса"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Изменить метку"
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "укажите часовой пояс метки, \n"
-#~ "(любое допустимое значение TZ)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Изменить настройки"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Укажите часовой пояс. (Используется для отображения в случае когда время "
-#~ "в предыдущей(-) или следующей(+) дате, добавляя +/- после времени)"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr "Укажите часовой пояс (=TZ) или выберите его из списка."
-
-#~ msgid "show line _1:"
-#~ msgstr "строка _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "строка _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "строка _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Параметры"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Не удалось выполнить 'orage -p'"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> вставить текущую дату в локальном формате.\n"
-#~ "<T> вставить время и \n"
-#~ "<DT> вставить дату и время."
-
-#~ msgid "Show event list"
-#~ msgstr "Показывать события"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = статический значок)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Динамический значок показывает сегодняшнее число и месяц. Он видима в "
-#~ "системном лотке. Если лоток слишком мал для динамического размера, Orage "
-#~ "автоматически переключается на статический значок."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Настройки календаря"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Настройки календаря Xfce 4"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Простой календарь"
diff -Nru orage-4.8.3/po/sk.po orage-4.12.1/po/sk.po
--- orage-4.8.3/po/sk.po	2012-01-03 12:01:09.000000000 +0000
+++ orage-4.12.1/po/sk.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,26 +1,42 @@
-# translation of xfcalendar.po to Slovak
-# This file is distributed under the same license as the orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# Juraj Brosz <juro@jurajbrosz.info>, 2004, 2005.
-# Roman Moravcik <roman.moravcik@gmail.com>, 2006.
-# Robert Hartl <hartl.robert@gmail.com>, 2009, 2011.
-# Tomáš Vadina <kyberdev@gmail.com>, 2011.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Juraj Brosz <juro@jurajbrosz.info>, 2004-2005
+# Robert Hartl <hartl.robert@gmail.com>, 2009,2011
+# Roman Moravčík <roman.moravcik@gmail.com>, 2006
+# Slavko <linux@slavino.sk>, 2014-2015
+# Tomáš Vadina <tomasvadina+transifex@cryptolab.net>, 2011-2012
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.8.1\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2011-10-05 08:02+0200\n"
-"Last-Translator: Tomáš Vadina <kyberdev@gmail.com>\n"
-"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2015-02-26 15:44+0000\n"
+"Last-Translator: Slavko <linux@slavino.sk>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/xfce-apps/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Poedit-Language: Slovak\n"
-"X-Poedit-Country: SLOVAKIA\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "bez podčiarknutia"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "jednoduché"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "dvojité"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "nízke"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -36,9 +52,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"kliknite pre zmenu času"
+msgstr "%s\nkliknite pre zmenu času"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -48,9 +62,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"tlačidlo 1 pre zmenu nastavení.\n"
-"tlačidlo 2 pre nastavenie času"
+msgstr "tlačidlo 1 pre zmenu nastavení.\ntlačidlo 2 pre nastavenie času"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -59,9 +71,11 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"nastavením zmeníte minútu. Pre zmenu iba o jednu minútu kliknite na šípky s "
-"tlačidlom 2."
+msgstr "nastavením zmeníte minútu. Pre zmenu iba o jednu minútu kliknite na šípky s tlačidlom 2."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Globálny čas"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -222,8 +236,7 @@
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"Zaškrtnite pre použitie predvoleného systémového písma namiesto vybraného"
+msgstr "Zaškrtnite pre použitie predvoleného systémového písma namiesto vybraného"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -264,6 +277,10 @@
 msgid "Use normal decorations"
 msgstr "Použiť bežné dekorácie"
 
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Žiadne"
+
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
 msgstr "Nezobrazovať dekorácie (okraje) okna"
@@ -339,7 +356,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Miesto"
@@ -400,97 +417,108 @@
 msgid "floating"
 msgstr "pohyblivá"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Svetový čas"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Orage - Svetový čas"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "Zobrazovať čas iných krajín"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Svetový čas"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Bez otočenia"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Otočiť vľavo"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Otočiť vpravo"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "Vzhľad"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
 msgstr "Zobraziť _rám"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
 msgstr "Nastaviť _farbu popredia:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
 msgstr "Nastaviť farbu _pozadia:"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
 msgstr "Nastaviť _výšku:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
 msgstr "Výšku vodorovných panelov nie je možné zmeniť"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
 msgstr "Nastaviť ší_rku:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
 msgstr "Šírku zvislých panelov nie je možné zmeniť"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Zobraziť riadky z_vislo"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "Nastavenie hodín"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
 msgstr "Nastaviť časovú zónu na:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "Riadok %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
 msgstr "Zadajte správny parameter funkcie strftime."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
 msgstr "Tip:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
 msgstr "opraviť nastavenie času pri prejdení z režimu spánku alebo hibernácie"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Túto akciu je nutné vykonať iba v prípade krátkodobého (menej ako 5 hodín) "
-"prepnutia do režimu spánku nebo hibernácie a v prípade, že viditeľný čas "
-"neobsahuje sekundy. Za týchto podmienok je možné, že hodiny aplikácie Orage "
-"zobrazujú čas nepresne, pokiaľ nevyberiete túto voľbu. (Zvolením tejto voľby "
-"bránite správnej činnosti úsporných vlastností procesora.)"
+msgstr "Túto akciu je nutné vykonať iba v prípade krátkodobého (menej ako 5 hodín) prepnutia do režimu spánku nebo hibernácie a v prípade, že viditeľný čas neobsahuje sekundy. Za týchto podmienok je možné, že hodiny aplikácie Orage zobrazujú čas nepresne, pokiaľ nevyberiete túto voľbu. (Zvolením tejto voľby bránite správnej činnosti úsporných vlastností procesora.)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -500,21 +528,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Tento program používa na získavanie času funkciu strftime.\n"
-"Použite správny kód pre formát zobrazenia času.\n"
-"Základné kódy sú:\n"
-"\t%A = deň v týždni\t\t%B = mesiac\n"
-"\t%c = dátum & čas\t\t%R = hodiny a minúty\n"
-"\t%V = týždeň\t\t\t%Z = použitá časová zóna\n"
-"\t%H = hodiny \t\t\t%M = minúty\n"
-"\t%X = miestny čas\t\t%x = miestny dátum"
+msgstr "Tento program používa na získavanie času funkciu strftime.\nPoužite správny kód pre formát zobrazenia času.\nZákladné kódy sú:\n\t%A = deň v týždni\t\t%B = mesiac\n\t%c = dátum & čas\t\t%R = hodiny a minúty\n\t%V = týždeň\t\t\t%Z = použitá časová zóna\n\t%H = hodiny \t\t\t%M = minúty\n\t%X = miestny čas\t\t%x = miestny dátum"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
 msgstr "Predvoľby hodín Orage"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -523,8 +542,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
 
@@ -539,7 +557,7 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Koniec"
 
@@ -547,13 +565,13 @@
 msgid "Due"
 msgstr "Kvôli"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Vyberte súbor..."
 
@@ -561,227 +579,281 @@
 msgid "Sound Files"
 msgstr "Zvukové súbory"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Všetky súbory"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Údaje o udalosti boli upravené."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovať?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Nie, neskončiť"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Á, ignorovať zmeny a skončiť"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "Koniec udalosti nastane skôr ako jej začiatok."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "Nie je nastavené"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Pridať udalosť do tohoto súboru"
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Predvolený súbor Orage"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Pridanie udalosti zlyhalo."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Nastala chyba pri pridávaní udalosti. Ďalšie podrobností hľadajte v súbore záznamu."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Aktualizácia udalosti zlyhala."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Ďalšie podrobností hľadajte v súbore záznamu. (Možno bol súbor aktualizovaný externe, mimo Orage?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
 msgstr "Udalosť bude odstránená."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Nie, zrušiť odstránenie"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Áno, odstrániť"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Vyberte si dátum"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Dnes"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
-msgstr "Táto schôdzka neexistuje."
+msgstr "Táto udalosť neexistuje."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
 msgstr "Pravdepodobne bolo odobrané, prosím aktualizujte obrazovku."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Aktuálne kategórie"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Pridať novú farebnú kategóriu"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Kategória:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Farby kategórií - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr " *** KÓPIA ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
-msgstr "Nová schôdzka - Orage"
+msgstr "Nová udalosť - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Záznam"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "U_ložiť a zatvoriť"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "_Kópia"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Uložiť"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Uložiť a zatvoriť"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Obnoviť"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Kópia"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Dostupný"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Základné"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Typ "
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Udalosť"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Udalosť, ktorá nastane. Napríklad:\n"
-"Schôdzka, narodeniny alebo televízna relácia."
+msgstr "Udalosť, ktorá nastane. Napríklad:\nSchôdzka, narodeniny alebo televízna relácia."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "Úlohy"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Niečo čo by ste mali urobiť. Napríklad:\n"
-"Umyte si auto, alebo otestujte novú verziu aplikácie Orage."
+msgstr "Niečo čo by ste mali urobiť. Napríklad:\nUmyte si auto, alebo otestujte novú verziu aplikácie Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Zápisok"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Zapíšte si čo sa stalo. Napríklad:\n"
-"Poznačte si, že volala mama, alebo napadol prvý sneh."
+msgstr "Zapíšte si čo sa stalo. Napríklad:\nPoznačte si, že volala mama, alebo napadol prvý sneh."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Názov "
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "Celodenná udalosť"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Začiatok"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Nastaviť"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Trvanie"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "dní"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "hodín"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "minút"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Dostupnosť"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Dokončené"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "Hotovo"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Kategórie"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Toto je špeciálna kategória, ktorú je možno použiť k zafarbeniu tejto "
-"schôdzky v pohľade na ich zoznam."
+msgstr "Toto je špeciálna kategória, ktorú je možno použiť na zafarbenie tejto udalosti v zozname."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "aktualizovať farby kategórií."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "Priorita"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Ak tu nastavíte 8 alebo viac, nebude udalosť zobrazená v oknách zoznamu.\nTúto vlastnosť môžete použiť na prečistenie okien zoznamov, ale potom je ťažké nájsť túto udalosť.\n(Alarmy sú spúšťané normálne.)\n(Existuje nedokumentovaný parameter, ktorým môžete zmeniť predvolenú hranicu 8.)"
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Poznámka"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -790,142 +862,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"Tieto zjednodušené príkazy pracujú ihneď:\n"
-"    <D> vkladá súčasný dátum vo formáte miestneho dátumu\n"
-"    <T> vkladá čas a\n"
-"    <DT> vkladá dátum a čas.\n"
-"\n"
-"Tieto hodnoty sa neskôr konvertujú iba ak sa:\n"
-"    <&Ynnnn> prekladá na súčasný rok mínus nnnn.\n"
-"(Táto vlastnosť sa dá použiť napríklad pre pripomenutie narodenín a "
-"informácí o veku osoby.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Tieto zjednodušené príkazy pracujú ihneď:\n    <D> vkladá súčasný dátum vo formáte miestneho dátumu\n    <T> vkladá čas a\n    <DT> vkladá dátum a čas.\n\nTieto hodnoty sa neskôr konvertujú iba ak sa:\n    <&Ynnnn> prekladá na súčasný rok mínus nnnn.\n(Táto vlastnosť sa dá použiť napríklad pre pripomenutie narodenín a informácí o veku osoby.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "Pred začatím"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "Pred koncom"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "Po začatí"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "Po skončení"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Pripomienka"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Čas pripomienky"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Kedy chcete byť upozornený:\n"
-" 1) pred začiatkom udalosti\n"
-" 2) pred dokončením úlohy\n"
-" 3) po dokončení úlohy"
+msgstr "Kedy chcete byť upozornený:\n 1) pred začiatkom udalosti\n 2) pred dokončením úlohy\n 3) po dokončení úlohy"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr "Trvalá pripomienka"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Vyberte túto možnosť, ak si želáte, aby Vám aplikácia Orage pripomenula "
-"udalosť aj keď v tom čase nebola aktívna."
+msgstr "Vyberte túto možnosť, ak si želáte, aby Vám aplikácia Orage pripomenula udalosť aj keď v tom čase nebola aktívna."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "Použiť"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
 msgstr "Vyberte túto možnosť, ak si želáte zvukovú pripomienku"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "Opakovať zvukovú pripomienku"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "krát"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "sekundový interval"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "Vizuálny"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Použiť okno Orage"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
 msgstr "Vyberte túto možnosť, ak si želáte pripomenutie oknom aplikácie Orage"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Použiť oznámenie"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
 msgstr "Vyberte túto možnosť, ak si želáte oznámenie o pripomienke"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "Nastaviť dobu vypršania"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
 msgstr "Vyberte túto možnosť, ak si želáte, aby oznámenie automaticky vypršalo"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 = predvolená systémová doba vyprašania"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "sekúnd"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Procedúra"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
-msgstr ""
-"Vyberte túto možnosť, ak si želáte spustiť procedúru, alebo skript "
-"pripomienky"
+msgstr "Vyberte túto možnosť, ak si želáte spustiť procedúru, alebo skript pripomienky"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -935,165 +989,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
-"Musíte zadať všetky ukončovacie a podobné znaky.\n"
-"Tento reťazec je jednoducho daný do interpretera do procesu.\n"
-"Nasledujúce špeciálne príkazy sú nahradené počas behu:\n"
-"\t<&T>  názov udalosti\n"
-"\t<&D>  popis udalosti\n"
-"\t<&AT> čas pripomienky\n"
-"\t<&ST> začiatok udalosti\n"
-"\t<&ET> koniec udalosti"
+msgstr "Musíte zadať všetky ukončovacie a podobné znaky.\nTento reťazec je jednoducho daný do interpretera do procesu.\nNasledujúce špeciálne príkazy sú nahradené počas behu:\n\t<&T>  názov udalosti\n\t<&D>  popis udalosti\n\t<&AT> čas pripomienky\n\t<&ST> začiatok udalosti\n\t<&ET> koniec udalosti"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
 msgstr "Vyskúšať túto pripomienku ihneď"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "Predvolená pripomienka"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
 msgstr "Uložiť aktuálne nastavenia ako predvolenú pripomienku"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
 msgstr "Použiť predvolenú pripomienku ako aktuálne nastavenie"
 
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Žiadne"
-
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Denne"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Týždenne"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Mesačne"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Ročne"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
 msgstr "Po hodine"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Pon"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Uto"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Str"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Štv"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Pia"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "Sob"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "Neď"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Opakovanie"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Zložitosť"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Základné"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Rozšírené"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "Použite túto možnosť, ak si želáte opakujúcu sa pripomienku"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Použite túto možnosť, ak si želáte nastaviť zložitejšie časové údaje ako "
-"napríklad:\n"
-" Každú sobotu a nedeľu, alebo \n"
-" prvý utorok v mesiaci"
+msgstr "Použite túto možnosť, ak si želáte nastaviť zložitejšie časové údaje ako napríklad:\n Každú sobotu a nedeľu, alebo \n prvý utorok v mesiaci"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Opakovať"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Káždý"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "výskyt"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Obmedzenie opakovania na určitý interval.\n"
-" Napríklad: Každý tretí deň:\n"
-" Opakovanie = denne a interval = 3"
+msgstr "Obmedzenie opakovania na určitý interval.\n Napríklad: Každý tretí deň:\n Opakovanie = denne a interval = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Obmedzenie"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Opakovať stále"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Opakovať "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Opakovať do "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Všedné dni"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "Ktorý deň"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1101,293 +1136,297 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Upresnite deň v týždni pre mesačnú a ročnú udalosť.\n"
-" Napríklad:\n"
-" Druhá streda v každom mesiaci:\n"
-"\tOpakovanie = mesačne,\n"
-"\tDni v týždni = zaškrtnite len stredu,\n"
-"\tVyberte deň = vyberte 2 z číslic pod stredou"
+msgstr "Upresnite deň v týždni pre mesačnú a ročnú udalosť.\n Napríklad:\n Druhá streda v každom mesiaci:\n\tOpakovanie = mesačne,\n\tDni v týždni = zaškrtnite len stredu,\n\tVyberte deň = vyberte 2 z číslic pod stredou"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr "Zoznam úloh TODO"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"Zoznam úloh TODO opakovane začína v čase zahájenia a opakuje sa v každom "
-"intervale, bez overenia či bol dokončený"
+msgstr "Zoznam úloh TODO opakovane začína v čase zahájenia a opakuje sa v každom intervale, bez overenia či bol dokončený"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"Opakovanie úloh TODO je založené na čase dokončenia a opakuje sa po "
-"intervale vypočítanom z predchádzajúceho času dokončenia.\n"
-"(Históriu zoznamu úloh TODO nie je možné vypísať, pretože opakovanie úloh sa "
-"mení po každom dokončení.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "Opakovanie úloh TODO je založené na čase dokončenia a opakuje sa po intervale vypočítanom z predchádzajúceho času dokončenia.\n(Históriu zoznamu úloh TODO nie je možné vypísať, pretože opakovanie úloh sa mení po každom dokončení.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "Výnimky"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"Viac dní s výnimkami pridáte kliknutím na dni v kalendári nižšie.\n"
-"Výnimku tvorí odobratie (-) alebo zahrnutie (+) v závislosti na výbere.\n"
-"Odoberiete ich kliknutím na dátum."
+msgstr "Viac dní s výnimkami pridáte kliknutím na dni v kalendári nižšie.\nVýnimku tvorí odobratie (-) alebo zahrnutie (+) v závislosti na výbere.\nOdoberiete ich kliknutím na dátum."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr "Pridať odobratý dátum (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr "Odobraté dni sú celé dni, v ktorých nie je plánovaná žiadna schôdzka"
+msgstr "Odobraté dni sú celé dni, v ktorých nie je plánovaná žiadna udalosť"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
 msgstr "Pridať zahrnutý čas (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"Zahrnuté časy sú v rovnakej časovej zóne ako počiatočný čas, ale môžu mať "
-"iný čas"
+msgstr "Zahrnuté časy sú v rovnakej časovej zóne ako počiatočný čas, ale môžu mať iný čas"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
 msgstr "Dátumy akcií"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "Zo_braziť"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "P_rejsť"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Nový"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Predchádzajúci deň"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Dnes"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Nasledujúci deň"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Pred týždňom"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Včera"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Zajtra"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Budúci týždeň"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Obnoviť"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Neznáma"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "       Počet zobrazených dní"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - denný prehľad"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Celodenná udalosť"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Čas"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "Neboli vybrané žiadne riadky"
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
 msgstr "Kliknutím vyberte riadok a potom ho môžete skopírovať."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"Týmto natrvalo odstránite všetky\n"
-"vybrané schôdzky."
+msgstr "Týmto natrvalo odstránite všetky\nvybrané udalosti."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Áno, odstrániť "
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Predchádzajúci deň"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Nasledujúci deň"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Nájsť"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "Prehľad dňa"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Dni navyše pre zobrazenie"
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Zobraziť ďalšie dni"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "len prvé opakovanie"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Zvoľte toto, ak chcete vidieť len prvú opakujúcu sa udalosť, predvolene sú zobrazované všetky.\nPamätajte, že toto tiež zobrazuje všetky urgencie.\nnezabudnite, že opakujúce sa udalosti sa môžu objavovať vyššie v zozname, pretože je zobrazený len prvý výskyt."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "aj staré"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Zvoľte toto, ak chcete vidieť aj staré udalosti. Možno to zvoliť len ak je zvolené „Len prvá opakujúca”, čo bráni príliš dlhým zoznamom.\nPamätajte, že výber ďalších dňov stále definuje, či sú zobrazované novšie udalosti."
+
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "Položky zápisu začínajúce od:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Hľadať"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "Hľadať ďalšie"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Značky"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Názov"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Pre úpravu dvakrát kliknite na riadok.\n"
-"\n"
-"Značky:\n"
-"\t 1. Pripomienka: n=bez pripomienky\n"
-"\t\tA=vizuálna pripomienka S=aj zvuková pripomienka\n"
-"\t 2. Opakovanie: n=bez opakovania\n"
-"\t\t D=Denne W=Týždenne M=Mesačne Y=Ročne\n"
-"\t 3. Typ: f=dostupný B=Zaneprázdnený\n"
-"\t 4. Umiestnené v súbore:\n"
-"\t\tO=Orage A=Archív F=Externý\n"
-"\t 5. Typ schôdzky:\n"
-"\t\tE=Udalosť T=Úlohy J=Zápisok"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Vyberte si dátum"
+msgstr "Dvojklikom na riadku ho upravíte.\n\nPríznaky v poradí:\n\t 1. Alarm: n=bez alarmu\n\t\t A=Alarm, P=Trvalý alarm\n\t 2. Opakovanie: n=bez opakovania\n\t\t H=Hodinovo, D=Denne, W=Týždenne, M=Mesačne, Y=Ročne\n\t 3. Typ: f=dostupný, B=Obsadený\n\t 4. Umiestnené v súbore:\n\t\tO=Orage, A=Archív, F=Cudzí\n\t 5. Typ udalosti:\n\t\tE=Event T=Todo J=Journal"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tOpakovanie skončilo, presúva sa do archívneho súboru."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Archivovanie nie je povolené. Ukončuje sa"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Prah archívu: %d mesiac(ov)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tArchivujú sa udalosti, ktoré predchádzajú dátumu: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Archivuje sa uid: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tVTODO nie je úplné a nebolo archivované"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tOpakujúci sa. Posledný rok: %04d, mesiac: %02d, deň: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Archivácia hotová\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Zahajovanie odobratia archívu."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
-msgstr "\tFÁZA 1: obnovenie opakujúcich sa schôdzok do pôvodného stavu"
+msgstr "\tFÁZA 1: obnovenie opakujúcich sa udalostí do pôvodného stavu"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
-msgstr "\tFÁZA 2: vrátenie archivovaných schôdzok"
+msgstr "\tFÁZA 2: vrátenie archivovaných udalostí"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Odobranie archívu dokončené\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Prednastavená pripomienka kalendára"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Vytvorený zoznam alarmov pre hlavný súbor Orage:"
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-"Zostaviť zoznam upozornení: Pridaných %d výstrah. Spracovaných %d udalostí."
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Vytvorený zoznam alarmov pre  cudzí súbor: %s (%s)"
+
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\tPridaných %d alarmov. Spracovaných %d udalostí."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tBolo nájdených %d pripomienok, z ktorých je %d aktívnych. (Bolo "
-"prehľadaných %d opakujúcich sa pripomienok.)"
+msgstr "\tBolo nájdených %d pripomienok, z ktorých je %d aktívnych. (Bolo prehľadaných %d opakujúcich sa pripomienok.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1405,7 +1444,16 @@
 msgid "Import file preprocessing done"
 msgstr "Predspracovanie importu súboru bolo dokončené"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Zistená externá aktualizácia súboru %s."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Obnovenie alarmov a kalendára kvôli aktualizácii externého súboru."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Súbory kalendára"
 
@@ -1413,617 +1461,670 @@
 msgid "Current foreign files"
 msgstr "Aktuálne externé súbory"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "LEN NA ČÍTANIE"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "PRE ČÍTANIE AJ ZÁPIS"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Žiadne externé súbory *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Pridanie externého súboru zlyhalo"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage môže spracovať len 10 cudzích súborov. Limit dosiahnutý."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Meno súboru je prázdne."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Názov je prázdny."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Súbor neexistuje."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Rovnaké meno súboru už v Orage existuje."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Rovnaký názov už v Orage existuje."
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Import/export"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Import"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Čítať zo súboru:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Názvy súborov oddeľte čiarkami.\n"
-" NOTE: čiarka nie je platným znakom v názvoch súborov aplikácie Orage."
+msgstr "Názvy súborov oddeľte čiarkami.\n NOTE: čiarka nie je platným znakom v názvoch súborov aplikácie Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Export"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Zapísať do súboru:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Vybrať"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
-msgstr "Všetky schôdzky"
+msgstr "Všetky udalosti"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
-msgstr "Pomenované schôdzky"
+msgstr "Pomenované udalosti"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Načítajú sa iba schôdzky z hlavného súboru.\n"
-"Archivované a externé udalosti sa neexportujú."
+msgstr "Načítajú sa iba udalosti z hlavného súboru.\nArchivované a externé udalosti sa neexportujú."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Načítajú sa iba schôdzky z hlavného súboru.\n"
-"Externé udalosti sa neexportujú."
+msgstr "Načítajú sa iba udalosti z hlavného súboru.\nExterné udalosti sa neexportujú."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "Tieto položky môžete jednoducho pretiahnuť z okna zoznamu udalostí."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
-msgstr "Čísla schôdzok UID aplikácie Orage oddelené čiarkami."
+msgstr "UID udalostí Orage oddelené čiarkami."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Archivovanie"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Archivovať teraz (prah: %d mesiacov)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Prah archívu môžete zmeniť v parametroch"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Obnovenie archívu do pôvodného stavu"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Vráti všetky archivované udalosti do hlavného súboru aplikácie\n"
-"Orage a odoberie súbor archívu. Táto funkcia je užitočná napríklad\n"
-"pri exporte a presune schôdzok na iný systém."
+msgstr "Vráti všetky archivované udalosti do hlavného súboru aplikácie\nOrage a odoberie súbor archívu. Táto funkcia je užitočná napríklad\npri exporte a presune udalostí na iný systém."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Súbory Orage"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Hlavný súbor kalendára Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Aktuálny súbor"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Nový súbor"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Voľby akcie"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Aktuálny súbor:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Nový súbor:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Voľby akcie:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Premenovať"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Premenovanie interného súboru aplikácie Orage.\n"
-"Nezasahuje do vonkajšieho systému súborov.\n"
-"Nový súbor už musí existovať."
+msgstr "Premenovanie interného súboru aplikácie Orage.\nNezasahuje do vonkajšieho systému súborov.\nNový súbor už musí existovať."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Kopírovať"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr "Aktuálny súbor sa skopíruje a ostane nezmenený v pôvodnom umiestnení."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Presunúť"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "Aktuálny súbor sa presunie a z pôvodného umiestnenia bude vymazaný."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Archívny súbor"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Externé súbory"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Pridať nový externý súbor"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Externý súbor:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Voľby"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Zobrazené meno:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Len na čítanie"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Túto možnosť nastavte, ak si chcete byť istí, že tento súbor aplikácia Orage "
-"nikdy nepozmení.\n"
-"Majte na pamäti, že pozmenením externých súborov ich môžete urobiť "
-"nekompatibilnými s pôvodnými nástrojmi, v ktorých boli vytvorené!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Túto možnosť nastavte, ak si chcete byť istí, že tento súbor aplikácia Orage nikdy nepozmení.\nMajte na pamäti, že pozmenením externých súborov ich môžete urobiť nekompatibilnými s pôvodnými nástrojmi, v ktorých boli vytvorené!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Používateľovi je zobrazené toto interné meno namiesto mena súboru."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Výmena dát - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tToto je %s verzie %s\n"
-"\n"
+msgstr "\tToto je %s verzie %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tVydané pod podmienkami licencie GNU General Public License.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tSkompilované proti GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "používa GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tPoužíva DBUS pre import.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tNepoužíva DBUS. Import bude pracovať len čiastočne.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tPoužíva sa knižnica libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tNepoužíva sa knižnica libnotify \n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tPoužíva sa automatické archivovanie.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tNepoužíva sa archivácia.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tPoužíva sa systémový balíček libical.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tPoužíva sa miestna verzia Orage balíčka libical.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Použitie: orage [voľby] [súbory]\n"
-"\n"
+msgstr "Použitie: orage [voľby] [súbory]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Voľby:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tzobrazí verziu orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tvypíšte tento text\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \tzobrazí formulár možností\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\tprepne orage na viditeľné/neviditeľné\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) súbor [RW] \tpridá externý súbor\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) súbor [RW] [názov] \tpridá cudzí súbor\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) súbor \todoberie externý súbor\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
-"--export (-e) súbor [udalosť...] \texportuje udalosti z aplikácie Orage do "
-"súboru\n"
+msgstr "--export (-e) súbor [udalosť...] \texportuje udalosti z aplikácie Orage do súboru\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "súbory=súbory typu ical pre načítanie do aplikácie orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\taplikácia orage nebola zostavená s podporou dbus. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tbez podpory dbus sa môžu [súbory] a možnosti externých súborov (-a & -r) "
-"použiť iba pri spúšťaní aplikácie orage\n"
+msgstr "\tbez podpory dbus sa môžu [súbory] a možnosti externých súborov (-a & -r) použiť iba pri spúšťaní aplikácie orage\n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Neznáma voľba %s\n"
-"\n"
+msgstr "\nNeznáma voľba %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Výmena dát"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Zobraziť zvolený _dátum"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Zobraziť zvolený _týždeň"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Vybrať _dnešný dátum"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
 msgstr "Zobraziť _svetový čas"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Pomocník"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Názov nie je definovaný"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr " Umiestnenie: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n Poznámka:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Nikdy"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Názov: %s\n"
-" Začiatok:\t%s\n"
-" Koniec:\t\t%s\n"
-" Poznámka:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "Názov: %s\n%s Začiatok:\t%s\n Koniec:\t%s\n Dokončené:\t%s%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Názov: %s\n"
-" Začiatok:\t%s\n"
-" Koniec:\t\t%s\n"
-" Poznámka:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Názov: %s\n%s Začiatok:\t%s\n Koniec:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Zoznam úloh:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Udalosti pre %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>Udalosti pre %s: - %s</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "Hlavné nastavenia"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Časová zóna"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "Vždy by ste mali definovať Vaše časové pásmo."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "Prah archivácie (v mesiacoch)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = nearchivuje sa)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Archivácia sa používa pre úsporu času a miesta pri spracovaní udalostí."
+msgstr "Archivácia sa používa pre úsporu času a miesta pri spracovaní udalostí."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Zvukový príkaz"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-"Tento príkaz je odovzdaný shell-u za účelom prehrania zvukovej pripomienky."
+msgstr "Tento príkaz je odovzdaný shell-u za účelom prehrania zvukovej pripomienky."
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "Nastavenia zobrazenia"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Okno kalendára"
 
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Hlavné okno kalendára"
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Podrobnosti zobrazenia kalendára"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "Zobraziť rám okna"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "Zobraziť ponuku"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Zobraziť mesiac a rok"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
 msgstr "Zobraziť názvy dní"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
 msgstr "Zobraziť čísla týždňov"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Zobraziť mesiac a rok"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Informačné okná kalendára"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "Zobraziť zoznam úloh"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
 msgstr "Počet dní zobrazených v prehľadovom okne"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
 msgstr "0 = nezobrazovať zoznam udalostí"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Viditeľnosť kalendára"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
 msgstr "Zobraziť na všetkých pracovných plochách"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
 msgstr "Vždy na vrchu"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "Zobraziť v taskbare"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "Zobraziť v pagery"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "Zobraziť v oznamovacej oblasti"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "Kalendár sa spúšťa"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Zobrazený"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Skrytý"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Minimalizovaný"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr "Ďalšie nastavenia"
-
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
 msgstr "Pri otvorení okna kalendára"
 
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "Vybrať _dnešný dátum"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr "Vybrať naposledy vybraný dátum"
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "Použiť dynamickú ikonu v oznamovacej oblasti"
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "Používať dynamické ikony"
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Zvoliť dnešný dátum"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Zvoliť predtým vybratý dátum"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Dvojité kliknutie na deň kalendára zobrazí"
 
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "Dynamická ikona zobrazuje aktuálny mesiac a deň v mesiaci."
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Dvojité kliknutie v hlavnom kalendári zobrazí"
-
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
 msgstr "Denný prehľad"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
 msgstr "Zoznam udalostí"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Ďalšie nastavenia"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
 msgstr "Okno zoznamu udalostí"
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
 msgstr "Počet zostávajúcich dní k zobrazeniu v zozname udalostí"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
-msgstr ""
-"Toto je iba predvolená hodnota, ktorú môžete zmeniť v okne zoznamu "
-"aktuálnych udalostí."
+msgstr "Toto je iba predvolená hodnota, ktorú môžete zmeniť v okne zoznamu aktuálnych udalostí."
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Zobraziť len prvú opakujúcu sa udalosť"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Predvolený prvý deň okna denného prehľadu"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Prvý deň týždňa"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Zvolený deň"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Použiť dynamickú ikonu v oznamovacej oblasti"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Používať dynamické ikony"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Dynamická ikona zobrazuje aktuálny mesiac a deň v mesiaci."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
-msgstr ""
+msgstr "Použiť budík"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
+msgstr "Tento časovač použite iba v prípade, že nastanú problémy s aplikáciou Orage po uspaní, alebo hibernácii. (Napríklad ak sa ikona v systémovej oblasti neprekresľuje, alebo sa nespúšťajú upozornenia.)"
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Predvolený vizuálny alarm cudzieho súboru"
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Okno Orage"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Použiť oznámenia"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Vždy skončiť, pri požiadavke na zatvorenie"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Vždy skončiť"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Predvolene ostáva Orage po zatvorení spustený na pozadí . Táto voľba mení správanie tak, aby Orage skončil a neostával spustený na pozadí."
+
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Predvoľby Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
 msgstr "Prvé spustenie aplikácie Orage. Vyhľadáva sa predvolená časová zóna."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Predvolené časové pásmo nastavená na %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
 msgstr "Predvolené časové pásmo sa nenašlo, nastavte ho ručne."
 
@@ -2035,40 +2136,35 @@
 msgid "Open"
 msgstr "Otvoriť"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Pripomienkovač - Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Odložiť"
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "Opakovane pripomenúť po zadanom čase"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr "Stlačte <Spustiť> pre opätovné pripomenutie po zadanom čase:"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Nasledujúce aktívne pripomienky:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d d %02d h %02d minút do: %s"
+msgstr "\n%02d d %02d h %02d minút do: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Nenašli sa žiadne aktívne pripomienky"
+msgstr "\nNenašli sa žiadne aktívne pripomienky"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2091,1537 +2187,2229 @@
 msgstr "Afrika/Algiers"
 
 #: ../src/timezone_names.c:41
+msgid "Africa/Asmara"
+msgstr "Afrika/Asmara"
+
+#: ../src/timezone_names.c:42
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
-#: ../src/timezone_names.c:42
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "Afrika/Banjul"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "Afrika/Cairo"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "Afrika/Conakry"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_Salaam"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "Afrika/Djibouti"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "Afrika/Douala"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Aaiun"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "Afrika/Freetown"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaborone"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "Afrika/Juba"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johannesburg"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "Afrika/Khartoum"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinshasa"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "Afrika/Libreville"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbashi"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "Afrika/Mogadishu"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovia"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndjamena"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamey"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nouakchott"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ouagadougou"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripoli"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "Afrika/Windhoek"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "Amerika"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "Amerika/Anchorage"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "Amerika/Anguilla"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "Amerika/Antigua"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "Amerika/Araguaina"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "Amerika/Argentína/Buenos_Aires"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "Amerika/Argentína/Catamarca"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "Amerika/Argentína/ComodRivadavia"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "Amerika/Argentína/Cordoba"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "Amerika/Argentína/Jujuy"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "Amerika/Argentína/La_Rioja"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "Amerika/Argentína/Mendoza"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "Amerika/Argentína/Rio_Gallegos"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "Amerika/Argentína/Salta"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "Amerika/Argentína/San_Juan"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "Amerika/Argentína/San_Luis"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "Amerika/Argentína/Tucuman"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "Amerika/Argentína/Ushuaia"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "Amerika/Asuncion"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "Amerika/Atikokan"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "Amerika/Atka"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "Amerika/Bahia"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "Amerika/Bahia_Banderas"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "Amerika/Blanc-Sablon"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "Amerika/Boise"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Cambridge_Bay"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "Amerika/Campo_Grande"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "Amerika/Cancun"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "Amerika/Caracas"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "Amerika/Catamarca"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "Amerika/Cayenne"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "Amerika/Cayman"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "Amerika/Chicago"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "Amerika/Chihuahua"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "Amerika/Coral_Harbour"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "Amerika/Cordoba"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "Amerika/Costa_Rica"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "Amerika/Creston"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "Amerika/Cuiaba"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "Amerika/Curacao"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "Amerika/Danmarkshavn"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "Amerika/Dawson"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Dawson_Creek"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "Amerika/Dominica"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "Amerika/Ensenada"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "Amerika/Eirunepe"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "Amerika/Fort_Wayne"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glace_Bay"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "Amerika/Godthab"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "Amerika/Goose_Bay"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grand_Turk"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "Amerika/Guadeloupe"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "Amerika/Guatemala"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "Amerika/Guayaquil"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "Amerika/Guyana"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "Amerika/Halifax"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosillo"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
-msgstr "Amerika/Indiaa/Indiaapolis"
+msgstr "Amerika/Indiana/Indiaapolis"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
-msgstr "Amerika/Indiaa/Knox"
+msgstr "Amerika/Indiana/Knox"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
-msgstr "Amerika/Indiaa/Marengo"
+msgstr "Amerika/Indiana/Marengo"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "Amerika/Indiana/Petersburg"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "Amerika/Indiana/Tell_City"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
-msgstr "Amerika/Indiaa/Vevay"
+msgstr "Amerika/Indiana/Vevay"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "Amerika/Indiana/Vincennes"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "Amerika/Indiana/Winamac"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
-msgstr "Amerika/Indiaapolis"
+msgstr "Amerika/Indianapolis"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "Amerika/Iqaluit"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "Amerika/Jamaica"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "Amerika/Jujuy"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "Amerika/Juneau"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentucky/Louisville"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentucky/Monticello"
 
-#: ../src/timezone_names.c:154
-msgid "America/La_Paz"
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "Amerika/Knox_IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "Amerika/Kralendijk"
+
+#: ../src/timezone_names.c:181
+msgid "America/La_Paz"
 msgstr "Amerika/La_Paz"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Angeles"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "Amerika/Louisville"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "Amerika/Lower_Princes"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "Amerika/Maceio"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "Amerika/Managua"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "Amerika/Marigot"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "Amerika/Martinique"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "Amerika/Matamoros"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "Amerika/Mazatlan"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "Amerika/Menominee"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "Amerika/Metlakatla"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "Amerika/Mexico_City"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "Amerika/Miquelon"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "Amerika/Moncton"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "Amerika/Monterrey"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "Amerika/Montserrat"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "Amerika/Nome"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "Amerika/Severná_Dakota/Beulah"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "Amerika/Severná_Dakota/Center"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "Amerika/Severná_Dakota/New_Salem"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "Amerika/Noronha"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "Amerika/Ojinaga"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "Amerika/Phoenix"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Port-au-Prince"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_of_Spain"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "Amerika/Porto_Acre"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "Amerika/Porto_Velho"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Puerto_Rico"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "Amerika/Rainy_River"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Rankin_Inlet"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "Amerika/Recife"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "Amerika/Resolute"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branco"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "Amerika/Rosario"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "Amerika/Santa_Isabel"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "Amerika/Santarem"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "Amerika/Santiago"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo_Domingo"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao_Paulo"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "Amerika/Scoresbysund"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "Amerika/Shiprock"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "Amerika/Sitka"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "Amerika/St_Barthelemy"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "Amerika/St_Johns"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "Amerika/St_Kitts"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "Amerika/St_Lucia"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "Amerika/St_Thomas"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "Amerika/St_Vincent"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "Amerika/Swift_Current"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegucigalpa"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "Amerika/Thule"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Thunder_Bay"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "Amerika/Tijuana"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "Amerika/Toronto"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "Amerika/Vancouver"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "Amerika/Virgin"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "Amerika/Whitehorse"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "Amerika/Winnipeg"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "Amerika/Yakutat"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "Amerika/Yellowknife"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Antarktída"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Antarktída/Casey"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Antarktída/Davis"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktída/DumontDUrville"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Antarktída/Macquarie"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Antarktída/Mawson"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Antarktída/McMurdo"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Antarktída/Palmer"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Antarktída/Rothera"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Antarktída/South_Pole"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "Antarktída/Syowa"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Antarktída/Vostok"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Arktída"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Arktída/Longyearbyen"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Ázia"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Ázia/Aden"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Ázia/Almaty"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Ázia/Amman"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Ázia/Anadyr"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Ázia/Aqtau"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Ázia/Aqtobe"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "Ázia/Ashgabat"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Ázia/Ashkhabad"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "Ázia/Baghdad"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Ázia/Bahrain"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Ázia/Baku"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Ázia/Bangkok"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Ázia/Beirut"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Ázia/Bishkek"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Ázia/Brunei"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Ázia/Calcutta"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Ázia/Choibalsan"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "Ázia/Chongqing"
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "Ázia/Chungking"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Ázia/Colombo"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Ázia/Dacca"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "Ázia/Damascus"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Ázia/Dhaka"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Ázia/Dili"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Ázia/Dubai"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Ázia/Dushanbe"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Ázia/Gaza"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Ázia/Harbin"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Ázia/Hebron"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Ázia/Hong_Kong"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Ázia/Ho_Chi_Minh"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Ázia/Hovd"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Ázia/Irkutsk"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Ázia/Istanbul"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Ázia/Jakarta"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Ázia/Jayapura"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Ázia/Jerusalem"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Ázia/Kabul"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Ázia/Kamchatka"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Ázia/Karachi"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Ázia/Kashgar"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Ázia/Kathmandu"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Ázia/Katmandu"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Ázia/Khandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Ázia/Kolkata"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Ázia/Krasnoyarsk"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Ázia/Kuala_Lumpur"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Ázia/Kuching"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Ázia/Kuvajt"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Ázia/Macao"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Ázia/Macau"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Ázia/Magadan"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Ázia/Makassar"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Ázia/Manila"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Ázia/Muscat"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Ázia/Nicosia"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Ázia/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Ázia/Novosibirsk"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Ázia/Omsk"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Ázia/Oral"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Ázia/Phnom_Penh"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Ázia/Pontianak"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Ázia/Pyongyang"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Ázia/Qatar"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Ázia/Qyzylorda"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Ázia/Rangoon"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Ázia/Riyadh"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Ázia/Riyadh87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Ázia/Riyadh88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Ázia/Riyadh89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Ázia/Saigon"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Ázia/Sakhalin"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Ázia/Samarkand"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Ázia/Seoul"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Ázia/Shanghai"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Ázia/Singapore"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Ázia/Taipei"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Ázia/Tashkent"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Ázia/Tbilisi"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Ázia/Tehran"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Ázia/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Ázia/Thimbu"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Ázia/Thimphu"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Ázia/Tokyo"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "Ázia/Ujung_Pandang"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Ázia/Ulaanbaatar"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Ázia/Ulan_Bator"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Ázia/Urumqi"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Ázia/Ust-Nera"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Ázia/Vientiane"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Ázia/Vladivostok"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Ázia/Yakutsk"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Ázia/Yekaterinburg"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Ázia/Yerevan"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Atlantik"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azores"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermuda"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Atlantik/Canary"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Cape_Verde"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "Atlantik/Faeroe"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlantik/Faroe"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantik/Jan_Mayen"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "Atlantik/Madeira"
 
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr "Atlantik/Reykjavík"
+#: ../src/timezone_names.c:374
+msgid "Atlantic/Reykjavik"
+msgstr "Atlantik/Reykjavík"
+
+#: ../src/timezone_names.c:375
+msgid "Atlantic/South_Georgia"
+msgstr "Atlantik/South_Georgia"
+
+#: ../src/timezone_names.c:376
+msgid "Atlantic/St_Helena"
+msgstr "Atlantik/St_Helena"
+
+#: ../src/timezone_names.c:377
+msgid "Atlantic/Stanley"
+msgstr "Atlantik/Stanley"
+
+#: ../src/timezone_names.c:378
+msgid "Australia"
+msgstr "Austrália"
+
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Austrália/ACT"
+
+#: ../src/timezone_names.c:380
+msgid "Australia/Adelaide"
+msgstr "Austrália/Adelaide"
+
+#: ../src/timezone_names.c:381
+msgid "Australia/Brisbane"
+msgstr "Austrália/Brisbane"
+
+#: ../src/timezone_names.c:382
+msgid "Australia/Broken_Hill"
+msgstr "Austrália/Broken_Hill"
+
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Austrália/Currie"
+
+#: ../src/timezone_names.c:384
+msgid "Australia/Darwin"
+msgstr "Austrália/Darwin"
+
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Austrália/Eucla"
+
+#: ../src/timezone_names.c:386
+msgid "Australia/Hobart"
+msgstr "Austrália/Hobart"
+
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr "Austrália/Lindeman"
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr "Austrália/Lord_Howe"
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "Austrália/Melbourne"
+
+#: ../src/timezone_names.c:390
+msgid "Australia/Perth"
+msgstr "Austrália/Perth"
+
+#: ../src/timezone_names.c:391
+msgid "Australia/Sydney"
+msgstr "Austrália/Sydney"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brazília"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brazília/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brazília/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brazília/East"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brazília/West"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Kanada/Atlantic"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Kanada/Central"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Kanada/East-Saskatchewan"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Kanada/Eastern"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Kanada/Mountain"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Kanada/Newfoundland"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Kanada/Pacific"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Kanada/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Kanada/Yukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Čile"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Čile/Vnútrozemský"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Čile/Východno-ostrovný"
 
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr "Atlantik/South_Georgia"
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Ostatné"
 
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr "Atlantik/St_Helena"
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Ostatné/GMT"
 
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr "Atlantik/Stanley"
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Ostatné/GMT+0"
 
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr "Austrália"
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Ostatné/GMT+1"
 
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr "Austrália/Adelaide"
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Ostatné/GMT+10"
 
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr "Austrália/Brisbane"
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Ostatné/GMT+11"
 
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr "Austrália/Broken_Hill"
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Ostatné/GMT+12"
 
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr "Austrália/Darwin"
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Ostatné/GMT+2"
 
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr "Austrália/Hobart"
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Ostatné/GMT+3"
 
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr "Austrália/Lindeman"
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Ostatné/GMT+4"
 
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr "Austrália/Lord_Howe"
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Ostatné/GMT+5"
 
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr "Austrália/Melbourne"
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Ostatné/GMT+6"
 
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr "Austrália/Perth"
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Ostatné/GMT+7"
 
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr "Austrália/Sydney"
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Ostatné/GMT+8"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Ostatné/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Ostatné/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Ostatné/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Ostatné/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Ostatné/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Ostatné/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Ostatné/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Ostatné/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Ostatné/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Ostatné/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Ostatné/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Ostatné/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Ostatné/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Ostatné/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Ostatné/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Ostatné/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Ostatné/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Ostatné/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Ostatné/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Ostatné/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Ostatné/Univerzálny"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Ostatné/Zulu"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Európa"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "Európa/Amsterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Európa/Andorra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Európa/Atény"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Európa/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Európa/Belgrade"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Európa/Berlín"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Európa/Bratislava"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Európa/Brusel"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Európa/Bukurešť"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Európa/Budapešt"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Európa/Busingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Európa/Chisinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Európa/Kodaň"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "Európa/Dublin"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Európa/Gibraltar"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Európa/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Európa/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Európa/Isle_of_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Európa/Istanbul"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Európa/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Európa/Kaliningrad"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Európa/Kiev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Európa/Lisbon"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "Európa/Ljubljana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Európa/Londín"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Európa/Luxemburg"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Európa/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Európa/Malta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Európa/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Európa/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Európa/Monaco"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Európa/Moskva"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "Európa/Nicosia"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Európa/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Európa/Paríž"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Európa/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Európa/Praha"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Európa/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Európa/Rome"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Európa/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Európa/San_Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Európa/Sarajevo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "Európa/Simferopoľ"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "Európa/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Európa/Sofia"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Európa/Štokholm"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Európa/Tallinn"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Európa/Tirana"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Európa/Tiraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "Európa/Užhorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Európa/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Európa/Vatikán"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Európa/Viedeň"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "Európa/Vilnius"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Európa/Volgograd"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "Európa/Varšava"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Európa/Záhreb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "Európa/Zaporozhye"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "Európa/Zurich"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "India"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "India/Antananarivo"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "India/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "India/Christmas"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "India/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "India/Comoro"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "India/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "India/Mahe"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "India/Maldivy"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "India/Maurícius"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "India/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "India/Réunion"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Mexiko"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Mexiko/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Mexiko/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Mexiko/General"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Mideast"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Mideast/Riyadh87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Mideast/Riyadh88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Mideast/Riyadh89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Pacifik"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "Pacifik/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Pacifik/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Pacifik/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Pacifik/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "Pacifik/Easter"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "Pacifik/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "Pacifik/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Pacifik/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "Pacifik/Fiji"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Pacifik/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Pacifik/Galapagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Pacifik/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "Pacifik/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Pacifik/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Pacifik/Honolulu"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Pacifik/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "Pacifik/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "Pacifik/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "Pacifik/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Pacifik/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Pacifik/Marquesas"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Pacifik/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Pacifik/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Pacifik/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Pacifik/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "Pacifik/Noumea"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Pacifik/Pago_Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Pacifik/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "Pacifik/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Pacifik/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "Pacifik/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Pacifik/Port_Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Pacifik/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Pacifik/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pacifik/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Pacifik/Tahiti"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Pacifik/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Pacifik/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Pacifik/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Pacifik/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Pacifik/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "Pacifik/Yap"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "USA"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "USA/Aljaška"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "USA/Aleutian"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "USA/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "USA/Stredná"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "USA/Východná"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "USA/East-Indiana"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "USA/Hawaii"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "USA/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "USA/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "USA/Mountain"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "USA/Pacific"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "USA/Pacific-New"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "USA/Samoa"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "Nová udalosť"
@@ -3639,224 +4427,26 @@
 msgstr "Zobrazovať čas a dátum?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Kalendár"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Predvoľby kalendára Orage"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Predvoľby Orage"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Nastavenia pre aplikáciu Kalendár Xfce 4 (Orage)"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Kalendár pracovnej plochy"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Predvoľby kalendára Orage"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Kalendár"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Kalendár Orage"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Názov: %s\n"
-#~ " Začiatok:\t%s\n"
-#~ " Kvôli:\t\t%s\n"
-#~ " Koniec:\t\t%s\n"
-#~ " Poznámka:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Všetky znaky ESC musíte vyplniť ručne.\n"
-#~ " Tento reťazec je pre spracovanie odovzdaný shell-u"
-
-#~ msgid "Orage clock"
-#~ msgstr "Hodiny Orage"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Pôvodný tvorca, bývalý správca"
-
-#~ msgid "Contributor"
-#~ msgstr "Prispievateľ"
-
-#~ msgid "Info"
-#~ msgstr "Informácie"
-
-#~ msgid "Warning"
-#~ msgstr "Upozornenie"
-
-#~ msgid "Error"
-#~ msgstr "Chyba"
-
-#~ msgid "Display"
-#~ msgstr "Zobrazenie"
-
-#~ msgid "Set sticked"
-#~ msgstr "Nastaviť prilepené"
-
-#~ msgid "Select always today"
-#~ msgstr "Vždy vybrať dnešný deň"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Pri zobrazovaní hlavného kalendára bude ukazovateľ nastavený na posledný "
-#~ "vybraný deň alebo vždy dnešný deň"
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Režim nastavenia koncového času"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Režim nastavenia počiatočného času"
-
-#~ msgid "Select timezone"
-#~ msgstr "Zvoľte časové pásmo"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Upraviť hodiny "
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Upraviť predvoľby"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Zadajte mieste časové pásmo (Používa sa pre zistenie, či je čas "
-#~ "predchádzajúceho (-) alebo nasledujúceho dátumu (+), pridaním znamienka + "
-#~ "alebo - za dátum"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr ""
-#~ "Zvoľte správnu hodnotu časovej zóny (=TZ)  alebo vyberte jednu zo zoznamu."
-
-#~ msgid "show line _1:"
-#~ msgstr "Zobraziť riadok _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "Zobraziť riadok _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "Zobraziť riadok _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Vlastnosti"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Nepodarilo sa spustiť 'orage -p'"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> vkladá aktuálny čas v miestnom formáte.\n"
-#~ "<T> vkladá čas a\n"
-#~ "<DT> vkladá dátum a čas."
-
-#~ msgid "Show event list"
-#~ msgstr "Zobraziť zoznam udalostí"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = použiť statickú ikonu)"
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Nastavenia kalendára"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Nastavenia pre Kalendár Xfce 4"
-
-#~ msgid "Monday"
-#~ msgstr "Dnes"
-
-#~ msgid "Tuesday"
-#~ msgstr "Dnes"
-
-#~ msgid "Wednesday"
-#~ msgstr "Týždenne"
-
-#~ msgid "Thursday"
-#~ msgstr "Dnes"
-
-#~ msgid "Friday"
-#~ msgstr "dní"
-
-#~ msgid "Sunday"
-#~ msgstr "Zvuk"
-
-#~ msgid "Days"
-#~ msgstr "dní"
-
-#~ msgid "normal"
-#~ msgstr "Základné"
-
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%d.%m.%Y"
-
-#~ msgid "Calendar Files"
-#~ msgstr "Súbory kalendára"
-
-#~ msgid "Calendar borders"
-#~ msgstr "Okraj okna kalendára"
-
-#~ msgid "Hidden"
-#~ msgstr "Skrytý"
-
-#~ msgid "3 months"
-#~ msgstr "3 mesiace"
-
-#~ msgid "6 months"
-#~ msgstr "6 mesiacov"
-
-#~ msgid "1 year"
-#~ msgstr "1 rok"
-
-#~ msgid "Application"
-#~ msgstr "Aplikácia"
-
-#~ msgid "Button Label|Orage"
-#~ msgstr "Kalendár"
-
-#~ msgid "Core developer"
-#~ msgstr "Hlavný vývojár"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Týmto odstránite všetky informácie \n"
-#~ "asociované s týmto dátumom."
-
-#~ msgid "Clear"
-#~ msgstr "Vymazať"
-
-#~ msgid "uid"
-#~ msgstr "uid"
-
-#~ msgid "This should not happen"
-#~ msgstr "Nemusí sa to podariť"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Nie je možné vytvoriť kanál MCS klienta"
-
-#~ msgid "Open archive file..."
-#~ msgstr "Otvoriť archívny súbor..."
-
-#~ msgid "Close archive file"
-#~ msgstr "Zatvoriť archívny súbor"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Kalendár pracovnej plochy"
diff -Nru orage-4.8.3/po/sq.po orage-4.12.1/po/sq.po
--- orage-4.8.3/po/sq.po	2012-01-03 12:01:09.000000000 +0000
+++ orage-4.12.1/po/sq.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,19 +1,22 @@
-# Albanian translation for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Besnik Bleta <besnik@programeshqip.org>, 2007.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Besnik <besnik@programeshqip.org>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.4.0\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2008-11-11 00:16+0200\n"
-"Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
-"Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2013-11-18 18:30+0100\n"
+"PO-Revision-Date: 2013-11-19 15:56+0000\n"
+"Last-Translator: Xfce <transifex@xfce.org>\n"
+"Language-Team: Albanian (http://www.transifex.com/projects/p/xfce/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -29,9 +32,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"klikoni për ndryshimin e orës"
+msgstr "%s\nklikoni për ndryshimin e orës"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -41,9 +42,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"butoni 1 për ndryshim parapëlqimesh \n"
-"butoni 2 për rregullim kohe të orëve"
+msgstr "butoni 1 për ndryshim parapëlqimesh \nbutoni 2 për rregullim kohe të orëve"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -107,9 +106,8 @@
 msgstr "mbylle dritaren dhe dil"
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "përditësoni parapëlqimet"
+msgstr ""
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -153,9 +151,7 @@
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
 #: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
 msgid "Cross this to use default instead of selected value"
-msgstr ""
-"I vini shenjë kësaj për të përdorur parazgjedhjen në vend të vlerës së "
-"përzgjedhur"
+msgstr "I vini shenjë kësaj për të përdorur parazgjedhjen në vend të vlerës së përzgjedhur"
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
@@ -204,9 +200,7 @@
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
-"I vini shenjë kësaj për të përdorur parazgjedhje sistemi në vend të ngjyrës "
-"së përzgjedhur"
+msgstr "I vini shenjë kësaj për të përdorur parazgjedhje sistemi në vend të ngjyrës së përzgjedhur"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
@@ -218,9 +212,7 @@
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"I vini shenjë kësaj për të përdorur gërmat parazgjedhje në vend të gërmave "
-"të përzgjedhura"
+msgstr "I vini shenjë kësaj për të përdorur gërmat parazgjedhje në vend të gërmave të përzgjedhura"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -241,9 +233,8 @@
 msgstr "përditësoni parapëlqimet"
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "Parapëlqime të Përgjithshme"
+msgstr ""
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
@@ -303,15 +294,15 @@
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
-msgstr "orë"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "%d mins"
-msgstr "min"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
@@ -320,9 +311,8 @@
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-#, fuzzy
 msgid "forward"
-msgstr "Përpara"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
@@ -338,7 +328,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2771
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Vendndodhje"
@@ -399,20 +389,18 @@
 msgid "floating"
 msgstr "pezull"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "Kohë vendore"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "Orage - Kalendar"
+msgstr ""
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr ""
 
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr ""
+
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
 msgstr "Dukje"
@@ -496,21 +484,11 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Ky program përdor funksionin strftime për marrjen e kohës.\n"
-"Përdorni çfarëdo kodi të vlefshëm për të pasur kohën në formatin që "
-"parapëlqeni.\n"
-"Disa nga koded e zakonshëm janë:\n"
-"\t%A = ditë e javës\t\t\t%B = muaj\n"
-"\t%c = datë & kohë\t\t%R = orë & minuta\n"
-"\t%V = numër javësh\t\t%Z = zonë kohore në përdorim\n"
-"\t%H = orë \t\t\t\t%M = minutë\n"
-"\t%X = kohë vendore\t\t\t%x = datë vendore"
+msgstr "Ky program përdor funksionin strftime për marrjen e kohës.\nPërdorni çfarëdo kodi të vlefshëm për të pasur kohën në formatin që parapëlqeni.\nDisa nga koded e zakonshëm janë:\n\t%A = ditë e javës\t\t\t%B = muaj\n\t%c = datë & kohë\t\t%R = orë & minuta\n\t%V = numër javësh\t\t%Z = zonë kohore në përdorim\n\t%H = orë \t\t\t\t%M = minutë\n\t%X = kohë vendore\t\t\t%x = datë vendore"
 
 #: ../panel-plugin/oc_config.c:457
-#, fuzzy
 msgid "Orage clock Preferences"
-msgstr "Parapëlqime për Orage-in"
+msgstr ""
 
 #. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
@@ -521,7 +499,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
@@ -531,14 +509,13 @@
 msgstr "Mirëmbajtës"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "Administroni kohën tuaj me Xfce4"
+msgstr ""
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2800
 msgid "End"
 msgstr "Fund"
 
@@ -546,13 +523,13 @@
 msgid "Due"
 msgstr ""
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Përzgjidhni një kartelë..."
 
@@ -560,227 +537,273 @@
 msgid "Sound Files"
 msgstr "Kartela Tingulli"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Tërë Kartelat"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Të dhënat për takimin u ndryshuan."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1282 ../src/event-list.c:921
 msgid "Do you want to continue?"
 msgstr "Doni të vazhdohet?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr ""
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr ""
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "Fundi i këtij takimi bie më herët se fillimi."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1918
 msgid "Not set"
 msgstr "E parregulluar"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1220
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1221
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1231
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1232
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1281
 msgid "This appointment will be permanently removed."
 msgstr "Ky takim do të hiqet përfundimisht."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1283 ../src/event-list.c:922
+msgid "No, cancel the removal"
+msgstr ""
+
+#: ../src/appointment.c:1284
+msgid "Yes, remove it"
+msgstr ""
+
+#: ../src/appointment.c:1373 ../src/appointment.c:1388 ../src/day-view.c:457
+#: ../src/event-list.c:980
+msgid "Pick the date"
+msgstr "Zgjidhni një datë"
+
+#: ../src/appointment.c:1375 ../src/appointment.c:1390 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:982 ../src/event-list.c:1132
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Sot"
+
+#: ../src/appointment.c:1798
 msgid "This appointment does not exist."
 msgstr "Ky takim nuk ekziston"
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1799
 msgid "It was probably removed, please refresh your screen."
 msgstr "Ndoshta qe hequr, ju lutem rifreskoni ekranin."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2100
 msgid "Current categories"
 msgstr "Kategoritë e tanishme"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2115
 msgid "Add new category with color"
 msgstr "Shto kategori të re me ngjyrë"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2119
 msgid "Category:"
 msgstr "Kategori:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2150
 msgid "Colors of categories - Orage"
 msgstr "Ngjyra të kategorive - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2196
 msgid " *** COPY ***"
 msgstr " *** KOPJOJE ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2461
 msgid "New appointment - Orage"
 msgstr "Takim i ri - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2491 ../src/day-view.c:279 ../src/event-list.c:1033
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Kartelë"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2497
 msgid "Sav_e and close"
 msgstr "R_uaje dhe mbylle"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2510 ../src/event-list.c:1039
 msgid "D_uplicate"
 msgstr "D_yfishoje"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2697
 msgid "Save"
 msgstr "Ruaj"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2699
 msgid "Save and close"
 msgstr "Ruaj dhe mbyll"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2704
 msgid "Revert"
 msgstr "Rikthe"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2706 ../src/event-list.c:1123
 msgid "Duplicate"
 msgstr "Dyfisho"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2711 ../src/event-list.c:1125
 msgid "Delete"
 msgstr "Fshij"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Free"
 msgstr "E lirë"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Busy"
 msgstr "I zënë"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2733
 msgid "General"
 msgstr "Të përgjithshme"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2739
 msgid "Type "
 msgstr "Lloj"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2741 ../src/event-list.c:1176
 msgid "Event"
 msgstr "Ngjarje"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2744
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Ngjarje që do të ndodhë një ditë. Për shembull:\n"
-"Mbledhje ose ditëlindje ose shfaqje në TV."
+msgstr "Ngjarje që do të ndodhë një ditë. Për shembull:\nMbledhje ose ditëlindje ose shfaqje në TV."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2747 ../src/event-list.c:1196
 msgid "Todo"
 msgstr ""
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2750
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Diçka që do të duhej ta bënit dikur. Për shembull:\n"
-"Lani makinën ose provoni versionin e ri të Orage-it."
+msgstr "Diçka që do të duhej ta bënit dikur. Për shembull:\nLani makinën ose provoni versionin e ri të Orage-it."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2753 ../src/event-list.c:1209
 msgid "Journal"
 msgstr "Ditar"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2757
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Mbani shënim që diçka ndodhi. Për shembull:\n"
-"Shënoni që ju telefoni prindi ose ra bora e parë."
+msgstr "Mbani shënim që diçka ndodhi. Për shembull:\nShënoni që ju telefoni prindi ose ra bora e parë."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2764
 msgid "Title "
 msgstr "Titull "
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2779
 msgid "All day event"
 msgstr "Ngjare për tërë ditën"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2785 ../src/appointment.c:3446 ../src/day-view.c:801
 msgid "Start"
 msgstr "Fillim"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2805
 msgid "Set      "
 msgstr "Caktoni"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2826
 msgid "Duration"
 msgstr "Kohëzgjatje"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2830 ../src/appointment.c:3020 ../src/reminder.c:758
 msgid "days"
 msgstr "ditë"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2832 ../src/appointment.c:3022 ../src/reminder.c:760
 msgid "hours"
 msgstr "orë"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2834 ../src/appointment.c:3024 ../src/reminder.c:762
 msgid "mins"
 msgstr "min"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2846
 msgid "Availability"
 msgstr "Pasje"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2854 ../src/appointment.c:3452
 msgid "Completed"
 msgstr "U plotësua"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2857
 msgid "Done"
 msgstr "U krye"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2878
 msgid "Categories"
 msgstr "Kategori"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2890
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Kjo është një kategori speciale, e cila mund të përdoret për të ngjyrosur "
-"këtë takim te paraqitjet në formë listash."
+msgstr "Kjo është një kategori speciale, e cila mund të përdoret për të ngjyrosur këtë takim te paraqitjet në formë listash."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2895
 msgid "update colors for categories."
 msgstr "përditëso ngjyra për kategoritë."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2901
 msgid "Priority"
 msgstr ""
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2911
 msgid "Note"
 msgstr "Shënim"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2932
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -789,131 +812,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before Start"
 msgstr "Para Fillimit"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before End"
 msgstr "Para Fundit"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After Start"
 msgstr "Pas Nisjes"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After End"
 msgstr "Pas Fundit"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3011
 msgid "Alarm"
 msgstr "Alarm"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3017
 msgid "Alarm time"
 msgstr "Kohë alarmi"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3041
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Shpesh ju duhet një alarm:\n"
-" 1) para fillimit të Ngjarjes\n"
-" 2) përpara se të përfundojë një Todo\n"
-" 3) pas fillimit të një Todo-je"
+msgstr "Shpesh ju duhet një alarm:\n 1) para fillimit të Ngjarjes\n 2) përpara se të përfundojë një Todo\n 3) pas fillimit të një Todo-je"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3046
 msgid "Persistent alarm"
 msgstr "Alarm i Përhershëm"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3048
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Përzgjidheni nëse doni që Orage t'ju kujtojë edhe nëse nuk është aktiv kur "
-"ndodh alarmi."
+msgstr "Përzgjidheni nëse doni që Orage t'ju kujtojë edhe nëse nuk është aktiv kur ndodh alarmi."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3057
 msgid "Sound"
 msgstr "Tingull"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3061 ../src/appointment.c:3181
 msgid "Use"
 msgstr "Përdor"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3063
 msgid "Select this if you want audible alarm"
 msgstr "Përzgjidheni këtë nëse doni alarm të dëgjueshëm"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3080
 msgid "Repeat alarm sound"
 msgstr "Përsërit tingullin e alarmit"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3096 ../src/appointment.c:3395
 msgid "times"
 msgstr "kohë"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3112
 msgid "sec interval"
 msgstr ""
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3122
 msgid "Visual"
 msgstr "Pamore"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3126
 msgid "Use Orage window"
 msgstr "Përdor dritare Orage-i"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3128
 msgid "Select this if you want Orage window alarm"
 msgstr "Përzgjidheni nëse doni dritare alarmi Orage"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3140
 msgid "Use notification"
 msgstr "Përdor njoftim"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3142
 msgid "Select this if you want notification alarm"
 msgstr "Përzgjidheni këtë nëse doni alarm njoftimi"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3148
 msgid "Set timeout"
 msgstr "Caktoni skadimin"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3150
 msgid "Select this if you want notification to expire automatically"
 msgstr "Përzgjidheni këtë nëse doni ëe njoftimi të skadojë vetvetiu"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3161
 msgid "0 = system default expiration time"
 msgstr "0 = kohës skadimi parazgjedhje e sistemit"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3166
 msgid "seconds"
 msgstr "sekonda"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3177
 msgid "Procedure"
 msgstr "Procedurë"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3183
 msgid "Select this if you want procedure or script alarm"
 msgstr "Përdoreni këtë nëse doni alarm procedure ose programthi"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3189
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -925,155 +941,148 @@
 "\t<&ET> appointment end time"
 msgstr ""
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3201
 msgid "Test this alarm by raising it now"
 msgstr ""
 
-#: ../src/appointment.c:3101
-#, fuzzy
+#: ../src/appointment.c:3208
 msgid "<b>Default alarm</b>"
-msgstr "Alarm parazgjedhje"
+msgstr ""
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3216
 msgid "Store current settings as default alarm"
 msgstr "Depozitoji rregullimet e tanishme si alarm parazgjedhje"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3221
 msgid "Set current settings from default alarm"
 msgstr "Caktoji rregullimet e tanishme nga alarm parazgjedhje"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "None"
 msgstr "Asnjë"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Daily"
 msgstr "Ditore"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Weekly"
 msgstr "Javore"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Monthly"
 msgstr "Mujore"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Yearly"
 msgstr "Vjetore"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Hourly"
 msgstr ""
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Mon"
 msgstr "Hën"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Tue"
 msgstr "Mar"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Wed"
 msgstr "Mër"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Thu"
 msgstr "Enj"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Fri"
 msgstr "Pre"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sat"
 msgstr "Sht"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sun"
 msgstr "Die"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3290
 msgid "Recurrence"
 msgstr "Përsëritje"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3296
 msgid "Complexity"
 msgstr "Ndërlikueshmëri"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3299
 msgid "Basic"
 msgstr "Bazë"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3305
 msgid "Advanced"
 msgstr "Të mëtejshme"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3309
 msgid "Use this if you want regular repeating event"
 msgstr "Përdoreni këtë kur dëshironi përsëritje të rregullt të një ngjarjeje"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3311
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Përdoreni këtë kur ju duhen kohë të ndërlikuara si:\n"
-" Çdo të Shtunë dhe të Dielë ose\n"
-" Të Martën e parë të çdo muaji"
+msgstr "Përdoreni këtë kur ju duhen kohë të ndërlikuara si:\n Çdo të Shtunë dhe të Dielë ose\n Të Martën e parë të çdo muaji"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3317
 msgid "Frequency"
 msgstr "Shpeshti"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3323
 msgid "Each"
 msgstr "Çdo"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3330
 msgid "occurrence"
 msgstr "hasje"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3334
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Kufizoni shpeshtinë deri në një farë intervali.\n"
-" Për shembull: Çdo ditën e tretë:\n"
-" Shpeshti = Përditë dhe Interval = 3"
+msgstr "Kufizoni shpeshtinë deri në një farë intervali.\n Për shembull: Çdo ditën e tretë:\n Shpeshti = Përditë dhe Interval = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3379
 msgid "Limit"
 msgstr "Kufi"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3381
 msgid "Repeat forever"
 msgstr "Përsërit përherë"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3387
 msgid "Repeat "
 msgstr "Përsëri"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3403
 msgid "Repeat until "
 msgstr "Përsërit derisa"
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3416
 msgid "Weekdays"
 msgstr "Ditë të javës"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3428
 msgid "Which day"
 msgstr "Cilën ditë"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3436
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1081,116 +1090,108 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Tregoni cilën ditë të javës për ngjarje mujore dhe vjetore.\n"
-" Për shembull:\n"
-" Të Mërkurat e dyta për çdo muaj:\n"
-"\tShpeshti = Përmuajshëm,\n"
-"\tDitë të javës = kontrollo vetëm të Mërkurave,\n"
-"\tCilën ditë = përzgjidhni 2 nga numrat poshtë të Mërkurës"
+msgstr "Tregoni cilën ditë të javës për ngjarje mujore dhe vjetore.\n Për shembull:\n Të Mërkurat e dyta për çdo muaj:\n\tShpeshti = Përmuajshëm,\n\tDitë të javës = kontrollo vetëm të Mërkurave,\n\tCilën ditë = përzgjidhni 2 nga numrat poshtë të Mërkurës"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3443
 msgid "TODO base"
 msgstr ""
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3456
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
 msgstr ""
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3458
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 
 #. exceptions
-#: ../src/appointment.c:3361
-#, fuzzy
+#: ../src/appointment.c:3464
 msgid "Exceptions"
-msgstr "Mundësi"
+msgstr ""
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3477
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
 msgstr ""
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3482
 msgid "Add excluded date (-)"
 msgstr ""
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3484
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr ""
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3490
 msgid "Add included time (+)"
 msgstr ""
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3492
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
 msgstr ""
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
-#, fuzzy
+#: ../src/appointment.c:3509
 msgid "Action dates"
-msgstr "Mundësi veprimi"
+msgstr ""
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1056 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Parje"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1075
 msgid "_Go"
 msgstr "_Shko"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1121
 msgid "New"
 msgstr "e Re"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Prapa"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr ""
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Sot"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Përpara"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1139
 msgid "Refresh"
 msgstr "Rifresko"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1146 ../src/interface.c:834
 msgid "Close"
 msgstr "Mbylle"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "E panjohur"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr ""
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - parje ditësh"
 
@@ -1199,164 +1200,166 @@
 msgid "All day"
 msgstr "Tërë ditën"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:583 ../src/event-list.c:1292
 msgid "Time"
 msgstr "Kohë"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:751
 msgid "No rows have been selected."
 msgstr "Nuk u përzgjodhën rreshta"
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:752
 msgid "Click a row to select it and after that you can copy it."
-msgstr ""
-"Klikoni mbi një rresht për ta përzgjedhur dhe pas kësaj mund ta kopjoni."
+msgstr "Klikoni mbi një rresht për ta përzgjedhur dhe pas kësaj mund ta kopjoni."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:920
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
+msgstr "Do të hiqni përgjithmonë tërë\ntakimet e përzgjedhura."
+
+#: ../src/event-list.c:923
+msgid "Yes, remove them"
 msgstr ""
-"Do të hiqni përgjithmonë tërë\n"
-"takimet e përzgjedhura."
 
 #: ../src/event-list.c:1130
+msgid "Back"
+msgstr "Prapa"
+
+#: ../src/event-list.c:1134
+msgid "Forward"
+msgstr "Përpara"
+
+#: ../src/event-list.c:1141
 msgid "Find"
 msgstr "Gjej"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1148
 msgid "Dayview"
 msgstr ""
 
-#: ../src/event-list.c:1170
+#: ../src/event-list.c:1181
 msgid "Extra days to show "
 msgstr "Ditë ekstra për shfaqje"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1212
 msgid "Journal entries starting from:"
 msgstr "Zëra ditari që fillojnë prej:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1232
 msgid "Search"
 msgstr "Kërko"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1235
 msgid "Search text "
 msgstr "Kërko tekst"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1300
 msgid "Flags"
 msgstr "Flamurka"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1308
 msgid "Title"
 msgstr "Titull"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1334
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
-"Për përpunimin e një rreshti, dyklikoni mbi të.\n"
-"\n"
-"Shenja sipas renditjes:\n"
-"\t 1. Alarm: n=pa alarm\n"
-"\t\tA=Alarm pamor S=edhe alarm Zanor\n"
-"\t 2. Ripërsëritje: n=pa ripërsëritje\n"
-"\t\t D=Përditë W=Përjavë M=Përmuaj Y=Përvit\n"
-"\t 3. Tip: f=i lirë B=i zënë\t 4. Gjendet në kartelë: O=Orage\n"
-"\t\t  A=Arkivë F=I huaj"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Zgjidhni një datë"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tRipërsëritja mbaroi, po kalohet te kartelë arkive."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Arkivimi nuk është veprues. Po dilet"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Prag arkivimi: %d muaj"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tPo arkivohen ngjarje që janë më të vjetra se: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Uid arkivimi: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
-#, fuzzy
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
-msgstr "\tVTODO jo e plotë; e paarkivuar"
+msgstr ""
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tNë ripërsëritje. Mbarimi në vitin: %04d, muajin: %02d, ditën: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Arkivimi u krye\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Po niset heqje arkive."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tFAZA 1: ricaktoni takime ripërsëritëse"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tFAZA 2: rikthe takime të arkivuara"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "U përfundua heqja e arkivës\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Alarm parazgjedhje i Orage-it"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "Krijo listë alarmesh: U shtuan %d alarme. U përpunuar %d ngjarje."
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr ""
+
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr ""
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tU gjetën %d alarme nga të cilat %d janë aktive. (U kërkua nëpër %d alarme "
-"ripërsëritëse.)"
+msgstr "\tU gjetën %d alarme nga të cilat %d janë aktive. (U kërkua nëpër %d alarme ripërsëritëse.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1374,7 +1377,16 @@
 msgid "Import file preprocessing done"
 msgstr "U bë parapërpunimi i kartelës së importit"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Kartela kalendari"
 
@@ -1382,628 +1394,667 @@
 msgid "Current foreign files"
 msgstr "Kartela të tanishme të huaja"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "VETËM LEXIM"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "LEXIM SHKRIM"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Pa kartela të huaja *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr ""
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Import/eskport"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Importo"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Lexoji prej kartelës:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Ndajini emrat e kartelave me presje (,).\n"
-"SHËNIM: presja nuk është shenjë e vlefshme për emrat e kartelave në Orage."
+msgstr "Ndajini emrat e kartelave me presje (,).\nSHËNIM: presja nuk është shenjë e vlefshme për emrat e kartelave në Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Eksporto"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Shkruaje te kartela:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Përzgjidhni"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Tërë takimet"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Takime të emërtuara:"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Kini parasysh që lexohen vetëm takimet prej kartelës kryesore.\n"
-"Ngjarjet e arkivuara nuk eksportohen."
+msgstr "Kini parasysh që lexohen vetëm takimet prej kartelës kryesore.\nNgjarjet e arkivuara nuk eksportohen."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Mbani parasysh që vetëm lexohen vetëm takimet prej kartelës kryesore.\n"
-"Ngjarjet e huaja nuk eksportohen."
+msgstr "Mbani parasysh që vetëm lexohen vetëm takimet prej kartelës kryesore.\nNgjarjet e huaja nuk eksportohen."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "Mund t'i tërhiqni kollaj prej dritares së listës së ngjarjeve."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "UID-ra takimesh Orage, ndarë me presje."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Arkivë"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Arkivoji tani (prag: %d muaj)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Pragun e arkivave mund ta ndryshoni te parametrat"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Rikthe arkivën tani"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Rikthe tërë ngjarjet e arkivuara te kartela kryesore e Orage-it dhe hiqe "
-"kartelën arkivë.\n"
-"Kjo është e dobishme, për shembull, kur bëhet eksportim dhe lëvizje takimesh "
-"Orage-i\n"
-"në një tjetër sistem."
+msgstr "Rikthe tërë ngjarjet e arkivuara te kartela kryesore e Orage-it dhe hiqe kartelën arkivë.\nKjo është e dobishme, për shembull, kur bëhet eksportim dhe lëvizje takimesh Orage-i\nnë një tjetër sistem."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Kartela Orage-i"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Kartela kryesore e kalendarit Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Kartela e çastit"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Kartelë e re"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Mundësi veprimi"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr ""
+
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Riemërtoje"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Vetëm riemërtim kartelash të brendshme Orage-i.\n"
-"Nuk prek fare sisteme të jashtëm kartelash.\n"
-"Kartela e re duhet të ekzistojë."
+msgstr "Vetëm riemërtim kartelash të brendshme Orage-i.\nNuk prek fare sisteme të jashtëm kartelash.\nKartela e re duhet të ekzistojë."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Kopjoje"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-"Kartela e tanishme kopjohet dhe qëndron e pandryshuar te vendi i vjetër."
+msgstr "Kartela e tanishme kopjohet dhe qëndron e pandryshuar te vendi i vjetër."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Lëvize"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "Kartela e tanishme lëvizet dhe avullon prej vendit të vjetër."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Kartelë arkivash"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Kartela të huaja"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Shto kartelë të huaj të re"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Kartelë e huaj."
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Mundësi"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Vetëm lexim"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Caktojeni këtë nëse doni të siguroheni që kjo kartelë nuk do të ndryshohet "
-"kurë nga Orage-i.\n"
-"Kini parasysh që ndryshimi i kartelave të huaja mund t'i bëjë ato të "
-"papërputhshme me mjetin origjinal, prej andej nga erdhën!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Caktojeni këtë nëse doni të siguroheni që kjo kartelë nuk do të ndryshohet kurë nga Orage-i.\nKini parasysh që ndryshimi i kartelave të huaja mund t'i bëjë ato të papërputhshme me mjetin origjinal, prej andej nga erdhën!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Shkëmbeni të dhëna - Orage"
 
-#: ../src/main.c:268
-#, fuzzy, c-format
+#: ../src/main.c:275
+#, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
 msgstr ""
-"\tKy është versioni %s i %s për Xfce %s\n"
-"\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tQarkulluar sipas kushteve të Licensës së Përgjithshme Publike GNU.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tPërpiluar kundrejt GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "po përdoret GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tMe përdorim të DBUS-it për importim.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tPa përdorur DBUS-in. Importo punë vetëm pjesërisht.\n"
 
-#: ../src/main.c:281
-#, fuzzy, c-format
+#: ../src/main.c:288
+#, c-format
 msgid "\tUsing libnotify.\n"
-msgstr "\tDuke përdorur libnotify.\n"
+msgstr ""
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tPa përdorim të libnotify-it.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tDuke përdorur arkivim të vetvetishëm.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tPa përdorur arkivim.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr ""
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr ""
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Përdorimi: orage [mundësi] [kartela]\n"
-"\n"
+msgstr "Përdorimi: orage [mundësi] [kartela]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Mundësi:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tshfaq versionin e orage-it\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tshtyp këtë tekst\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--parapëlqime (-p) \tshfaq formë parapëlqimesh\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\tbëje orage-in të dukshëm/të padukshëm\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) kartelë [RW] \tshto një kartelë të huaj\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) kartelë \thiq një kartelë të huaj\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
 msgstr ""
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "kartela=kartela ical për ngarkim te orage-i\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tdbus nuk përfshihet në orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tpa dbus [kartela] dhe mundësi kartelash të huaja(-a & -r) mund të përdoren "
-"vetëm kur niset orage-i \n"
+msgstr "\tpa dbus [kartela] dhe mundësi kartelash të huaja(-a & -r) mund të përdoren vetëm kur niset orage-i \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Mundësi e panjohur %s\n"
-"\n"
+msgstr "\nMundësi e panjohur %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Shkëmbe të dhëna"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Përpunoni"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Shihni _datën e përzgjedhur"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Shihni _javën e përzgjedhur"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Përzgjidhni _Sot"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Kohë vendore"
+msgstr ""
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Ndihmë"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr ""
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr ""
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr ""
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Kurrë"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
-"Titull: %s\n"
-" Fillim:\t%s\n"
-" Nisje:\t%s\n"
-" Shënim:\n"
-"%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
-"Titull: %s\n"
-" Fillim:\t%s\n"
-" Nisje:\t%s\n"
-" Shënim:\n"
-"%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Për t'u bërë:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Ngjarje për %s:</b>"
 
-#: ../src/mainbox.c:593
-#, fuzzy, c-format
+#: ../src/mainbox.c:660
+#, c-format
 msgid "<b>Events for %s - %s:</b>"
-msgstr "<b>Ngjarje për %s:</b>"
+msgstr ""
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:486
 msgid "Main settings"
-msgstr "Rregullimet kryesore"
+msgstr ""
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:492
 msgid "Timezone"
 msgstr "Zonë kohe"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:507
 msgid "You should always define your local timezone."
 msgstr "Duhet të përcaktoni gjithmonë zonën kohore. "
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:515
 msgid "Archive threshold (months)"
 msgstr "Prag arkive (muaj)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:525
 msgid "(0 = no archiving)"
 msgstr "(0 = pa arkivim)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:528
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Arkivimi përdoret për të kursyer kohë dhe hapësirë gjatë trajtimit të "
-"ngjarjeve."
+msgstr "Arkivimi përdoret për të kursyer kohë dhe hapësirë gjatë trajtimit të ngjarjeve."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:536
 msgid "Sound command"
 msgstr "Urdhër tingulli"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:551
 msgid "This command is given to shell to make sound in alarms."
 msgstr "Ky urdhër i kalohet shellit për të prodhuar tingull gjatë alarmesh."
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Shfaq"
+#: ../src/parameters.c:590
+msgid "Calendar window"
+msgstr ""
 
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Dritarja kryesore e kalendarit"
+#: ../src/parameters.c:597
+msgid "Calendar visual details"
+msgstr ""
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:603
 msgid "Show borders"
 msgstr "Shfaq anë"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:608
 msgid "Show menu"
 msgstr "Shfaq menu"
 
-#: ../src/parameters.c:632
-#, fuzzy
-msgid "Show month and year"
-msgstr "Shfaq në faques"
-
-#: ../src/parameters.c:639
-#, fuzzy
+#: ../src/parameters.c:616
 msgid "Show day names"
-msgstr "Shfaq _kornizë"
+msgstr ""
 
-#: ../src/parameters.c:646
-#, fuzzy
+#: ../src/parameters.c:621
 msgid "Show week numbers"
-msgstr "Shfaq anë"
+msgstr ""
+
+#: ../src/parameters.c:629
+msgid "Show month and year"
+msgstr ""
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:649
+msgid "Calendar info boxes"
+msgstr ""
+
+#: ../src/parameters.c:654
 msgid "Show todo list"
 msgstr "Shfaq listë veprimesh"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:661
 msgid "Number of days to show in event window"
 msgstr ""
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:667
 msgid "0 = do not show event list at all"
 msgstr ""
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:680
+msgid "Calendar visibility"
+msgstr ""
+
+#: ../src/parameters.c:685
 msgid "Show on all desktops"
 msgstr ""
 
-#: ../src/parameters.c:683
-#, fuzzy
+#: ../src/parameters.c:690
 msgid "Keep on top"
-msgstr "Vëre në majë"
+msgstr ""
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:698
 msgid "Show in taskbar"
 msgstr "Shfaq në shtyllë veprimesh"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:703
 msgid "Show in pager"
 msgstr "Shfaq në faques"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:711
 msgid "Show in systray"
 msgstr "Shfaq në shtyllë sistemi"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:732
 msgid "Calendar start"
 msgstr "Fillim kalendari"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:737
 msgid "Show"
 msgstr "Shfaq"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:749
 msgid "Hide"
 msgstr "Fshih"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:761
 msgid "Minimized"
 msgstr "Minimizuar"
 
-#: ../src/parameters.c:793
-#, fuzzy
-msgid "Extra settings"
-msgstr "Rregullime ekstra"
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Dritarja kryesore e kalendarit"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "Përzgjidhni _Sot"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:781
+msgid "On calendar window open"
 msgstr ""
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
+#: ../src/parameters.c:786
+msgid "Select today's date"
 msgstr ""
 
-#: ../src/parameters.c:841
-#, fuzzy
-msgid "Use dynamic icon"
-msgstr "Madhësi ikone dinamike"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
+#: ../src/parameters.c:799
+msgid "Select previously selected date"
 msgstr ""
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Dyklikimi mbi Kalendarin Kryesor shfaq"
+#: ../src/parameters.c:817
+msgid "Calendar day double click shows"
+msgstr ""
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:822
 msgid "Days view"
 msgstr "Parje ditësh"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:834
 msgid "Event list"
 msgstr "Listë ngjarjesh"
 
-#: ../src/parameters.c:890
-#, fuzzy
-msgid "Eventlist window"
-msgstr "Listë ngjarjesh"
+#: ../src/parameters.c:856
+msgid "Extra settings"
+msgstr ""
+
+#: ../src/parameters.c:863
+msgid "Event list window extra days"
+msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:868
 msgid "Number of extra days to show in event list"
 msgstr ""
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:876
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
 msgstr ""
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:886
+msgid "Day view window default first day"
+msgstr ""
+
+#: ../src/parameters.c:891
+msgid "First day of week"
+msgstr ""
+
+#: ../src/parameters.c:904
+msgid "Selected day"
+msgstr ""
+
+#: ../src/parameters.c:922
+msgid "Use dynamic tray icon"
+msgstr ""
+
+#: ../src/parameters.c:927
+msgid "Use dynamic icon"
+msgstr ""
+
+#: ../src/parameters.c:933
+msgid "Dynamic icon shows current month and day of the month."
+msgstr ""
+
+#: ../src/parameters.c:941 ../src/parameters.c:946
 msgid "Use wakeup timer"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:952
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:961
+msgid "Foreign file default visual alarm"
+msgstr ""
+
+#: ../src/parameters.c:966
+msgid "Orage window"
+msgstr ""
+
+#: ../src/parameters.c:979
+msgid "Notify notification"
+msgstr ""
+
+#: ../src/parameters.c:997
+msgid "Always quit when asked to close"
+msgstr ""
+
+#: ../src/parameters.c:1002
+msgid "Always quit"
+msgstr ""
+
+#: ../src/parameters.c:1008
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr ""
+
+#: ../src/parameters.c:1024
 msgid "Orage Preferences"
 msgstr "Parapëlqime për Orage-in"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1136
 msgid "First Orage start. Searching default timezone."
 msgstr ""
 
-#: ../src/parameters.c:1069
-#, fuzzy, c-format
+#: ../src/parameters.c:1155
+#, c-format
 msgid "Default timezone set to %s."
-msgstr "vendose zonën kohore si:"
+msgstr ""
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1158
 msgid "Default timezone not found, please, set it manually."
 msgstr ""
 
@@ -2015,40 +2066,35 @@
 msgid "Open"
 msgstr "Hap"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Përkujtues - Orage"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
+#: ../src/reminder.c:803
+msgid "Postpone"
 msgstr ""
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
 msgstr ""
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Alarmet pasues veprues:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d d %02d h %02d miuta deri në: %s"
+msgstr "\n%02d d %02d h %02d miuta deri në: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Nuk u gjet alarm veprues"
+msgstr "\nNuk u gjet alarm veprues"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -3611,192 +3657,34 @@
 msgstr "Rreth Orage-it"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Orage Panel Clock"
-msgstr "Orë Orage"
+msgstr ""
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
 msgid "Show time and date?"
-msgstr "Çfarë date është dhe sa është ora?"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Kalendar"
+msgid "Orage preferences"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Parapëlqime për Orage-in"
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Parapëlqime për Orage-in"
+msgid "Orage Calendar Preferences"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Rregullimet për Zbatimin Kalendar Xfce 4"
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Kalendar"
+
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr ""
 
 #: ../xfcalendar.desktop.in.h:2
 msgid "Desktop calendar"
 msgstr "Kalendar desktopi"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "Orage - Kalendar"
-
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Titull: %s\n"
-#~ " Fillon:\t%s\n"
-#~ " Skadon:\t%s\n"
-#~ " Kryer:\t%s\n"
-#~ "Shënim:\n"
-#~ "%s"
-
-#~ msgid "Orage clock"
-#~ msgstr "Orë e Orage-it"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Krijuesi fillestar, mirëmbajtës në pension"
-
-#~ msgid "Contributor"
-#~ msgstr "Ndihmoi"
-
-#~ msgid "Info"
-#~ msgstr "Të dhëna"
-
-#~ msgid "Warning"
-#~ msgstr "Kujdes"
-
-#~ msgid "Error"
-#~ msgstr "Gabim"
-
-#~ msgid "Set sticked"
-#~ msgstr "Caktoje të ngjitur"
-
-#~ msgid "Select always today"
-#~ msgstr "Përzgjidh përherë sot"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Kur shfaqet kalendari kryesor, cakto treguesin ose te dita e përzgjedhur "
-#~ "më parë ose përherë te dita e sotshme."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Po mbyllet mënyra rregullim kohe"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Po fillohet mënyra rregullim kohe"
-
-#~ msgid "Select timezone"
-#~ msgstr "Përzgjidhni zonë kohore"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Ndryshoni Orën"
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "jepni zonë kohore të orës,\n"
-#~ "(=çfarëdo vlere e vlefshme ZK)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Ndryshoni Parapëlqimet"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Jepni zonën kohore vendore. (Përdoret për të treguar nëse koha është në "
-#~ "datën e mëparshme(-) ose pasuesen(+) duke shtuar një +/- pas kohës)"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr ""
-#~ "Caktoni çfarëdo vlere zone kohore (=TZ) të vlefshme ose zgjidhni një prej "
-#~ "listës."
-
-#~ msgid "show line _1:"
-#~ msgstr "shfaq rreshtin _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "shfaq rreshtin _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "shfaq rreshtin _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Veti"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Dështoi në dhënien e 'orage -p'"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> fut datën e tanishme në format date vendore.\n"
-#~ "<T> fut kohën dhe\n"
-#~ "<DT> fut datën dhe kohën."
-
-#~ msgid "Show event list"
-#~ msgstr "Shfaq listë ngjarjesh"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = përdor ikonë statike)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Ikona dinamike shfaq ditën dhe muajin e tanishëm. Është e dukshme vetëm "
-#~ "në shtyllë. Po qe se shtylla është shumë e vogël për madhësinë e ikonave "
-#~ "dinamike, Orage-i kalon vetvetiu te ikonat statike."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Rregullime Kalendari"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Rregullime për Kalendarin Xfce"
-
-#~ msgid "Saturday"
-#~ msgstr "e Shtunë"
-
-#, fuzzy
-#~ msgid "Monday"
-#~ msgstr "Sot"
-
-#, fuzzy
-#~ msgid "Tuesday"
-#~ msgstr "Sot"
-
-#, fuzzy
-#~ msgid "Wednesday"
-#~ msgstr "Ditë të javës"
-
-#, fuzzy
-#~ msgid "Thursday"
-#~ msgstr "orë"
-
-#, fuzzy
-#~ msgid "Friday"
-#~ msgstr "Pre"
-
-#, fuzzy
-#~ msgid "Sunday"
-#~ msgstr "Tingull"
diff -Nru orage-4.8.3/po/sr.po orage-4.12.1/po/sr.po
--- orage-4.8.3/po/sr.po	1970-01-01 00:00:00.000000000 +0000
+++ orage-4.12.1/po/sr.po	2015-04-10 10:26:26.000000000 +0000
@@ -0,0 +1,4452 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2012
+# Саша Петровић <salepetronije@gmail.com>, 2013
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2012
+# Саша Петровић <salepetronije@gmail.com>, 2013-2014
+# Саша Петровић <salepetronije@gmail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: Xfce Apps\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2015-02-24 13:55+0000\n"
+"Last-Translator: Саша Петровић <salepetronije@gmail.com>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/xfce-apps/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "без подвлачења"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "једноструко"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "двоструко"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "ниско"
+
+#: ../globaltime/globaltime.c:100
+msgid "Raising GlobalTime window..."
+msgstr "Издижем прозор Општег времена..."
+
+#: ../globaltime/globaltime.c:102
+msgid "GlobalTime window raise failed"
+msgstr "Издизање прозора Општег времена није успело"
+
+#. ********** timezone tooltip **********
+#: ../globaltime/globaltime.c:277
+#, c-format
+msgid ""
+"%s\n"
+"click to modify clock"
+msgstr "%s\nкликните да измените часовник"
+
+#: ../globaltime/globaltime.c:386
+msgid "Localtime"
+msgstr "Месно време"
+
+#: ../globaltime/globaltime.c:464
+msgid ""
+"button 1 to change preferences \n"
+"button 2 to adjust time of clocks"
+msgstr "дугме 1 за измену поставки\nдугме 2 за дотеривање времена часовника"
+
+#: ../globaltime/globaltime.c:480
+msgid "adjust to change hour"
+msgstr "дотерајте да измените сат"
+
+#: ../globaltime/globaltime.c:496
+msgid ""
+"adjust to change minute. Click arrows with button 2 to change only 1 minute."
+msgstr "дотерајте да измените минут. Кликните стрелице дугметом 2 да измените само 1 минут."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Опште време"
+
+#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
+msgid "NEW"
+msgstr "НОВИ"
+
+#: ../globaltime/gt_prefs.c:289
+msgid "NEW COPY"
+msgstr "НОВИ УМНОЖАК"
+
+#: ../globaltime/gt_prefs.c:310
+msgid "Not possible to delete the last clock."
+msgstr "Није могуће обрисати последњи часовник."
+
+#: ../globaltime/gt_prefs.c:516
+msgid "update this clock"
+msgstr "освежите овај часовник"
+
+#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
+msgid "add new empty clock"
+msgstr "додајте нови празан часовник"
+
+#: ../globaltime/gt_prefs.c:526
+msgid "add new clock using this clock as model"
+msgstr "додајте нови часовник користећи овај као модел"
+
+#: ../globaltime/gt_prefs.c:531
+msgid "delete this clock"
+msgstr "обришите овај часовник"
+
+#: ../globaltime/gt_prefs.c:539
+msgid "move this clock first"
+msgstr "померите овај часовник на почетак"
+
+#: ../globaltime/gt_prefs.c:544
+msgid "move this clock left"
+msgstr "померите овај часовник на лево"
+
+#: ../globaltime/gt_prefs.c:549
+msgid "move this clock right"
+msgstr "померите овај часовник на десно"
+
+#: ../globaltime/gt_prefs.c:554
+msgid "move this clock last"
+msgstr "померите овај часовник на крај"
+
+#: ../globaltime/gt_prefs.c:562
+msgid "set the timezone of this clock to be local timezone"
+msgstr "поставите временску област овог часовника за своју временску област"
+
+#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
+msgid "close window and exit"
+msgstr "затворите прозор и изађите"
+
+#: ../globaltime/gt_prefs.c:590
+msgid "Globaltime preferences "
+msgstr "Поставке општег времена "
+
+#. -----------------------HEADING-------------------------------------------
+#: ../globaltime/gt_prefs.c:603
+msgid "Clock Parameters"
+msgstr "Параметри часовника"
+
+#: ../globaltime/gt_prefs.c:607
+msgid "Name of the clock:"
+msgstr "Назив часовника:"
+
+#: ../globaltime/gt_prefs.c:613
+msgid "enter name of clock"
+msgstr "унесите назив за часовник"
+
+#: ../globaltime/gt_prefs.c:616
+msgid "Timezone of the clock:"
+msgstr "Временска област часовника:"
+
+#: ../globaltime/gt_prefs.c:643
+msgid "Text Formatting"
+msgstr "Обликовање текста"
+
+#. ------------------------background-------------------------
+#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
+msgid "Background color:"
+msgstr "Боја позадине:"
+
+#: ../globaltime/gt_prefs.c:656
+msgid "Click to change background colour for clock"
+msgstr "Кликните да измените боју позадине часовника"
+
+#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
+#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
+#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
+#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
+#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
+msgid "Use default"
+msgstr "Користи основно"
+
+#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
+#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
+#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
+msgid "Cross this to use default instead of selected value"
+msgstr "Штиклирајте ово да би била коришћена основна уместо изабране вредности"
+
+#. ------------------------foreground-------------------------
+#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
+msgid "Foreground (=text) color:"
+msgstr "Боја прочеља (=текста):"
+
+#: ../globaltime/gt_prefs.c:688
+msgid "Click to change foreground colour for clock"
+msgstr "Кликните да измените боју прочеља часовника"
+
+#. ------------------------name font-------------------------
+#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
+msgid "Font for name of clock:"
+msgstr "Писмо за назив часовника:"
+
+#: ../globaltime/gt_prefs.c:720
+msgid "Click to change font for clock name"
+msgstr "Кликните да измените словни лик за назив часовника"
+
+#. ------------------------time font-------------------------
+#: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
+msgid "Font for time of clock:"
+msgstr "Писмо за време часовника:"
+
+#: ../globaltime/gt_prefs.c:753
+msgid "Click to change font for clock time"
+msgstr "Кликните да измените словни лик за време часовника"
+
+#. ------------------------underline name--------------------
+#: ../globaltime/gt_prefs.c:780
+msgid "Underline name of clock:"
+msgstr "Подвучени назив часовника:"
+
+#. ------------------------underline time--------------------
+#: ../globaltime/gt_prefs.c:810
+msgid "Underline time of clock:"
+msgstr "Подвучено време часовника:"
+
+#: ../globaltime/gt_prefs.c:850
+msgid "Text Default Formatting"
+msgstr "Основно обликовање текста"
+
+#: ../globaltime/gt_prefs.c:863
+msgid "Click to change default background colour for clocks"
+msgstr "Кликните да измените основну боју позадине часовника"
+
+#: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
+msgid "Cross this to use system default instead of selected color"
+msgstr "Штиклирајте ово да би била коришћена основна уместо изабране боје"
+
+#: ../globaltime/gt_prefs.c:896
+msgid "Click to change default text colour for clocks"
+msgstr "Кликните да измените основну боју текста часовника"
+
+#: ../globaltime/gt_prefs.c:929
+msgid "Click to change default font for clock name"
+msgstr "Кликните да измените основни словни лик за назив часовника"
+
+#: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
+msgid "Cross this to use system default font instead of selected font"
+msgstr "Штиклирајте ово да би било коришћен основни уместо изабраног словног лика"
+
+#: ../globaltime/gt_prefs.c:963
+msgid "Click to change default font for clock time"
+msgstr "Кликните да измените основни словни лик за време часовника"
+
+#. ------------------------underline name--------------------
+#: ../globaltime/gt_prefs.c:990
+msgid "Underline for name of clock:"
+msgstr "Подвлака за назив часовника:"
+
+#. ------------------------underline time--------------------
+#: ../globaltime/gt_prefs.c:1004
+msgid "Underline for time of clock:"
+msgstr "Подвлака за време часовника:"
+
+#: ../globaltime/gt_prefs.c:1027
+msgid "update preferences"
+msgstr "освежите поставке"
+
+#: ../globaltime/gt_prefs.c:1062
+msgid "Globaltime Preferences"
+msgstr "Поставке општег времена"
+
+#. -----------------------HEADING--------------------------------------
+#: ../globaltime/gt_prefs.c:1073
+msgid "General Preferences"
+msgstr "Опште поставке"
+
+#: ../globaltime/gt_prefs.c:1077
+msgid "Decorations:"
+msgstr "Украси:"
+
+#: ../globaltime/gt_prefs.c:1078
+msgid "Standard"
+msgstr "Обично"
+
+#: ../globaltime/gt_prefs.c:1083
+msgid "Use normal decorations"
+msgstr "Биће коришћени уобичајени украси"
+
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Ништа"
+
+#: ../globaltime/gt_prefs.c:1094
+msgid "Do not show window decorations (borders)"
+msgstr "Неће бити приказани украси прозора (ивице)"
+
+#: ../globaltime/gt_prefs.c:1100
+msgid "Clock size:"
+msgstr "Величина часовника:"
+
+#: ../globaltime/gt_prefs.c:1101
+msgid "Equal"
+msgstr "Иста"
+
+#: ../globaltime/gt_prefs.c:1106
+msgid "All clocks have same size"
+msgstr "Сви часовници ће бити исте величине"
+
+#: ../globaltime/gt_prefs.c:1111
+msgid "Varying"
+msgstr "Различита"
+
+#: ../globaltime/gt_prefs.c:1116
+msgid "Clock sizes vary"
+msgstr "Величине часовника ће се разликовати"
+
+#: ../globaltime/gt_prefs.c:1122
+msgid "Local timezone:"
+msgstr "Месна временска област:"
+
+#: ../globaltime/timezone_selection.c:101
+#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
+msgid " Other"
+msgstr " Друго"
+
+#: ../globaltime/timezone_selection.c:156
+#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
+#, c-format
+msgid "%d hour %d mins"
+msgstr "%d часова %d минута"
+
+#: ../globaltime/timezone_selection.c:159
+#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
+#, c-format
+msgid "%d hour"
+msgstr "%d сат"
+
+#: ../globaltime/timezone_selection.c:161
+#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
+#, c-format
+msgid "%d mins"
+msgstr "%d минута"
+
+#: ../globaltime/timezone_selection.c:167
+#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
+msgid "backward"
+msgstr "уназад"
+
+#: ../globaltime/timezone_selection.c:170
+#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
+msgid "forward"
+msgstr "унапред"
+
+#: ../globaltime/timezone_selection.c:194
+#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
+msgid "not changed"
+msgstr "није измењено"
+
+#: ../globaltime/timezone_selection.c:195
+#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
+msgid "not changing"
+msgstr "без промена"
+
+#. location
+#: ../globaltime/timezone_selection.c:247
+#: ../globaltime/timezone_selection.c:252
+#: ../panel-plugin/timezone_selection.c:248
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
+#: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
+msgid "Location"
+msgstr "Место"
+
+#: ../globaltime/timezone_selection.c:258
+#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
+msgid "GMT Offset"
+msgstr "ГМТ померај"
+
+#: ../globaltime/timezone_selection.c:264
+#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
+msgid "Previous/Next Change"
+msgstr "Претходна/Наредна измена"
+
+#: ../globaltime/timezone_selection.c:269
+#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
+msgid "Country"
+msgstr "Држава"
+
+#. We are actually setting the g_par parameter. In other words
+#. we are setting the global default timezone for Orage. This is
+#. done very seldom and we do not want to allow "floating" here.
+#. This test is ugly, but it is not worth an extra parameter.
+#. this is normal appointment
+#: ../globaltime/timezone_selection.c:299
+#: ../globaltime/timezone_selection.c:309
+#: ../panel-plugin/timezone_selection.c:300
+#: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
+#: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
+msgid "Pick timezone"
+msgstr "Изаберите временску област"
+
+#: ../globaltime/timezone_selection.c:302
+#: ../globaltime/timezone_selection.c:312
+#: ../panel-plugin/timezone_selection.c:303
+#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
+#: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
+msgid "Change mode"
+msgstr "Режим измене"
+
+#: ../globaltime/timezone_selection.c:303
+#: ../globaltime/timezone_selection.c:313
+#: ../globaltime/timezone_selection.c:352
+#: ../panel-plugin/timezone_selection.c:304
+#: ../panel-plugin/timezone_selection.c:314
+#: ../panel-plugin/timezone_selection.c:353 ../src/timezone_selection.c:320
+#: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
+#: ../src/timezone_selection.c:379
+msgid "UTC"
+msgstr "КУВ"
+
+#. NOTE: this exists only if ical timezones are being used
+#: ../globaltime/timezone_selection.c:304
+#: ../globaltime/timezone_selection.c:357
+#: ../panel-plugin/timezone_selection.c:305
+#: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
+#: ../src/timezone_selection.c:384
+msgid "floating"
+msgstr "плутајуће"
+
+#: ../globaltime/globaltime.desktop.in.h:1
+msgid "Orage Globaltime"
+msgstr "Опште време Оража"
+
+#: ../globaltime/globaltime.desktop.in.h:2
+msgid "Show clocks from different countries"
+msgstr "Прикажите часовнике за разне државе"
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Опште време"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Без окретања"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Окрени на лево"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Окрени на десно"
+
+#: ../panel-plugin/oc_config.c:248
+msgid "Appearance"
+msgstr "Изглед"
+
+#. show frame
+#: ../panel-plugin/oc_config.c:257
+msgid "Show _frame"
+msgstr "Прикажи _оквир"
+
+#. foreground color
+#: ../panel-plugin/oc_config.c:263
+msgid "set foreground _color:"
+msgstr "боја про_чеља:"
+
+#. background color
+#: ../panel-plugin/oc_config.c:277
+msgid "set _background color:"
+msgstr "боја по_задине:"
+
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
+msgid "set _height:"
+msgstr "_висина:"
+
+#: ../panel-plugin/oc_config.c:301
+msgid "Note that you can not change the height of horizontal panels"
+msgstr "Знајте да не можете да измените висину водоравних површи"
+
+#: ../panel-plugin/oc_config.c:306
+msgid "set _width:"
+msgstr "_ширина:"
+
+#: ../panel-plugin/oc_config.c:316
+msgid "Note that you can not change the width of vertical panels"
+msgstr "Знајте да не можете да измените ширину усправних површи"
+
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Приказуј линије _усправно"
+
+#: ../panel-plugin/oc_config.c:350
+msgid "Clock Options"
+msgstr "Могућности часовника"
+
+#. timezone
+#: ../panel-plugin/oc_config.c:360
+msgid "set timezone to:"
+msgstr "постави временску област на:"
+
+#: ../panel-plugin/oc_config.c:381
+#, c-format
+msgid "Line %d:"
+msgstr "Ред %d:"
+
+#: ../panel-plugin/oc_config.c:391
+msgid "Enter any valid strftime function parameter."
+msgstr "Унесите неки исправан параметар функције временске ниске."
+
+#. Tooltip hint
+#: ../panel-plugin/oc_config.c:435
+msgid "Tooltip:"
+msgstr "Облачићи:"
+
+#. special timing for SUSPEND/HIBERNATE
+#: ../panel-plugin/oc_config.c:445
+msgid "fix time after suspend/hibernate"
+msgstr "поправи време након обуставе/замрзавања"
+
+#: ../panel-plugin/oc_config.c:449
+msgid ""
+"You only need this if you do short term (less than 5 hours) suspend or "
+"hibernate and your visible time does not include seconds. Under these "
+"circumstances it is possible that Orageclock shows time inaccurately unless "
+"you have this selected. (Selecting this prevents cpu and interrupt saving "
+"features from working.)"
+msgstr "Ово вам је потребно само ако радите краткорочно (мање од 5 сати) обустављање или замрзавање а у вашем видљивом времену нису приказане секунде. Под овим околностима могуће је да Оражов часовник приказује нетачно време осим ако нисте изабрали ово. (Бирање овога штити процесор и прекида функције чувања од дејствовања.)"
+
+#: ../panel-plugin/oc_config.c:466
+msgid ""
+"This program uses strftime function to get time.\n"
+"Use any valid code to get time in the format you prefer.\n"
+"Some common codes are:\n"
+"\t%A = weekday\t\t\t%B = month\n"
+"\t%c = date & time\t\t%R = hour & minute\n"
+"\t%V = week number\t\t%Z = timezone in use\n"
+"\t%H = hours \t\t\t\t%M = minute\n"
+"\t%X = local time\t\t\t%x = local date"
+msgstr "Овај програм користи „strftime“ функцију да добави време.\nКористите било који исправан код да добавите време у облику који желите.\nНеки општи кодови су:\n\t%A = седмица\t\t\t%B = месец\n\t%c = датум и време\t\t%R = сат и минут\n\t%V = број седмице\t\t%Z = временска област у употреби\n\t%H = сати \t\t        %M = минут\n\t%X = месно време\t\t%x = месни датум"
+
+#: ../panel-plugin/oc_config.c:491
+msgid "Orage clock Preferences"
+msgstr "Поставке Оражовог часовника"
+
+#. TRANSLATORS: Use format characters from strftime(3)
+#. * to get the proper string for your locale.
+#. * I used these:
+#. * %A  : full weekday name
+#. * %d  : day of the month
+#. * %B  : full month name
+#. * %Y  : four digit year
+#. * %V  : ISO week number
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
+msgid "%A %d %B %Y/%V"
+msgstr "%A, %d. %B %Y/%V"
+
+#: ../src/about-xfcalendar.c:40
+msgid "Maintainer"
+msgstr "Одржавалац"
+
+#: ../src/about-xfcalendar.c:47
+msgid "Manage your time with Orage"
+msgstr "Управљајте вашим временом са Оранжом"
+
+#. if (gtk_toggle_button_get_active(
+#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
+#. end time
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
+msgid "End"
+msgstr "Kraj"
+
+#: ../src/appointment.c:333
+msgid "Due"
+msgstr "Рок"
+
+#: ../src/appointment.c:493 ../src/mainbox.c:862
+msgid "Orage"
+msgstr "Ораже"
+
+#. to avoid timing problems when updating entry
+#. Create file chooser
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
+msgid "Select a file..."
+msgstr "Изаберите датотеку..."
+
+#: ../src/appointment.c:680
+msgid "Sound Files"
+msgstr "Звучне датотеке"
+
+#: ../src/appointment.c:687 ../src/interface.c:277
+msgid "All Files"
+msgstr "Све датотеке"
+
+#: ../src/appointment.c:738
+msgid "The appointment information has been modified."
+msgstr "Подаци о састанку су измењени."
+
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
+msgid "Do you want to continue?"
+msgstr "Да ли желите да наставите?"
+
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Не, не прекидај"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Да, занемари измене и прекини"
+
+#: ../src/appointment.c:768
+msgid "The end of this appointment is earlier than the beginning."
+msgstr "Крај овог састанка је пре почетка."
+
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
+msgid "Not set"
+msgstr "Није постављено"
+
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Додај нови састанак у датотеку."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Подразумевана датотека Оража"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Додавање састанка није успело."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Десила се грешка при додавању састанка. Погледајте датотеку дневника за више појединости."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Освежавање састанка није успело."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Погледајте датотеку дневника за више појединости. (Можда датотека није освежена Оражом, већ споља?)"
+
+#: ../src/appointment.c:1286
+msgid "This appointment will be permanently removed."
+msgstr "Овај састанак ће бити трајно уклоњен."
+
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Не, откажи уклањање"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Да, уклони"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Изаберите датум"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Данас"
+
+#: ../src/appointment.c:1803
+msgid "This appointment does not exist."
+msgstr "Овај састанак не постоји."
+
+#: ../src/appointment.c:1804
+msgid "It was probably removed, please refresh your screen."
+msgstr "Вероватно је уклоњен, молим освежите ваш екран."
+
+#: ../src/appointment.c:2105
+msgid "Current categories"
+msgstr "Тренутне категорије"
+
+#: ../src/appointment.c:2120
+msgid "Add new category with color"
+msgstr "Додајте нову категорију са бојом"
+
+#: ../src/appointment.c:2124
+msgid "Category:"
+msgstr "Категорија:"
+
+#: ../src/appointment.c:2155
+msgid "Colors of categories - Orage"
+msgstr "Боје категорија — Ораж"
+
+#: ../src/appointment.c:2201
+msgid " *** COPY ***"
+msgstr " *** УМНОЖИ ***"
+
+#: ../src/appointment.c:2466
+msgid "New appointment - Orage"
+msgstr "Нови састанак — Ораж"
+
+#. File menu stuff
+#. ********* File menu *********
+#. File menu
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
+msgid "_File"
+msgstr "_Датотека"
+
+#: ../src/appointment.c:2502
+msgid "Sav_e and close"
+msgstr "_Сачувај и затвори"
+
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
+msgid "D_uplicate"
+msgstr "У_двостручи"
+
+#: ../src/appointment.c:2702
+msgid "Save"
+msgstr "Сачувај"
+
+#: ../src/appointment.c:2704
+msgid "Save and close"
+msgstr "Сачувај и затвори"
+
+#: ../src/appointment.c:2709
+msgid "Revert"
+msgstr "Поврати"
+
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
+msgid "Duplicate"
+msgstr "Удвостручи"
+
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
+msgid "Delete"
+msgstr "Обриши"
+
+#: ../src/appointment.c:2734
+msgid "Free"
+msgstr "Слободан"
+
+#: ../src/appointment.c:2734
+msgid "Busy"
+msgstr "Заузет"
+
+#: ../src/appointment.c:2738
+msgid "General"
+msgstr "Опште"
+
+#. type
+#: ../src/appointment.c:2744
+msgid "Type "
+msgstr "Врста "
+
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
+msgid "Event"
+msgstr "Догађај"
+
+#: ../src/appointment.c:2749
+msgid ""
+"Event that will happen sometime. For example:\n"
+"Meeting or birthday or TV show."
+msgstr "Догађај који ће се десити некада. На пример:\nСастанак или рођендан или ТВ емисија."
+
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
+msgid "Todo"
+msgstr "Обавезе"
+
+#: ../src/appointment.c:2755
+msgid ""
+"Something that you should do sometime. For example:\n"
+"Wash your car or test new version of Orage."
+msgstr "Нешто што бисте требали некад да урадите. На пример:\nДа оперете судове или да испробате нове бакине колаче."
+
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
+msgid "Journal"
+msgstr "Дневник"
+
+#: ../src/appointment.c:2762
+msgid ""
+"Make a note that something happened. For example:\n"
+"Remark that your mother called or first snow came."
+msgstr "Направите белешку неког дешавања. На пример:\nЗабележите када сте добили на лутрији или када је маца омацила седам белих пуфница."
+
+#. title
+#: ../src/appointment.c:2769
+msgid "Title "
+msgstr "Наслов "
+
+#: ../src/appointment.c:2784
+msgid "All day event"
+msgstr "Целодневни догађај"
+
+#. start time
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
+msgid "Start"
+msgstr "Почетак"
+
+#: ../src/appointment.c:2810
+msgid "Set      "
+msgstr "Подеси      "
+
+#: ../src/appointment.c:2831
+msgid "Duration"
+msgstr "Трајање"
+
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
+msgid "days"
+msgstr "дана"
+
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
+msgid "hours"
+msgstr "часова"
+
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
+msgid "mins"
+msgstr "минута"
+
+#. Availability (only for EVENT)
+#: ../src/appointment.c:2851
+msgid "Availability"
+msgstr "Доступност"
+
+#. completed (only for TODO)
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
+msgid "Completed"
+msgstr "Завршено"
+
+#: ../src/appointment.c:2862
+msgid "Done"
+msgstr "Урађено"
+
+#. categories
+#: ../src/appointment.c:2883
+msgid "Categories"
+msgstr "Категорије"
+
+#: ../src/appointment.c:2895
+msgid ""
+"This is special category, which can be used to color this appointment in "
+"list views."
+msgstr "Ово је посебна категорија, која може бити коришћена да обоји овај састанак у прегледу списком."
+
+#: ../src/appointment.c:2900
+msgid "update colors for categories."
+msgstr "освежите боје за категорије."
+
+#. priority
+#: ../src/appointment.c:2906
+msgid "Priority"
+msgstr "Хитност"
+
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Уколико се постави на 8 или више састанак се НЕЋЕ приказати у прозорима.\nМожете користити ову могућност за смањивање прозора списка, али је теже да се пронађе састанак.\n(Узбуне ће и даље радити.)\n(Постоји недокументована одредница тако да можете променити подразумевано ограничење од 8.)"
+
+#. note
+#: ../src/appointment.c:2918
+msgid "Note"
+msgstr "Белешка"
+
+#: ../src/appointment.c:2939
+msgid ""
+"These shorthand commands take effect immediately:\n"
+"    <D> inserts current date in local date format\n"
+"    <T> inserts time and\n"
+"    <DT> inserts date and time.\n"
+"\n"
+"These are converted only later when they are seen:\n"
+"    <&Ynnnn> is translated to current year minus nnnn.\n"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Ове наредбе пречица ступају на снагу одмах:\n    <D> умеће текући датум у облику месног датума\n    <T> умеће време и\n    <DT> умеће датум и време.\n\nОве су претворене једино касније када бивају виђене:\n    <&Ynnnn> је преведена на текућу годину мање nnnn.\n(Ово може бити коришћено на пример у потсетнику рођендана када ће рећи колико ће особа бити стара.)"
+
+#: ../src/appointment.c:3010
+msgid "Before Start"
+msgstr "Пре почетка"
+
+#: ../src/appointment.c:3010
+msgid "Before End"
+msgstr "Пре краја"
+
+#: ../src/appointment.c:3011
+msgid "After Start"
+msgstr "Након почетка"
+
+#: ../src/appointment.c:3011
+msgid "After End"
+msgstr "Након краја"
+
+#: ../src/appointment.c:3018
+msgid "Alarm"
+msgstr "Аларм"
+
+#. **** ALARM TIME ****
+#: ../src/appointment.c:3024
+msgid "Alarm time"
+msgstr "Време аларма"
+
+#: ../src/appointment.c:3048
+msgid ""
+"Often you want to get alarm:\n"
+" 1) before Event start\n"
+" 2) before Todo end\n"
+" 3) after Todo start"
+msgstr "Колико често желите аларм:\n 1) пре почетка догађаја\n 2) пре краја обавезе\n 3) након почетка обавезе"
+
+#: ../src/appointment.c:3053
+msgid "Persistent alarm"
+msgstr "Стални аларм"
+
+#: ../src/appointment.c:3055
+msgid ""
+"Select this if you want Orage to remind you even if it has not been active "
+"when the alarm happened."
+msgstr "Изаберите ово ако желите да вас Ораж подсети чак и ако није био активан када се догодио аларм."
+
+#. **** Audio Alarm ****
+#: ../src/appointment.c:3064
+msgid "Sound"
+msgstr "Звук"
+
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
+msgid "Use"
+msgstr "Користи"
+
+#: ../src/appointment.c:3070
+msgid "Select this if you want audible alarm"
+msgstr "Изаберите ово ако желите чујни аларм"
+
+#: ../src/appointment.c:3087
+msgid "Repeat alarm sound"
+msgstr "Понови звук аларма"
+
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
+msgid "times"
+msgstr "пута"
+
+#: ../src/appointment.c:3119
+msgid "sec interval"
+msgstr "период секунди"
+
+#. **** Display Alarm ****
+#: ../src/appointment.c:3129
+msgid "Visual"
+msgstr "Видни"
+
+#: ../src/appointment.c:3133
+msgid "Use Orage window"
+msgstr "Користи прозор Оража"
+
+#: ../src/appointment.c:3135
+msgid "Select this if you want Orage window alarm"
+msgstr "Изаберите ово ако желите аларм прозора Оража"
+
+#: ../src/appointment.c:3147
+msgid "Use notification"
+msgstr "Користи обавештења"
+
+#: ../src/appointment.c:3149
+msgid "Select this if you want notification alarm"
+msgstr "Изаберите ово ако желите аларм обавештења"
+
+#: ../src/appointment.c:3155
+msgid "Set timeout"
+msgstr "Подеси време истека"
+
+#: ../src/appointment.c:3157
+msgid "Select this if you want notification to expire automatically"
+msgstr "Изаберите ово ако желите да обавештење истекне само"
+
+#: ../src/appointment.c:3168
+msgid "0 = system default expiration time"
+msgstr "0 = основно системско време истека"
+
+#: ../src/appointment.c:3173
+msgid "seconds"
+msgstr "секунди"
+
+#. **** Procedure Alarm ****
+#: ../src/appointment.c:3184
+msgid "Procedure"
+msgstr "Поступак"
+
+#: ../src/appointment.c:3190
+msgid "Select this if you want procedure or script alarm"
+msgstr "Изаберите ово ако желите поступак или аларм скрипте"
+
+#: ../src/appointment.c:3196
+msgid ""
+"You must enter all escape etc characters yourself.\n"
+"This string is just given to shell to process.\n"
+"The following special commands are replaced at run time:\n"
+"\t<&T>  appointment title\n"
+"\t<&D>  appointment description\n"
+"\t<&AT> alarm time\n"
+"\t<&ST> appointment start time\n"
+"\t<&ET> appointment end time"
+msgstr "Морате сами да унесете све знаке избегавања.\nОва ниска је заправо дата конзоли на обраду.\nСледеће посебне наредбе бивају замењене за време покретања:\n\t<&T>  наслов састанка\n\t<&D>  опис састанка\n\t<&AT> време аларма\n\t<&ST> време почетка састанка\n\t<&ET> време краја састанка"
+
+#: ../src/appointment.c:3208
+msgid "Test this alarm by raising it now"
+msgstr "Испробајте овај аларм његовим издизањем сада"
+
+#: ../src/appointment.c:3215
+msgid "<b>Default alarm</b>"
+msgstr "<b>Основни аларм</b>"
+
+#: ../src/appointment.c:3223
+msgid "Store current settings as default alarm"
+msgstr "Сачувај текућа подешавања као основни аларм"
+
+#: ../src/appointment.c:3228
+msgid "Set current settings from default alarm"
+msgstr "Постави текућа подешавања из основног аларма"
+
+#: ../src/appointment.c:3290
+msgid "Daily"
+msgstr "Дневно"
+
+#: ../src/appointment.c:3290
+msgid "Weekly"
+msgstr "Недељно"
+
+#: ../src/appointment.c:3290
+msgid "Monthly"
+msgstr "Месечно"
+
+#: ../src/appointment.c:3290
+msgid "Yearly"
+msgstr "Годишње"
+
+#: ../src/appointment.c:3290
+msgid "Hourly"
+msgstr "Сваког сата"
+
+#: ../src/appointment.c:3292
+msgid "Mon"
+msgstr "Пон"
+
+#: ../src/appointment.c:3292
+msgid "Tue"
+msgstr "Уто"
+
+#: ../src/appointment.c:3292
+msgid "Wed"
+msgstr "Сре"
+
+#: ../src/appointment.c:3292
+msgid "Thu"
+msgstr "Чет"
+
+#: ../src/appointment.c:3292
+msgid "Fri"
+msgstr "Пет"
+
+#: ../src/appointment.c:3292
+msgid "Sat"
+msgstr "Суб"
+
+#: ../src/appointment.c:3292
+msgid "Sun"
+msgstr "Нед"
+
+#: ../src/appointment.c:3297
+msgid "Recurrence"
+msgstr "Понављање"
+
+#. complexity
+#: ../src/appointment.c:3303
+msgid "Complexity"
+msgstr "Сложеност"
+
+#: ../src/appointment.c:3306
+msgid "Basic"
+msgstr "Основнo"
+
+#: ../src/appointment.c:3312
+msgid "Advanced"
+msgstr "Напредно"
+
+#: ../src/appointment.c:3316
+msgid "Use this if you want regular repeating event"
+msgstr "Користите ово ако желите редовно понављање догађаја"
+
+#: ../src/appointment.c:3318
+msgid ""
+"Use this if you need complex times like:\n"
+" Every Saturday and Sunday or \n"
+" First Tuesday every month"
+msgstr "Користите ово ако вам требају сложена времена као:\n Сваке суботе и недеље или \n Сваког првог петка у месецу"
+
+#. frequency
+#: ../src/appointment.c:3324
+msgid "Frequency"
+msgstr "Учестаност"
+
+#: ../src/appointment.c:3330
+msgid "Each"
+msgstr "Сваки"
+
+#: ../src/appointment.c:3337
+msgid "occurrence"
+msgstr "понављање"
+
+#: ../src/appointment.c:3341
+msgid ""
+"Limit frequency to certain interval.\n"
+" For example: Every third day:\n"
+" Frequency = Daily and Interval = 3"
+msgstr "Ограничите учестаност на одређени период.\n На пример: Сваког трећег дана:\n Учестаност = Дневно и Период = 3"
+
+#: ../src/appointment.c:3386
+msgid "Limit"
+msgstr "Ограничи"
+
+#: ../src/appointment.c:3388
+msgid "Repeat forever"
+msgstr "Понављај заувек"
+
+#: ../src/appointment.c:3394
+msgid "Repeat "
+msgstr "Понављај "
+
+#: ../src/appointment.c:3410
+msgid "Repeat until "
+msgstr "Понављај до "
+
+#. weekdays (only for complex settings)
+#: ../src/appointment.c:3423
+msgid "Weekdays"
+msgstr "Радним данима"
+
+#: ../src/appointment.c:3435
+msgid "Which day"
+msgstr "Којим даном"
+
+#: ../src/appointment.c:3443
+msgid ""
+"Specify which weekday for monthly and yearly events.\n"
+" For example:\n"
+" Second Wednesday each month:\n"
+"\tFrequency = Monthly,\n"
+"\tWeekdays = check only Wednesday,\n"
+"\tWhich day = select 2 from the number below Wednesday"
+msgstr "Наведите који радни дан за месечне и годишње догађаје.\n На пример:\n Сваке друге среде у месецу:\n\tУчестаност = Месечно,\n\tРадни дани = изаберите само среду,\n\tКојим даном = изаберите 2 из бројева испод среде"
+
+#. TODO base (only for TODOs)
+#: ../src/appointment.c:3450
+msgid "TODO base"
+msgstr "Основна ОБАВЕЗА"
+
+#: ../src/appointment.c:3463
+msgid ""
+"TODO reoccurs regularly starting on start time and repeating after each "
+"interval no matter when it was last completed"
+msgstr "ОБАВЕЗА се поново дешава редовно почевши од времена почетка и понавља се након сваког периода без обзира када је последњи пут обављена"
+
+#: ../src/appointment.c:3465
+msgid ""
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "Поновно дешавање ОБАВЕЗЕ је засновано на времену обављања и понавља се након периода који се броји од последњег времена бављања.\n(Знајте да нећете моћи ништа да кажете о историјату ОБАВЕЗЕ све док се основа поновног дешавања не промени након сваког обављања.)"
+
+#. exceptions
+#: ../src/appointment.c:3471
+msgid "Exceptions"
+msgstr "Изузеци"
+
+#: ../src/appointment.c:3484
+msgid ""
+"Add more exception dates by clicking the calendar days below.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
+"Remove by clicking the data."
+msgstr "Додајте још датума изузетака кликом на дан колендара.\nИзузетак је или искључење(-) или укључење(+) у зависности од избора.\nУклоните кликом на податак."
+
+#: ../src/appointment.c:3489
+msgid "Add excluded date (-)"
+msgstr "Додај искључени датум (+)"
+
+#: ../src/appointment.c:3491
+msgid "Excluded days are full days where this appointment is not happening"
+msgstr "Искључени дани су цели дани у којима се овај састанак не дешава"
+
+#: ../src/appointment.c:3497
+msgid "Add included time (+)"
+msgstr "Додај укључено време (-)"
+
+#: ../src/appointment.c:3499
+msgid ""
+"Included times have same timezone than start time, but they may have "
+"different time"
+msgstr "Укључена времена имају исту временску област као почетно време, али могу имати различито време"
+
+#. calendars showing the action days
+#: ../src/appointment.c:3516
+msgid "Action dates"
+msgstr "Датуми радње"
+
+#. ********* View menu *********
+#. View menu
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
+msgid "_View"
+msgstr "_Преглед"
+
+#. ********* Go menu   *********
+#: ../src/day-view.c:303 ../src/event-list.c:1123
+msgid "_Go"
+msgstr "_Иди"
+
+#: ../src/day-view.c:377 ../src/event-list.c:1169
+msgid "New"
+msgstr "Ново"
+
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Једну седмицу уназад"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Један дан уназад"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Унапред један дан"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Унапред једну седмицу"
+
+#: ../src/day-view.c:395 ../src/event-list.c:1187
+msgid "Refresh"
+msgstr "Освежи"
+
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
+msgid "Close"
+msgstr "Затвори"
+
+#: ../src/day-view.c:549
+msgid "Unknown"
+msgstr "Непознато"
+
+#: ../src/day-view.c:807
+msgid "       Number of days to show"
+msgstr "       Број дана за приказивање"
+
+#: ../src/day-view.c:1073
+msgid "Orage - day view"
+msgstr "Ораже — преглед дана"
+
+#. date only appointment
+#: ../src/event-list.c:191
+msgid "All day"
+msgstr "Читав дан"
+
+#: ../src/event-list.c:596 ../src/event-list.c:1370
+msgid "Time"
+msgstr "Време"
+
+#: ../src/event-list.c:784
+msgid "No rows have been selected."
+msgstr "Ниједан ред није изабран."
+
+#: ../src/event-list.c:785
+msgid "Click a row to select it and after that you can copy it."
+msgstr "Кликните на ред да га изаберете и након тога можете да га умножите."
+
+#: ../src/event-list.c:968
+msgid ""
+"You will permanently remove all\n"
+"selected appointments."
+msgstr "Трајно ћете уклонити све\nизабране састанке."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Да, уклони их"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Назад"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Напред"
+
+#: ../src/event-list.c:1189
+msgid "Find"
+msgstr "Нађи"
+
+#: ../src/event-list.c:1196
+msgid "Dayview"
+msgstr "Дневни преглед"
+
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Додатни дани за приказивање:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "само први се понавља"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Означите ако желите да се приказује само први догађај који се понавља. Подразумевано се приказују сви.\nТакође приказује и све хитне догађаје.\nПонављајући догађаји се могу приказивати раније на списку јер је само први догађај приказан."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "укључујући старе"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Означите ако желите да се приказују и стари догађаји. Може бити означено само ако је омогућено „самопрви се понавља“ да би се избегли дуги спискови.\nОзначавање додатних дана ће и даље одређивати да се нови састанци приказују."
+
+#: ../src/event-list.c:1290
+msgid "Journal entries starting from:"
+msgstr "Прибележи уносе почевши од:"
+
+#: ../src/event-list.c:1310
+msgid "Search"
+msgstr "Потражи"
+
+#: ../src/event-list.c:1313
+msgid "Search text "
+msgstr "Потражи текст "
+
+#: ../src/event-list.c:1378
+msgid "Flags"
+msgstr "Ознаке"
+
+#: ../src/event-list.c:1386
+msgid "Title"
+msgstr "Наслов"
+
+#: ../src/event-list.c:1412
+msgid ""
+"Double click line to edit it.\n"
+"\n"
+"Flags in order:\n"
+"\t 1. Alarm: n=no alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
+"\t 2. Recurrence: n=no recurrence\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t 3. Type: f=free B=Busy\n"
+"\t 4. Located in file:\n"
+"\t\tO=Orage A=Archive F=Foreign\n"
+"\t 5. Appointment type:\n"
+"\t\tE=Event T=Todo J=Journal"
+msgstr "Двоструки клик на линију за уређивање.\n\nРаспоред ознака:\n\t 1. Аларм: n=без аларма\n\t\t A=Аларм је постављен P=Стални аларм је постављен\n\t 2. Понављање: n=без понављања\n\t\t H=Сваког сата D=Дневно W=Седмично M=Месечно Y=Годишње\n\t 3. Врста: f=слободан B=Заузет\n\t 4. Налази се у датотеци:\n\t\tO=Ораж A=Складиште F=Страни\n\t 5. Врста састанка:\n\t\tE=Догађај T=Обавеза J=Дневник"
+
+#. remove since it has ended
+#: ../src/ical-archive.c:267
+msgid "\tRecur ended, moving to archive file."
+msgstr "        Понављање је завршено, прелазим на датотеку складишта."
+
+#: ../src/ical-archive.c:330
+msgid "Archiving not enabled. Exiting"
+msgstr "Архивирање није укључено. Излазим"
+
+#: ../src/ical-archive.c:349
+#, c-format
+msgid "Archiving threshold: %d month(s)"
+msgstr "Праг архивирања: %d месец(а)"
+
+#. yy mon day
+#: ../src/ical-archive.c:352
+#, c-format
+msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
+msgstr "\tДогађаји архивирања, који су старији од: %04d-%02d-%02d"
+
+#: ../src/ical-archive.c:379
+#, c-format
+msgid "Archiving uid: %s"
+msgstr "уиб архивирања: %s"
+
+#. VTODO not completed, do not archive
+#: ../src/ical-archive.c:385
+msgid "\tVTODO not complete; not archived"
+msgstr "\tВОБАВЕЗА није обављена; није ускладиштена"
+
+#. it is recurrent event
+#: ../src/ical-archive.c:390
+#, c-format
+msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
+msgstr "\tПонављање. Година краја: %04d, месец: %02d, дан: %02d"
+
+#: ../src/ical-archive.c:407
+msgid "Archiving done\n"
+msgstr "Архивирање је обављено\n"
+
+#. PHASE 1: go through base orage file and remove "repeat" shortcuts
+#: ../src/ical-archive.c:423
+msgid "Starting archive removal."
+msgstr "Почињем уклањање складишта."
+
+#: ../src/ical-archive.c:424
+msgid "\tPHASE 1: reset recurring appointments"
+msgstr "        ФАЗА 1: поново поставља понављајуће састанке"
+
+#. PHASE 2: go through archive file and add everything back to base orage.
+#. * After that delete the whole arch file
+#: ../src/ical-archive.c:446
+msgid "\tPHASE 2: return archived appointments"
+msgstr "        ФАЗА 2: враћа складиштене састанке"
+
+#: ../src/ical-archive.c:472
+msgid "Archive removal done\n"
+msgstr "Уклањање складишта је обављено\n"
+
+#: ../src/ical-code.c:972
+msgid "Orage default alarm"
+msgstr "Оражов основни аларм"
+
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Списак аларма из главне датотеке Оража:"
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Образован је списак аларма за спољну датотеку: %s (%s)"
+
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\tДодато је %d аларма. Обрађено је %d догађаја."
+
+#: ../src/ical-code.c:3185
+#, c-format
+msgid ""
+"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
+msgstr "        Пронашао сам %d аларма од којих су активна %d. (Тражених понављајућих аларма — %d.)"
+
+#: ../src/ical-expimp.c:123
+msgid "Starting import file preprocessing"
+msgstr "Покрећем уводну обраду увоза датотеке"
+
+#: ../src/ical-expimp.c:158
+msgid "... Patched DCREATED to be CREATED."
+msgstr "... Прекрпљен ДСТВОРЕН да буде СТВОРЕН."
+
+#: ../src/ical-expimp.c:197
+msgid "... Patched timezone to Orage format."
+msgstr "... Прекрпљена временска област у Оражов облик."
+
+#: ../src/ical-expimp.c:206
+msgid "Import file preprocessing done"
+msgstr "Уводна обрада увоза датотеке је обављена"
+
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Пронађена је спољна измена датотеке %s."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Освежавам аларме и колендар због спољних измена датотеке,"
+
+#: ../src/interface.c:271
+msgid "Calendar files"
+msgstr "Датотеке колендара"
+
+#: ../src/interface.c:631
+msgid "Current foreign files"
+msgstr "Текуће стране датотеке"
+
+#: ../src/interface.c:648
+msgid "READ ONLY"
+msgstr "САМО ЧИТАЊЕ"
+
+#: ../src/interface.c:650
+msgid "READ WRITE"
+msgstr "ЧИТАЊЕ ПИСАЊЕ"
+
+#: ../src/interface.c:669
+msgid "***** No foreign files *****"
+msgstr "***** Нема страних датотека *****"
+
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Нисам успео да додам страну датотеку"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Ораж може да обрађује само 10 спољних датотека. Ограничење је досегнуто."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Нема имена датотеке."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Нема имена."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Датотека не постоји."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "У Оражу већ постоји исто име датотеке."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Исто име већ постоји у Оражу."
+
+#: ../src/interface.c:965
+msgid "Import/export"
+msgstr "Увоз/извоз"
+
+#: ../src/interface.c:972
+msgid "Import"
+msgstr "Увези"
+
+#: ../src/interface.c:977
+msgid "Read from file:"
+msgstr "Читај из датотеке:"
+
+#: ../src/interface.c:994
+msgid ""
+"Separate filenames with comma(,).\n"
+" NOTE: comma is not valid character in filenames for Orage."
+msgstr "Раздвојте називе датотека зарезом(,).\n НАПОМЕНА: зарез није исправан знак у називима датотека за Ораж."
+
+#: ../src/interface.c:999
+msgid "Export"
+msgstr "Извези"
+
+#: ../src/interface.c:1004
+msgid "Write to file:"
+msgstr "Упиши у датотеку:"
+
+#: ../src/interface.c:1025 ../src/interface.c:1037
+msgid "Select"
+msgstr "Изабери"
+
+#: ../src/interface.c:1028
+msgid "All appointments"
+msgstr "Сви састанци"
+
+#: ../src/interface.c:1041
+msgid "Named appointments: "
+msgstr "Именовани састанци: "
+
+#: ../src/interface.c:1053
+msgid ""
+"Note that only main file appointments are read.\n"
+"Archived and Foreign events are not exported."
+msgstr "Знајте да се читају само састанци главне датотеке.\nСкладиштени и страни догађаји се не извозе."
+
+#: ../src/interface.c:1056
+msgid ""
+"Note that only main file appointments are read.\n"
+"Foreign events are not exported."
+msgstr "Знајте да се читају само састанци главне датотеке.\nСтрани догађаји се не извозе."
+
+#: ../src/interface.c:1059
+msgid "You can easily drag these from event-list window."
+msgstr "Можете лако да их превучете из прозора списка догађаја."
+
+#: ../src/interface.c:1061
+msgid "Orage appointment UIDs separated by commas."
+msgstr "УИБ-ови Оражовог састанка раздвојени зарезима."
+
+#: ../src/interface.c:1067
+msgid "Archive"
+msgstr "Складиште"
+
+#: ../src/interface.c:1075
+#, c-format
+msgid "Archive now (threshold: %d months)"
+msgstr "Складишти сада (праг: %d месеца)"
+
+#: ../src/interface.c:1085
+msgid "You can change archive threshold in parameters"
+msgstr "Можете да измените праг складиштења у параметрима"
+
+#: ../src/interface.c:1092
+msgid "Revert archive now"
+msgstr "Поврати складиште сада"
+
+#: ../src/interface.c:1098
+msgid ""
+"Return all archived events into main orage file and remove arch file.\n"
+"This is useful for example when doing export and moving orage\n"
+"appointments to another system."
+msgstr "Вратите све складиштене догађаје у главну оражову датотеку и уклоните датотеку архиве.\nОво је корисно на пример када обављате извоз и премештате оражове\nсастанке на други систем."
+
+#: ../src/interface.c:1109
+msgid "Orage files"
+msgstr "Оражове датотеке"
+
+#: ../src/interface.c:1116
+msgid "Orage main calendar file"
+msgstr "Датотека Оражовог главног колендара"
+
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Тренутна датотека:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Нова датотека:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Могућности радње:"
+
+#: ../src/interface.c:1147 ../src/interface.c:1213
+msgid "Rename"
+msgstr "Преименуј"
+
+#: ../src/interface.c:1151
+msgid ""
+"Orage internal file rename only.\n"
+"Does not touch external filesystem at all.\n"
+"New file must exist."
+msgstr "Преименујте само Оражове унутрашње датотеке.\nНећете уопште дирати спољни систем датотека.\nНова датотека мора да постоји."
+
+#: ../src/interface.c:1155 ../src/interface.c:1218
+msgid "Copy"
+msgstr "Умножи"
+
+#: ../src/interface.c:1159
+msgid "Current file is copied and stays unmodified in the old place."
+msgstr "Текућа датотека је умножена и стање није измењено на старом месту."
+
+#: ../src/interface.c:1163 ../src/interface.c:1223
+msgid "Move"
+msgstr "Премести"
+
+#: ../src/interface.c:1167
+msgid "Current file is moved and vanishes from the old place."
+msgstr "Текућа датотека је премештена и нестаје са старог места."
+
+#: ../src/interface.c:1181
+msgid "Archive file"
+msgstr "Датотека складишта"
+
+#: ../src/interface.c:1245
+msgid "Foreign files"
+msgstr "Стране датотеке"
+
+#: ../src/interface.c:1252
+msgid "Add new foreign file"
+msgstr "Додајте нову страну датотеку"
+
+#: ../src/interface.c:1257
+msgid "Foreign file:"
+msgstr "Страна датотека:"
+
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Име које се приказује:"
+
+#: ../src/interface.c:1285
+msgid "Read only"
+msgstr "Само читање"
+
+#: ../src/interface.c:1292
+msgid ""
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Поставите ово ако желите да осигурате да ова датотека неће никада бити измењена Оражом.\nЗнајте да мењање страних датотека може да их учини несагласним са првобитним алатом, тамо одакле долазе!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Кориснику се приказује унутрашње име уместо имена датотеке."
+
+#: ../src/interface.c:1308
+msgid "Exchange data - Orage"
+msgstr "Размена података — Ораж"
+
+#: ../src/main.c:275
+#, c-format
+msgid ""
+"\tThis is %s version %s\n"
+"\n"
+msgstr "        Ово је %s, издање %s\n\n"
+
+#: ../src/main.c:277
+#, c-format
+msgid "\tReleased under the terms of the GNU General Public License.\n"
+msgstr "        Издато под одредбама Гнуове опште јавне лиценце.\n"
+
+#: ../src/main.c:278
+#, c-format
+msgid "\tCompiled against GTK+-%d.%d.%d, "
+msgstr "\tПреведено наспрам ГТК+-%d.%d.%d, "
+
+#: ../src/main.c:280
+#, c-format
+msgid "using GTK+-%d.%d.%d.\n"
+msgstr "користећи ГТК+-%d.%d.%d.\n"
+
+#: ../src/main.c:283
+#, c-format
+msgid "\tUsing DBUS for import.\n"
+msgstr "        Користи Д-сабирницу за увоз.\n"
+
+#: ../src/main.c:285
+#, c-format
+msgid "\tNot using DBUS. Import works only partially.\n"
+msgstr "        Не користи Д-сабирницу. Увоз ради само делимично.\n"
+
+#: ../src/main.c:288
+#, c-format
+msgid "\tUsing libnotify.\n"
+msgstr "        Користи библиотеку обавештења.\n"
+
+#: ../src/main.c:290
+#, c-format
+msgid "\tNot using libnotify.\n"
+msgstr "        Не користи библиотеку обавештења.\n"
+
+#: ../src/main.c:293
+#, c-format
+msgid "\tUsing automatic archiving.\n"
+msgstr "        Користи самостално архивирање.\n"
+
+#: ../src/main.c:295
+#, c-format
+msgid "\tNot using archiving.\n"
+msgstr "        Не користи архивирање.\n"
+
+#: ../src/main.c:298
+#, c-format
+msgid "\tUsing operating system package libical.\n"
+msgstr "\tКористи пакет библиотеке и-позива оперативног система.\n"
+
+#: ../src/main.c:300
+#, c-format
+msgid "\tUsing Orage local version of libical.\n"
+msgstr "\tКористи Оражово месно издање библиотеке и-позива.\n"
+
+#: ../src/main.c:313
+#, c-format
+msgid ""
+"Usage: orage [options] [files]\n"
+"\n"
+msgstr "Употреба: orage [опције] [датотеке]\n\n"
+
+#: ../src/main.c:314
+#, c-format
+msgid "Options:\n"
+msgstr "Опције:\n"
+
+#: ../src/main.c:315
+#, c-format
+msgid "--version (-v) \t\tshow version of orage\n"
+msgstr "--version (-v) \t\t                приказује издање оража\n"
+
+#: ../src/main.c:316
+#, c-format
+msgid "--help (-h) \t\tprint this text\n"
+msgstr "--help (-h) \t\t                исписује овај текст\n"
+
+#: ../src/main.c:317
+#, c-format
+msgid "--preferences (-p) \tshow preferences form\n"
+msgstr "--preferences (-p) \t\t        приказује поставке из\n"
+
+#: ../src/main.c:318
+#, c-format
+msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
+msgstr "--toggle (-t) \t\t                чини ораж видљивим/невидљивим\n"
+
+#: ../src/main.c:319
+#, c-format
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) file [RW] [name] \tдодаје спољну датотеку\n"
+
+#: ../src/main.c:320
+#, c-format
+msgid "--remove-foreign (-r) file \tremove a foreign file\n"
+msgstr "--remove-foreign (-r) датотека \t        уклања страну датотеку\n"
+
+#: ../src/main.c:321
+#, c-format
+msgid ""
+"--export (-e) file [appointment...] \texport appointments from Orage to "
+"file\n"
+msgstr "--export (-e) датотека [састанак...] \tизвози састанке из Оража у датотеку\n"
+
+#: ../src/main.c:323
+#, c-format
+msgid "files=ical files to load into orage\n"
+msgstr "датотеке=и-позив датотеке за учитавање у ораж\n"
+
+#: ../src/main.c:325
+#, c-format
+msgid "\tdbus not included in orage. \n"
+msgstr "\tд-сабирница није укључена у ораж. \n"
+
+#: ../src/main.c:326
+#, c-format
+msgid ""
+"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
+"when starting orage \n"
+msgstr "коришћен приликом покретања оража \n"
+
+#: ../src/main.c:535
+#, c-format
+msgid ""
+"\n"
+"Unknown option %s\n"
+"\n"
+msgstr "\nНепозната опција %s\n\n"
+
+#: ../src/mainbox.c:305
+msgid "_Exchange data"
+msgstr "_Размени податке"
+
+#. Edit menu
+#: ../src/mainbox.c:316
+msgid "_Edit"
+msgstr "_Измени"
+
+#: ../src/mainbox.c:326
+msgid "View selected _date"
+msgstr "Прикажи изабрани _датум"
+
+#: ../src/mainbox.c:329
+msgid "View selected _week"
+msgstr "Прикажи изабрану _седмицу"
+
+#: ../src/mainbox.c:335
+msgid "Select _Today"
+msgstr "Изабери _данашњи дан"
+
+#: ../src/mainbox.c:341
+msgid "Show _Globaltime"
+msgstr "Покажи _опште време"
+
+#. Help menu
+#: ../src/mainbox.c:345
+msgid "_Help"
+msgstr "По_моћ"
+
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Није одређен наслов"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr " Положај: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n Примедба:\n%s"
+
+#: ../src/mainbox.c:489
+msgid "Never"
+msgstr "Никада"
+
+#: ../src/mainbox.c:495
+#, c-format
+msgid ""
+"Title: %s\n"
+"%s Start:\t%s\n"
+" Due:\t%s\n"
+" Done:\t%s%s"
+msgstr "Наслов: %s\n%s Почетак:\t%s\n За време:\t%s\n Готово:\t%s%s"
+
+#: ../src/mainbox.c:503
+#, c-format
+msgid ""
+"Title: %s\n"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Наслов: %s\n%s Почетак:\t%s\n Завршетак:\t%s%s"
+
+#: ../src/mainbox.c:613
+msgid "<b>To do:</b>"
+msgstr "<b>Обавеза:</b>"
+
+#: ../src/mainbox.c:649
+#, c-format
+msgid "<b>Events for %s:</b>"
+msgstr "<b>Догађаји за %s:</b>"
+
+#: ../src/mainbox.c:660
+#, c-format
+msgid "<b>Events for %s - %s:</b>"
+msgstr "<b>Догађаји за %s — %s:</b>"
+
+#: ../src/parameters.c:492
+msgid "Main settings"
+msgstr "Главна подешавања"
+
+#: ../src/parameters.c:498
+msgid "Timezone"
+msgstr "Временска област"
+
+#: ../src/parameters.c:513
+msgid "You should always define your local timezone."
+msgstr "Требало би да увек одредите временску област свог места."
+
+#: ../src/parameters.c:521
+msgid "Archive threshold (months)"
+msgstr "Праг складиштења (месеци)"
+
+#: ../src/parameters.c:531
+msgid "(0 = no archiving)"
+msgstr "(0 = без архивирања)"
+
+#: ../src/parameters.c:534
+msgid "Archiving is used to save time and space when handling events."
+msgstr "Архивирање се користи за уштеду на времену и простору приликом руковања догађајима."
+
+#: ../src/parameters.c:542
+msgid "Sound command"
+msgstr "Наредба звука"
+
+#: ../src/parameters.c:557
+msgid "This command is given to shell to make sound in alarms."
+msgstr "Ова наредба се даје конзоли за стварање звука у алармима."
+
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Прозор колендара"
+
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Видљиве појединости колендара"
+
+#: ../src/parameters.c:609
+msgid "Show borders"
+msgstr "Прикажи ивице"
+
+#: ../src/parameters.c:614
+msgid "Show menu"
+msgstr "Прикажи избор"
+
+#: ../src/parameters.c:622
+msgid "Show day names"
+msgstr "Прикажи имена дана"
+
+#: ../src/parameters.c:627
+msgid "Show week numbers"
+msgstr "Прикажи бројеве недеља"
+
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Прикажи месец и годину"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Обавештајне кутијице колендара"
+
+#: ../src/parameters.c:660
+msgid "Show todo list"
+msgstr "Прикажи списак обавеза"
+
+#: ../src/parameters.c:667
+msgid "Number of days to show in event window"
+msgstr "Број дана за приказ у прозору догађаја"
+
+#: ../src/parameters.c:673
+msgid "0 = do not show event list at all"
+msgstr "0 = не приказуј списак догађаја нипошто"
+
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Видљивост колендара"
+
+#: ../src/parameters.c:691
+msgid "Show on all desktops"
+msgstr "Прикажи на свим радним површима"
+
+#: ../src/parameters.c:696
+msgid "Keep on top"
+msgstr "Задржи изнад"
+
+#: ../src/parameters.c:704
+msgid "Show in taskbar"
+msgstr "Прикажи на траци алата"
+
+#: ../src/parameters.c:709
+msgid "Show in pager"
+msgstr "Прикажи у страничнику"
+
+#: ../src/parameters.c:717
+msgid "Show in systray"
+msgstr "Прикажи у системској фиоци"
+
+#: ../src/parameters.c:738
+msgid "Calendar start"
+msgstr "Почетак колендара"
+
+#: ../src/parameters.c:743
+msgid "Show"
+msgstr "Прикажи"
+
+#: ../src/parameters.c:755
+msgid "Hide"
+msgstr "Сакриј"
+
+#: ../src/parameters.c:767
+msgid "Minimized"
+msgstr "Умањено"
+
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "При отварању прозора колендара"
+
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Одабери данашњи датум"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Одабери претходно одабрани датум"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Двоструки клик на дан колендара приказује"
+
+#: ../src/parameters.c:828
+msgid "Days view"
+msgstr "Преглед дана"
+
+#: ../src/parameters.c:840
+msgid "Event list"
+msgstr "Списак догађаја"
+
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Додатна подешавања"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Прозор садржаја списка"
+
+#: ../src/parameters.c:874
+msgid "Number of extra days to show in event list"
+msgstr "Број додатних дана за приказ у списку догађаја"
+
+#: ../src/parameters.c:883
+msgid ""
+"This is just the default value, you can change it in the actual eventlist "
+"window."
+msgstr "Ово је само основна вредност, можете да је измените у садашњем прозору списка догађаја."
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Приказуј само први понављајући догађај"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Подразумевани први дан прозора прегледа по данима"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Први дан седмице"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Означени дан"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Користи динамичку иконицу фиоке"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Користи динамичку иконицу"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Динамичка иконица приказује текући месец и дан у месецу."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
+msgid "Use wakeup timer"
+msgstr "Користи одбројавач буђења"
+
+#: ../src/parameters.c:973
+msgid ""
+"Use this timer if Orage has problems waking up properly after suspend or "
+"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "Користите овај одбројавач ако Ораж има проблема да се исправно пробуди након обуставе или замрзавања. (На пример иконица фиоке није освежена или аларми не раде.)"
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Спољна датотека приказног аларма"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Прозор Оража"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Обавештење обавештења"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Увек напусти програм при захтеву за затварањем"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Увек напусти"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Ораж подразумевано остаје отворен у позадини када се затвори. Ова могућност чини да се Ораж напусти и да не остаје у позадини када се затражи затварање програма."
+
+#: ../src/parameters.c:1045
+msgid "Orage Preferences"
+msgstr "Поставке Оража"
+
+#: ../src/parameters.c:1157
+msgid "First Orage start. Searching default timezone."
+msgstr "Прво покретање Оража. Тражим основну временску област."
+
+#: ../src/parameters.c:1176
+#, c-format
+msgid "Default timezone set to %s."
+msgstr "Основна временска област је постављена на %s."
+
+#: ../src/parameters.c:1179
+msgid "Default timezone not found, please, set it manually."
+msgstr "Није пронађена основна временска област, молим, поставите је ручно."
+
+#: ../src/reminder.c:562
+msgid "Reminder "
+msgstr "Подсетник "
+
+#: ../src/reminder.c:591
+msgid "Open"
+msgstr "Отвори"
+
+#: ../src/reminder.c:719
+msgid "Reminder - Orage"
+msgstr "Подсетник — Ораж"
+
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Одлагање"
+
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
+msgstr "Подсети ме опет након наведеног времена"
+
+#: ../src/reminder.c:1091
+msgid "Next active alarms:"
+msgstr "Следећи радни аларми:"
+
+#: ../src/reminder.c:1145
+#, c-format
+msgid ""
+"\n"
+"%02d d %02d h %02d min to: %s"
+msgstr "\n%02d д %02d ч %02d мин до: %s"
+
+#: ../src/reminder.c:1154
+#, c-format
+msgid ""
+"\n"
+"No active alarms found"
+msgstr "\nНису пронађени активни аларми"
+
+#: ../src/timezone_names.c:36
+msgid "Africa"
+msgstr "Африка"
+
+#: ../src/timezone_names.c:37
+msgid "Africa/Abidjan"
+msgstr "Африка/Абиџан"
+
+#: ../src/timezone_names.c:38
+msgid "Africa/Accra"
+msgstr "Африка/Акра"
+
+#: ../src/timezone_names.c:39
+msgid "Africa/Addis_Ababa"
+msgstr "Африка/Адис_Абеба"
+
+#: ../src/timezone_names.c:40
+msgid "Africa/Algiers"
+msgstr "Африка/Алжир"
+
+#: ../src/timezone_names.c:41
+msgid "Africa/Asmara"
+msgstr "Африка/Асмара"
+
+#: ../src/timezone_names.c:42
+msgid "Africa/Asmera"
+msgstr "Африка/Асмера"
+
+#: ../src/timezone_names.c:43
+msgid "Africa/Bamako"
+msgstr "Африка/Бамако"
+
+#: ../src/timezone_names.c:44
+msgid "Africa/Bangui"
+msgstr "Африка/Банги"
+
+#: ../src/timezone_names.c:45
+msgid "Africa/Banjul"
+msgstr "Африка/Банжул"
+
+#: ../src/timezone_names.c:46
+msgid "Africa/Bissau"
+msgstr "Африка/Бисао"
+
+#: ../src/timezone_names.c:47
+msgid "Africa/Blantyre"
+msgstr "Африка/Блантир"
+
+#: ../src/timezone_names.c:48
+msgid "Africa/Brazzaville"
+msgstr "Африка/Бразавил"
+
+#: ../src/timezone_names.c:49
+msgid "Africa/Bujumbura"
+msgstr "Африка/Бујумбура"
+
+#: ../src/timezone_names.c:50
+msgid "Africa/Cairo"
+msgstr "Африка/Каиро"
+
+#: ../src/timezone_names.c:51
+msgid "Africa/Casablanca"
+msgstr "Африка/Казабланка"
+
+#: ../src/timezone_names.c:52
+msgid "Africa/Ceuta"
+msgstr "Африка/Цеута"
+
+#: ../src/timezone_names.c:53
+msgid "Africa/Conakry"
+msgstr "Африка/Конакри"
+
+#: ../src/timezone_names.c:54
+msgid "Africa/Dakar"
+msgstr "Африка/Дакар"
+
+#: ../src/timezone_names.c:55
+msgid "Africa/Dar_es_Salaam"
+msgstr "Африка/Дар_ес_Салам"
+
+#: ../src/timezone_names.c:56
+msgid "Africa/Djibouti"
+msgstr "Африка/Џибути"
+
+#: ../src/timezone_names.c:57
+msgid "Africa/Douala"
+msgstr "Африка/Дуала"
+
+#: ../src/timezone_names.c:58
+msgid "Africa/El_Aaiun"
+msgstr "Африка/Ел_Ајун"
+
+#: ../src/timezone_names.c:59
+msgid "Africa/Freetown"
+msgstr "Африка/Фритаун"
+
+#: ../src/timezone_names.c:60
+msgid "Africa/Gaborone"
+msgstr "Африка/Габорне"
+
+#: ../src/timezone_names.c:61
+msgid "Africa/Harare"
+msgstr "Африка/Хараре"
+
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "Африка/Џуба"
+
+#: ../src/timezone_names.c:63
+msgid "Africa/Johannesburg"
+msgstr "Африка/Јоханесбург"
+
+#: ../src/timezone_names.c:64
+msgid "Africa/Kampala"
+msgstr "Африка/Кампала"
+
+#: ../src/timezone_names.c:65
+msgid "Africa/Khartoum"
+msgstr "Африка/Картум"
+
+#: ../src/timezone_names.c:66
+msgid "Africa/Kigali"
+msgstr "Африка/Кигали"
+
+#: ../src/timezone_names.c:67
+msgid "Africa/Kinshasa"
+msgstr "Африка/Киншаса"
+
+#: ../src/timezone_names.c:68
+msgid "Africa/Lagos"
+msgstr "Африка/Лагос"
+
+#: ../src/timezone_names.c:69
+msgid "Africa/Libreville"
+msgstr "Африка/Либревил"
+
+#: ../src/timezone_names.c:70
+msgid "Africa/Lome"
+msgstr "Африка/Ломе"
+
+#: ../src/timezone_names.c:71
+msgid "Africa/Luanda"
+msgstr "Африка/Луанда"
+
+#: ../src/timezone_names.c:72
+msgid "Africa/Lubumbashi"
+msgstr "Африка/Лумбаши"
+
+#: ../src/timezone_names.c:73
+msgid "Africa/Lusaka"
+msgstr "Африка/Лусака"
+
+#: ../src/timezone_names.c:74
+msgid "Africa/Malabo"
+msgstr "Африка/Малабо"
+
+#: ../src/timezone_names.c:75
+msgid "Africa/Maputo"
+msgstr "Африка/Мапуто"
+
+#: ../src/timezone_names.c:76
+msgid "Africa/Maseru"
+msgstr "Африка/Масеру"
+
+#: ../src/timezone_names.c:77
+msgid "Africa/Mbabane"
+msgstr "Африка/Мбабане"
+
+#: ../src/timezone_names.c:78
+msgid "Africa/Mogadishu"
+msgstr "Африка/Могадиш"
+
+#: ../src/timezone_names.c:79
+msgid "Africa/Monrovia"
+msgstr "Африка/Монровија"
+
+#: ../src/timezone_names.c:80
+msgid "Africa/Nairobi"
+msgstr "Африка/Најроби"
+
+#: ../src/timezone_names.c:81
+msgid "Africa/Ndjamena"
+msgstr "Африка/Нџамена"
+
+#: ../src/timezone_names.c:82
+msgid "Africa/Niamey"
+msgstr "Африка/Нимај"
+
+#: ../src/timezone_names.c:83
+msgid "Africa/Nouakchott"
+msgstr "Африка/Нуакшот"
+
+#: ../src/timezone_names.c:84
+msgid "Africa/Ouagadougou"
+msgstr "Африка/Уагадугу"
+
+#: ../src/timezone_names.c:85
+msgid "Africa/Porto-Novo"
+msgstr "Африка/Порто-Ново"
+
+#: ../src/timezone_names.c:86
+msgid "Africa/Sao_Tome"
+msgstr "Африка/Сао_Томе"
+
+#: ../src/timezone_names.c:87
+msgid "Africa/Timbuktu"
+msgstr "Африка/Тимбукту"
+
+#: ../src/timezone_names.c:88
+msgid "Africa/Tripoli"
+msgstr "Африка/Триполи"
+
+#: ../src/timezone_names.c:89
+msgid "Africa/Tunis"
+msgstr "Африка/Тунис"
+
+#: ../src/timezone_names.c:90
+msgid "Africa/Windhoek"
+msgstr "Африка/Виндхок"
+
+#: ../src/timezone_names.c:91
+msgid "America"
+msgstr "Америка"
+
+#: ../src/timezone_names.c:92
+msgid "America/Adak"
+msgstr "Америка/Адак"
+
+#: ../src/timezone_names.c:93
+msgid "America/Anchorage"
+msgstr "Америка/Анкорејџ"
+
+#: ../src/timezone_names.c:94
+msgid "America/Anguilla"
+msgstr "Америка/Ангила"
+
+#: ../src/timezone_names.c:95
+msgid "America/Antigua"
+msgstr "Америка/Антигва"
+
+#: ../src/timezone_names.c:96
+msgid "America/Araguaina"
+msgstr "Америка/Арагвајна"
+
+#: ../src/timezone_names.c:97
+msgid "America/Argentina/Buenos_Aires"
+msgstr "Америка/Аргентина/Буенос_Ајрес"
+
+#: ../src/timezone_names.c:98
+msgid "America/Argentina/Catamarca"
+msgstr "Америка/Аргентина/Катамарка"
+
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "Америка/Аргентина/Комод_Ривадавија"
+
+#: ../src/timezone_names.c:100
+msgid "America/Argentina/Cordoba"
+msgstr "Америка/Аргентина/Кордоба"
+
+#: ../src/timezone_names.c:101
+msgid "America/Argentina/Jujuy"
+msgstr "Америка/Аргентина/Јујуј"
+
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "Америка/Аргентина/Ла_Риоха"
+
+#: ../src/timezone_names.c:103
+msgid "America/Argentina/Mendoza"
+msgstr "Америка/Аргентина/Мендоза"
+
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "Америка/Аргентина/Рио_Галегос"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "Америка/Аргентина/Салта"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "Америка/Аргентина/Сан_Хуан"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "Америка/Аргентина/Свети Луј"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "Америка/Аргентина/Тукуман"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "Америка/Аргентина/Ушуаја"
+
+#: ../src/timezone_names.c:110
+msgid "America/Aruba"
+msgstr "Америка/Аруба"
+
+#: ../src/timezone_names.c:111
+msgid "America/Asuncion"
+msgstr "Америка/Асунсион"
+
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "Америка/Атикокан"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "Америка/Атка"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "Америка/Баија"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "Америка/Баија_бандерас"
+
+#: ../src/timezone_names.c:116
+msgid "America/Barbados"
+msgstr "Америка/Барбадос"
+
+#: ../src/timezone_names.c:117
+msgid "America/Belem"
+msgstr "Америка/Белем"
+
+#: ../src/timezone_names.c:118
+msgid "America/Belize"
+msgstr "Америка/Белиз"
+
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "Америка/Блан-Саблон"
+
+#: ../src/timezone_names.c:120
+msgid "America/Boa_Vista"
+msgstr "Америка/Боа_Виста"
+
+#: ../src/timezone_names.c:121
+msgid "America/Bogota"
+msgstr "Америка/Богота"
+
+#: ../src/timezone_names.c:122
+msgid "America/Boise"
+msgstr "Америка/Бојз"
+
+#: ../src/timezone_names.c:123
+msgid "America/Buenos_Aires"
+msgstr "Америка/Буенос_Ајрес"
+
+#: ../src/timezone_names.c:124
+msgid "America/Cambridge_Bay"
+msgstr "Америка/Кејмбриџ_залив"
+
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "Америка/Кампо_гранде"
+
+#: ../src/timezone_names.c:126
+msgid "America/Cancun"
+msgstr "Америка/Канкун"
+
+#: ../src/timezone_names.c:127
+msgid "America/Caracas"
+msgstr "Америка/Каракас"
+
+#: ../src/timezone_names.c:128
+msgid "America/Catamarca"
+msgstr "Америка/Катамарка"
+
+#: ../src/timezone_names.c:129
+msgid "America/Cayenne"
+msgstr "Америка/Сајон"
+
+#: ../src/timezone_names.c:130
+msgid "America/Cayman"
+msgstr "Америка/Кајман"
+
+#: ../src/timezone_names.c:131
+msgid "America/Chicago"
+msgstr "Америка/Чикаго"
+
+#: ../src/timezone_names.c:132
+msgid "America/Chihuahua"
+msgstr "Америка/Чивава"
+
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "Америка/Корал_харбор"
+
+#: ../src/timezone_names.c:134
+msgid "America/Cordoba"
+msgstr "Америка/Кордоба"
+
+#: ../src/timezone_names.c:135
+msgid "America/Costa_Rica"
+msgstr "Америка/Костарика"
+
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "Африка/Крестон"
+
+#: ../src/timezone_names.c:137
+msgid "America/Cuiaba"
+msgstr "Америка/Куијаба"
+
+#: ../src/timezone_names.c:138
+msgid "America/Curacao"
+msgstr "Америка/Куракао"
+
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "Америка/Демаркшавн"
+
+#: ../src/timezone_names.c:140
+msgid "America/Dawson"
+msgstr "Америка/Досон"
+
+#: ../src/timezone_names.c:141
+msgid "America/Dawson_Creek"
+msgstr "Америка/Досон_Крик"
+
+#: ../src/timezone_names.c:142
+msgid "America/Denver"
+msgstr "Америка/Денвер"
+
+#: ../src/timezone_names.c:143
+msgid "America/Detroit"
+msgstr "Америка/Детроит"
+
+#: ../src/timezone_names.c:144
+msgid "America/Dominica"
+msgstr "Америка/Доминика"
+
+#: ../src/timezone_names.c:145
+msgid "America/Edmonton"
+msgstr "Америка/Едмонтон"
+
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "Америка/Енсењада"
+
+#: ../src/timezone_names.c:147
+msgid "America/Eirunepe"
+msgstr "Америка/Еирунепе"
+
+#: ../src/timezone_names.c:148
+msgid "America/El_Salvador"
+msgstr "Америка/Ел_Салвадор"
+
+#: ../src/timezone_names.c:149
+msgid "America/Fortaleza"
+msgstr "Америка/Форталеза"
+
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "Америка/Форт_Вејн"
+
+#: ../src/timezone_names.c:151
+msgid "America/Glace_Bay"
+msgstr "Америка/Глас_Беј"
+
+#: ../src/timezone_names.c:152
+msgid "America/Godthab"
+msgstr "Америка/Готаб"
+
+#: ../src/timezone_names.c:153
+msgid "America/Goose_Bay"
+msgstr "Америка/Залив_гусака"
+
+#: ../src/timezone_names.c:154
+msgid "America/Grand_Turk"
+msgstr "Америка/Велики_Турк"
+
+#: ../src/timezone_names.c:155
+msgid "America/Grenada"
+msgstr "Америка/Гренада"
+
+#: ../src/timezone_names.c:156
+msgid "America/Guadeloupe"
+msgstr "Америка/Гвадалупе"
+
+#: ../src/timezone_names.c:157
+msgid "America/Guatemala"
+msgstr "Америка/Гватемала"
+
+#: ../src/timezone_names.c:158
+msgid "America/Guayaquil"
+msgstr "Америка/Гвајакил"
+
+#: ../src/timezone_names.c:159
+msgid "America/Guyana"
+msgstr "Америка/Гвајана"
+
+#: ../src/timezone_names.c:160
+msgid "America/Halifax"
+msgstr "Америка/Халифакс"
+
+#: ../src/timezone_names.c:161
+msgid "America/Havana"
+msgstr "Америка/Хавана"
+
+#: ../src/timezone_names.c:162
+msgid "America/Hermosillo"
+msgstr "Америка/Ермосиљо"
+
+#: ../src/timezone_names.c:163
+msgid "America/Indiana/Indianapolis"
+msgstr "Америка/Индијана/Индијанаполис"
+
+#: ../src/timezone_names.c:164
+msgid "America/Indiana/Knox"
+msgstr "Америка/Индијана/Нокс"
+
+#: ../src/timezone_names.c:165
+msgid "America/Indiana/Marengo"
+msgstr "Америка/Индијана/Маренго"
+
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "Америка/Индијана/Питерсбург"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "Америка/Индијана/Тел_сити"
+
+#: ../src/timezone_names.c:168
+msgid "America/Indiana/Vevay"
+msgstr "Америка/Индијана/Вивеј"
+
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "Америка/Индијана/Винсенес"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "Америка/Индијана/Винамак"
+
+#: ../src/timezone_names.c:171
+msgid "America/Indianapolis"
+msgstr "Америка/Индијанаполис"
+
+#: ../src/timezone_names.c:172
+msgid "America/Inuvik"
+msgstr "Америка/Инувик"
+
+#: ../src/timezone_names.c:173
+msgid "America/Iqaluit"
+msgstr "Америка/Икалуит"
+
+#: ../src/timezone_names.c:174
+msgid "America/Jamaica"
+msgstr "Америка/Јамајка"
+
+#: ../src/timezone_names.c:175
+msgid "America/Jujuy"
+msgstr "Америка/Јујуј"
+
+#: ../src/timezone_names.c:176
+msgid "America/Juneau"
+msgstr "Америка/Џуно"
+
+#: ../src/timezone_names.c:177
+msgid "America/Kentucky/Louisville"
+msgstr "Америка/Кентаки/Луисвил"
+
+#: ../src/timezone_names.c:178
+msgid "America/Kentucky/Monticello"
+msgstr "Америка/Кентаки/Монтичело"
+
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "Америка/Нокс_ИН"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "Америка/Кралендајк"
+
+#: ../src/timezone_names.c:181
+msgid "America/La_Paz"
+msgstr "Америка/Ла_Паз"
+
+#: ../src/timezone_names.c:182
+msgid "America/Lima"
+msgstr "Америка/Лима"
+
+#: ../src/timezone_names.c:183
+msgid "America/Los_Angeles"
+msgstr "Америка/Лос_Анђелес"
+
+#: ../src/timezone_names.c:184
+msgid "America/Louisville"
+msgstr "Америка/Луисвил"
+
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "Америка/Доњи_Принсес"
+
+#: ../src/timezone_names.c:186
+msgid "America/Maceio"
+msgstr "Америка/Макејо"
+
+#: ../src/timezone_names.c:187
+msgid "America/Managua"
+msgstr "Америка/Манагва"
+
+#: ../src/timezone_names.c:188
+msgid "America/Manaus"
+msgstr "Америка/Манаус"
+
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "Америка/Маригот"
+
+#: ../src/timezone_names.c:190
+msgid "America/Martinique"
+msgstr "Америка/Мартиник"
+
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "Америка/Матаморос"
+
+#: ../src/timezone_names.c:192
+msgid "America/Mazatlan"
+msgstr "Америка/Мацатлан"
+
+#: ../src/timezone_names.c:193
+msgid "America/Mendoza"
+msgstr "Америка/Мендоза"
+
+#: ../src/timezone_names.c:194
+msgid "America/Menominee"
+msgstr "Америка/Меномини"
+
+#: ../src/timezone_names.c:195
+msgid "America/Merida"
+msgstr "Америка/Мерида"
+
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "Америка/Метлакатла"
+
+#: ../src/timezone_names.c:197
+msgid "America/Mexico_City"
+msgstr "Америка/Мексико_Сити"
+
+#: ../src/timezone_names.c:198
+msgid "America/Miquelon"
+msgstr "Америка/Микелон"
+
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "Америка/Монктон"
+
+#: ../src/timezone_names.c:200
+msgid "America/Monterrey"
+msgstr "Америка/Монтереј"
+
+#: ../src/timezone_names.c:201
+msgid "America/Montevideo"
+msgstr "Америка/Монтевидео"
+
+#: ../src/timezone_names.c:202
+msgid "America/Montreal"
+msgstr "Америка/Монтреал"
+
+#: ../src/timezone_names.c:203
+msgid "America/Montserrat"
+msgstr "Америка/Монсерат"
+
+#: ../src/timezone_names.c:204
+msgid "America/Nassau"
+msgstr "Америка/Насау"
+
+#: ../src/timezone_names.c:205
+msgid "America/New_York"
+msgstr "Америка/Њујорк"
+
+#: ../src/timezone_names.c:206
+msgid "America/Nipigon"
+msgstr "Америка/Нипигон"
+
+#: ../src/timezone_names.c:207
+msgid "America/Nome"
+msgstr "Америка/Ном"
+
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "Америка/Северна_Дакота/Бјула"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "Америка/Северна_Дакота/Средишња"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "Америка/Северна_Дакота/Нови_Салем"
+
+#: ../src/timezone_names.c:211
+msgid "America/Noronha"
+msgstr "Америна/Норона"
+
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "Америка/Оџинага"
+
+#: ../src/timezone_names.c:213
+msgid "America/Panama"
+msgstr "Америка/Панама"
+
+#: ../src/timezone_names.c:214
+msgid "America/Pangnirtung"
+msgstr "Америка/Пангниртунг"
+
+#: ../src/timezone_names.c:215
+msgid "America/Paramaribo"
+msgstr "Америка/Парамарибо"
+
+#: ../src/timezone_names.c:216
+msgid "America/Phoenix"
+msgstr "Америка/Феникс"
+
+#: ../src/timezone_names.c:217
+msgid "America/Port-au-Prince"
+msgstr "Америка/Портопренс"
+
+#: ../src/timezone_names.c:218
+msgid "America/Port_of_Spain"
+msgstr "Америка/Порт_Оф_Спејн"
+
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "Америка/Порто_Акре"
+
+#: ../src/timezone_names.c:220
+msgid "America/Porto_Velho"
+msgstr "Америка/Портовељо"
+
+#: ../src/timezone_names.c:221
+msgid "America/Puerto_Rico"
+msgstr "Америка/Порторико"
+
+#: ../src/timezone_names.c:222
+msgid "America/Rainy_River"
+msgstr "Америка/Кишна_река"
+
+#: ../src/timezone_names.c:223
+msgid "America/Rankin_Inlet"
+msgstr "Америка/Ранкин_увала"
+
+#: ../src/timezone_names.c:224
+msgid "America/Recife"
+msgstr "Америка/Ресифе"
+
+#: ../src/timezone_names.c:225
+msgid "America/Regina"
+msgstr "Америка/Регина"
+
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "Америка/Резолјут"
+
+#: ../src/timezone_names.c:227
+msgid "America/Rio_Branco"
+msgstr "Америка/Рио_Бранко"
+
+#: ../src/timezone_names.c:228
+msgid "America/Rosario"
+msgstr "Америка/Розарио"
+
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "Америка/Санта_Изабел"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "Америка/Сантарем"
+
+#: ../src/timezone_names.c:231
+msgid "America/Santiago"
+msgstr "Америка/Сантијаго"
+
+#: ../src/timezone_names.c:232
+msgid "America/Santo_Domingo"
+msgstr "Америка/Санто_Доминго"
+
+#: ../src/timezone_names.c:233
+msgid "America/Sao_Paulo"
+msgstr "Америка/Сао_Паоло"
+
+#: ../src/timezone_names.c:234
+msgid "America/Scoresbysund"
+msgstr "Америка/Скорсбисанд"
+
+#: ../src/timezone_names.c:235
+msgid "America/Shiprock"
+msgstr "Америка/Шипрок"
+
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "Америка/Ситка"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "Америка/Сент_Бартелеми"
+
+#: ../src/timezone_names.c:238
+msgid "America/St_Johns"
+msgstr "Америка/Св_Џонс"
+
+#: ../src/timezone_names.c:239
+msgid "America/St_Kitts"
+msgstr "Америка/Св_Китс"
+
+#: ../src/timezone_names.c:240
+msgid "America/St_Lucia"
+msgstr "Америка/Св_Луција"
+
+#: ../src/timezone_names.c:241
+msgid "America/St_Thomas"
+msgstr "Америка/Св_Томас"
+
+#: ../src/timezone_names.c:242
+msgid "America/St_Vincent"
+msgstr "Америка/Св_Винсент"
+
+#: ../src/timezone_names.c:243
+msgid "America/Swift_Current"
+msgstr "Америка/Брза_струја"
+
+#: ../src/timezone_names.c:244
+msgid "America/Tegucigalpa"
+msgstr "Америка/Тегучигалпа"
+
+#: ../src/timezone_names.c:245
+msgid "America/Thule"
+msgstr "Америка/Тула"
+
+#: ../src/timezone_names.c:246
+msgid "America/Thunder_Bay"
+msgstr "Америка/Тандер_залив"
+
+#: ../src/timezone_names.c:247
+msgid "America/Tijuana"
+msgstr "Америка/Тихуана"
+
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "Америка/Торонто"
+
+#: ../src/timezone_names.c:249
+msgid "America/Tortola"
+msgstr "Америка/Тортола"
+
+#: ../src/timezone_names.c:250
+msgid "America/Vancouver"
+msgstr "Америка/Ванкувер"
+
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "Америка/Вирџин"
+
+#: ../src/timezone_names.c:252
+msgid "America/Whitehorse"
+msgstr "Америка/Вајтхорс"
+
+#: ../src/timezone_names.c:253
+msgid "America/Winnipeg"
+msgstr "Америка/Винипег"
+
+#: ../src/timezone_names.c:254
+msgid "America/Yakutat"
+msgstr "Америка/Јакута"
+
+#: ../src/timezone_names.c:255
+msgid "America/Yellowknife"
+msgstr "Америка/Јелоунајф"
+
+#: ../src/timezone_names.c:256
+msgid "Antarctica"
+msgstr "Антарктик"
+
+#: ../src/timezone_names.c:257
+msgid "Antarctica/Casey"
+msgstr "Антарктик/Кејси"
+
+#: ../src/timezone_names.c:258
+msgid "Antarctica/Davis"
+msgstr "Антарктик/Дејвис"
+
+#: ../src/timezone_names.c:259
+msgid "Antarctica/DumontDUrville"
+msgstr "Антарктик/Думон_Дурвил"
+
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Антарктик/Меквари"
+
+#: ../src/timezone_names.c:261
+msgid "Antarctica/Mawson"
+msgstr "Антарктик/Мосон"
+
+#: ../src/timezone_names.c:262
+msgid "Antarctica/McMurdo"
+msgstr "Антарктик/Мекмардо"
+
+#: ../src/timezone_names.c:263
+msgid "Antarctica/Palmer"
+msgstr "Антарктик/Палмер"
+
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Антарктик/Ротера"
+
+#: ../src/timezone_names.c:265
+msgid "Antarctica/South_Pole"
+msgstr "Антарктик/Јужни_пол"
+
+#: ../src/timezone_names.c:266
+msgid "Antarctica/Syowa"
+msgstr "Антарктик/Сијова"
+
+#: ../src/timezone_names.c:267
+msgid "Antarctica/Vostok"
+msgstr "Антарктик/Восток"
+
+#: ../src/timezone_names.c:268
+msgid "Arctic"
+msgstr "Арктик"
+
+#: ../src/timezone_names.c:269
+msgid "Arctic/Longyearbyen"
+msgstr "Арктик/Лонгјирбјен"
+
+#: ../src/timezone_names.c:270
+msgid "Asia"
+msgstr "Азија"
+
+#: ../src/timezone_names.c:271
+msgid "Asia/Aden"
+msgstr "Азија/Аден"
+
+#: ../src/timezone_names.c:272
+msgid "Asia/Almaty"
+msgstr "Азија/Алмати"
+
+#: ../src/timezone_names.c:273
+msgid "Asia/Amman"
+msgstr "Азија/Аман"
+
+#: ../src/timezone_names.c:274
+msgid "Asia/Anadyr"
+msgstr "Азија/Анадир"
+
+#: ../src/timezone_names.c:275
+msgid "Asia/Aqtau"
+msgstr "Азија/Актау"
+
+#: ../src/timezone_names.c:276
+msgid "Asia/Aqtobe"
+msgstr "Азија/Актобе"
+
+#: ../src/timezone_names.c:277
+msgid "Asia/Ashgabat"
+msgstr "Азија/Ашгабат"
+
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Азија/Ашкабад"
+
+#: ../src/timezone_names.c:279
+msgid "Asia/Baghdad"
+msgstr "Азија/Багдад"
+
+#: ../src/timezone_names.c:280
+msgid "Asia/Bahrain"
+msgstr "Азија/Бахреин"
+
+#: ../src/timezone_names.c:281
+msgid "Asia/Baku"
+msgstr "Азија/Баку"
+
+#: ../src/timezone_names.c:282
+msgid "Asia/Bangkok"
+msgstr "Азија/Бангкок"
+
+#: ../src/timezone_names.c:283
+msgid "Asia/Beirut"
+msgstr "Азија/Бејрут"
+
+#: ../src/timezone_names.c:284
+msgid "Asia/Bishkek"
+msgstr "Азија/Бишкек"
+
+#: ../src/timezone_names.c:285
+msgid "Asia/Brunei"
+msgstr "Азиа/Бринеј"
+
+#: ../src/timezone_names.c:286
+msgid "Asia/Calcutta"
+msgstr "Азија/Калкута"
+
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Азија/Чиобалзан"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "Азија/Чонгкуинг"
+
+#: ../src/timezone_names.c:289
+msgid "Asia/Chungking"
+msgstr "Азија/Чунгкинг"
+
+#: ../src/timezone_names.c:290
+msgid "Asia/Colombo"
+msgstr "Азија/Коломбо"
+
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Азија/Дака"
+
+#: ../src/timezone_names.c:292
+msgid "Asia/Damascus"
+msgstr "Азија/Дамаск"
+
+#: ../src/timezone_names.c:293
+msgid "Asia/Dhaka"
+msgstr "Азија/Дака"
+
+#: ../src/timezone_names.c:294
+msgid "Asia/Dili"
+msgstr "Азија/Дили"
+
+#: ../src/timezone_names.c:295
+msgid "Asia/Dubai"
+msgstr "Азија/Дубаи"
+
+#: ../src/timezone_names.c:296
+msgid "Asia/Dushanbe"
+msgstr "Азија/Душанбе"
+
+#: ../src/timezone_names.c:297
+msgid "Asia/Gaza"
+msgstr "Азија/Газа"
+
+#: ../src/timezone_names.c:298
+msgid "Asia/Harbin"
+msgstr "Азија/Харбин"
+
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Азија/Хеброн"
+
+#: ../src/timezone_names.c:300
+msgid "Asia/Hong_Kong"
+msgstr "Азија/Хонгконг"
+
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Азија/Хо_Ши_Мин"
+
+#: ../src/timezone_names.c:302
+msgid "Asia/Hovd"
+msgstr "Азија/Хоуд"
+
+#: ../src/timezone_names.c:303
+msgid "Asia/Irkutsk"
+msgstr "Азија/Иркутск"
+
+#: ../src/timezone_names.c:304
+msgid "Asia/Istanbul"
+msgstr "Азија/Цариград"
+
+#: ../src/timezone_names.c:305
+msgid "Asia/Jakarta"
+msgstr "Азија/Џакарта"
+
+#: ../src/timezone_names.c:306
+msgid "Asia/Jayapura"
+msgstr "Азија/Џајапура"
+
+#: ../src/timezone_names.c:307
+msgid "Asia/Jerusalem"
+msgstr "Азија/Јерусалим"
+
+#: ../src/timezone_names.c:308
+msgid "Asia/Kabul"
+msgstr "Азија/Кабул"
+
+#: ../src/timezone_names.c:309
+msgid "Asia/Kamchatka"
+msgstr "Азија/Камчатка"
+
+#: ../src/timezone_names.c:310
+msgid "Asia/Karachi"
+msgstr "Азија/Карачи"
+
+#: ../src/timezone_names.c:311
+msgid "Asia/Kashgar"
+msgstr "Азија/Кашгар"
+
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Азија/Катманду"
+
+#: ../src/timezone_names.c:313
+msgid "Asia/Katmandu"
+msgstr "Азија/Катманду"
+
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Азија/Хандига"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Азија/Калкута"
+
+#: ../src/timezone_names.c:316
+msgid "Asia/Krasnoyarsk"
+msgstr "Азија/Краснојарск"
+
+#: ../src/timezone_names.c:317
+msgid "Asia/Kuala_Lumpur"
+msgstr "Азија/Куалалумпур"
+
+#: ../src/timezone_names.c:318
+msgid "Asia/Kuching"
+msgstr "Азија/Кучинг"
+
+#: ../src/timezone_names.c:319
+msgid "Asia/Kuwait"
+msgstr "Азија/Кувајт"
+
+#: ../src/timezone_names.c:320
+msgid "Asia/Macao"
+msgstr "Азија/Макао"
+
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Азија/Макао"
+
+#: ../src/timezone_names.c:322
+msgid "Asia/Magadan"
+msgstr "Азија/Магадан"
+
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Азија/Макасар"
+
+#: ../src/timezone_names.c:324
+msgid "Asia/Manila"
+msgstr "Азија/Манила"
+
+#: ../src/timezone_names.c:325
+msgid "Asia/Muscat"
+msgstr "Азија/Мускат"
+
+#: ../src/timezone_names.c:326
+msgid "Asia/Nicosia"
+msgstr "Азија/Никозија"
+
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Азија/Новокузњецк"
+
+#: ../src/timezone_names.c:328
+msgid "Asia/Novosibirsk"
+msgstr "Азија/Новосибирск"
+
+#: ../src/timezone_names.c:329
+msgid "Asia/Omsk"
+msgstr "Азија/Омск"
+
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Азија/Орал"
+
+#: ../src/timezone_names.c:331
+msgid "Asia/Phnom_Penh"
+msgstr "Азија/Пном_Пен"
+
+#: ../src/timezone_names.c:332
+msgid "Asia/Pontianak"
+msgstr "Азија/Понтијанак"
+
+#: ../src/timezone_names.c:333
+msgid "Asia/Pyongyang"
+msgstr "Азија/Пјонгјанг"
+
+#: ../src/timezone_names.c:334
+msgid "Asia/Qatar"
+msgstr "Азија/Катар"
+
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Азија/Кизилорда"
+
+#: ../src/timezone_names.c:336
+msgid "Asia/Rangoon"
+msgstr "Азија/Рангун"
+
+#: ../src/timezone_names.c:337
+msgid "Asia/Riyadh"
+msgstr "Азија/Ријад"
+
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Азија/Ријад87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Азија/Ријад88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Азија/Ријад89"
+
+#: ../src/timezone_names.c:341
+msgid "Asia/Saigon"
+msgstr "Азија/Сајгон"
+
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Азија/Сахалин"
+
+#: ../src/timezone_names.c:343
+msgid "Asia/Samarkand"
+msgstr "Азија/Самарканд"
+
+#: ../src/timezone_names.c:344
+msgid "Asia/Seoul"
+msgstr "Азија/Сеул"
+
+#: ../src/timezone_names.c:345
+msgid "Asia/Shanghai"
+msgstr "Азија/Шангај"
+
+#: ../src/timezone_names.c:346
+msgid "Asia/Singapore"
+msgstr "Азија/Сингапур"
+
+#: ../src/timezone_names.c:347
+msgid "Asia/Taipei"
+msgstr "Азија/Тајпеј"
+
+#: ../src/timezone_names.c:348
+msgid "Asia/Tashkent"
+msgstr "Азија/Ташкент"
+
+#: ../src/timezone_names.c:349
+msgid "Asia/Tbilisi"
+msgstr "Азија/Тбилиси"
+
+#: ../src/timezone_names.c:350
+msgid "Asia/Tehran"
+msgstr "Азија/Техеран"
+
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Азија/Тел_Авив"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Азија/Тимбу"
+
+#: ../src/timezone_names.c:353
+msgid "Asia/Thimphu"
+msgstr "Азија/Тимфу"
+
+#: ../src/timezone_names.c:354
+msgid "Asia/Tokyo"
+msgstr "Азија/Токио"
+
+#: ../src/timezone_names.c:355
+msgid "Asia/Ujung_Pandang"
+msgstr "Азија/Ујунг_Панданг"
+
+#: ../src/timezone_names.c:356
+msgid "Asia/Ulaanbaatar"
+msgstr "Азија/Уланбатор"
+
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Азија/Уланбатор"
+
+#: ../src/timezone_names.c:358
+msgid "Asia/Urumqi"
+msgstr "Азија/Урумки"
+
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Азија/Уст-Њера"
+
+#: ../src/timezone_names.c:360
+msgid "Asia/Vientiane"
+msgstr "Азија/Винтин"
+
+#: ../src/timezone_names.c:361
+msgid "Asia/Vladivostok"
+msgstr "Азија/Владивосток"
+
+#: ../src/timezone_names.c:362
+msgid "Asia/Yakutsk"
+msgstr "Азија/Јакутск"
+
+#: ../src/timezone_names.c:363
+msgid "Asia/Yekaterinburg"
+msgstr "Азија/Јекатеринбург"
+
+#: ../src/timezone_names.c:364
+msgid "Asia/Yerevan"
+msgstr "Азија/Јереван"
+
+#: ../src/timezone_names.c:365
+msgid "Atlantic"
+msgstr "Атлантик"
+
+#: ../src/timezone_names.c:366
+msgid "Atlantic/Azores"
+msgstr "Атлантик/Азорска_острва"
+
+#: ../src/timezone_names.c:367
+msgid "Atlantic/Bermuda"
+msgstr "Атлантик/Бермуда"
+
+#: ../src/timezone_names.c:368
+msgid "Atlantic/Canary"
+msgstr "Атлантик/Канари"
+
+#: ../src/timezone_names.c:369
+msgid "Atlantic/Cape_Verde"
+msgstr "Атлантик/Зеленортска_Острва"
+
+#: ../src/timezone_names.c:370
+msgid "Atlantic/Faeroe"
+msgstr "Атлантик/Фарска_острва"
+
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Атлантик/Фарска острва"
+
+#: ../src/timezone_names.c:372
+msgid "Atlantic/Jan_Mayen"
+msgstr "Атлантик/Јан_Мајен"
+
+#: ../src/timezone_names.c:373
+msgid "Atlantic/Madeira"
+msgstr "Атлантик/Мадеира"
+
+#: ../src/timezone_names.c:374
+msgid "Atlantic/Reykjavik"
+msgstr "Атлантик/Рејкјавик"
+
+#: ../src/timezone_names.c:375
+msgid "Atlantic/South_Georgia"
+msgstr "Атлантик/Јужна_Џорџија"
+
+#: ../src/timezone_names.c:376
+msgid "Atlantic/St_Helena"
+msgstr "Атлантик/Св_Јелена"
+
+#: ../src/timezone_names.c:377
+msgid "Atlantic/Stanley"
+msgstr "Атлантик/Стенли"
+
+#: ../src/timezone_names.c:378
+msgid "Australia"
+msgstr "Аустралија"
+
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Аустралија/АЦТ"
+
+#: ../src/timezone_names.c:380
+msgid "Australia/Adelaide"
+msgstr "Аустралија/Аделејд"
+
+#: ../src/timezone_names.c:381
+msgid "Australia/Brisbane"
+msgstr "Аустралија/Бризбејн"
+
+#: ../src/timezone_names.c:382
+msgid "Australia/Broken_Hill"
+msgstr "Аустралија/Броукен_Хил"
+
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Аустралија/Кари"
+
+#: ../src/timezone_names.c:384
+msgid "Australia/Darwin"
+msgstr "Аустралија/Дарвин"
+
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Аустралија/Јукла"
+
+#: ../src/timezone_names.c:386
+msgid "Australia/Hobart"
+msgstr "Аустралија/Хобарт"
+
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr "Аустралија/Линдерман"
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr "Аустралија/Лорд_Хоу"
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "Аустралија/Мелбурн"
+
+#: ../src/timezone_names.c:390
+msgid "Australia/Perth"
+msgstr "Аустралија/Перт"
+
+#: ../src/timezone_names.c:391
+msgid "Australia/Sydney"
+msgstr "Аустралија/Сиднеј"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Бразил"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Бразил/Акре"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Бразил/Де_Норона"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Бразил/Исток"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Бразил/Запад"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Канада"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Канада/Атлантик"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Канада/централна"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Канада/источни-Саскачеван"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Канада/источна"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Канада/планинска"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Канада/Њуфаундленд"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Канада/Тихи океан"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Канада/Саскачеван"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Канада/Јукон"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Чиле"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Чиле/континентални"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Чиле/Ускршње_острво"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Етц"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Етц/ГМТ"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Етц/ГМТ+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Етц/ГМТ+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Етц/ГМТ+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Етц/ГМТ+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Етц/ГМТ+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Етц/ГМТ+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Етц/ГМТ+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Етц/ГМТ+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Етц/ГМТ+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Етц/ГМТ+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Етц/ГМТ+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Етц/ГМТ+8"
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Етц/ГМТ+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Етц/ГМТ-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Етц/ГМТ-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Етц/ГМТ-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Етц/ГМТ-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Етц/ГМТ-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Етц/ГМТ-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Етц/ГМТ-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Етц/ГМТ-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Етц/ГМТ-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Етц/ГМТ-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Етц/ГМТ-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Етц/ГМТ-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Етц/ГМТ-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Етц/ГМТ-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Етц/ГМТ-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Етц/ГМТ0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "ЕТЦ/Гринич"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Етц/УЦТ"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Етц/УТЦ"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Етц/Опште"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Етц/Зулу"
+
+#: ../src/timezone_names.c:446
+msgid "Europe"
+msgstr "Европа"
+
+#: ../src/timezone_names.c:447
+msgid "Europe/Amsterdam"
+msgstr "Европа/Амстердам"
+
+#: ../src/timezone_names.c:448
+msgid "Europe/Andorra"
+msgstr "Европа/Андора"
+
+#: ../src/timezone_names.c:449
+msgid "Europe/Athens"
+msgstr "Европа/Атина"
+
+#: ../src/timezone_names.c:450
+msgid "Europe/Belfast"
+msgstr "Европа/Белфаст"
+
+#: ../src/timezone_names.c:451
+msgid "Europe/Belgrade"
+msgstr "Европа/Београд"
+
+#: ../src/timezone_names.c:452
+msgid "Europe/Berlin"
+msgstr "Европа/Берлин"
+
+#: ../src/timezone_names.c:453
+msgid "Europe/Bratislava"
+msgstr "Европа/Братислава"
+
+#: ../src/timezone_names.c:454
+msgid "Europe/Brussels"
+msgstr "Европа/Брисел"
+
+#: ../src/timezone_names.c:455
+msgid "Europe/Bucharest"
+msgstr "Европа/Букурешт"
+
+#: ../src/timezone_names.c:456
+msgid "Europe/Budapest"
+msgstr "Европа/Будимпешта"
+
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Европа/Бисинген"
+
+#: ../src/timezone_names.c:458
+msgid "Europe/Chisinau"
+msgstr "Европа/Чисинау"
+
+#: ../src/timezone_names.c:459
+msgid "Europe/Copenhagen"
+msgstr "Европа/Копенхаген"
+
+#: ../src/timezone_names.c:460
+msgid "Europe/Dublin"
+msgstr "Европа/Даблин"
+
+#: ../src/timezone_names.c:461
+msgid "Europe/Gibraltar"
+msgstr "Европа/Гибралтар"
+
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Европа/Гернси"
+
+#: ../src/timezone_names.c:463
+msgid "Europe/Helsinki"
+msgstr "Европа/Хелсинки"
+
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Европа/Острво_Ман"
+
+#: ../src/timezone_names.c:465
+msgid "Europe/Istanbul"
+msgstr "Европа/Истамбул"
+
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Европа/Џерси"
+
+#: ../src/timezone_names.c:467
+msgid "Europe/Kaliningrad"
+msgstr "Европа/Калињинград"
+
+#: ../src/timezone_names.c:468
+msgid "Europe/Kiev"
+msgstr "Европа/Кијев"
+
+#: ../src/timezone_names.c:469
+msgid "Europe/Lisbon"
+msgstr "Европа/Лисабон"
+
+#: ../src/timezone_names.c:470
+msgid "Europe/Ljubljana"
+msgstr "Европа/Љубљана"
+
+#: ../src/timezone_names.c:471
+msgid "Europe/London"
+msgstr "Европа/Лондон"
+
+#: ../src/timezone_names.c:472
+msgid "Europe/Luxembourg"
+msgstr "Европа/Луксембург"
+
+#: ../src/timezone_names.c:473
+msgid "Europe/Madrid"
+msgstr "Европа/Мадрид"
+
+#: ../src/timezone_names.c:474
+msgid "Europe/Malta"
+msgstr "Европа/Малта"
+
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Европа/Марихамн"
+
+#: ../src/timezone_names.c:476
+msgid "Europe/Minsk"
+msgstr "Европа/Минск"
+
+#: ../src/timezone_names.c:477
+msgid "Europe/Monaco"
+msgstr "Европа/Монако"
+
+#: ../src/timezone_names.c:478
+msgid "Europe/Moscow"
+msgstr "Европа/Москва"
+
+#: ../src/timezone_names.c:479
+msgid "Europe/Nicosia"
+msgstr "Европа/Никозија"
+
+#: ../src/timezone_names.c:480
+msgid "Europe/Oslo"
+msgstr "Европа/Осло"
+
+#: ../src/timezone_names.c:481
+msgid "Europe/Paris"
+msgstr "Европа/Париз"
+
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Европа/Подгорица"
+
+#: ../src/timezone_names.c:483
+msgid "Europe/Prague"
+msgstr "Европа/Праг"
+
+#: ../src/timezone_names.c:484
+msgid "Europe/Riga"
+msgstr "Европа/Рига"
+
+#: ../src/timezone_names.c:485
+msgid "Europe/Rome"
+msgstr "Европа/Рим"
+
+#: ../src/timezone_names.c:486
+msgid "Europe/Samara"
+msgstr "Европа/Самара"
+
+#: ../src/timezone_names.c:487
+msgid "Europe/San_Marino"
+msgstr "Европа/Сан_Марино"
+
+#: ../src/timezone_names.c:488
+msgid "Europe/Sarajevo"
+msgstr "Европа/Сарајево"
+
+#: ../src/timezone_names.c:489
+msgid "Europe/Simferopol"
+msgstr "Европа/Севастопољ"
+
+#: ../src/timezone_names.c:490
+msgid "Europe/Skopje"
+msgstr "Европа/Скопље"
+
+#: ../src/timezone_names.c:491
+msgid "Europe/Sofia"
+msgstr "Европа/Софија"
+
+#: ../src/timezone_names.c:492
+msgid "Europe/Stockholm"
+msgstr "Европа/Штокхолм"
+
+#: ../src/timezone_names.c:493
+msgid "Europe/Tallinn"
+msgstr "Европа/Талин"
+
+#: ../src/timezone_names.c:494
+msgid "Europe/Tirane"
+msgstr "Европа/Тирана"
+
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Европа/Тираспољ"
+
+#: ../src/timezone_names.c:496
+msgid "Europe/Uzhgorod"
+msgstr "Европа/Ужгород"
+
+#: ../src/timezone_names.c:497
+msgid "Europe/Vaduz"
+msgstr "Европа/Вадуц"
+
+#: ../src/timezone_names.c:498
+msgid "Europe/Vatican"
+msgstr "Европа/Ватикан"
+
+#: ../src/timezone_names.c:499
+msgid "Europe/Vienna"
+msgstr "Европа/Беч"
+
+#: ../src/timezone_names.c:500
+msgid "Europe/Vilnius"
+msgstr "Европа/Вилнус"
+
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Европа/Волгоград"
+
+#: ../src/timezone_names.c:502
+msgid "Europe/Warsaw"
+msgstr "Европа/Варшава"
+
+#: ../src/timezone_names.c:503
+msgid "Europe/Zagreb"
+msgstr "Европа/Загреб"
+
+#: ../src/timezone_names.c:504
+msgid "Europe/Zaporozhye"
+msgstr "Европа/Запорожје"
+
+#: ../src/timezone_names.c:505
+msgid "Europe/Zurich"
+msgstr "Европа/Цирих"
+
+#: ../src/timezone_names.c:506
+msgid "Indian"
+msgstr "Индијски"
+
+#: ../src/timezone_names.c:507
+msgid "Indian/Antananarivo"
+msgstr "Индијски_океан/Антанариво"
+
+#: ../src/timezone_names.c:508
+msgid "Indian/Chagos"
+msgstr "Индијски_океан/Чагос"
+
+#: ../src/timezone_names.c:509
+msgid "Indian/Christmas"
+msgstr "Индијски_океан/Божићна_острва"
+
+#: ../src/timezone_names.c:510
+msgid "Indian/Cocos"
+msgstr "Индијски_океан/Кокос"
+
+#: ../src/timezone_names.c:511
+msgid "Indian/Comoro"
+msgstr "Индијски_океан/Коморо"
+
+#: ../src/timezone_names.c:512
+msgid "Indian/Kerguelen"
+msgstr "Индијски_океан/Кергулен"
+
+#: ../src/timezone_names.c:513
+msgid "Indian/Mahe"
+msgstr "Индијски_океан/Махе"
+
+#: ../src/timezone_names.c:514
+msgid "Indian/Maldives"
+msgstr "Индијски_океан/Малдиви"
+
+#: ../src/timezone_names.c:515
+msgid "Indian/Mauritius"
+msgstr "Индијски_океан/Маурицијус"
+
+#: ../src/timezone_names.c:516
+msgid "Indian/Mayotte"
+msgstr "Индијски_океан/Мајот"
+
+#: ../src/timezone_names.c:517
+msgid "Indian/Reunion"
+msgstr "Индијски_океан/Реунион"
+
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Мексико"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Мексико/Баха_норте"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Мексико/Баха_сур"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Мексико/Опште"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Средњи исток"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Средњи исток/Ријад87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Средњи исток/Ријад88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Средњи исток/Ријад89"
+
+#: ../src/timezone_names.c:526
+msgid "Pacific"
+msgstr "Тихи океан"
+
+#: ../src/timezone_names.c:527
+msgid "Pacific/Apia"
+msgstr "Тихи океан/Апија"
+
+#: ../src/timezone_names.c:528
+msgid "Pacific/Auckland"
+msgstr "Тихи океан/Оукленд"
+
+#: ../src/timezone_names.c:529
+msgid "Pacific/Chatham"
+msgstr "Тихи океан/Чатам"
+
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Тихи океан/Чук"
+
+#: ../src/timezone_names.c:531
+msgid "Pacific/Easter"
+msgstr "Тихи океан/Ускршња_острва"
+
+#: ../src/timezone_names.c:532
+msgid "Pacific/Efate"
+msgstr "Тихи океан/Ефат"
+
+#: ../src/timezone_names.c:533
+msgid "Pacific/Enderbury"
+msgstr "Тихи океан/Ендербури"
+
+#: ../src/timezone_names.c:534
+msgid "Pacific/Fakaofo"
+msgstr "Тихи океан/Факаофо"
+
+#: ../src/timezone_names.c:535
+msgid "Pacific/Fiji"
+msgstr "Тихи океан/Фиџи"
+
+#: ../src/timezone_names.c:536
+msgid "Pacific/Funafuti"
+msgstr "Тихи океан/Фунафути"
+
+#: ../src/timezone_names.c:537
+msgid "Pacific/Galapagos"
+msgstr "Тихи океан/Галапагос"
+
+#: ../src/timezone_names.c:538
+msgid "Pacific/Gambier"
+msgstr "Тихи океан/Гамбјер"
+
+#: ../src/timezone_names.c:539
+msgid "Pacific/Guadalcanal"
+msgstr "Тихи океан/Гвадалканал"
+
+#: ../src/timezone_names.c:540
+msgid "Pacific/Guam"
+msgstr "Тихи океан/Гуам"
+
+#: ../src/timezone_names.c:541
+msgid "Pacific/Honolulu"
+msgstr "Тихи океан/Хонолулу"
+
+#: ../src/timezone_names.c:542
+msgid "Pacific/Johnston"
+msgstr "Тихи океан/Џонстон"
+
+#: ../src/timezone_names.c:543
+msgid "Pacific/Kiritimati"
+msgstr "Тихи океан/Киритимати"
+
+#: ../src/timezone_names.c:544
+msgid "Pacific/Kosrae"
+msgstr "Тихи океан/Косре"
+
+#: ../src/timezone_names.c:545
+msgid "Pacific/Kwajalein"
+msgstr "Тихи океан/Квајалајн"
+
+#: ../src/timezone_names.c:546
+msgid "Pacific/Majuro"
+msgstr "Тихи океан/Маџуро"
+
+#: ../src/timezone_names.c:547
+msgid "Pacific/Marquesas"
+msgstr "Тихи океан/Маркесас"
+
+#: ../src/timezone_names.c:548
+msgid "Pacific/Midway"
+msgstr "Тихи океан/Мидвеј"
+
+#: ../src/timezone_names.c:549
+msgid "Pacific/Nauru"
+msgstr "Тихи океан/Науру"
+
+#: ../src/timezone_names.c:550
+msgid "Pacific/Niue"
+msgstr "Тихи океан/Нјуе"
+
+#: ../src/timezone_names.c:551
+msgid "Pacific/Norfolk"
+msgstr "Тихи океан/Норфолк"
+
+#: ../src/timezone_names.c:552
+msgid "Pacific/Noumea"
+msgstr "Тихи океан/Нума"
+
+#: ../src/timezone_names.c:553
+msgid "Pacific/Pago_Pago"
+msgstr "Тихи океан/Паго_Паго"
+
+#: ../src/timezone_names.c:554
+msgid "Pacific/Palau"
+msgstr "Тихи океан/Палау"
+
+#: ../src/timezone_names.c:555
+msgid "Pacific/Pitcairn"
+msgstr "Тихи океан/Питкарн"
+
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Тихи океан/Понпеј"
+
+#: ../src/timezone_names.c:557
+msgid "Pacific/Ponape"
+msgstr "Тихи океан/Понап"
+
+#: ../src/timezone_names.c:558
+msgid "Pacific/Port_Moresby"
+msgstr "Тихи океан/Порт_Моресби"
+
+#: ../src/timezone_names.c:559
+msgid "Pacific/Rarotonga"
+msgstr "Тихи океан/Раротонга"
+
+#: ../src/timezone_names.c:560
+msgid "Pacific/Saipan"
+msgstr "Тихи океан/Сајпан"
+
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Тихи океан/Самоа"
+
+#: ../src/timezone_names.c:562
+msgid "Pacific/Tahiti"
+msgstr "Тихи океан/Тахити"
+
+#: ../src/timezone_names.c:563
+msgid "Pacific/Tarawa"
+msgstr "Тихи океан/Тарава"
+
+#: ../src/timezone_names.c:564
+msgid "Pacific/Tongatapu"
+msgstr "Тихи океан/Тонгатапу"
+
+#: ../src/timezone_names.c:565
+msgid "Pacific/Truk"
+msgstr "Тихи океан/Трук"
+
+#: ../src/timezone_names.c:566
+msgid "Pacific/Wake"
+msgstr "Тихи океан/Вејк"
+
+#: ../src/timezone_names.c:567
+msgid "Pacific/Wallis"
+msgstr "Тихи океан/Волис"
+
+#: ../src/timezone_names.c:568
+msgid "Pacific/Yap"
+msgstr "Тихи океан/Јап"
+
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "САД"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "САД/Аљаска"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "САД/Алеути"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "САД/Аризона"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "САД/централне"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "САД/источне"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "САД/источне-Индијана"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "САД/Хаваји"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "Сад/Индијана-Старк"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "САД/Мичиген"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "САД/планинске"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "САД/Тихи океан"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "САД/Нови_Тихи океан"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "САД/Самоа"
+
+#: ../src/tray_icon.c:469
+msgid "New appointment"
+msgstr "Нови састанак"
+
+#: ../src/tray_icon.c:485
+msgid "About Orage"
+msgstr "О Оражу"
+
+#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
+msgid "Orage Panel Clock"
+msgstr "Ораж часовник за полицу"
+
+#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
+msgid "Show time and date?"
+msgstr "Да прикажем време и датум?"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
+msgid "Orage preferences"
+msgstr "Поставке Оража"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr "Подешавања за колендар Иксфце-а 4 (Ораж)"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Поставке Оражовог колендара"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Колендар"
+
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr "Оражов колендар"
+
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Колендар радне површи"
diff -Nru orage-4.8.3/po/sv.po orage-4.12.1/po/sv.po
--- orage-4.8.3/po/sv.po	2012-01-03 12:01:10.000000000 +0000
+++ orage-4.12.1/po/sv.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,23 +1,27 @@
-# Swedish messages for xfcalendar.
-# Copyright (C) 2003-2008 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Johan Hammar <johan.hammar@swipnet.se>, 2003.
-# Alexander Toresson <alexander.toresson@gmail.com>, 2006.
-# Daniel Nylander <po@danielnylander.se>, 2008.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Alex Nordlund <deep.alexander@gmail.com>, 2013
+# Alexander Toresson <alexander.toresson@gmail.com>, 2006
+# Alex Nordlund <deep.alexander@gmail.com>, 2013
+# Daniel Nylander <po@danielnylander.se>, 2008
+# Johan Hammar <johan.hammar@swipnet.se>, 2003
+# Påvel Nicklasson <pavel@frimix.se>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: xfcalendar\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2008-12-14 19:26+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"POT-Creation-Date: 2013-12-02 18:30+0100\n"
+"PO-Revision-Date: 2014-04-09 15:12+0000\n"
+"Last-Translator: PavelNicklasson <pavelnicklasson@bahnhof.se>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/xfce/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -33,9 +37,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"klicka för att ändra klocka"
+msgstr "%s\nklicka för att justera klocka"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -45,9 +47,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"knapp 1 för att ändra inställningar \n"
-"knapp 2 för att justera tid för klockor"
+msgstr "knapp 1 för att ändra inställningar \nknapp 2 för att justera tid för klockor"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -56,7 +56,7 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
+msgstr "justera för att ändra minut. Klicka på pilarna med knapp 2 för att ändra endast 1 minut."
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -111,9 +111,8 @@
 msgstr "stäng fönstret och avsluta"
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "uppdatera inställningar"
+msgstr "Globaltid inställningar"
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -218,9 +217,7 @@
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"Kryssa denna för att använda systemets standardtypsnitt istället för valt "
-"typsnitt"
+msgstr "Kryssa denna för att använda systemets standardtypsnitt istället för valt typsnitt"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -241,9 +238,8 @@
 msgstr "uppdatera inställningar"
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "Allmänna inställningar"
+msgstr "Globaltid inställningar"
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
@@ -293,7 +289,7 @@
 #: ../globaltime/timezone_selection.c:101
 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
 msgid " Other"
-msgstr ""
+msgstr "Annan"
 
 #: ../globaltime/timezone_selection.c:156
 #: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
@@ -326,18 +322,18 @@
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
 msgid "not changed"
-msgstr ""
+msgstr "inte ändrad"
 
 #: ../globaltime/timezone_selection.c:195
 #: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
 msgid "not changing"
-msgstr ""
+msgstr "ändras inte"
 
 #. location
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Plats"
@@ -345,12 +341,12 @@
 #: ../globaltime/timezone_selection.c:258
 #: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
 msgid "GMT Offset"
-msgstr ""
+msgstr "GMT kompensation"
 
 #: ../globaltime/timezone_selection.c:264
 #: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
 msgid "Previous/Next Change"
-msgstr ""
+msgstr "Föregående/Nästa Ändring"
 
 #: ../globaltime/timezone_selection.c:269
 #: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
@@ -376,7 +372,7 @@
 #: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
 #: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
 msgid "Change mode"
-msgstr ""
+msgstr "Ändringsläge"
 
 #: ../globaltime/timezone_selection.c:303
 #: ../globaltime/timezone_selection.c:313
@@ -398,19 +394,17 @@
 msgid "floating"
 msgstr "flytande"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "Lokaltid"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "Orage - Kalender"
+msgstr "Orage globaltid"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
-msgstr ""
+msgstr "Visa klockor från olika länder"
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Globaltid"
 
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
@@ -438,7 +432,7 @@
 
 #: ../panel-plugin/oc_config.c:277
 msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
+msgstr "Notera att du inte kan ändra höjden på horisontala paneler"
 
 #: ../panel-plugin/oc_config.c:282
 msgid "set _width:"
@@ -446,7 +440,7 @@
 
 #: ../panel-plugin/oc_config.c:293
 msgid "Note that you can not change the width of vertical panels"
-msgstr ""
+msgstr "Notera att du inte kan ändra bredden på vertikala paneler"
 
 #: ../panel-plugin/oc_config.c:316
 msgid "Clock Options"
@@ -460,7 +454,7 @@
 #: ../panel-plugin/oc_config.c:347
 #, c-format
 msgid "Line %d:"
-msgstr ""
+msgstr "Rad %d:"
 
 #: ../panel-plugin/oc_config.c:357
 msgid "Enter any valid strftime function parameter."
@@ -483,12 +477,7 @@
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Du behöver endast denna om du gör korta (mindre än 5 timmar) vänteläge eller "
-"viloläge och din synliga tid inte inkluderar sekunder. Under dessa "
-"förhållanden är det möjligt att Orageclock visar tiden felaktigt såvida du "
-"inte har valt detta alternativ. (Välja detta förhindrar sparfunktioner för "
-"processor och avbrott från att fungera.)"
+msgstr "Du behöver endast denna om du gör korta (mindre än 5 timmar) vänteläge eller viloläge och din synliga tid inte inkluderar sekunder. Under dessa förhållanden är det möjligt att Orageclock visar tiden felaktigt såvida du inte har valt detta alternativ. (Välja detta förhindrar sparfunktioner för processor och avbrott från att fungera.)"
 
 #: ../panel-plugin/oc_config.c:432
 msgid ""
@@ -500,18 +489,9 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Detta program använder strftime-funktionen för att hämta tid.\n"
-"Använd någon giltig kod för att få tid i formatet du föredrar.\n"
-"Några vanliga koder är:\n"
-"\t%A = veckodag\t\t\t%B = månad\n"
-"\t%c = datum och tid\t\t%R = timme och minut\n"
-"\t%V = veckonummer\t\t%Z = tidszon som används\n"
-"\t%H = timmar \t\t\t\t%M = minut\n"
-"\t%X = lokal tid\t\t\t%x = lokalt datum"
+msgstr "Detta program använder strftime-funktionen för att hämta tid.\nAnvänd någon giltig kod för att få tid i formatet du föredrar.\nNågra vanliga koder är:\n\t%A = veckodag\t\t\t%B = månad\n\t%c = datum och tid\t\t%R = timme och minut\n\t%V = veckonummer\t\t%Z = tidszon som används\n\t%H = timmar \t\t\t\t%M = minut\n\t%X = lokal tid\t\t\t%x = lokalt datum"
 
 #: ../panel-plugin/oc_config.c:457
-#, fuzzy
 msgid "Orage clock Preferences"
 msgstr "Inställningar för Orage"
 
@@ -524,7 +504,6 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
@@ -534,14 +513,13 @@
 msgstr "Ansvarig"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "Planera din tid med Xfce4"
+msgstr "Planera din tid med Orage"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Slut"
 
@@ -549,13 +527,13 @@
 msgid "Due"
 msgstr "Förfaller"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Välj en fil..."
 
@@ -563,227 +541,281 @@
 msgid "Sound Files"
 msgstr "Ljudfiler"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Alla filer"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Mötesinformationen har ändrats."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "Vill du fortsätta?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Nej, lämna inte"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Ja, ignorera ändringar och lämna"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "Det här mötet slutar innan det börjar."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "Inte angiven"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Lägg till nytt möte till denna fil."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Orage standardfil"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Lägg till möte misslyckades."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Ett fel inträffade då ett möte lades till. Se fler detaljer i loggfilen. "
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Mötesuppdatering misslyckades."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Se fler detaljer i loggfilen. (Kanske blev filen uppdaterad externt utanför Orage?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
 msgstr "Det här mötet kommer att tas bort permanent."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Nej, avbryt borttagningen"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Ja, ta bort den"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Välj ett datum"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Idag"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "Detta möte finns inte."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
 msgstr "Det togs antagligen bort så uppdatera din skärm."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Aktuella kategorier"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Lägg till ny kategori med färg"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Kategori:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Färger för kategorier - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr " *** KOPIA ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "Nytt möte - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Arkiv"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "Spar_a och stäng"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "D_uplicera"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Spara"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Spara och stäng"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Återgå"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Duplicera"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Ledig"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Allmänt"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Typ "
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Händelse"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Händelse som kommer att hända någon gång. Till exempel:\n"
-"Besök, födelsedag eller tv-program."
+msgstr "Händelse som kommer att hända någon gång. Till exempel:\nBesök, födelsedag eller tv-program."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "Att göra"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Någonting som du ska göra någon gång. Till exempel:\n"
-"Tvätta din bil eller testa en ny version av Orage."
+msgstr "Någonting som du ska göra någon gång. Till exempel:\nTvätta din bil eller testa en ny version av Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Dagbok"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Gör en anteckning om någonting som hände. Till exempel:\n"
-"Gör en notering att din mamma ringde eller att första snön kom."
+msgstr "Gör en anteckning om någonting som hände. Till exempel:\nGör en notering att din mamma ringde eller att första snön kom."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Titel"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "Heldagsaktivitet"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Start"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Ställ in"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Längd"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "dagar"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "timmar"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "minuter"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Tillgänglighet"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Färdig"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "Färdig"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Kategorier"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Detta är en speciell kategori som kan användas för att färga detta möte i "
-"listvyer."
+msgstr "Detta är en speciell kategori som kan användas för att färga detta möte i listvyer."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "uppdatera färger för kategorier."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "Prioritet"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Om du anger detta som 8 eller mer, visas INTE mötet på listfönster.\nDu kan använda funktionen för att minska röran dina listfönster, men det gör det svårare att hitta detta möte.\n(Alarm kommer fortfarande att ges normal.)\n(Det finns odokumenterade parametrar så att du kan ändra standardgränsen på 8)"
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Anteckning"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -792,131 +824,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Dessa snabbkommandon träder omedelbart i kraft:\n    <D> infogar aktuellt datum i lokalt datumformat\n    <T> infogar tid och\n    <DT> infogar datum och tid.\n\nDessa konverteras först senare när de ses:\n    <&Ynnnn> översätts till aktuellt år minus nnnn.\n(Detta kan användas till exempel för påminnelser om födelsedagar för att visa hur gammal personen blir.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
-msgstr "Före starten"
+msgstr "Före start"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "Före slutet"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
-msgstr "Efter starten"
+msgstr "Efter start"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "Efter slutet"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Alarm"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Alarmtid"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Hur ofta du vill få alarm:\n"
-" 1) före händelsens start\n"
-" 2) före att göra-slutet\n"
-" 3) efter att göra-starten"
+msgstr "Hur ofta du vill få alarm:\n 1) före händelsens start\n 2) före att göra-slut\n 3) efter att göra-start"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr "Bestående alarm"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Välj denna om du vill att Orage ska påminna dig även om den inte har varit "
-"aktiv när alarmet skedde."
+msgstr "Välj denna om du vill att Orage ska påminna dig även om den inte har varit aktiv när alarmet skedde."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Ljud"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "Använd"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
 msgstr "Välj denna om du vill använda alarmljud"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "Upprepa alarmljud"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "gånger"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "sekunders intervall"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "Visuellt"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Använd Orage-fönstret"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
 msgstr "Välj den här om du vill se alarm i Orage-fönstret"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Använd notifiering"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
 msgstr "Välj den här om du vill använda notifieringsalarm"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "Ange tidsgräns"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
 msgstr "Välj den här om du vill att notifieringen ska försvinna automatiskt"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 = systemets standardtid"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "sekunder"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Procedur"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
 msgstr "Välj denna om du vill använda procedur eller skriptalarm"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -926,156 +951,150 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
+msgstr "Du måste själv ange alla kontrolltecken.\nDen här strängen ges till shell bara för bearbetning.\nFöljande specialkommandon ersätts vid körning:\n\t<&T>  mötestitel\n\t<&D>  mötesbeskrivning\n\t<&AT> alarmtid\n\t<&ST> starttid för möte\n\t<&ET> sluttid för möte"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
-msgstr ""
+msgstr "Testa detta alarm genom att larma nu"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "<b>Standardalarm</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
 msgstr "Lagra aktuella inställningar som standardalarm"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
 msgstr "Ange aktuella inställningar från standardalarm"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Dagligen"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Veckomässigt"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Månatligen"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Årligen"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
-msgstr ""
+msgstr "Varje timme"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Mån"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Tis"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Ons"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Tor"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Fre"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "Lör"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "Sön"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Återkommande"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Komplexitet"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Grundläggande"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "Använd denna om du vill ha vanlig upprepad händelse"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Använd denna om du behöver komplexa tidsangivelser:\n"
-" Varje lördag och söndag eller \n"
-" Första tisdagen i varje månad"
+msgstr "Använd denna om du behöver komplexa tidsangivelser:\n Varje lördag och söndag eller \n Första tisdagen i varje månad"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Frekvens"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Var"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "förekomst"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Begränsa frekvensen till specifika intervall.\n"
-" Till exempel: Var tredje dag:\n"
-" Frekvens = Dagligen och Intervall = 3"
+msgstr "Begränsa frekvensen till specifika intervall.\n Till exempel: Var tredje dag:\n Frekvens = Dagligen och Intervall = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Gräns"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Upprepa för alltid"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Upprepa "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Upprepa tills "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Veckodagar"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "Vilken dag"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1083,283 +1102,297 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Ange vilken veckodag för månatliga och årliga händelser.\n"
-" Till exempel:\n"
-" Andra onsdagen varje månad:\n"
-"\tFrekvens = Månatligen,\n"
-"\tVeckodagar = kryssa endast Onsdag,\n"
-"\tVilken dag = välj 2 under Onsdag"
+msgstr "Ange vilken veckodag för månatliga och årliga händelser.\n Till exempel:\n Andra onsdagen varje månad:\n\tFrekvens = Månatligen,\n\tVeckodagar = kryssa endast Onsdag,\n\tVilken dag = välj 2 under Onsdag"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
-msgstr ""
+msgstr "ATT GÖRA bas"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
+msgstr "ATT GÖRA återkommer regelbundet vid starttid och upprepas efter varje intervall oavsett då det senast avslutades"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "ATT GÖRA återkomst baseras på komplett tid och upprepningar efter intervallet räknat från senast avslutad tid.\n(Notera att du inte kan säga något om ATT GÖRA historiken eftersom återkomstbas ändras efter varje avslut.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "Undantag"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
+msgstr "Lägg till fler undantagsdatum genom att klicka på kalenderdagarna nedan.\nUndantag är antingen uteslutningar(-) eller inbegripande(+) beroende på markeringen.\nTa bort genom att klicka på uppgifter."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
-msgstr ""
+msgstr "Lägg till undantagsdatum (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
+msgstr "Undantagna dagar är hela dagar då detta möte inte sker"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
-msgstr ""
+msgstr "Lägg till inbegripen tid (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
+msgstr "Inbegripna tider har samma tidszon som starttid, men de kan ha en annan tid"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
-#, fuzzy
+#: ../src/appointment.c:3516
 msgid "Action dates"
-msgstr "Åtgärdsalternativ"
+msgstr "Händelsedatum"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Visa"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "_Gå"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Ny"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Bakåt"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Idag"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Framåt"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Bakåt en vecka"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Bakåt en dag"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Framåt en dag"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Framåt en vecka"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Stäng"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
-msgstr ""
+msgstr "       Antal dagar som ska visas"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - dagsvy"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Hela dagen"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "Inga rader har markerats."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
-msgstr ""
-"Klicka på en rad för att markera den och efter det så kan du kopiera den."
+msgstr "Klicka på en rad för att markera den och efter det så kan du kopiera den."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"Du kommer permanent ta bort alla\n"
-"markerade möten."
+msgstr "Du kommer permanent ta bort alla\nmarkerade möten."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Ja, ta bort dem."
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Bakåt"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Framåt"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Sök"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "Dagsvy"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Extra dagar att visa "
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Extra dagar att visa:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "upprepa bara första"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Markera detta om du bara vill se den första upprepade händelsen. Som standard visas alla.\nNotera att detta även visar allt brådskande.\nNotera att upprepade händelser kan inträffa tidigare på listan eftersom bara den första förekomsten är listad."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "också gammal"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Markera detta om du även vill se gamla händelser. Detta kan bara väljas efter det att 'upprepa bara första' är aktiverat för att undvika mycket långa listor.\nNotera att markering av extra dagar fortfarande definierar om nyare möten är listade."
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "Dagboksposter från och med:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Sök"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "Sök efter text "
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Flaggor"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Titel"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Dubbelklicka på raden för att redigera den.\n"
-"\n"
-"Flaggor i ordning:\n"
-"\t 1. Alarm: n=inget alarm\n"
-"\t\t A=Visuellt alarm S=Även ljudalarm\n"
-"\t 2. Återkommande: n=Inte återkommande\n"
-"\t\t D=Dagligen W=Veckomässigt M=Månatligen Y=Årligen\n"
-"\t 3. Typ: f=Ledig B=Upptagen\n"
-"\t 4. Finns i filen:\n"
-"\t\tO=Orage A=Arkiverad F=Extern\n"
-"\t 5. Mötestyp:\n"
-"\t\tE=Händelse T=Att göra J=Dagbok"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Välj ett datum"
+msgstr "Dubbelklicka på raden för att redigera den.\n\nGiltiga flaggor:\n\t 1. Alarm: n=inget alarm\n\t\t A=Alarm är inställt P=Ihållande alarm är inställt\n\t 2. Återkommande: n=icke återkommande\n\t\t H=Varje timme D=Dagligen V=Varje vecka M=Varje månad Å=Årlig\n\t 3. Typ: f=ledig B=Upptagen\n\t 4. Finns i fil:\n\t\tO=Orage A=Arkiv F=Främmande\n\t 5. Mötestyp:\n\t\tE=Händelse A=Att göra J=Journal"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tÅterkommande slutade, flyttar till arkiveringsfil."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Arkivering är inte aktiverad. Avslutar"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Arkiveringsgräns: %d månad(er)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tArkiverar händelser som är äldre än: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Arkiverar uid: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tVTODO inte färdig; inte arkiverad"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tÅterkommande. Slut år: %04d, månad: %02d, dag: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Arkivering färdig\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Startar borttagning av arkivering."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tFAS 1: nollställ återkommande möten"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tFAS 2: återskapa arkiverade möten"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Borttagning av arkivering är färdig\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Orage standardalarm"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Skapade alarmlista för Orages huvudfil:"
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Skapade alarmlista för främmande fil: %s (%s)"
+
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "Bygger alarmlista: Lade till %d alarm. Behandlade %d händelser."
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\tLade till %d alarm. Bearbetade %d händelser."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tHittade %d alarm av vilka %d är aktiva. (Sökte igenom %d återkommande "
-"alarm.)"
+msgstr "\tHittade %d alarm av vilka %d är aktiva. (Sökte igenom %d återkommande alarm.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1377,7 +1410,16 @@
 msgid "Import file preprocessing done"
 msgstr "Behandling av Importerad fil är färdig"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Hittade extern uppdatering av fil %s."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Uppdaterar alarm och kalender på grund av extern filuppdatering."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Kalenderfiler"
 
@@ -1385,620 +1427,670 @@
 msgid "Current foreign files"
 msgstr "Aktuella externa filer"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "SKRIVSKYDDAD"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "LÄS-SKRIV"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Inga externa filer *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Tillägg av främmande fil misslyckades"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage kan bara hantera 10 främmande filer. Gränsen är nådd."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Filnamn är tomt."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Namn är tomt."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Filen finns inte."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Samma filnamn finns redan i Orage."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Samma namn finns redan i Orage."
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Importera/exportera"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Importera"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Läs från fil:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Separera filnamn med kommatecken(,).\n"
-" OBSERVERA: kommaetcken är inte giltiga tecken i filnamn för Orage."
+msgstr "Separera filnamn med kommatecken(,).\n OBSERVERA: kommaetcken är inte giltiga tecken i filnamn för Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Exportera"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Skriv till fil:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Välj"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Alla möten"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Namngivna möten: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Observera att endast huvudfilens möten läses.\n"
-"Arkiverade och externa händelser exporteras inte."
+msgstr "Observera att endast huvudfilens möten läses.\nArkiverade och externa händelser exporteras inte."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Observera att endast huvudfilens möten läses.\n"
-"Externa händelser exporteras inte."
+msgstr "Observera att endast huvudfilens möten läses.\nExterna händelser exporteras inte."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "Du kan enkelt dra dessa från händelselistans fönster."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "UID:er för Orage-möten, separerade med kommatecken."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Arkivering"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Arkivera nu (gräns: %d månader)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Du kan ändra arkiveringsgränsen i parametrarna"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Återställ arkiv nu"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Återskapa alla arkiverade händelser till Orages huvudfil och ta bort "
-"arkiveringsfilen.\n"
-"Detta är användbart till exempel när man exporterar och flyttar Orage-möten\n"
-"till andra system."
+msgstr "Återskapa alla arkiverade händelser till Orages huvudfil och ta bort arkiveringsfilen.\nDetta är användbart till exempel när man exporterar och flyttar Orage-möten\ntill andra system."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Orage-filer"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Huvudkalenderfil för Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Aktuell fil"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Ny fil"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Åtgärdsalternativ"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Aktuell fil:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Ny fil:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Åtgärdsalternativ:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Byt namn"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Endast namnbyte på Orage interna fil.\n"
-"Kommer inte att röra externa filsystem alls.\n"
-"Nya filen måste finnas."
+msgstr "Endast namnbyte på Orage interna fil.\nKommer inte att röra externa filsystem alls.\nNya filen måste finnas."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Kopiera"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr "Aktuell fil kopieras och ändras inte på dess ursprungliga plats."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Flytta"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "Aktuell fil flyttas och försvinner från den ursprungliga platsen."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Arkiveringsfil"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Externa filer"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Lägg till ny extern fil"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Extern fil:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Alternativ"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Synligt namn:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Skrivskyddad"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Ställ in denna om du vill försäkra dig om att denna fil aldrig kommer att "
-"ändras av Orage.\n"
-"Observera att ändring av externa filer kan göra dem inkompatibila med "
-"ursprungsverktyget, alltså där de kom från!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Ställ in denna om du vill försäkra dig om att denna fil aldrig kommer att ändras av Orage.\nObservera att ändring av externa filer kan göra dem inkompatibila med ursprungsverktyget, alltså där de kom från!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Detta interna namn visas för användaren istället för filnamnet."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Utväxla data - Orage"
 
-#: ../src/main.c:268
-#, fuzzy, c-format
+#: ../src/main.c:275
+#, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tDetta är %s version %s för Xfce %s\n"
-"\n"
+msgstr "\tDetta är %s version %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tUtgivet under villkoren för GNU General Public License.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tKompilerat mot GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "använder GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tAnvänder DBUS för import.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tAnvänder inte DBUS. Importering fungerar endast delvis.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tAnvänder libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tAnvänder inte libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tAnvänder automatisk arkivering.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tAnvänder inte arkivering.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
-msgstr ""
+msgstr "\tAnvänder operativsystemspaket libical.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
+msgstr "\tAnvänder Orages lokala version av libical.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Användning: orage [flaggor] [filer]\n"
-"\n"
+msgstr "Användning: orage [flaggor] [filer]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Flaggor:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tvisa version för orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tskriv ut denna text\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \tvisa inställningar\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\tgör orage synligt/osynligt\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) fil [RW] \tlägg till en extern fil\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) file [RW] [name] \tlägg till en främmande fil\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) fil \tta bort en extern fil\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--export (-e) file [appointment...] \texportera möten från Orage till fil\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "filer=ical-filer att läsa in i orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tdbus inte inkluderat i orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tflaggor för \"utan dbus [filer]\" och externa filer(-a & -r) får endast "
-"användas när orage startas \n"
+msgstr "\tflaggor för \"utan dbus [filer]\" och externa filer(-a & -r) får endast användas när orage startas \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Okänd flagga %s\n"
-"\n"
+msgstr "\nOkänd flagga %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Utväxla data"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Visa markerat _datum"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Visa markerad _vecka"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Markera _idag"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Lokaltid"
+msgstr "Visa _globaltid"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Ingen titel definierad"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr "Plats: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n Anteckning:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Aldrig"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Titel: %s\n"
-" Start:\t%s\n"
-" Slut:\t%s\n"
-" Anteckning:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "Titel: %s\n%s Start:\t%s\n Till:\t%s\n Färdigt:\t%s%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Titel: %s\n"
-" Start:\t%s\n"
-" Slut:\t%s\n"
-" Anteckning:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Titel: %s\n%s Start:\t%s\n Slut:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Att göra:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Händelser för %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>Händelser för %s - %s:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "Huvudinställningar"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Tidszon"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "Du bör alltid definiera din lokala tidszon."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "Arkiveringsgräns (månader)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = ingen arkivering)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Arkivering används för att spara tid och utrymme vid hantering av händelser."
+msgstr "Arkivering används för att spara tid och utrymme vid hantering av händelser."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Ljudkommando"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-"Detta kommando skickas till kommandoradsskalet för att spela upp ljud i "
-"alarm."
+msgstr "Detta kommando skickas till kommandoradsskalet för att spela upp ljud i alarm."
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Vsa"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Huvudfönstret"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Kalenderfönster"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Kalender visuella detaljer"
+
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "Visa ramar"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "Visa meny"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Visa månad och år"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
 msgstr "Visa namn på dagar"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
 msgstr "Visa veckonummer"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Visa månad och år"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Kalender inforutor"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "Visa att göra-lista"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
-msgstr ""
+msgstr "Antal dagar att visa i händelsefönstret"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
-msgstr ""
+msgstr "0 = visa inte händelselistan alls"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Kalender synlighet"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
 msgstr "Visa på alla skrivbord"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
 msgstr "Behåll överst"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "Visa i verktygsraden"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "Visa i skrivbordsbläddraren"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "Visa i notifieringsfältet"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "Kalenderstart"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Visa"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Dölj"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Minimerad"
 
-#: ../src/parameters.c:793
-#, fuzzy
-msgid "Extra settings"
-msgstr "Fler alternativ"
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Huvudfönstret"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "Öppna fönster på kalender"
 
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
+#: ../src/parameters.c:792
+msgid "Select today's date"
 msgstr "Välj dagens datum"
 
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "Använd dynamisk ikon"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Dubbelklick i huvudkalendern visar"
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Välj tidigare valt datum"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Kalenderdagar dubbelklick visar"
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
 msgstr "Dagsvy"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
 msgstr "Händelselista"
 
-#: ../src/parameters.c:890
-#, fuzzy
-msgid "Eventlist window"
-msgstr "Händelselista"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Extra inställningar"
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Händelselista fönster"
+
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
-msgstr ""
+msgstr "Antal extra dagar att visa i händelselista"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
-msgstr ""
+msgstr "Detta är bara standardvärdet, du kan ändra det i själva händelselistfönstret."
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Visa bara första upprepande händelse"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Dagsfönster standard första dag"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Veckans första dag"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Vald dag"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Använd dynamisk systembrickeikon"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Använd dynamisk ikon"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Dynamisk ikon visar aktuell månad och dag i månaden."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
-msgstr ""
+msgstr "Använd väckarklocka"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
+msgstr "Använd detta om Orage har problem att vakna upp ordentligt efter vänteläge eller viloläge. (Om till exempel systembrickeikonen inte uppdateras eller alarm inte avges.)"
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Främmande fil standard visuellt alarm"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Orage fönster"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Meddelandeunderrättelse"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Avsluta alltid vid stängning"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Avsluta alltid"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Som standard fortsätter Orage att vara öppet i bakgrunden då det stängs. Denna inställningar gör att Orage avslutas och inte fortsätter i bakgrunden då det stängs."
+
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Inställningar för Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
 msgstr "Första gången Orage startas. Söker efter standardtidszon."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Standardtidszon angiven till %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
 msgstr "Standardtidszon hittades inte. Ställ in den manuellt."
 
@@ -2010,40 +2102,35 @@
 msgid "Open"
 msgstr "Öppna"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Påminnelse - Orage"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Skjut upp"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
+msgstr "Påminn mig efter den angivna tiden"
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Nästa aktiva alarm:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d d %02d h %02d min till: %s"
+msgstr "\n%02d d %02d h %02d min till: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Inga aktiva alarm hittades"
+msgstr "\nInga aktiva alarm hittades"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2066,1537 +2153,2229 @@
 msgstr "Afrika/Algier"
 
 #: ../src/timezone_names.c:41
+msgid "Africa/Asmara"
+msgstr "Afrika/Asmara"
+
+#: ../src/timezone_names.c:42
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
-#: ../src/timezone_names.c:42
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "Afrika/Banjul"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "Afrika/Kairo"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "Afrika/Conakry"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_Salaam"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "Afrika/Djibouti"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "Afrika/Douala"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Aaiun"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "Afrika/Freetown"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaborone"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "Afrika/Juba"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johannesburg"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "Afrika/Khartoum"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinshasa"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "Afrika/Libreville"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbashi"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "Afrika/Mogadishu"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovia"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndjamena"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamey"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nouakchott"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ouagadougou"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripoli"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "Afrika/Windhoek"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "Amerika"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "Amerika/Anchorage"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "Amerika/Anguilla"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "Amerika/Antigua"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "Amerika/Araguaina"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "Amerika/Argentina/Buenos_Aires"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "Amerika/Argentina/Catamarca"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "Amerika/Argentina/ComodRivadavia"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "Amerika/Argentina/Cordoba"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "Amerika/Argentina/Jujuy"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "Amerika/Argentina/La_Rioja"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "Amerika/Argentina/Mendoza"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "Amerika/Argentina/Rio_Gallegos"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "Amerika/Argentina/Salta"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "Amerika/Argentina/San_Juan"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "Amerika/Argentina/San_Luis"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "Amerika/Argentina/Tucuman"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "Amerika/Argentina/Ushuaia"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "Amerika/Asuncion"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "Amerika/Atikokan"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "Amerika/Atka"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "Amerika/Bahia"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "Amerika/Bahia_Banderas"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "Amerika/Blanc-Sablon"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "Amerika/Boise"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Cambridge_Bay"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "Amerika/Campo_Grande"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "Amerika/Cancun"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "Amerika/Caracas"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "Amerika/Catamarca"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "Amerika/Cayenne"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "Amerika/Cayman"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "Amerika/Chicago"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "Amerika/Chihuahua"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "Amerika/Coral_Harbour"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "Amerika/Cordoba"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "Amerika/Costa_Rica"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "Amerika/Creston"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "Amerika/Cuiaba"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "Amerika/Curacao"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "Amerika/Danmarkshavn"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "Amerika/Dawson"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Dawson_Creek"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "Amerika/Dominica"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "Amerika/Ensenada"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "Amerika/Eirunepe"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "Amerika/Fort_Wayne"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glace_Bay"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "Amerika/Godthab"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "Amerika/Goose_Bay"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grand_Turk"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "Amerika/Guadeloupe"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "Amerika/Guatemala"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "Amerika/Guayaquil"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "Amerika/Guyana"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "Amerika/Halifax"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosillo"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indiana/Indianapolis"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indiana/Knox"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indiana/Marengo"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "Amerika/Indiana/Petersburg"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "Amerika/Indiana/Tell_City"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indiana/Vevay"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "Amerika/Indiana/Vincennes"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "Amerika/Indiana/Winamac"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "Amerika/Indianapolis"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "Amerika/Iqaluit"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "Amerika/Jamaica"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "Amerika/Jujuy"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "Amerika/Juneau"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentucky/Louisville"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentucky/Monticello"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "Amerika/Knox_IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "Amerika/Kralendijk"
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "Amerika/La_Paz"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Angeles"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "Amerika/Louisville"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "Amerika/Lower_Princes"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "Amerika/Maceio"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "Amerika/Managua"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "Amerika/Marigot"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "Amerika/Martinique"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "Amerika/Matamoros"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "Amerika/Mazatlan"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "Amerika/Menominee"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "Amerika/Metlakatla"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "Amerika/Mexico_City"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "Amerika/Miquelon"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "Amerika/Moncton"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "Amerika/Monterrey"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "Amerika/Montserrat"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "Amerika/Nome"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "Amerika/North_Dakota/Beulah"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "Amerika/North_Dakota/Central"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "Amerika/North_Dakota/New_Salem"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "Amerika/Noronha"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "Amerika/Ojinaga"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "Amerika/Phoenix"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Port-au-Prince"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_of_Spain"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "Amerika/Porto_Acre"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "Amerika/Porto_Velho"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Puerto_Rico"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "Amerika/Rainy_River"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Rankin_Inlet"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "Amerika/Recife"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "Amerika/Resolute"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branco"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "Amerika/Rosario"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "Amerika/Santa_Isabel"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "Amerika/Santarem"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "Amerika/Santiago"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo_Domingo"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao_Paulo"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "Amerika/Scoresbysund"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "Amerika/Shiprock"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "Amerika/Sitka"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "Amerika/St_Barthelemy"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "Amerika/St_Johns"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "Amerika/St_Kitts"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "Amerika/St_Lucia"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "Amerika/St_Thomas"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "Amerika/St_Vincent"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "Amerika/Swift_Current"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegucigalpa"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "Amerika/Thule"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Thunder_Bay"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "Amerika/Tijuana"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "Amerika/Toronto"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "Amerika/Vancouver"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "Amerika/Virgin"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "Amerika/Whitehorse"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "Amerika/Winnipeg"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "Amerika/Yakutat"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "Amerika/Yellowknife"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Antarktis"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Antarktis/Casey"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Antarktis/Davis"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktis/DumontDUrville"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Antarktis/Macquarie"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Antarktis/Mawson"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Antarktis/McMurdo"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Antarktis/Palmer"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Antarktis/Rothera"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Antarktis/Sydpolen"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "Antarktis/Syowa"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Antarktis/Vostok"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Arktis"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Arktis/Longyearbyen"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Asien"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Asien/Aden"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Asien/Almaty"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Asien/Amman"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Asien/Anadyr"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Asien/Aqtau"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Asien/Aqtobe"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "Asien/Ashgabat"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Asien/Ashkhabad"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "Asien/Baghdad"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Asien/Bahrain"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Asien/Baku"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Asien/Bangkok"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Asien/Beirut"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Asien/Bishkek"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Asien/Brunei"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Asien/Calcutta"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Asien/Choibaisan"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "Asien/Chongqing"
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "Asien/Chungking"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Asien/Colombo"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Asien/Decca"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "Asien/Damaskus"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Asien/Dhaka"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Asien/Dili"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Asien/Dubai"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Asien/Dushanbe"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Asien/Gaza"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Asien/Harbin"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Asien/Hebron"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Asien/Hong_Kong"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Asien/Ho_Chi_Minh"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Asien/Hovd"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Asien/Irkutsk"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Asien/Istanbul"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Asien/Jakarta"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Asien/Jayapura"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Asien/Jerusalem"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Asien/Kabul"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Asien/Kamchatka"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Asien/Karachi"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Asien/Kashgar"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Asien/Katmandu"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Asien/Katmandu"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Asien/Khandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Asien/Kolkata"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Asien/Krasnoyarsk"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asien/Kuala_Lumpur"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Asien/Kuching"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Asien/Kuwait"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Asien/Macao"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Asien/Macao"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Asien/Magadan"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Asien/Makassar"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Asien/Manila"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Asien/Muscat"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Asien/Nicosia"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Asien/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Asien/Novosibirsk"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Asien/Omsk"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Asien/Oral"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Asien/Phnom_Penh"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Asien/Pontianak"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Asien/Pyongyang"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Asien/Qatar"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Asien/Qyzylorda"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Asien/Rangoon"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Asien/Riyadh"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Asien/Riyadh87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Asien/Riyadh88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Asien/Riyadh89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Asien/Saigon"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Asien/Sakhalin"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Asien/Samarkand"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Asien/Seoul"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Asien/Shanghai"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Asien/Singapore"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Asien/Taipei"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Asien/Tashkent"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Asien/Tbilisi"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Asien/Tehran"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Asien/Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Asien/Thimbu"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Asien/Thimphu"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Asien/Tokyo"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "Asien/Ujung_Pandang"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Asien/Ulaanbaatar"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Asien/Ulan_Bator"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Asien/Urumqi"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Asien/Ust-Nera"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Asien/Vientiane"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Asien/Vladivostok"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Asien/Yakutsk"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Asien/Yekaterinburg"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Asien/Yerevan"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Atlanten"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Atlanten/Azorerna"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Atlanten/Bermuda"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Atlanten/Kanarieöarna"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlanten/Cape_Verde"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "Atlanten/Färöarna"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlanten/Färöarna"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlanten/Jan_Mayen"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "Atlanten/Madeira"
 
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr "Atlanten/Reykjavik"
+#: ../src/timezone_names.c:374
+msgid "Atlantic/Reykjavik"
+msgstr "Atlanten/Reykjavik"
+
+#: ../src/timezone_names.c:375
+msgid "Atlantic/South_Georgia"
+msgstr "Atlanten/South_Georgia"
+
+#: ../src/timezone_names.c:376
+msgid "Atlantic/St_Helena"
+msgstr "Atlanten/St_Helena"
+
+#: ../src/timezone_names.c:377
+msgid "Atlantic/Stanley"
+msgstr "Atlanten/Stanley"
+
+#: ../src/timezone_names.c:378
+msgid "Australia"
+msgstr "Australien"
+
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Australien/ACT"
+
+#: ../src/timezone_names.c:380
+msgid "Australia/Adelaide"
+msgstr "Australien/Adelaide"
+
+#: ../src/timezone_names.c:381
+msgid "Australia/Brisbane"
+msgstr "Australien/Brisbane"
+
+#: ../src/timezone_names.c:382
+msgid "Australia/Broken_Hill"
+msgstr "Australien/Broken_Hill"
+
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Australien/Currie"
+
+#: ../src/timezone_names.c:384
+msgid "Australia/Darwin"
+msgstr "Australien/Darwin"
+
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Australien/Eucla"
+
+#: ../src/timezone_names.c:386
+msgid "Australia/Hobart"
+msgstr "Australien/Hobart"
+
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr "Australien/Lindeman"
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr "Australien/Lord_Howe"
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "Australien/Melbourne"
+
+#: ../src/timezone_names.c:390
+msgid "Australia/Perth"
+msgstr "Australien/Perth"
+
+#: ../src/timezone_names.c:391
+msgid "Australia/Sydney"
+msgstr "Australien/Sydney"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brasilien"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brasilien/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brasilien/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brasilien/Östra"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brasilien/Västra"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Kanada/Atlantisk"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Kanada/Central"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Kanada/Öst-Saskatchewan"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Kanada/Östlig"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Kanada/Mountain"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Kanada/Newfoundland"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Kanada/Stilla havet"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Kanada/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Kanada/Yukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Chile"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Chile/Kontinental"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Chile/Påskön"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
 
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr "Atlanten/South_Georgia"
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
 
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr "Atlanten/St_Helena"
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
 
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr "Atlanten/Stanley"
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
 
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr "Australien"
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
 
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr "Australien/Adelaide"
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
 
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr "Australien/Brisbane"
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
 
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr "Australien/Broken_Hill"
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
 
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr "Australien/Darwin"
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
 
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr "Australien/Hobart"
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
 
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr "Australien/Lindeman"
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
 
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr "Australien/Lord_Howe"
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
 
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr "Australien/Melbourne"
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
 
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr "Australien/Perth"
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
 
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr "Australien/Sydney"
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Universell"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Zulu"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Europa"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Europa/Aten"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrad"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Europa/Berlin"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Europa/Bryssel"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Europa/Bukarest"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Europa/Busingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Europa/Köpenhamn"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Europa/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsingfors"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Europa/Isle_of_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Europa/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Europa/Lissabon"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Europa/London"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxembourg"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Europa/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Europa/Moskva"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Europa/Paris"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Europa/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Europa/Prag"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Europa/Rom"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Europa/Stockholm"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Europa/Tiraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Europa/Vatikanstaten"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Europa/Wien"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Europa/Volgograd"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "Europa/Warsawa"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "Europa/Zurich"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Indiska oceanen"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "Indiska oceanen/Antananarivo"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "Indiska oceanen/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "Indiska oceanen/Julön"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "Indiska oceanen/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "Indiska oceanen/Comoro"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "Indiska oceanen/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "Indiska oceanen/Mahe"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "Indiska oceanen/Maldiverna"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "Indiska oceanen/Mauritius"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "Indiska oceanen/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "Indiska oceanen/Reunion"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Mexiko"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Mexiko/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Mexiko/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Mexiko/General"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Mellanöstern"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Mellanöstern/Riyadh87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Mellanöstern/Riyadh88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Mellanöstern/Riyadh89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Stilla havet"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "Stilla havet/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Stilla havet/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Stilla havet/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Stilla havet/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "Stilla havet/Påskön"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "Stilla havet/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "Stilla havet/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Stilla havet/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "Stilla havet/Fiji"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Stilla havet/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Stilla havet/Galapagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Stilla havet/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "Stilla havet/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Stilla havet/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Stilla havet/Honolulu"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Stilla havet/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "Stilla havet/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "Stilla havet/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "Stilla havet/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Stilla havet/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Stilla havet/Marquesas"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Stilla havet/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Stilla havet/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Stilla havet/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Stilla havet/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "Stilla havet/Noumea"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Stilla havet/Pago_Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Stilla havet/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "Stilla havet/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Stilla havet/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "Stilla havet/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Stilla havet/Port_Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Stilla havet/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Stilla havet/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Stilla havet/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Stilla havet/Tahiti"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Stilla havet/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Stilla havet/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Stilla havet/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Stilla havet/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Stilla havet/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "Stilla havet/Yap"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "USA"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "USA/Alaska"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "USA/Aleuterna"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "USA/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "USA/Central"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "USA/Östlig"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "USA/Öst-Indiana"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "USA/Hawaii"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "USA/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "USA/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "USA/Mountain"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "USA/Stilla havet"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "USA/Stilla havet ny"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "USA/Samoa"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "Nytt möte"
@@ -3614,238 +4393,26 @@
 msgstr "Visa tid och datum?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Kalender"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Inställningar för Orage-kalendern"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Inställningar för Orage"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Inställningar för Xfce 4-kalendern (Orage)"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Skrivbordskalender"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Inställningar för Orage-kalendern"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Kalender"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Orage-kalendern"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Titel: %s\n"
-#~ " Start:\t%s\n"
-#~ " Slut:\t%s\n"
-#~ " Färdig:\t%s\n"
-#~ "Anteckning:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Du måste ange alla escape-tecken och annat själv.\n"
-#~ " Denna sträng skickas endast till kommandoradsskal för behandling"
-
-#~ msgid "Orage clock"
-#~ msgstr "Orage-klocka"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Ursprunglig skapare, tidigare ansvarig"
-
-#~ msgid "Contributor"
-#~ msgstr "Bidragsgivare"
-
-#~ msgid "Info"
-#~ msgstr "Info"
-
-#~ msgid "Warning"
-#~ msgstr "Varning"
-
-#~ msgid "Error"
-#~ msgstr "Fel"
-
-#~ msgid "Display"
-#~ msgstr "Visning"
-
-#~ msgid "Set sticked"
-#~ msgstr "Ange som klistrad"
-
-#~ msgid "Select always today"
-#~ msgstr "Välj alltid idag"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "När huvudkalendern visas så ställ in pekaren till antingen tidigare "
-#~ "markerade dag eller alltid till dagens datum."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Avslutar tidsjusteringsläge"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Startar tidsjusteringsläge"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "justera för att ändra minut"
-
-#~ msgid "Vary"
-#~ msgstr "Varierande"
-
-#~ msgid "Select timezone"
-#~ msgstr "Välj tidszon"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Ändra klocka"
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "ange tidszon för klocka,\n"
-#~ "(=något giltigt TZ-värde)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Ändra inställningar"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Ange lokal tidszon. (den visas om tiden är på tidigare(-) eller nästa "
-#~ "datum(+) genom att lägga till ett +/- efter tiden)"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr "Ange en giltig tidszon (=TZ) eller välj en från listan."
-
-#~ msgid "show line _1:"
-#~ msgstr "visa rad _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "visa rad _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "visa rad _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Egenskaper"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Misslyckades med att starta \"orage -p\""
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> infogar aktuellt datum i lokalt datumformat.\n"
-#~ "<T> infogar tid och\n"
-#~ "<DT> infogar datum och tid."
-
-#~ msgid "Show event list"
-#~ msgstr "Visa händelselista"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = använd statisk ikon)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Dynamisk ikon visar aktuell dag och månad. Den är endast synlig i "
-#~ "notifieringsfältet. Om notifieringsfältet är för litet för den dynamiska "
-#~ "ikonen så kommer Orage att automatiskt växla tillbaka till statisk ikon."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Kalenderinställningar"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Inställningar för Xfce 4 Kalender"
-
-#~ msgid "Monday"
-#~ msgstr "Idag"
-
-#~ msgid "Tuesday"
-#~ msgstr "Idag"
-
-#~ msgid "Wednesday"
-#~ msgstr "En gång i veckan"
-
-#~ msgid "Thursday"
-#~ msgstr "Idag"
-
-#~ msgid "Friday"
-#~ msgstr "dagar"
-
-#~ msgid "Sunday"
-#~ msgstr "Ljud"
-
-#~ msgid "Days"
-#~ msgstr "dagar"
-
-#~ msgid "normal"
-#~ msgstr "Generellt"
-
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%Y/%m/%d"
-
-#~ msgid "Calendar Files"
-#~ msgstr "Kalenderfiler"
-
-#~ msgid "Calendar borders"
-#~ msgstr "Fönsterkanter"
-
-#~ msgid "Hidden"
-#~ msgstr "Göm"
-
-#~ msgid "3 months"
-#~ msgstr "3 månader"
-
-#~ msgid "6 months"
-#~ msgstr "6 månader"
-
-#~ msgid "1 year"
-#~ msgstr "1 år"
-
-#~ msgid "Application"
-#~ msgstr "Program"
-
-#~ msgid "Core developer"
-#~ msgstr "Huvudutvecklare"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Du kommer att ta bort all information \n"
-#~ "som hör till det här datumet."
-
-#~ msgid "Clear"
-#~ msgstr "Töm"
-
-#~ msgid "This should not happen"
-#~ msgstr "Detta ska inte kunna hända"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Kan inte skapa MCS-klientkanal"
-
-#~ msgid "Open archive file..."
-#~ msgstr "Öppna arkivfil..."
-
-#~ msgid "Close archive file"
-#~ msgstr "Stäng arkivfil"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Skrivbordskalender"
diff -Nru orage-4.8.3/po/ta.po orage-4.12.1/po/ta.po
--- orage-4.8.3/po/ta.po	2012-01-03 12:01:10.000000000 +0000
+++ orage-4.12.1/po/ta.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,3626 +0,0 @@
-# Tamil translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Dinesh Nadarajah <dinesh_list@sbcglobal.net>, 2003
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2005-09-14 01:22+0900\n"
-"Last-Translator: Dinesh Nadarajah <dinesh_list@sbcglobal.net>\n"
-"Language-Team: Tamil <tamillinux-user@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ta\n"
-
-#: ../globaltime/globaltime.c:100
-msgid "Raising GlobalTime window..."
-msgstr ""
-
-#: ../globaltime/globaltime.c:102
-msgid "GlobalTime window raise failed"
-msgstr ""
-
-#. ********** timezone tooltip **********
-#: ../globaltime/globaltime.c:277
-#, c-format
-msgid ""
-"%s\n"
-"click to modify clock"
-msgstr ""
-
-#: ../globaltime/globaltime.c:386
-msgid "Localtime"
-msgstr ""
-
-#: ../globaltime/globaltime.c:464
-msgid ""
-"button 1 to change preferences \n"
-"button 2 to adjust time of clocks"
-msgstr ""
-
-#: ../globaltime/globaltime.c:480
-msgid "adjust to change hour"
-msgstr ""
-
-#: ../globaltime/globaltime.c:496
-msgid ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
-msgid "NEW"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:289
-msgid "NEW COPY"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:310
-msgid "Not possible to delete the last clock."
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:516
-msgid "update this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
-msgid "add new empty clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:526
-msgid "add new clock using this clock as model"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:531
-msgid "delete this clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:539
-msgid "move this clock first"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:544
-msgid "move this clock left"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:549
-msgid "move this clock right"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:554
-msgid "move this clock last"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:562
-msgid "set the timezone of this clock to be local timezone"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
-msgid "close window and exit"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:590
-#, fuzzy
-msgid "Globaltime preferences "
-msgstr "விருப்பங்கள்"
-
-#. -----------------------HEADING-------------------------------------------
-#: ../globaltime/gt_prefs.c:603
-msgid "Clock Parameters"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:607
-msgid "Name of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:613
-msgid "enter name of clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:616
-msgid "Timezone of the clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:643
-msgid "Text Formatting"
-msgstr ""
-
-#. ------------------------background-------------------------
-#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
-msgid "Background color:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:656
-msgid "Click to change background colour for clock"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
-#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
-#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
-#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
-#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
-msgid "Use default"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
-#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
-#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
-msgid "Cross this to use default instead of selected value"
-msgstr ""
-
-#. ------------------------foreground-------------------------
-#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
-msgid "Foreground (=text) color:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:688
-msgid "Click to change foreground colour for clock"
-msgstr ""
-
-#. ------------------------name font-------------------------
-#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
-msgid "Font for name of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:720
-msgid "Click to change font for clock name"
-msgstr ""
-
-#. ------------------------time font-------------------------
-#: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
-msgid "Font for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:753
-msgid "Click to change font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:780
-msgid "Underline name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:810
-msgid "Underline time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:850
-msgid "Text Default Formatting"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:863
-msgid "Click to change default background colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
-msgid "Cross this to use system default instead of selected color"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:896
-msgid "Click to change default text colour for clocks"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:929
-msgid "Click to change default font for clock name"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
-msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:963
-msgid "Click to change default font for clock time"
-msgstr ""
-
-#. ------------------------underline name--------------------
-#: ../globaltime/gt_prefs.c:990
-msgid "Underline for name of clock:"
-msgstr ""
-
-#. ------------------------underline time--------------------
-#: ../globaltime/gt_prefs.c:1004
-msgid "Underline for time of clock:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1027
-#, fuzzy
-msgid "update preferences"
-msgstr "விருப்பங்கள்"
-
-#: ../globaltime/gt_prefs.c:1062
-#, fuzzy
-msgid "Globaltime Preferences"
-msgstr "விருப்பங்கள்"
-
-#. -----------------------HEADING--------------------------------------
-#: ../globaltime/gt_prefs.c:1073
-#, fuzzy
-msgid "General Preferences"
-msgstr "விருப்பங்கள்"
-
-#: ../globaltime/gt_prefs.c:1077
-msgid "Decorations:"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1078
-#, fuzzy
-msgid "Standard"
-msgstr "XFநால்-காட்டி"
-
-#: ../globaltime/gt_prefs.c:1083
-msgid "Use normal decorations"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1094
-msgid "Do not show window decorations (borders)"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1100
-#, fuzzy
-msgid "Clock size:"
-msgstr "மூடுக"
-
-#: ../globaltime/gt_prefs.c:1101
-msgid "Equal"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1106
-msgid "All clocks have same size"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1111
-#, fuzzy
-msgid "Varying"
-msgstr "எச்சரிக்கை"
-
-#: ../globaltime/gt_prefs.c:1116
-msgid "Clock sizes vary"
-msgstr ""
-
-#: ../globaltime/gt_prefs.c:1122
-msgid "Local timezone:"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:101
-#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
-msgid " Other"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:156
-#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
-#, c-format
-msgid "%d hour %d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:159
-#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, c-format
-msgid "%d hour"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:161
-#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, c-format
-msgid "%d mins"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:167
-#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
-msgid "backward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:170
-#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-msgid "forward"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:194
-#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
-msgid "not changed"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:195
-#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
-msgid "not changing"
-msgstr ""
-
-#. location
-#: ../globaltime/timezone_selection.c:247
-#: ../globaltime/timezone_selection.c:252
-#: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
-#: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
-msgid "Location"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:258
-#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
-msgid "GMT Offset"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:264
-#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
-msgid "Previous/Next Change"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:269
-#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
-msgid "Country"
-msgstr ""
-
-#. We are actually setting the g_par parameter. In other words
-#. we are setting the global default timezone for Orage. This is
-#. done very seldom and we do not want to allow "floating" here.
-#. This test is ugly, but it is not worth an extra parameter.
-#. this is normal appointment
-#: ../globaltime/timezone_selection.c:299
-#: ../globaltime/timezone_selection.c:309
-#: ../panel-plugin/timezone_selection.c:300
-#: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
-#: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
-msgid "Pick timezone"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:302
-#: ../globaltime/timezone_selection.c:312
-#: ../panel-plugin/timezone_selection.c:303
-#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
-#: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
-msgid "Change mode"
-msgstr ""
-
-#: ../globaltime/timezone_selection.c:303
-#: ../globaltime/timezone_selection.c:313
-#: ../globaltime/timezone_selection.c:352
-#: ../panel-plugin/timezone_selection.c:304
-#: ../panel-plugin/timezone_selection.c:314
-#: ../panel-plugin/timezone_selection.c:353 ../src/timezone_selection.c:320
-#: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
-#: ../src/timezone_selection.c:379
-msgid "UTC"
-msgstr ""
-
-#. NOTE: this exists only if ical timezones are being used
-#: ../globaltime/timezone_selection.c:304
-#: ../globaltime/timezone_selection.c:357
-#: ../panel-plugin/timezone_selection.c:305
-#: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
-#: ../src/timezone_selection.c:384
-msgid "floating"
-msgstr ""
-
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "விருப்பங்கள்"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
-msgid "Orage Globaltime"
-msgstr "XFநால்-காட்டி"
-
-#: ../globaltime/globaltime.desktop.in.h:3
-msgid "Show clocks from different countries"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:224
-msgid "Appearance"
-msgstr ""
-
-#. show frame
-#: ../panel-plugin/oc_config.c:229
-msgid "Show _frame"
-msgstr ""
-
-#. foreground color
-#: ../panel-plugin/oc_config.c:239
-msgid "set foreground _color:"
-msgstr ""
-
-#. background color
-#: ../panel-plugin/oc_config.c:253
-msgid "set _background color:"
-msgstr ""
-
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
-msgid "set _height:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:277
-msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:282
-msgid "set _width:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:293
-msgid "Note that you can not change the width of vertical panels"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:316
-msgid "Clock Options"
-msgstr ""
-
-#. timezone
-#: ../panel-plugin/oc_config.c:326
-msgid "set timezone to:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:347
-#, c-format
-msgid "Line %d:"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:357
-msgid "Enter any valid strftime function parameter."
-msgstr ""
-
-#. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
-msgid "Tooltip:"
-msgstr ""
-
-#. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
-msgid "fix time after suspend/hibernate"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:415
-msgid ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:432
-msgid ""
-"This program uses strftime function to get time.\n"
-"Use any valid code to get time in the format you prefer.\n"
-"Some common codes are:\n"
-"\t%A = weekday\t\t\t%B = month\n"
-"\t%c = date & time\t\t%R = hour & minute\n"
-"\t%V = week number\t\t%Z = timezone in use\n"
-"\t%H = hours \t\t\t\t%M = minute\n"
-"\t%X = local time\t\t\t%x = local date"
-msgstr ""
-
-#: ../panel-plugin/oc_config.c:457
-#, fuzzy
-msgid "Orage clock Preferences"
-msgstr "விருப்பங்கள்"
-
-#. no lines yet
-#. TRANSLATORS: Use format characters from strftime(3)
-#. * to get the proper string for your locale.
-#. * I used these:
-#. * %A  : full weekday name
-#. * %d  : day of the month
-#. * %B  : full month name
-#. * %Y  : four digit year
-#. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
-msgid "%A %d %B %Y/%V"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:40
-msgid "Maintainer"
-msgstr ""
-
-#: ../src/about-xfcalendar.c:47
-msgid "Manage your time with Orage"
-msgstr ""
-
-#. if (gtk_toggle_button_get_active(
-#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
-#. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
-msgid "End"
-msgstr ""
-
-#: ../src/appointment.c:333
-msgid "Due"
-msgstr ""
-
-#: ../src/appointment.c:493 ../src/mainbox.c:783
-msgid "Orage"
-msgstr ""
-
-#. to avoid timing problems when updating entry
-#. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
-msgid "Select a file..."
-msgstr ""
-
-#: ../src/appointment.c:680
-msgid "Sound Files"
-msgstr ""
-
-#: ../src/appointment.c:687 ../src/interface.c:290
-msgid "All Files"
-msgstr ""
-
-#: ../src/appointment.c:739
-msgid "The appointment information has been modified."
-msgstr ""
-
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
-msgid "Do you want to continue?"
-msgstr ""
-
-#: ../src/appointment.c:767
-msgid "The end of this appointment is earlier than the beginning."
-msgstr ""
-
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-msgid "Not set"
-msgstr ""
-
-#: ../src/appointment.c:1193
-msgid "This appointment will be permanently removed."
-msgstr ""
-
-#: ../src/appointment.c:1692
-msgid "This appointment does not exist."
-msgstr ""
-
-#: ../src/appointment.c:1693
-msgid "It was probably removed, please refresh your screen."
-msgstr ""
-
-#: ../src/appointment.c:1995
-#, fuzzy
-msgid "Current categories"
-msgstr "XFநால்-காட்டி"
-
-#: ../src/appointment.c:2010
-msgid "Add new category with color"
-msgstr ""
-
-#: ../src/appointment.c:2014
-msgid "Category:"
-msgstr ""
-
-#: ../src/appointment.c:2045
-msgid "Colors of categories - Orage"
-msgstr ""
-
-#: ../src/appointment.c:2092
-msgid " *** COPY ***"
-msgstr ""
-
-#: ../src/appointment.c:2353
-#, fuzzy
-msgid "New appointment - Orage"
-msgstr "முன்னேற்பாடு"
-
-#. File menu stuff
-#. ********* File menu *********
-#. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
-msgid "_File"
-msgstr "_கோப்பு"
-
-#: ../src/appointment.c:2388
-msgid "Sav_e and close"
-msgstr ""
-
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
-msgid "D_uplicate"
-msgstr ""
-
-#: ../src/appointment.c:2589
-msgid "Save"
-msgstr "சேமிக்கவும்"
-
-#: ../src/appointment.c:2591
-msgid "Save and close"
-msgstr ""
-
-#: ../src/appointment.c:2596
-msgid "Revert"
-msgstr ""
-
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
-msgid "Duplicate"
-msgstr ""
-
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
-msgid "Delete"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Free"
-msgstr ""
-
-#: ../src/appointment.c:2621
-msgid "Busy"
-msgstr ""
-
-#: ../src/appointment.c:2625
-msgid "General"
-msgstr ""
-
-#. type
-#: ../src/appointment.c:2631
-msgid "Type "
-msgstr ""
-
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
-msgid "Event"
-msgstr ""
-
-#: ../src/appointment.c:2636
-msgid ""
-"Event that will happen sometime. For example:\n"
-"Meeting or birthday or TV show."
-msgstr ""
-
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-#, fuzzy
-msgid "Todo"
-msgstr "இன்று"
-
-#: ../src/appointment.c:2642
-msgid ""
-"Something that you should do sometime. For example:\n"
-"Wash your car or test new version of Orage."
-msgstr ""
-
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
-msgid "Journal"
-msgstr ""
-
-#: ../src/appointment.c:2649
-msgid ""
-"Make a note that something happened. For example:\n"
-"Remark that your mother called or first snow came."
-msgstr ""
-
-#. title
-#: ../src/appointment.c:2656
-msgid "Title "
-msgstr ""
-
-#: ../src/appointment.c:2671
-msgid "All day event"
-msgstr ""
-
-#. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
-msgid "Start"
-msgstr ""
-
-#: ../src/appointment.c:2697
-msgid "Set      "
-msgstr ""
-
-#: ../src/appointment.c:2718
-msgid "Duration"
-msgstr ""
-
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
-#, fuzzy
-msgid "days"
-msgstr "இன்று"
-
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
-msgid "hours"
-msgstr ""
-
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
-msgid "mins"
-msgstr ""
-
-#. Availability (only for EVENT)
-#: ../src/appointment.c:2738
-msgid "Availability"
-msgstr ""
-
-#. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
-msgid "Completed"
-msgstr ""
-
-#: ../src/appointment.c:2749
-msgid "Done"
-msgstr ""
-
-#. categories
-#: ../src/appointment.c:2770
-msgid "Categories"
-msgstr ""
-
-#: ../src/appointment.c:2782
-msgid ""
-"This is special category, which can be used to color this appointment in "
-"list views."
-msgstr ""
-
-#: ../src/appointment.c:2787
-msgid "update colors for categories."
-msgstr ""
-
-#. priority
-#: ../src/appointment.c:2793
-msgid "Priority"
-msgstr ""
-
-#. note
-#: ../src/appointment.c:2803
-msgid "Note"
-msgstr ""
-
-#: ../src/appointment.c:2824
-msgid ""
-"These shorthand commands take effect immediately:\n"
-"    <D> inserts current date in local date format\n"
-"    <T> inserts time and\n"
-"    <DT> inserts date and time.\n"
-"\n"
-"These are converted only later when they are seen:\n"
-"    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before Start"
-msgstr ""
-
-#: ../src/appointment.c:2895
-msgid "Before End"
-msgstr ""
-
-#: ../src/appointment.c:2896
-msgid "After Start"
-msgstr ""
-
-#: ../src/appointment.c:2896
-msgid "After End"
-msgstr ""
-
-#: ../src/appointment.c:2903
-msgid "Alarm"
-msgstr ""
-
-#. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-msgid "Alarm time"
-msgstr ""
-
-#: ../src/appointment.c:2933
-msgid ""
-"Often you want to get alarm:\n"
-" 1) before Event start\n"
-" 2) before Todo end\n"
-" 3) after Todo start"
-msgstr ""
-
-#: ../src/appointment.c:2938
-msgid "Persistent alarm"
-msgstr ""
-
-#: ../src/appointment.c:2940
-msgid ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
-msgstr ""
-
-#. **** Audio Alarm ****
-#: ../src/appointment.c:2949
-#, fuzzy
-msgid "Sound"
-msgstr "ஞாயிறு"
-
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
-msgid "Use"
-msgstr ""
-
-#: ../src/appointment.c:2955
-msgid "Select this if you want audible alarm"
-msgstr ""
-
-#: ../src/appointment.c:2972
-msgid "Repeat alarm sound"
-msgstr ""
-
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
-msgid "times"
-msgstr ""
-
-#: ../src/appointment.c:3004
-msgid "sec interval"
-msgstr ""
-
-#. **** Display Alarm ****
-#: ../src/appointment.c:3014
-msgid "Visual"
-msgstr ""
-
-#: ../src/appointment.c:3018
-msgid "Use Orage window"
-msgstr ""
-
-#: ../src/appointment.c:3020
-msgid "Select this if you want Orage window alarm"
-msgstr ""
-
-#: ../src/appointment.c:3032
-msgid "Use notification"
-msgstr ""
-
-#: ../src/appointment.c:3034
-msgid "Select this if you want notification alarm"
-msgstr ""
-
-#: ../src/appointment.c:3040
-msgid "Set timeout"
-msgstr ""
-
-#: ../src/appointment.c:3043
-msgid "Select this if you want notification to expire automatically"
-msgstr ""
-
-#: ../src/appointment.c:3054
-msgid "0 = system default expiration time"
-msgstr ""
-
-#: ../src/appointment.c:3059
-msgid "seconds"
-msgstr ""
-
-#. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
-msgid "Procedure"
-msgstr ""
-
-#: ../src/appointment.c:3076
-msgid "Select this if you want procedure or script alarm"
-msgstr ""
-
-#: ../src/appointment.c:3082
-msgid ""
-"You must enter all escape etc characters yourself.\n"
-"This string is just given to shell to process.\n"
-"The following special commands are replaced at run time:\n"
-"\t<&T>  appointment title\n"
-"\t<&D>  appointment description\n"
-"\t<&AT> alarm time\n"
-"\t<&ST> appointment start time\n"
-"\t<&ET> appointment end time"
-msgstr ""
-
-#: ../src/appointment.c:3094
-msgid "Test this alarm by raising it now"
-msgstr ""
-
-#: ../src/appointment.c:3101
-msgid "<b>Default alarm</b>"
-msgstr ""
-
-#: ../src/appointment.c:3109
-msgid "Store current settings as default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3114
-msgid "Set current settings from default alarm"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Daily"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Weekly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-#, fuzzy
-msgid "Monthly"
-msgstr "திங்கள்"
-
-#: ../src/appointment.c:3176
-msgid "Yearly"
-msgstr ""
-
-#: ../src/appointment.c:3176
-msgid "Hourly"
-msgstr ""
-
-#: ../src/appointment.c:3178
-#, fuzzy
-msgid "Mon"
-msgstr "திங்கள்"
-
-#: ../src/appointment.c:3178
-msgid "Tue"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Wed"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Thu"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Fri"
-msgstr ""
-
-#: ../src/appointment.c:3178
-msgid "Sat"
-msgstr ""
-
-#: ../src/appointment.c:3178
-#, fuzzy
-msgid "Sun"
-msgstr "ஞாயிறு"
-
-#: ../src/appointment.c:3183
-msgid "Recurrence"
-msgstr ""
-
-#. complexity
-#: ../src/appointment.c:3189
-msgid "Complexity"
-msgstr ""
-
-#: ../src/appointment.c:3192
-msgid "Basic"
-msgstr ""
-
-#: ../src/appointment.c:3198
-msgid "Advanced"
-msgstr ""
-
-#: ../src/appointment.c:3202
-msgid "Use this if you want regular repeating event"
-msgstr ""
-
-#: ../src/appointment.c:3204
-msgid ""
-"Use this if you need complex times like:\n"
-" Every Saturday and Sunday or \n"
-" First Tuesday every month"
-msgstr ""
-
-#. frequency
-#: ../src/appointment.c:3211
-msgid "Frequency"
-msgstr ""
-
-#: ../src/appointment.c:3217
-msgid "Each"
-msgstr ""
-
-#: ../src/appointment.c:3224
-msgid "occurrence"
-msgstr ""
-
-#: ../src/appointment.c:3228
-msgid ""
-"Limit frequency to certain interval.\n"
-" For example: Every third day:\n"
-" Frequency = Daily and Interval = 3"
-msgstr ""
-
-#: ../src/appointment.c:3274
-msgid "Limit"
-msgstr ""
-
-#: ../src/appointment.c:3276
-msgid "Repeat forever"
-msgstr ""
-
-#: ../src/appointment.c:3282
-msgid "Repeat "
-msgstr ""
-
-#: ../src/appointment.c:3298
-msgid "Repeat until "
-msgstr ""
-
-#. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-#, fuzzy
-msgid "Weekdays"
-msgstr "இன்று"
-
-#: ../src/appointment.c:3323
-msgid "Which day"
-msgstr ""
-
-#: ../src/appointment.c:3331
-msgid ""
-"Specify which weekday for monthly and yearly events.\n"
-" For example:\n"
-" Second Wednesday each month:\n"
-"\tFrequency = Monthly,\n"
-"\tWeekdays = check only Wednesday,\n"
-"\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-
-#. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
-msgid "TODO base"
-msgstr ""
-
-#: ../src/appointment.c:3352
-msgid ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
-msgstr ""
-
-#: ../src/appointment.c:3354
-msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-
-#. exceptions
-#: ../src/appointment.c:3361
-msgid "Exceptions"
-msgstr ""
-
-#: ../src/appointment.c:3374
-msgid ""
-"Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
-"Remove by clicking the data."
-msgstr ""
-
-#: ../src/appointment.c:3379
-msgid "Add excluded date (-)"
-msgstr ""
-
-#: ../src/appointment.c:3381
-msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-
-#: ../src/appointment.c:3387
-msgid "Add included time (+)"
-msgstr ""
-
-#: ../src/appointment.c:3389
-msgid ""
-"Included times have same timezone than start time, but they may have "
-"different time"
-msgstr ""
-
-#. calendars showing the action days
-#: ../src/appointment.c:3406
-msgid "Action dates"
-msgstr ""
-
-#. ********* View menu *********
-#. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
-msgid "_View"
-msgstr ""
-
-#. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
-msgid "_Go"
-msgstr ""
-
-#: ../src/day-view.c:319 ../src/event-list.c:1110
-msgid "New"
-msgstr ""
-
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr ""
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "இன்று"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr ""
-
-#: ../src/day-view.c:333 ../src/event-list.c:1128
-msgid "Refresh"
-msgstr ""
-
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
-msgid "Close"
-msgstr "மூடுக"
-
-#: ../src/day-view.c:454
-msgid "Unknown"
-msgstr ""
-
-#: ../src/day-view.c:704
-msgid "       Number of days to show"
-msgstr ""
-
-#: ../src/day-view.c:935
-#, fuzzy
-msgid "Orage - day view"
-msgstr "XFநால்-காட்டி"
-
-#. date only appointment
-#: ../src/event-list.c:190
-msgid "All day"
-msgstr ""
-
-#: ../src/event-list.c:580 ../src/event-list.c:1281
-msgid "Time"
-msgstr ""
-
-#: ../src/event-list.c:748
-msgid "No rows have been selected."
-msgstr ""
-
-#: ../src/event-list.c:749
-msgid "Click a row to select it and after that you can copy it."
-msgstr ""
-
-#: ../src/event-list.c:918
-msgid ""
-"You will permanently remove all\n"
-"selected appointments."
-msgstr ""
-
-#: ../src/event-list.c:1130
-msgid "Find"
-msgstr ""
-
-#: ../src/event-list.c:1137
-msgid "Dayview"
-msgstr ""
-
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr ""
-
-#: ../src/event-list.c:1201
-msgid "Journal entries starting from:"
-msgstr ""
-
-#: ../src/event-list.c:1221
-msgid "Search"
-msgstr ""
-
-#: ../src/event-list.c:1224
-msgid "Search text "
-msgstr ""
-
-#: ../src/event-list.c:1289
-msgid "Flags"
-msgstr ""
-
-#: ../src/event-list.c:1297
-msgid "Title"
-msgstr ""
-
-#: ../src/event-list.c:1323
-msgid ""
-"Double click line to edit it.\n"
-"\n"
-"Flags in order:\n"
-"\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
-"\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
-"\t 3. Type: f=free B=Busy\n"
-"\t 4. Located in file:\n"
-"\t\tO=Orage A=Archive F=Foreign\n"
-"\t 5. Appointment type:\n"
-"\t\tE=Event T=Todo J=Journal"
-msgstr ""
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr ""
-
-#. remove since it has ended
-#: ../src/ical-archive.c:267
-msgid "\tRecur ended, moving to archive file."
-msgstr ""
-
-#: ../src/ical-archive.c:329
-msgid "Archiving not enabled. Exiting"
-msgstr ""
-
-#: ../src/ical-archive.c:347
-#, c-format
-msgid "Archiving threshold: %d month(s)"
-msgstr ""
-
-#. yy mon day
-#: ../src/ical-archive.c:350
-#, c-format
-msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr ""
-
-#: ../src/ical-archive.c:377
-#, c-format
-msgid "Archiving uid: %s"
-msgstr ""
-
-#. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
-msgid "\tVTODO not complete; not archived"
-msgstr ""
-
-#. it is recurrent event
-#: ../src/ical-archive.c:388
-#, c-format
-msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr ""
-
-#: ../src/ical-archive.c:405
-msgid "Archiving done\n"
-msgstr ""
-
-#. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
-msgid "Starting archive removal."
-msgstr ""
-
-#: ../src/ical-archive.c:422
-msgid "\tPHASE 1: reset recurring appointments"
-msgstr ""
-
-#. PHASE 2: go through archive file and add everything back to base orage.
-#. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
-msgid "\tPHASE 2: return archived appointments"
-msgstr ""
-
-#: ../src/ical-archive.c:470
-msgid "Archive removal done\n"
-msgstr ""
-
-#: ../src/ical-code.c:932
-msgid "Orage default alarm"
-msgstr ""
-
-#: ../src/ical-code.c:3115
-#, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-
-#: ../src/ical-code.c:3117
-#, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-
-#: ../src/ical-expimp.c:123
-msgid "Starting import file preprocessing"
-msgstr ""
-
-#: ../src/ical-expimp.c:158
-msgid "... Patched DCREATED to be CREATED."
-msgstr ""
-
-#: ../src/ical-expimp.c:197
-msgid "... Patched timezone to Orage format."
-msgstr ""
-
-#: ../src/ical-expimp.c:206
-msgid "Import file preprocessing done"
-msgstr ""
-
-#: ../src/interface.c:284
-#, fuzzy
-msgid "Calendar files"
-msgstr "XFநால்-காட்டி"
-
-#: ../src/interface.c:631
-msgid "Current foreign files"
-msgstr ""
-
-#: ../src/interface.c:643
-msgid "READ ONLY"
-msgstr ""
-
-#: ../src/interface.c:645
-msgid "READ WRITE"
-msgstr ""
-
-#: ../src/interface.c:663
-msgid "***** No foreign files *****"
-msgstr ""
-
-#: ../src/interface.c:974
-msgid "Import/export"
-msgstr ""
-
-#: ../src/interface.c:981
-msgid "Import"
-msgstr ""
-
-#: ../src/interface.c:986
-msgid "Read from file:"
-msgstr ""
-
-#: ../src/interface.c:1003
-msgid ""
-"Separate filenames with comma(,).\n"
-" NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-
-#: ../src/interface.c:1008
-msgid "Export"
-msgstr ""
-
-#: ../src/interface.c:1013
-msgid "Write to file:"
-msgstr ""
-
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
-msgid "Select"
-msgstr "இன்று தெரிவு செய்க"
-
-#: ../src/interface.c:1037
-#, fuzzy
-msgid "All appointments"
-msgstr "முன்னேற்பாடு"
-
-#: ../src/interface.c:1050
-#, fuzzy
-msgid "Named appointments: "
-msgstr "முன்னேற்பாடு"
-
-#: ../src/interface.c:1062
-msgid ""
-"Note that only main file appointments are read.\n"
-"Archived and Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1065
-msgid ""
-"Note that only main file appointments are read.\n"
-"Foreign events are not exported."
-msgstr ""
-
-#: ../src/interface.c:1068
-msgid "You can easily drag these from event-list window."
-msgstr ""
-
-#: ../src/interface.c:1070
-msgid "Orage appointment UIDs separated by commas."
-msgstr ""
-
-#: ../src/interface.c:1076
-msgid "Archive"
-msgstr ""
-
-#: ../src/interface.c:1084
-#, c-format
-msgid "Archive now (threshold: %d months)"
-msgstr ""
-
-#: ../src/interface.c:1094
-msgid "You can change archive threshold in parameters"
-msgstr ""
-
-#: ../src/interface.c:1101
-msgid "Revert archive now"
-msgstr ""
-
-#: ../src/interface.c:1107
-msgid ""
-"Return all archived events into main orage file and remove arch file.\n"
-"This is useful for example when doing export and moving orage\n"
-"appointments to another system."
-msgstr ""
-
-#: ../src/interface.c:1118
-#, fuzzy
-msgid "Orage files"
-msgstr "விருப்பங்கள்"
-
-#: ../src/interface.c:1125
-#, fuzzy
-msgid "Orage main calendar file"
-msgstr "XFநால்-காட்டி"
-
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "XFநால்-காட்டி"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr ""
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr ""
-
-#: ../src/interface.c:1156 ../src/interface.c:1222
-msgid "Rename"
-msgstr ""
-
-#: ../src/interface.c:1160
-msgid ""
-"Orage internal file rename only.\n"
-"Does not touch external filesystem at all.\n"
-"New file must exist."
-msgstr ""
-
-#: ../src/interface.c:1164 ../src/interface.c:1227
-msgid "Copy"
-msgstr ""
-
-#: ../src/interface.c:1168
-msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-
-#: ../src/interface.c:1172 ../src/interface.c:1232
-msgid "Move"
-msgstr ""
-
-#: ../src/interface.c:1176
-msgid "Current file is moved and vanishes from the old place."
-msgstr ""
-
-#: ../src/interface.c:1190
-msgid "Archive file"
-msgstr ""
-
-#: ../src/interface.c:1254
-msgid "Foreign files"
-msgstr ""
-
-#: ../src/interface.c:1261
-msgid "Add new foreign file"
-msgstr ""
-
-#: ../src/interface.c:1266
-msgid "Foreign file:"
-msgstr ""
-
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr ""
-
-#: ../src/interface.c:1286
-msgid "Read only"
-msgstr ""
-
-#: ../src/interface.c:1294
-msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-
-#: ../src/interface.c:1308
-msgid "Exchange data - Orage"
-msgstr ""
-
-#: ../src/main.c:268
-#, c-format
-msgid ""
-"\tThis is %s version %s\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:270
-#, c-format
-msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
-
-#: ../src/main.c:271
-#, c-format
-msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
-
-#: ../src/main.c:273
-#, c-format
-msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
-
-#: ../src/main.c:276
-#, c-format
-msgid "\tUsing DBUS for import.\n"
-msgstr ""
-
-#: ../src/main.c:278
-#, c-format
-msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
-
-#: ../src/main.c:281
-#, c-format
-msgid "\tUsing libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:283
-#, c-format
-msgid "\tNot using libnotify.\n"
-msgstr ""
-
-#: ../src/main.c:286
-#, c-format
-msgid "\tUsing automatic archiving.\n"
-msgstr ""
-
-#: ../src/main.c:288
-#, c-format
-msgid "\tNot using archiving.\n"
-msgstr ""
-
-#: ../src/main.c:291
-#, c-format
-msgid "\tUsing operating system package libical.\n"
-msgstr ""
-
-#: ../src/main.c:293
-#, c-format
-msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
-
-#: ../src/main.c:306
-#, c-format
-msgid ""
-"Usage: orage [options] [files]\n"
-"\n"
-msgstr ""
-
-#: ../src/main.c:307
-#, c-format
-msgid "Options:\n"
-msgstr ""
-
-#: ../src/main.c:308
-#, c-format
-msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
-
-#: ../src/main.c:309
-#, c-format
-msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
-
-#: ../src/main.c:310
-#, c-format
-msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
-
-#: ../src/main.c:311
-#, c-format
-msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
-
-#: ../src/main.c:312
-#, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:313
-#, c-format
-msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
-
-#: ../src/main.c:314
-#, c-format
-msgid ""
-"--export (-e) file [appointment...] \texport appointments from Orage to "
-"file\n"
-msgstr ""
-
-#: ../src/main.c:316
-#, c-format
-msgid "files=ical files to load into orage\n"
-msgstr ""
-
-#: ../src/main.c:318
-#, c-format
-msgid "\tdbus not included in orage. \n"
-msgstr ""
-
-#: ../src/main.c:319
-#, c-format
-msgid ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
-msgstr ""
-
-#: ../src/main.c:511
-#, c-format
-msgid ""
-"\n"
-"Unknown option %s\n"
-"\n"
-msgstr ""
-
-#: ../src/mainbox.c:287
-msgid "_Exchange data"
-msgstr ""
-
-#. Edit menu
-#: ../src/mainbox.c:298
-msgid "_Edit"
-msgstr ""
-
-#: ../src/mainbox.c:308
-msgid "View selected _date"
-msgstr ""
-
-#: ../src/mainbox.c:311
-msgid "View selected _week"
-msgstr ""
-
-#: ../src/mainbox.c:317
-#, fuzzy
-msgid "Select _Today"
-msgstr "இன்று தெரிவு செய்க"
-
-#: ../src/mainbox.c:323
-#, fuzzy
-msgid "Show _Globaltime"
-msgstr "விருப்பங்கள்"
-
-#. Help menu
-#: ../src/mainbox.c:327
-msgid "_Help"
-msgstr "_உதவி"
-
-#: ../src/mainbox.c:448
-msgid "Never"
-msgstr ""
-
-#: ../src/mainbox.c:453
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:460
-#, c-format
-msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-
-#: ../src/mainbox.c:546
-msgid "<b>To do:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:582
-#, c-format
-msgid "<b>Events for %s:</b>"
-msgstr ""
-
-#: ../src/mainbox.c:593
-#, c-format
-msgid "<b>Events for %s - %s:</b>"
-msgstr ""
-
-#: ../src/parameters.c:522
-#, fuzzy
-msgid "Main settings"
-msgstr "அமைவுகள்"
-
-#: ../src/parameters.c:528
-msgid "Timezone"
-msgstr ""
-
-#: ../src/parameters.c:543
-msgid "You should always define your local timezone."
-msgstr ""
-
-#: ../src/parameters.c:552
-msgid "Archive threshold (months)"
-msgstr ""
-
-#: ../src/parameters.c:562
-msgid "(0 = no archiving)"
-msgstr ""
-
-#: ../src/parameters.c:565
-msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-
-#: ../src/parameters.c:574
-msgid "Sound command"
-msgstr ""
-
-#: ../src/parameters.c:589
-msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "அமைவுகள்"
-
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
-msgstr "சாளரம் மூடுக்"
-
-#: ../src/parameters.c:618
-msgid "Show borders"
-msgstr ""
-
-#: ../src/parameters.c:625
-msgid "Show menu"
-msgstr ""
-
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr ""
-
-#: ../src/parameters.c:639
-msgid "Show day names"
-msgstr ""
-
-#: ../src/parameters.c:646
-msgid "Show week numbers"
-msgstr ""
-
-#: ../src/parameters.c:653
-msgid "Show todo list"
-msgstr ""
-
-#: ../src/parameters.c:660
-msgid "Number of days to show in event window"
-msgstr ""
-
-#: ../src/parameters.c:666
-msgid "0 = do not show event list at all"
-msgstr ""
-
-#: ../src/parameters.c:676
-msgid "Show on all desktops"
-msgstr ""
-
-#: ../src/parameters.c:683
-msgid "Keep on top"
-msgstr ""
-
-#: ../src/parameters.c:690
-msgid "Show in taskbar"
-msgstr ""
-
-#: ../src/parameters.c:697
-msgid "Show in pager"
-msgstr ""
-
-#: ../src/parameters.c:704
-msgid "Show in systray"
-msgstr ""
-
-#: ../src/parameters.c:739
-#, fuzzy
-msgid "Calendar start"
-msgstr "XFநால்-காட்டி"
-
-#: ../src/parameters.c:744
-msgid "Show"
-msgstr ""
-
-#: ../src/parameters.c:756
-msgid "Hide"
-msgstr ""
-
-#: ../src/parameters.c:768
-msgid "Minimized"
-msgstr ""
-
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr ""
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "சாளரம் மூடுக்"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "இன்று தெரிவு செய்க"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr ""
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr ""
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
-
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr ""
-
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr ""
-
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr ""
-
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr ""
-
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
-
-#: ../src/parameters.c:921
-msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-
-#: ../src/parameters.c:938
-#, fuzzy
-msgid "Orage Preferences"
-msgstr "விருப்பங்கள்"
-
-#: ../src/parameters.c:1050
-msgid "First Orage start. Searching default timezone."
-msgstr ""
-
-#: ../src/parameters.c:1069
-#, c-format
-msgid "Default timezone set to %s."
-msgstr ""
-
-#: ../src/parameters.c:1072
-msgid "Default timezone not found, please, set it manually."
-msgstr ""
-
-#: ../src/reminder.c:562
-#, fuzzy
-msgid "Reminder "
-msgstr "ஞாபகமூட்டி"
-
-#: ../src/reminder.c:591
-msgid "Open"
-msgstr ""
-
-#: ../src/reminder.c:722
-#, fuzzy
-msgid "Reminder - Orage"
-msgstr "ஞாபகமூட்டி"
-
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
-msgstr ""
-
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-
-#: ../src/reminder.c:1099
-msgid "Next active alarms:"
-msgstr ""
-
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
-#, c-format
-msgid ""
-"\n"
-"%02d d %02d h %02d min to: %s"
-msgstr ""
-
-#: ../src/reminder.c:1166
-#, c-format
-msgid ""
-"\n"
-"No active alarms found"
-msgstr ""
-
-#: ../src/timezone_names.c:36
-msgid "Africa"
-msgstr ""
-
-#: ../src/timezone_names.c:37
-msgid "Africa/Abidjan"
-msgstr ""
-
-#: ../src/timezone_names.c:38
-msgid "Africa/Accra"
-msgstr ""
-
-#: ../src/timezone_names.c:39
-msgid "Africa/Addis_Ababa"
-msgstr ""
-
-#: ../src/timezone_names.c:40
-msgid "Africa/Algiers"
-msgstr ""
-
-#: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
-msgstr ""
-
-#: ../src/timezone_names.c:42
-msgid "Africa/Bamako"
-msgstr ""
-
-#: ../src/timezone_names.c:43
-msgid "Africa/Bangui"
-msgstr ""
-
-#: ../src/timezone_names.c:44
-msgid "Africa/Banjul"
-msgstr ""
-
-#: ../src/timezone_names.c:45
-msgid "Africa/Bissau"
-msgstr ""
-
-#: ../src/timezone_names.c:46
-msgid "Africa/Blantyre"
-msgstr ""
-
-#: ../src/timezone_names.c:47
-msgid "Africa/Brazzaville"
-msgstr ""
-
-#: ../src/timezone_names.c:48
-msgid "Africa/Bujumbura"
-msgstr ""
-
-#: ../src/timezone_names.c:49
-msgid "Africa/Cairo"
-msgstr ""
-
-#: ../src/timezone_names.c:50
-msgid "Africa/Casablanca"
-msgstr ""
-
-#: ../src/timezone_names.c:51
-msgid "Africa/Ceuta"
-msgstr ""
-
-#: ../src/timezone_names.c:52
-msgid "Africa/Conakry"
-msgstr ""
-
-#: ../src/timezone_names.c:53
-msgid "Africa/Dakar"
-msgstr ""
-
-#: ../src/timezone_names.c:54
-msgid "Africa/Dar_es_Salaam"
-msgstr ""
-
-#: ../src/timezone_names.c:55
-msgid "Africa/Djibouti"
-msgstr ""
-
-#: ../src/timezone_names.c:56
-msgid "Africa/Douala"
-msgstr ""
-
-#: ../src/timezone_names.c:57
-msgid "Africa/El_Aaiun"
-msgstr ""
-
-#: ../src/timezone_names.c:58
-msgid "Africa/Freetown"
-msgstr ""
-
-#: ../src/timezone_names.c:59
-msgid "Africa/Gaborone"
-msgstr ""
-
-#: ../src/timezone_names.c:60
-msgid "Africa/Harare"
-msgstr ""
-
-#: ../src/timezone_names.c:61
-msgid "Africa/Johannesburg"
-msgstr ""
-
-#: ../src/timezone_names.c:62
-msgid "Africa/Kampala"
-msgstr ""
-
-#: ../src/timezone_names.c:63
-msgid "Africa/Khartoum"
-msgstr ""
-
-#: ../src/timezone_names.c:64
-msgid "Africa/Kigali"
-msgstr ""
-
-#: ../src/timezone_names.c:65
-msgid "Africa/Kinshasa"
-msgstr ""
-
-#: ../src/timezone_names.c:66
-msgid "Africa/Lagos"
-msgstr ""
-
-#: ../src/timezone_names.c:67
-msgid "Africa/Libreville"
-msgstr ""
-
-#: ../src/timezone_names.c:68
-msgid "Africa/Lome"
-msgstr ""
-
-#: ../src/timezone_names.c:69
-msgid "Africa/Luanda"
-msgstr ""
-
-#: ../src/timezone_names.c:70
-msgid "Africa/Lubumbashi"
-msgstr ""
-
-#: ../src/timezone_names.c:71
-msgid "Africa/Lusaka"
-msgstr ""
-
-#: ../src/timezone_names.c:72
-msgid "Africa/Malabo"
-msgstr ""
-
-#: ../src/timezone_names.c:73
-msgid "Africa/Maputo"
-msgstr ""
-
-#: ../src/timezone_names.c:74
-msgid "Africa/Maseru"
-msgstr ""
-
-#: ../src/timezone_names.c:75
-msgid "Africa/Mbabane"
-msgstr ""
-
-#: ../src/timezone_names.c:76
-msgid "Africa/Mogadishu"
-msgstr ""
-
-#: ../src/timezone_names.c:77
-msgid "Africa/Monrovia"
-msgstr ""
-
-#: ../src/timezone_names.c:78
-msgid "Africa/Nairobi"
-msgstr ""
-
-#: ../src/timezone_names.c:79
-msgid "Africa/Ndjamena"
-msgstr ""
-
-#: ../src/timezone_names.c:80
-msgid "Africa/Niamey"
-msgstr ""
-
-#: ../src/timezone_names.c:81
-msgid "Africa/Nouakchott"
-msgstr ""
-
-#: ../src/timezone_names.c:82
-msgid "Africa/Ouagadougou"
-msgstr ""
-
-#: ../src/timezone_names.c:83
-msgid "Africa/Porto-Novo"
-msgstr ""
-
-#: ../src/timezone_names.c:84
-msgid "Africa/Sao_Tome"
-msgstr ""
-
-#: ../src/timezone_names.c:85
-msgid "Africa/Timbuktu"
-msgstr ""
-
-#: ../src/timezone_names.c:86
-msgid "Africa/Tripoli"
-msgstr ""
-
-#: ../src/timezone_names.c:87
-msgid "Africa/Tunis"
-msgstr ""
-
-#: ../src/timezone_names.c:88
-msgid "Africa/Windhoek"
-msgstr ""
-
-#: ../src/timezone_names.c:89
-msgid "America"
-msgstr ""
-
-#: ../src/timezone_names.c:90
-msgid "America/Adak"
-msgstr ""
-
-#: ../src/timezone_names.c:91
-msgid "America/Anchorage"
-msgstr ""
-
-#: ../src/timezone_names.c:92
-msgid "America/Anguilla"
-msgstr ""
-
-#: ../src/timezone_names.c:93
-msgid "America/Antigua"
-msgstr ""
-
-#: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr ""
-
-#: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:96
-msgid "America/Argentina/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:97
-msgid "America/Argentina/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:98
-msgid "America/Argentina/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:99
-msgid "America/Argentina/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr ""
-
-#: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr ""
-
-#: ../src/timezone_names.c:102
-msgid "America/Barbados"
-msgstr ""
-
-#: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr ""
-
-#: ../src/timezone_names.c:104
-msgid "America/Belize"
-msgstr ""
-
-#: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
-msgstr ""
-
-#: ../src/timezone_names.c:106
-msgid "America/Bogota"
-msgstr ""
-
-#: ../src/timezone_names.c:107
-msgid "America/Boise"
-msgstr ""
-
-#: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
-msgstr ""
-
-#: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr ""
-
-#: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr ""
-
-#: ../src/timezone_names.c:112
-msgid "America/Catamarca"
-msgstr ""
-
-#: ../src/timezone_names.c:113
-msgid "America/Cayenne"
-msgstr ""
-
-#: ../src/timezone_names.c:114
-msgid "America/Cayman"
-msgstr ""
-
-#: ../src/timezone_names.c:115
-msgid "America/Chicago"
-msgstr ""
-
-#: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr ""
-
-#: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr ""
-
-#: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr ""
-
-#: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
-msgstr ""
-
-#: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr ""
-
-#: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr ""
-
-#: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr ""
-
-#: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr ""
-
-#: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr ""
-
-#: ../src/timezone_names.c:125
-msgid "America/Dominica"
-msgstr ""
-
-#: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr ""
-
-#: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr ""
-
-#: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr ""
-
-#: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr ""
-
-#: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr ""
-
-#: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
-msgstr ""
-
-#: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr ""
-
-#: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr ""
-
-#: ../src/timezone_names.c:136
-msgid "America/Guatemala"
-msgstr ""
-
-#: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr ""
-
-#: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr ""
-
-#: ../src/timezone_names.c:139
-msgid "America/Halifax"
-msgstr ""
-
-#: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr ""
-
-#: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr ""
-
-#: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr ""
-
-#: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr ""
-
-#: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr ""
-
-#: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
-msgstr ""
-
-#: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr ""
-
-#: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr ""
-
-#: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr ""
-
-#: ../src/timezone_names.c:150
-msgid "America/Jujuy"
-msgstr ""
-
-#: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr ""
-
-#: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr ""
-
-#: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr ""
-
-#: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr ""
-
-#: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr ""
-
-#: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr ""
-
-#: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr ""
-
-#: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr ""
-
-#: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr ""
-
-#: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr ""
-
-#: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr ""
-
-#: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr ""
-
-#: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr ""
-
-#: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr ""
-
-#: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr ""
-
-#: ../src/timezone_names.c:167
-msgid "America/Miquelon"
-msgstr ""
-
-#: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr ""
-
-#: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr ""
-
-#: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr ""
-
-#: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr ""
-
-#: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr ""
-
-#: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr ""
-
-#: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr ""
-
-#: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr ""
-
-#: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr ""
-
-#: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr ""
-
-#: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr ""
-
-#: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
-msgstr ""
-
-#: ../src/timezone_names.c:180
-msgid "America/Phoenix"
-msgstr ""
-
-#: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr ""
-
-#: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr ""
-
-#: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr ""
-
-#: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr ""
-
-#: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
-msgstr ""
-
-#: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr ""
-
-#: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr ""
-
-#: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr ""
-
-#: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
-msgstr ""
-
-#: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr ""
-
-#: ../src/timezone_names.c:191
-msgid "America/Santiago"
-msgstr ""
-
-#: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr ""
-
-#: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr ""
-
-#: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr ""
-
-#: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr ""
-
-#: ../src/timezone_names.c:196
-msgid "America/St_Johns"
-msgstr ""
-
-#: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr ""
-
-#: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr ""
-
-#: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
-msgstr ""
-
-#: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr ""
-
-#: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr ""
-
-#: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr ""
-
-#: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr ""
-
-#: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr ""
-
-#: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr ""
-
-#: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr ""
-
-#: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr ""
-
-#: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
-msgstr ""
-
-#: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
-msgstr ""
-
-#: ../src/timezone_names.c:210
-msgid "America/Yakutat"
-msgstr ""
-
-#: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr ""
-
-#: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr ""
-
-#: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr ""
-
-#: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr ""
-
-#: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr ""
-
-#: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr ""
-
-#: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr ""
-
-#: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr ""
-
-#: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
-msgstr ""
-
-#: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr ""
-
-#: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr ""
-
-#: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr ""
-
-#: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr ""
-
-#: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr ""
-
-#: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr ""
-
-#: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr ""
-
-#: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr ""
-
-#: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr ""
-
-#: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr ""
-
-#: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr ""
-
-#: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr ""
-
-#: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr ""
-
-#: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr ""
-
-#: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr ""
-
-#: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr ""
-
-#: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr ""
-
-#: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr ""
-
-#: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr ""
-
-#: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr ""
-
-#: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr ""
-
-#: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr ""
-
-#: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr ""
-
-#: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr ""
-
-#: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr ""
-
-#: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr ""
-
-#: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr ""
-
-#: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr ""
-
-#: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
-msgstr ""
-
-#: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr ""
-
-#: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
-msgstr ""
-
-#: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr ""
-
-#: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
-msgstr ""
-
-#: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr ""
-
-#: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr ""
-
-#: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr ""
-
-#: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr ""
-
-#: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
-msgstr ""
-
-#: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
-msgstr ""
-
-#: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
-msgstr ""
-
-#: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr ""
-
-#: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
-msgstr ""
-
-#: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
-msgstr ""
-
-#: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr ""
-
-#: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
-msgstr ""
-
-#: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr ""
-
-#: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr ""
-
-#: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr ""
-
-#: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr ""
-
-#: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr ""
-
-#: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr ""
-
-#: ../src/timezone_names.c:274
-msgid "Asia/Pyongyang"
-msgstr ""
-
-#: ../src/timezone_names.c:275
-msgid "Asia/Qatar"
-msgstr ""
-
-#: ../src/timezone_names.c:276
-msgid "Asia/Rangoon"
-msgstr ""
-
-#: ../src/timezone_names.c:277
-msgid "Asia/Riyadh"
-msgstr ""
-
-#: ../src/timezone_names.c:278
-msgid "Asia/Saigon"
-msgstr ""
-
-#: ../src/timezone_names.c:279
-msgid "Asia/Samarkand"
-msgstr ""
-
-#: ../src/timezone_names.c:280
-msgid "Asia/Seoul"
-msgstr ""
-
-#: ../src/timezone_names.c:281
-msgid "Asia/Shanghai"
-msgstr ""
-
-#: ../src/timezone_names.c:282
-msgid "Asia/Singapore"
-msgstr ""
-
-#: ../src/timezone_names.c:283
-msgid "Asia/Taipei"
-msgstr ""
-
-#: ../src/timezone_names.c:284
-msgid "Asia/Tashkent"
-msgstr ""
-
-#: ../src/timezone_names.c:285
-msgid "Asia/Tbilisi"
-msgstr ""
-
-#: ../src/timezone_names.c:286
-msgid "Asia/Tehran"
-msgstr ""
-
-#: ../src/timezone_names.c:287
-msgid "Asia/Thimphu"
-msgstr ""
-
-#: ../src/timezone_names.c:288
-msgid "Asia/Tokyo"
-msgstr ""
-
-#: ../src/timezone_names.c:289
-msgid "Asia/Ujung_Pandang"
-msgstr ""
-
-#: ../src/timezone_names.c:290
-msgid "Asia/Ulaanbaatar"
-msgstr ""
-
-#: ../src/timezone_names.c:291
-msgid "Asia/Urumqi"
-msgstr ""
-
-#: ../src/timezone_names.c:292
-msgid "Asia/Vientiane"
-msgstr ""
-
-#: ../src/timezone_names.c:293
-msgid "Asia/Vladivostok"
-msgstr ""
-
-#: ../src/timezone_names.c:294
-msgid "Asia/Yakutsk"
-msgstr ""
-
-#: ../src/timezone_names.c:295
-msgid "Asia/Yekaterinburg"
-msgstr ""
-
-#: ../src/timezone_names.c:296
-msgid "Asia/Yerevan"
-msgstr ""
-
-#: ../src/timezone_names.c:297
-msgid "Atlantic"
-msgstr ""
-
-#: ../src/timezone_names.c:298
-msgid "Atlantic/Azores"
-msgstr ""
-
-#: ../src/timezone_names.c:299
-msgid "Atlantic/Bermuda"
-msgstr ""
-
-#: ../src/timezone_names.c:300
-msgid "Atlantic/Canary"
-msgstr ""
-
-#: ../src/timezone_names.c:301
-msgid "Atlantic/Cape_Verde"
-msgstr ""
-
-#: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr ""
-
-#: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr ""
-
-#: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr ""
-
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr ""
-
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr ""
-
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr ""
-
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr ""
-
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr ""
-
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr ""
-
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr ""
-
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr ""
-
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr ""
-
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr ""
-
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr ""
-
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr ""
-
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr ""
-
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr ""
-
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr ""
-
-#: ../src/timezone_names.c:320
-msgid "Europe"
-msgstr ""
-
-#: ../src/timezone_names.c:321
-msgid "Europe/Amsterdam"
-msgstr ""
-
-#: ../src/timezone_names.c:322
-msgid "Europe/Andorra"
-msgstr ""
-
-#: ../src/timezone_names.c:323
-msgid "Europe/Athens"
-msgstr ""
-
-#: ../src/timezone_names.c:324
-msgid "Europe/Belfast"
-msgstr ""
-
-#: ../src/timezone_names.c:325
-msgid "Europe/Belgrade"
-msgstr ""
-
-#: ../src/timezone_names.c:326
-msgid "Europe/Berlin"
-msgstr ""
-
-#: ../src/timezone_names.c:327
-msgid "Europe/Bratislava"
-msgstr ""
-
-#: ../src/timezone_names.c:328
-msgid "Europe/Brussels"
-msgstr ""
-
-#: ../src/timezone_names.c:329
-msgid "Europe/Bucharest"
-msgstr ""
-
-#: ../src/timezone_names.c:330
-msgid "Europe/Budapest"
-msgstr ""
-
-#: ../src/timezone_names.c:331
-msgid "Europe/Chisinau"
-msgstr ""
-
-#: ../src/timezone_names.c:332
-msgid "Europe/Copenhagen"
-msgstr ""
-
-#: ../src/timezone_names.c:333
-msgid "Europe/Dublin"
-msgstr ""
-
-#: ../src/timezone_names.c:334
-msgid "Europe/Gibraltar"
-msgstr ""
-
-#: ../src/timezone_names.c:335
-msgid "Europe/Helsinki"
-msgstr ""
-
-#: ../src/timezone_names.c:336
-msgid "Europe/Istanbul"
-msgstr ""
-
-#: ../src/timezone_names.c:337
-msgid "Europe/Kaliningrad"
-msgstr ""
-
-#: ../src/timezone_names.c:338
-msgid "Europe/Kiev"
-msgstr ""
-
-#: ../src/timezone_names.c:339
-msgid "Europe/Lisbon"
-msgstr ""
-
-#: ../src/timezone_names.c:340
-msgid "Europe/Ljubljana"
-msgstr ""
-
-#: ../src/timezone_names.c:341
-msgid "Europe/London"
-msgstr ""
-
-#: ../src/timezone_names.c:342
-msgid "Europe/Luxembourg"
-msgstr ""
-
-#: ../src/timezone_names.c:343
-msgid "Europe/Madrid"
-msgstr ""
-
-#: ../src/timezone_names.c:344
-msgid "Europe/Malta"
-msgstr ""
-
-#: ../src/timezone_names.c:345
-msgid "Europe/Minsk"
-msgstr ""
-
-#: ../src/timezone_names.c:346
-msgid "Europe/Monaco"
-msgstr ""
-
-#: ../src/timezone_names.c:347
-msgid "Europe/Moscow"
-msgstr ""
-
-#: ../src/timezone_names.c:348
-msgid "Europe/Nicosia"
-msgstr ""
-
-#: ../src/timezone_names.c:349
-msgid "Europe/Oslo"
-msgstr ""
-
-#: ../src/timezone_names.c:350
-msgid "Europe/Paris"
-msgstr ""
-
-#: ../src/timezone_names.c:351
-msgid "Europe/Prague"
-msgstr ""
-
-#: ../src/timezone_names.c:352
-msgid "Europe/Riga"
-msgstr ""
-
-#: ../src/timezone_names.c:353
-msgid "Europe/Rome"
-msgstr ""
-
-#: ../src/timezone_names.c:354
-msgid "Europe/Samara"
-msgstr ""
-
-#: ../src/timezone_names.c:355
-msgid "Europe/San_Marino"
-msgstr ""
-
-#: ../src/timezone_names.c:356
-msgid "Europe/Sarajevo"
-msgstr ""
-
-#: ../src/timezone_names.c:357
-msgid "Europe/Simferopol"
-msgstr ""
-
-#: ../src/timezone_names.c:358
-msgid "Europe/Skopje"
-msgstr ""
-
-#: ../src/timezone_names.c:359
-msgid "Europe/Sofia"
-msgstr ""
-
-#: ../src/timezone_names.c:360
-msgid "Europe/Stockholm"
-msgstr ""
-
-#: ../src/timezone_names.c:361
-msgid "Europe/Tallinn"
-msgstr ""
-
-#: ../src/timezone_names.c:362
-msgid "Europe/Tirane"
-msgstr ""
-
-#: ../src/timezone_names.c:363
-msgid "Europe/Uzhgorod"
-msgstr ""
-
-#: ../src/timezone_names.c:364
-msgid "Europe/Vaduz"
-msgstr ""
-
-#: ../src/timezone_names.c:365
-msgid "Europe/Vatican"
-msgstr ""
-
-#: ../src/timezone_names.c:366
-msgid "Europe/Vienna"
-msgstr ""
-
-#: ../src/timezone_names.c:367
-msgid "Europe/Vilnius"
-msgstr ""
-
-#: ../src/timezone_names.c:368
-msgid "Europe/Warsaw"
-msgstr ""
-
-#: ../src/timezone_names.c:369
-msgid "Europe/Zagreb"
-msgstr ""
-
-#: ../src/timezone_names.c:370
-msgid "Europe/Zaporozhye"
-msgstr ""
-
-#: ../src/timezone_names.c:371
-msgid "Europe/Zurich"
-msgstr ""
-
-#: ../src/timezone_names.c:372
-msgid "Indian"
-msgstr ""
-
-#: ../src/timezone_names.c:373
-msgid "Indian/Antananarivo"
-msgstr ""
-
-#: ../src/timezone_names.c:374
-msgid "Indian/Chagos"
-msgstr ""
-
-#: ../src/timezone_names.c:375
-msgid "Indian/Christmas"
-msgstr ""
-
-#: ../src/timezone_names.c:376
-msgid "Indian/Cocos"
-msgstr ""
-
-#: ../src/timezone_names.c:377
-msgid "Indian/Comoro"
-msgstr ""
-
-#: ../src/timezone_names.c:378
-msgid "Indian/Kerguelen"
-msgstr ""
-
-#: ../src/timezone_names.c:379
-msgid "Indian/Mahe"
-msgstr ""
-
-#: ../src/timezone_names.c:380
-msgid "Indian/Maldives"
-msgstr ""
-
-#: ../src/timezone_names.c:381
-msgid "Indian/Mauritius"
-msgstr ""
-
-#: ../src/timezone_names.c:382
-msgid "Indian/Mayotte"
-msgstr ""
-
-#: ../src/timezone_names.c:383
-msgid "Indian/Reunion"
-msgstr ""
-
-#: ../src/timezone_names.c:384
-msgid "Pacific"
-msgstr ""
-
-#: ../src/timezone_names.c:385
-msgid "Pacific/Apia"
-msgstr ""
-
-#: ../src/timezone_names.c:386
-msgid "Pacific/Auckland"
-msgstr ""
-
-#: ../src/timezone_names.c:387
-msgid "Pacific/Chatham"
-msgstr ""
-
-#: ../src/timezone_names.c:388
-msgid "Pacific/Easter"
-msgstr ""
-
-#: ../src/timezone_names.c:389
-msgid "Pacific/Efate"
-msgstr ""
-
-#: ../src/timezone_names.c:390
-msgid "Pacific/Enderbury"
-msgstr ""
-
-#: ../src/timezone_names.c:391
-msgid "Pacific/Fakaofo"
-msgstr ""
-
-#: ../src/timezone_names.c:392
-msgid "Pacific/Fiji"
-msgstr ""
-
-#: ../src/timezone_names.c:393
-msgid "Pacific/Funafuti"
-msgstr ""
-
-#: ../src/timezone_names.c:394
-msgid "Pacific/Galapagos"
-msgstr ""
-
-#: ../src/timezone_names.c:395
-msgid "Pacific/Gambier"
-msgstr ""
-
-#: ../src/timezone_names.c:396
-msgid "Pacific/Guadalcanal"
-msgstr ""
-
-#: ../src/timezone_names.c:397
-msgid "Pacific/Guam"
-msgstr ""
-
-#: ../src/timezone_names.c:398
-msgid "Pacific/Honolulu"
-msgstr ""
-
-#: ../src/timezone_names.c:399
-msgid "Pacific/Johnston"
-msgstr ""
-
-#: ../src/timezone_names.c:400
-msgid "Pacific/Kiritimati"
-msgstr ""
-
-#: ../src/timezone_names.c:401
-msgid "Pacific/Kosrae"
-msgstr ""
-
-#: ../src/timezone_names.c:402
-msgid "Pacific/Kwajalein"
-msgstr ""
-
-#: ../src/timezone_names.c:403
-msgid "Pacific/Majuro"
-msgstr ""
-
-#: ../src/timezone_names.c:404
-msgid "Pacific/Marquesas"
-msgstr ""
-
-#: ../src/timezone_names.c:405
-msgid "Pacific/Midway"
-msgstr ""
-
-#: ../src/timezone_names.c:406
-msgid "Pacific/Nauru"
-msgstr ""
-
-#: ../src/timezone_names.c:407
-msgid "Pacific/Niue"
-msgstr ""
-
-#: ../src/timezone_names.c:408
-msgid "Pacific/Norfolk"
-msgstr ""
-
-#: ../src/timezone_names.c:409
-msgid "Pacific/Noumea"
-msgstr ""
-
-#: ../src/timezone_names.c:410
-msgid "Pacific/Pago_Pago"
-msgstr ""
-
-#: ../src/timezone_names.c:411
-msgid "Pacific/Palau"
-msgstr ""
-
-#: ../src/timezone_names.c:412
-msgid "Pacific/Pitcairn"
-msgstr ""
-
-#: ../src/timezone_names.c:413
-msgid "Pacific/Ponape"
-msgstr ""
-
-#: ../src/timezone_names.c:414
-msgid "Pacific/Port_Moresby"
-msgstr ""
-
-#: ../src/timezone_names.c:415
-msgid "Pacific/Rarotonga"
-msgstr ""
-
-#: ../src/timezone_names.c:416
-msgid "Pacific/Saipan"
-msgstr ""
-
-#: ../src/timezone_names.c:417
-msgid "Pacific/Tahiti"
-msgstr ""
-
-#: ../src/timezone_names.c:418
-msgid "Pacific/Tarawa"
-msgstr ""
-
-#: ../src/timezone_names.c:419
-msgid "Pacific/Tongatapu"
-msgstr ""
-
-#: ../src/timezone_names.c:420
-msgid "Pacific/Truk"
-msgstr ""
-
-#: ../src/timezone_names.c:421
-msgid "Pacific/Wake"
-msgstr ""
-
-#: ../src/timezone_names.c:422
-msgid "Pacific/Wallis"
-msgstr ""
-
-#: ../src/timezone_names.c:423
-msgid "Pacific/Yap"
-msgstr ""
-
-#: ../src/tray_icon.c:469
-#, fuzzy
-msgid "New appointment"
-msgstr "முன்னேற்பாடு"
-
-#: ../src/tray_icon.c:485
-msgid "About Orage"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-msgid "Orage Panel Clock"
-msgstr ""
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-msgid "Show time and date?"
-msgstr ""
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-#, fuzzy
-msgid "Calendar"
-msgstr "XFநால்-காட்டி"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "விருப்பங்கள்"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "விருப்பங்கள்"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr ""
-
-#: ../xfcalendar.desktop.in.h:2
-#, fuzzy
-msgid "Desktop calendar"
-msgstr "XFநால்-காட்டி பற்றி"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "XFநால்-காட்டி"
-
-#~ msgid "Warning"
-#~ msgstr "எச்சரிக்கை"
-
-#, fuzzy
-#~ msgid "Select always today"
-#~ msgstr "இன்று தெரிவு செய்க"
-
-#, fuzzy
-#~ msgid "Modify Preferences"
-#~ msgstr "விருப்பங்கள்"
-
-#, fuzzy
-#~ msgid "Monday"
-#~ msgstr "இன்று"
-
-#, fuzzy
-#~ msgid "Tuesday"
-#~ msgstr "இன்று"
-
-#, fuzzy
-#~ msgid "Wednesday"
-#~ msgstr "இன்று"
-
-#, fuzzy
-#~ msgid "Thursday"
-#~ msgstr "இன்று"
-
-#, fuzzy
-#~ msgid "Friday"
-#~ msgstr "இன்று"
-
-#, fuzzy
-#~ msgid "Sunday"
-#~ msgstr "ஞாயிறு"
-
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "இன்று"
-
-#, fuzzy
-#~ msgid "Calendar Files"
-#~ msgstr "XFநால்-காட்டி"
-
-#, fuzzy
-#~ msgid "Calendar borders"
-#~ msgstr "XFநால்-காட்டி"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "இத்திகதியில் உள்ள அனைத்து  \n"
-#~ "விபரங்களையும் அழித்துவிடுவீர்."
-
-#~ msgid "Clear"
-#~ msgstr "துப்பரவு"
-
-#~ msgid "This should not happen"
-#~ msgstr "இது நடைபெறக்கூடாது"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "MCS சேவைப்பயனர் தடம் உருவாக்க முடியவில்லை"
diff -Nru orage-4.8.3/po/th.po orage-4.12.1/po/th.po
--- orage-4.8.3/po/th.po	1970-01-01 00:00:00.000000000 +0000
+++ orage-4.12.1/po/th.po	2015-04-10 10:26:26.000000000 +0000
@@ -0,0 +1,4413 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# theppitak <theppitak@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Xfce Apps\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-12-02 18:30+0100\n"
+"PO-Revision-Date: 2014-04-16 14:11+0000\n"
+"Last-Translator: theppitak <theppitak@gmail.com>\n"
+"Language-Team: Thai (http://www.transifex.com/projects/p/xfce/language/th/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../globaltime/globaltime.c:100
+msgid "Raising GlobalTime window..."
+msgstr "กำลังเปิดหน้าต่างเวลาสากล"
+
+#: ../globaltime/globaltime.c:102
+msgid "GlobalTime window raise failed"
+msgstr "เปิดหน้าต่างเวลาสากลไม่สำเร็จ"
+
+#. ********** timezone tooltip **********
+#: ../globaltime/globaltime.c:277
+#, c-format
+msgid ""
+"%s\n"
+"click to modify clock"
+msgstr "%s\nคลิกเพื่อแก้ไขนาฬิกา"
+
+#: ../globaltime/globaltime.c:386
+msgid "Localtime"
+msgstr "เวลาท้องถิ่น"
+
+#: ../globaltime/globaltime.c:464
+msgid ""
+"button 1 to change preferences \n"
+"button 2 to adjust time of clocks"
+msgstr "ปุ่มซ้าย ใช้ปรับแต่ง\nปุ่มขวา ใช้ปรับเวลานาฬิกา"
+
+#: ../globaltime/globaltime.c:480
+msgid "adjust to change hour"
+msgstr "ปรับเพื่อตั้งชั่วโมง"
+
+#: ../globaltime/globaltime.c:496
+msgid ""
+"adjust to change minute. Click arrows with button 2 to change only 1 minute."
+msgstr "ปรับเพื่อตั้งนาที คลิกลูกศรด้วยปุ่มขวาจะเปลี่ยนทีละ 1 นาที"
+
+#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
+msgid "NEW"
+msgstr "ใหม่"
+
+#: ../globaltime/gt_prefs.c:289
+msgid "NEW COPY"
+msgstr "สำเนาใหม่"
+
+#: ../globaltime/gt_prefs.c:310
+msgid "Not possible to delete the last clock."
+msgstr "ลบนาฬิกาเรือนสุดท้ายไม่ได้"
+
+#: ../globaltime/gt_prefs.c:516
+msgid "update this clock"
+msgstr "ปรับข้อมูลนาฬิกาเรือนนี้"
+
+#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
+msgid "add new empty clock"
+msgstr "เพิ่มนาฬิกาเปล่าเรือนใหม่"
+
+#: ../globaltime/gt_prefs.c:526
+msgid "add new clock using this clock as model"
+msgstr "เพิ่มนาฬิกาเรือนใหม่โดยใช้นาฬิกาเรือนนี้เป็นต้นแบบ"
+
+#: ../globaltime/gt_prefs.c:531
+msgid "delete this clock"
+msgstr "ลบนาฬิกาเรือนนี้"
+
+#: ../globaltime/gt_prefs.c:539
+msgid "move this clock first"
+msgstr "ย้ายนาฬิกาเรือนนี้ไปแรกสุด"
+
+#: ../globaltime/gt_prefs.c:544
+msgid "move this clock left"
+msgstr "ย้านนาฬิกาเรือนนี้ไปทางซ้าย"
+
+#: ../globaltime/gt_prefs.c:549
+msgid "move this clock right"
+msgstr "ย้านนาฬิกาเรือนนี้ไปทางขวา"
+
+#: ../globaltime/gt_prefs.c:554
+msgid "move this clock last"
+msgstr "ย้ายนาฬิกาเรือนนี้ไปท้ายสุด"
+
+#: ../globaltime/gt_prefs.c:562
+msgid "set the timezone of this clock to be local timezone"
+msgstr "กำหนดเขตเวลาของนาฬิกาเรือนนี้เป็นเขตเวลาท้องถิ่น"
+
+#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
+msgid "close window and exit"
+msgstr "ปิดหน้าต่างแล้วออก"
+
+#: ../globaltime/gt_prefs.c:590
+msgid "Globaltime preferences "
+msgstr "ปรับแต่งนาฬิกาสากล"
+
+#. -----------------------HEADING-------------------------------------------
+#: ../globaltime/gt_prefs.c:603
+msgid "Clock Parameters"
+msgstr "ปรับแต่งนาฬิกา"
+
+#: ../globaltime/gt_prefs.c:607
+msgid "Name of the clock:"
+msgstr "ชื่อของนาฬิกา:"
+
+#: ../globaltime/gt_prefs.c:613
+msgid "enter name of clock"
+msgstr "ป้อนชื่อของนาฬิกา"
+
+#: ../globaltime/gt_prefs.c:616
+msgid "Timezone of the clock:"
+msgstr "เขตเวลาของนาฬิกา:"
+
+#: ../globaltime/gt_prefs.c:643
+msgid "Text Formatting"
+msgstr "การจัดรูปแบบข้อความ"
+
+#. ------------------------background-------------------------
+#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
+msgid "Background color:"
+msgstr "สีพื้นหลัง:"
+
+#: ../globaltime/gt_prefs.c:656
+msgid "Click to change background colour for clock"
+msgstr "คลิกเพื่อเปลี่ยนสีพื้นหลังของนาฬิกา"
+
+#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
+#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
+#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
+#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
+#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
+msgid "Use default"
+msgstr "ใช้ค่าปริยาย"
+
+#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
+#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
+#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
+msgid "Cross this to use default instead of selected value"
+msgstr "กาช่องนี้หากต้องการใช้ค่าปริยายแทนค่าที่เลือกไว้"
+
+#. ------------------------foreground-------------------------
+#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
+msgid "Foreground (=text) color:"
+msgstr "สีตัวอักษร:"
+
+#: ../globaltime/gt_prefs.c:688
+msgid "Click to change foreground colour for clock"
+msgstr "คลิกเพื่อเปลี่ยนสีตัวอักษรของนาฬิกา"
+
+#. ------------------------name font-------------------------
+#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
+msgid "Font for name of clock:"
+msgstr "แบบอักษรของชื่อนาฬิกา:"
+
+#: ../globaltime/gt_prefs.c:720
+msgid "Click to change font for clock name"
+msgstr "คลิกเพื่อเปลี่ยนแบบอักษรของชื่อนาฬิกา"
+
+#. ------------------------time font-------------------------
+#: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
+msgid "Font for time of clock:"
+msgstr "แบบอักษรของเวลานาฬิกา:"
+
+#: ../globaltime/gt_prefs.c:753
+msgid "Click to change font for clock time"
+msgstr "คลิกเพื่อเปลี่ยนแบบอักษรของเวลานาฬิกา"
+
+#. ------------------------underline name--------------------
+#: ../globaltime/gt_prefs.c:780
+msgid "Underline name of clock:"
+msgstr "ขีดเส้นใต้ชื่อนาฬิกา:"
+
+#. ------------------------underline time--------------------
+#: ../globaltime/gt_prefs.c:810
+msgid "Underline time of clock:"
+msgstr "ขีดเส้นใต้เวลานาฬิกา:"
+
+#: ../globaltime/gt_prefs.c:850
+msgid "Text Default Formatting"
+msgstr "การจัดรูปแบบข้อความโดยปริยาย"
+
+#: ../globaltime/gt_prefs.c:863
+msgid "Click to change default background colour for clocks"
+msgstr "คลิกเพื่อเปลี่ยนสีพื้นหลังปริยายของนาฬิกาต่างๆ"
+
+#: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
+msgid "Cross this to use system default instead of selected color"
+msgstr "กาช่องนี้หากต้องการใช้สีปริยายของระบบแทนสีที่เลือกไว้"
+
+#: ../globaltime/gt_prefs.c:896
+msgid "Click to change default text colour for clocks"
+msgstr "คลิกเพื่อเปลี่ยนสีตัวอักษรปริยายของนาฬิกาต่างๆ"
+
+#: ../globaltime/gt_prefs.c:929
+msgid "Click to change default font for clock name"
+msgstr "คลิกเพื่อเปลี่ยนแบบอักษรปริยายของชื่อนาฬิกา"
+
+#: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
+msgid "Cross this to use system default font instead of selected font"
+msgstr "กาช่องนี้หากต้องการใช้แบบอักษรปริยายของระบบแทนแบบอักษรที่เลือกไว้"
+
+#: ../globaltime/gt_prefs.c:963
+msgid "Click to change default font for clock time"
+msgstr "คลิกเพื่อเปลี่ยนแบบอักษรปริยายของเวลานาฬิกา"
+
+#. ------------------------underline name--------------------
+#: ../globaltime/gt_prefs.c:990
+msgid "Underline for name of clock:"
+msgstr "ขีดเส้นใต้ชื่อนาฬิกา:"
+
+#. ------------------------underline time--------------------
+#: ../globaltime/gt_prefs.c:1004
+msgid "Underline for time of clock:"
+msgstr "ขีดเส้นใต้เวลานาฬิกา:"
+
+#: ../globaltime/gt_prefs.c:1027
+msgid "update preferences"
+msgstr "ปรับข้อมูลค่าปรับแต่ง"
+
+#: ../globaltime/gt_prefs.c:1062
+msgid "Globaltime Preferences"
+msgstr "ปรับแต่งเวลาสากล"
+
+#. -----------------------HEADING--------------------------------------
+#: ../globaltime/gt_prefs.c:1073
+msgid "General Preferences"
+msgstr "ค่าปรับแต่งทั่วไป"
+
+#: ../globaltime/gt_prefs.c:1077
+msgid "Decorations:"
+msgstr "กรอบหน้าต่าง:"
+
+#: ../globaltime/gt_prefs.c:1078
+msgid "Standard"
+msgstr "มาตรฐาน"
+
+#: ../globaltime/gt_prefs.c:1083
+msgid "Use normal decorations"
+msgstr "ใช้กรอบหน้าต่างปกติ"
+
+#: ../globaltime/gt_prefs.c:1094
+msgid "Do not show window decorations (borders)"
+msgstr "ไม่ต้องแสดงกรอบหน้าต่าง"
+
+#: ../globaltime/gt_prefs.c:1100
+msgid "Clock size:"
+msgstr "ขนาดนาฬิกา:"
+
+#: ../globaltime/gt_prefs.c:1101
+msgid "Equal"
+msgstr "เท่ากัน"
+
+#: ../globaltime/gt_prefs.c:1106
+msgid "All clocks have same size"
+msgstr "นาฬิกาทุกเรือนมีขนาดเท่ากันหมด"
+
+#: ../globaltime/gt_prefs.c:1111
+msgid "Varying"
+msgstr "ต่างกัน"
+
+#: ../globaltime/gt_prefs.c:1116
+msgid "Clock sizes vary"
+msgstr "ขนาดของนาฬิกาต่างกัน"
+
+#: ../globaltime/gt_prefs.c:1122
+msgid "Local timezone:"
+msgstr "เขตเวลาท้องถิ่น:"
+
+#: ../globaltime/timezone_selection.c:101
+#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
+msgid " Other"
+msgstr "อื่นๆ"
+
+#: ../globaltime/timezone_selection.c:156
+#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
+#, c-format
+msgid "%d hour %d mins"
+msgstr "%d ชั่วโมง %d นาที"
+
+#: ../globaltime/timezone_selection.c:159
+#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
+#, c-format
+msgid "%d hour"
+msgstr "%d ชั่วโมง"
+
+#: ../globaltime/timezone_selection.c:161
+#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
+#, c-format
+msgid "%d mins"
+msgstr "%d นาที"
+
+#: ../globaltime/timezone_selection.c:167
+#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
+msgid "backward"
+msgstr "ถอยหลัง"
+
+#: ../globaltime/timezone_selection.c:170
+#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
+msgid "forward"
+msgstr "ไปข้างหน้า"
+
+#: ../globaltime/timezone_selection.c:194
+#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
+msgid "not changed"
+msgstr "ไม่ได้เปลี่ยน"
+
+#: ../globaltime/timezone_selection.c:195
+#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
+msgid "not changing"
+msgstr "ไม่เปลี่ยนอีก"
+
+#. location
+#: ../globaltime/timezone_selection.c:247
+#: ../globaltime/timezone_selection.c:252
+#: ../panel-plugin/timezone_selection.c:248
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
+#: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
+msgid "Location"
+msgstr "สถานที่"
+
+#: ../globaltime/timezone_selection.c:258
+#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
+msgid "GMT Offset"
+msgstr "ความต่างกับ GMT"
+
+#: ../globaltime/timezone_selection.c:264
+#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
+msgid "Previous/Next Change"
+msgstr "การปรับก่อนหน้า/ถัดไป"
+
+#: ../globaltime/timezone_selection.c:269
+#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
+msgid "Country"
+msgstr "ประเทศ"
+
+#. We are actually setting the g_par parameter. In other words
+#. we are setting the global default timezone for Orage. This is
+#. done very seldom and we do not want to allow "floating" here.
+#. This test is ugly, but it is not worth an extra parameter.
+#. this is normal appointment
+#: ../globaltime/timezone_selection.c:299
+#: ../globaltime/timezone_selection.c:309
+#: ../panel-plugin/timezone_selection.c:300
+#: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:316
+#: ../src/timezone_selection.c:325 ../src/timezone_selection.c:336
+msgid "Pick timezone"
+msgstr "เลือกเขตเวลา"
+
+#: ../globaltime/timezone_selection.c:302
+#: ../globaltime/timezone_selection.c:312
+#: ../panel-plugin/timezone_selection.c:303
+#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
+#: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
+msgid "Change mode"
+msgstr "เปลี่ยนรูปแบบ"
+
+#: ../globaltime/timezone_selection.c:303
+#: ../globaltime/timezone_selection.c:313
+#: ../globaltime/timezone_selection.c:352
+#: ../panel-plugin/timezone_selection.c:304
+#: ../panel-plugin/timezone_selection.c:314
+#: ../panel-plugin/timezone_selection.c:353 ../src/timezone_selection.c:320
+#: ../src/timezone_selection.c:329 ../src/timezone_selection.c:340
+#: ../src/timezone_selection.c:379
+msgid "UTC"
+msgstr "UTC"
+
+#. NOTE: this exists only if ical timezones are being used
+#: ../globaltime/timezone_selection.c:304
+#: ../globaltime/timezone_selection.c:357
+#: ../panel-plugin/timezone_selection.c:305
+#: ../panel-plugin/timezone_selection.c:358 ../src/timezone_selection.c:330
+#: ../src/timezone_selection.c:384
+msgid "floating"
+msgstr "ลอยตัว"
+
+#: ../globaltime/globaltime.desktop.in.h:1
+msgid "Orage Globaltime"
+msgstr "เวลาสากลของ Orage"
+
+#: ../globaltime/globaltime.desktop.in.h:2
+msgid "Show clocks from different countries"
+msgstr "แสดงนาฬิกาของประเทศต่างๆ"
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "เวลาสากล"
+
+#: ../panel-plugin/oc_config.c:224
+msgid "Appearance"
+msgstr "รูปลักษณ์"
+
+#. show frame
+#: ../panel-plugin/oc_config.c:229
+msgid "Show _frame"
+msgstr "แสดงเส้นกรอ_บ"
+
+#. foreground color
+#: ../panel-plugin/oc_config.c:239
+msgid "set foreground _color:"
+msgstr "_สีตัวอักษร:"
+
+#. background color
+#: ../panel-plugin/oc_config.c:253
+msgid "set _background color:"
+msgstr "สี_พื้นหลัง:"
+
+#. clock size (=vbox size): height and width
+#: ../panel-plugin/oc_config.c:267
+msgid "set _height:"
+msgstr "ความสู_ง:"
+
+#: ../panel-plugin/oc_config.c:277
+msgid "Note that you can not change the height of horizontal panels"
+msgstr "อย่าลืมว่าคุณไม่สามารถเปลี่ยนความสูงของพาเนลแนวนอนได้"
+
+#: ../panel-plugin/oc_config.c:282
+msgid "set _width:"
+msgstr "ความ_กว้าง:"
+
+#: ../panel-plugin/oc_config.c:293
+msgid "Note that you can not change the width of vertical panels"
+msgstr "อย่าลืมว่าคุณไม่สามารถเปลี่ยนความกว้างของพาเนลแนวตั้งได้"
+
+#: ../panel-plugin/oc_config.c:316
+msgid "Clock Options"
+msgstr "ตัวเลือกของนาฬิกา"
+
+#. timezone
+#: ../panel-plugin/oc_config.c:326
+msgid "set timezone to:"
+msgstr "เขตเวลา:"
+
+#: ../panel-plugin/oc_config.c:347
+#, c-format
+msgid "Line %d:"
+msgstr "บรรทัด %d:"
+
+#: ../panel-plugin/oc_config.c:357
+msgid "Enter any valid strftime function parameter."
+msgstr "ป้อนพารามิเตอร์ที่ถูกต้องของฟังก์ชัน strftime"
+
+#. Tooltip hint
+#: ../panel-plugin/oc_config.c:401
+msgid "Tooltip:"
+msgstr "คำแนะนำเครื่องมือ:"
+
+#. special timing for SUSPEND/HIBERNATE
+#: ../panel-plugin/oc_config.c:411
+msgid "fix time after suspend/hibernate"
+msgstr "ปรับแก้เวลาหลังจากพักเครื่อง/จำศีลเครื่อง"
+
+#: ../panel-plugin/oc_config.c:415
+msgid ""
+"You only need this if you do short term (less than 5 hours) suspend or "
+"hibernate and your visible time does not include seconds. Under these "
+"circumstances it is possible that Orageclock shows time inaccurately unless "
+"you have this selected. (Selecting this prevents cpu and interrupt saving "
+"features from working.)"
+msgstr "คุณต้องใช้ตัวเลือกนี้ก็ต่อเมื่อคุณพักเครื่องหรือจำศีลเครื่องเป็นเวลาสั้นๆ (น้อยกว่า 5 ชั่วโมง) และนาฬิกาไม่ได้แสดงวินาทีเท่านั้น ภายใต้เงื่อนไขดังกล่าว นาฬิกาของ Orage อาจแสดงเวลาคลาดเคลื่อนถ้าคุณไม่เลือกตัวเลือกนี้ (การเลือกตัวเลือกนี้จะป้องกันไม่ให้การเก็บบันทึกซีพียูและการขัดจังหวะของระบบทำงาน)"
+
+#: ../panel-plugin/oc_config.c:432
+msgid ""
+"This program uses strftime function to get time.\n"
+"Use any valid code to get time in the format you prefer.\n"
+"Some common codes are:\n"
+"\t%A = weekday\t\t\t%B = month\n"
+"\t%c = date & time\t\t%R = hour & minute\n"
+"\t%V = week number\t\t%Z = timezone in use\n"
+"\t%H = hours \t\t\t\t%M = minute\n"
+"\t%X = local time\t\t\t%x = local date"
+msgstr "โปรแกรมนี้ใช้ฟังก์ชัน strftime ในการอ่านค่าเวลา\nคุณสามารถใช้รหัสอะไรก็ได้ที่สามารถอ่านเวลาในรูปแบบที่คุณต้องการ\nรหัสที่ใช้บ่อยก็เช่น:\n\t%A = วันในสัปดาห์\t\t%B = เดือน\n\t%c = วันที่ & เวลา\t\t%R = ชั่วโมง & นาที\n\t%V = สัปดาห์ที่\t\t\t%Z = เขตเวลาที่ใช้\n\t%H = ชั่วโมง\t\t\t%M = นาที\n\t%X = เวลาท้องถิ่น\t\t%x = วันที่ท้องถิ่น"
+
+#: ../panel-plugin/oc_config.c:457
+msgid "Orage clock Preferences"
+msgstr "ปรับแต่งนาฬิกา Orage"
+
+#. no lines yet
+#. TRANSLATORS: Use format characters from strftime(3)
+#. * to get the proper string for your locale.
+#. * I used these:
+#. * %A  : full weekday name
+#. * %d  : day of the month
+#. * %B  : full month name
+#. * %Y  : four digit year
+#. * %V  : ISO week number
+#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+msgid "%A %d %B %Y/%V"
+msgstr "%A %d %B %Ey/%V"
+
+#: ../src/about-xfcalendar.c:40
+msgid "Maintainer"
+msgstr "ผู้ดูแล"
+
+#: ../src/about-xfcalendar.c:47
+msgid "Manage your time with Orage"
+msgstr "บริหารเวลาของคุณด้วย Orage"
+
+#. if (gtk_toggle_button_get_active(
+#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
+#. end time
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
+msgid "End"
+msgstr "สิ้นสุด"
+
+#: ../src/appointment.c:333
+msgid "Due"
+msgstr "กำหนดเสร็จ"
+
+#: ../src/appointment.c:493 ../src/mainbox.c:862
+msgid "Orage"
+msgstr "Orage"
+
+#. to avoid timing problems when updating entry
+#. Create file chooser
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
+msgid "Select a file..."
+msgstr "เลือกแฟ้ม..."
+
+#: ../src/appointment.c:680
+msgid "Sound Files"
+msgstr "แฟ้มเสียง"
+
+#: ../src/appointment.c:687 ../src/interface.c:277
+msgid "All Files"
+msgstr "ทุกแฟ้ม"
+
+#: ../src/appointment.c:738
+msgid "The appointment information has been modified."
+msgstr "ข้อมูลนัดหมายมีการแก้ไข"
+
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
+msgid "Do you want to continue?"
+msgstr "คุณต้องการทำต่อไปหรือไม่?"
+
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "ไม่ ไม่ต้องปิด"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "ใช่ ทิ้งสิ่งที่แก้ไขแล้วปิด"
+
+#: ../src/appointment.c:768
+msgid "The end of this appointment is earlier than the beginning."
+msgstr "เวลาสิ้นสุดของนัดหมายนี้มาก่อนเวลาเริ่มต้น"
+
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
+msgid "Not set"
+msgstr "ไม่ได้กำหนด"
+
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "เพิ่มนัดหมายใหม่ในแฟ้มนี้"
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "แฟ้มปริยายของ Orage"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "เพิ่มนัดหมายไม่สำเร็จ"
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "เกิดข้อผิดพลาดขณะเพิ่มนัดหมาย ดูรายละเอียดเพิ่มเติมได้จากแฟ้มปูม"
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "ปรับข้อมูลนัดหมายไม่สำเร็จ"
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "ดูรายละเอียดเพิ่มเติมได้จากแฟ้มปูม (บางทีแฟ้มอาจถูกเปลี่ยนแปลงจากนอกโปรแกรม Orage?)"
+
+#: ../src/appointment.c:1286
+msgid "This appointment will be permanently removed."
+msgstr "นัดหมายนี้จะถูกลบทิ้งอย่างถาวร"
+
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "ไม่ ยกเลิกการลบ"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "ใช่ ลบเลย"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "เลือกวันที่"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "วันนี้"
+
+#: ../src/appointment.c:1803
+msgid "This appointment does not exist."
+msgstr "ไม่มีนัดหมายนี้"
+
+#: ../src/appointment.c:1804
+msgid "It was probably removed, please refresh your screen."
+msgstr "นัดหมายดังกล่าวอาจถูกลบไปแล้ว กรุณาปรับข้อมูลหน้าจอของคุณ"
+
+#: ../src/appointment.c:2105
+msgid "Current categories"
+msgstr "หมวดปัจจุบัน"
+
+#: ../src/appointment.c:2120
+msgid "Add new category with color"
+msgstr "เพิ่มหมวดใหม่พร้อมสีกำกับ"
+
+#: ../src/appointment.c:2124
+msgid "Category:"
+msgstr "หมวด:"
+
+#: ../src/appointment.c:2155
+msgid "Colors of categories - Orage"
+msgstr "สีกำกับหมวด - Orage"
+
+#: ../src/appointment.c:2201
+msgid " *** COPY ***"
+msgstr " *** สำเนา ***"
+
+#: ../src/appointment.c:2466
+msgid "New appointment - Orage"
+msgstr "นัดหมายใหม่ - Orage"
+
+#. File menu stuff
+#. ********* File menu *********
+#. File menu
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
+msgid "_File"
+msgstr "แ_ฟ้ม"
+
+#: ../src/appointment.c:2502
+msgid "Sav_e and close"
+msgstr "บันทึ_กและปิด"
+
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
+msgid "D_uplicate"
+msgstr "_ทำซ้ำ"
+
+#: ../src/appointment.c:2702
+msgid "Save"
+msgstr "บันทึก"
+
+#: ../src/appointment.c:2704
+msgid "Save and close"
+msgstr "บันทึกและปิด"
+
+#: ../src/appointment.c:2709
+msgid "Revert"
+msgstr "คืนกลับ"
+
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
+msgid "Duplicate"
+msgstr "ทำซ้ำ"
+
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
+msgid "Delete"
+msgstr "ลบ"
+
+#: ../src/appointment.c:2734
+msgid "Free"
+msgstr "ว่าง"
+
+#: ../src/appointment.c:2734
+msgid "Busy"
+msgstr "ไม่ว่าง"
+
+#: ../src/appointment.c:2738
+msgid "General"
+msgstr "ทั่วไป"
+
+#. type
+#: ../src/appointment.c:2744
+msgid "Type "
+msgstr "ชนิด"
+
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
+msgid "Event"
+msgstr "เหตุการณ์"
+
+#: ../src/appointment.c:2749
+msgid ""
+"Event that will happen sometime. For example:\n"
+"Meeting or birthday or TV show."
+msgstr "เหตุการณ์ที่จะเกิดขึ้น ณ เวลาหนึ่ง เช่น:\nการประชุม หรือวันเกิด หรือรายการโทรทัศน์"
+
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
+msgid "Todo"
+msgstr "สิ่งที่จะทำ"
+
+#: ../src/appointment.c:2755
+msgid ""
+"Something that you should do sometime. For example:\n"
+"Wash your car or test new version of Orage."
+msgstr "สิ่งที่คุณควรจะทำ ณ เวลาหนึ่ง เช่น:\nล้างรถ หรือทดสอบ Orage รุ่นใหม่"
+
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
+msgid "Journal"
+msgstr "บันทึก"
+
+#: ../src/appointment.c:2762
+msgid ""
+"Make a note that something happened. For example:\n"
+"Remark that your mother called or first snow came."
+msgstr "บันทึกสิ่งที่เกิดขึ้นไปแล้ว เช่น:\nบันทึกว่าคุณแม่โทรมา หรือหิมะตกครั้งแรก"
+
+#. title
+#: ../src/appointment.c:2769
+msgid "Title "
+msgstr "เรื่อง"
+
+#: ../src/appointment.c:2784
+msgid "All day event"
+msgstr "เหตุการณ์ทั้งวัน"
+
+#. start time
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
+msgid "Start"
+msgstr "เริ่มต้น"
+
+#: ../src/appointment.c:2810
+msgid "Set      "
+msgstr "กำหนด    "
+
+#: ../src/appointment.c:2831
+msgid "Duration"
+msgstr "ระยะเวลา"
+
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
+msgid "days"
+msgstr "วัน"
+
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
+msgid "hours"
+msgstr "ชั่วโมง"
+
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
+msgid "mins"
+msgstr "นาที"
+
+#. Availability (only for EVENT)
+#: ../src/appointment.c:2851
+msgid "Availability"
+msgstr "สถานะว่าง/ไม่ว่าง"
+
+#. completed (only for TODO)
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
+msgid "Completed"
+msgstr "เสร็จสิ้น"
+
+#: ../src/appointment.c:2862
+msgid "Done"
+msgstr "เสร็จ"
+
+#. categories
+#: ../src/appointment.c:2883
+msgid "Categories"
+msgstr "หมวด"
+
+#: ../src/appointment.c:2895
+msgid ""
+"This is special category, which can be used to color this appointment in "
+"list views."
+msgstr "นี่เป็นหมวดพิเศษ ซึ่งสามารถใช้ให้สีกำกับนัดหมายนี้ในมุมมองแบบรายการได้"
+
+#: ../src/appointment.c:2900
+msgid "update colors for categories."
+msgstr "ปรับสีสำหรับหมวดต่างๆ"
+
+#. priority
+#: ../src/appointment.c:2906
+msgid "Priority"
+msgstr "ความสำคัญ"
+
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "ถ้าคุณกำหนดค่านี้เป็นค่า 8 ขึ้นไป นัดหมายก็จะไม่แสดงในหน้าต่างรายการเลย\nคุณสามารถใช้ความสามารถนี้เพื่อทำให้หน้าต่างรายการสะอาดขึ้นได้ แต่ก็จะทำให้หานัดหมายนี้ได้ยากขึ้นด้วย\n(การปลุกเตือนยังคงมีผลตามปกติ)\n(มีพารามิเตอร์หนึ่งที่ไม่ได้อธิบายในเอกสาร เพื่อให้คุณเปลี่ยนค่าขีดจำกัดปริยายจากค่า 8 ได้)"
+
+#. note
+#: ../src/appointment.c:2918
+msgid "Note"
+msgstr "หมายเหตุ"
+
+#: ../src/appointment.c:2939
+msgid ""
+"These shorthand commands take effect immediately:\n"
+"    <D> inserts current date in local date format\n"
+"    <T> inserts time and\n"
+"    <DT> inserts date and time.\n"
+"\n"
+"These are converted only later when they are seen:\n"
+"    <&Ynnnn> is translated to current year minus nnnn.\n"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "คำสั่งลัดต่อไปนี้มีผลทันที:\n    <D> แทรกวันที่ปัจจุบันในรูปแบบวันที่ท้องถิ่น\n    <T> แทรกเวลา และ\n    <DT> แทรกวันที่และเวลา\n\nคำสั่งลัดต่อไปนี้จะถูกแปลงเมื่อแสดงผลเท่านั้น:\n    <&Ynnnn> จะถูกแปลงเป็นปีปัจจุบันลบด้วย nnnn\n(สามารถใช้ได้ในกรณีอย่างเช่นการเตือนวันเกิด เพื่อบอกว่าบุคคลนั้นอายุเท่าไรแล้ว)"
+
+#: ../src/appointment.c:3010
+msgid "Before Start"
+msgstr "ก่อนเริ่ม"
+
+#: ../src/appointment.c:3010
+msgid "Before End"
+msgstr "ก่อนจบ"
+
+#: ../src/appointment.c:3011
+msgid "After Start"
+msgstr "หลังเริ่ม"
+
+#: ../src/appointment.c:3011
+msgid "After End"
+msgstr "หลังจบ"
+
+#: ../src/appointment.c:3018
+msgid "Alarm"
+msgstr "การปลุกเตือน"
+
+#. **** ALARM TIME ****
+#: ../src/appointment.c:3024
+msgid "Alarm time"
+msgstr "เวลาปลุกเตือน"
+
+#: ../src/appointment.c:3048
+msgid ""
+"Often you want to get alarm:\n"
+" 1) before Event start\n"
+" 2) before Todo end\n"
+" 3) after Todo start"
+msgstr "บ่อยครั้งที่คุณต้องการการปลุกเตือน:\n 1) ก่อนที่เหตุการณ์จะเริ่ม\n 2) ก่อนที่สิ่งที่จะทำจะจบลง\n 3) หลังจากที่สิ่งที่จะทำเริ่มขึ้น"
+
+#: ../src/appointment.c:3053
+msgid "Persistent alarm"
+msgstr "ปลุกเตือนแบบติดแน่น"
+
+#: ../src/appointment.c:3055
+msgid ""
+"Select this if you want Orage to remind you even if it has not been active "
+"when the alarm happened."
+msgstr "เลือกตัวเลือกนี้ถ้าคุณต้องการให้ Orage เตือนคุณแม้จะไม่ได้ทำงานอยู่ในขณะที่การปลุกเตือนเกิดขึ้น"
+
+#. **** Audio Alarm ****
+#: ../src/appointment.c:3064
+msgid "Sound"
+msgstr "เสียง"
+
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
+msgid "Use"
+msgstr "ใช้"
+
+#: ../src/appointment.c:3070
+msgid "Select this if you want audible alarm"
+msgstr "เลือกตัวเลือกนี้ถ้าคุณต้องการให้ปลุกเตือนแบบมีเสียง"
+
+#: ../src/appointment.c:3087
+msgid "Repeat alarm sound"
+msgstr "ซ้ำเสียงปลุก"
+
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
+msgid "times"
+msgstr "ครั้ง"
+
+#: ../src/appointment.c:3119
+msgid "sec interval"
+msgstr "วินาทีต่อครั้ง"
+
+#. **** Display Alarm ****
+#: ../src/appointment.c:3129
+msgid "Visual"
+msgstr "ภาพ"
+
+#: ../src/appointment.c:3133
+msgid "Use Orage window"
+msgstr "ใช้หน้าต่าง Orage"
+
+#: ../src/appointment.c:3135
+msgid "Select this if you want Orage window alarm"
+msgstr "เลือกตัวเลือกนี้ถ้าคุณต้องการใช้การปลุกเตือนด้วยหน้าต่างของ Orage"
+
+#: ../src/appointment.c:3147
+msgid "Use notification"
+msgstr "ใช้การแจ้งเหตุ"
+
+#: ../src/appointment.c:3149
+msgid "Select this if you want notification alarm"
+msgstr "เลือกตัวเลือกนี้ถ้าคุณต้องการใช้การปลุกเตือนด้วยการแจ้งเหตุ"
+
+#: ../src/appointment.c:3155
+msgid "Set timeout"
+msgstr "ตั้งเวลาคอย"
+
+#: ../src/appointment.c:3157
+msgid "Select this if you want notification to expire automatically"
+msgstr "เลือกตัวเลือกนี้ถ้าคุณต้องการให้การแจ้งเหตุหมดอายุเองโดยอัตโนมัติ"
+
+#: ../src/appointment.c:3168
+msgid "0 = system default expiration time"
+msgstr "0 = ใช้เวลาหมดอายุปริยายของระบบ"
+
+#: ../src/appointment.c:3173
+msgid "seconds"
+msgstr "วินาที"
+
+#. **** Procedure Alarm ****
+#: ../src/appointment.c:3184
+msgid "Procedure"
+msgstr "โปรแกรม"
+
+#: ../src/appointment.c:3190
+msgid "Select this if you want procedure or script alarm"
+msgstr "เลือกตัวเลือกนี้ถ้าคุณต้องการใช้การปลุกเตือนแบบเรียกโปรแกรมหรือสคริปต์"
+
+#: ../src/appointment.c:3196
+msgid ""
+"You must enter all escape etc characters yourself.\n"
+"This string is just given to shell to process.\n"
+"The following special commands are replaced at run time:\n"
+"\t<&T>  appointment title\n"
+"\t<&D>  appointment description\n"
+"\t<&AT> alarm time\n"
+"\t<&ST> appointment start time\n"
+"\t<&ET> appointment end time"
+msgstr "คุณต้องป้อนอักขระหลีกและสิ่งต่างๆ เองทั้งหมด\nข้อความนี้จะถูกส่งไปให้เชลล์เพื่อดำเนินการ\nคำสั่งพิเศษต่อไปนี้จะถูกแทนค่าขณะทำงาน:\n\t<&T>  ชื่อเรื่องของนัดหมาย\n\t<&D>  คำบรรยายของนัดหมาย\n\t<&AT> เวลาปลุกเตือน\n\t<&ST> เวลาเริ่มของนัดหมาย\n\t<&ET> เวลาจบของนัดหมาย"
+
+#: ../src/appointment.c:3208
+msgid "Test this alarm by raising it now"
+msgstr "ทดสอบการปลุกเตือนนี้โดยสั่งปลุกเดี๋ยวนี้"
+
+#: ../src/appointment.c:3215
+msgid "<b>Default alarm</b>"
+msgstr "<b>การปลุกเตือนปริยาย</b>"
+
+#: ../src/appointment.c:3223
+msgid "Store current settings as default alarm"
+msgstr "บันทึกค่าตั้งปัจจุบันเป็นค่าการปลุกเตือนปริยาย"
+
+#: ../src/appointment.c:3228
+msgid "Set current settings from default alarm"
+msgstr "ตั้งค่าปัจจุบันจากค่าการปลุกเตือนปริยาย"
+
+#: ../src/appointment.c:3290
+msgid "None"
+msgstr "ไม่ซ้ำ"
+
+#: ../src/appointment.c:3290
+msgid "Daily"
+msgstr "ทุกวัน"
+
+#: ../src/appointment.c:3290
+msgid "Weekly"
+msgstr "ทุกสัปดาห์"
+
+#: ../src/appointment.c:3290
+msgid "Monthly"
+msgstr "ทุกเดือน"
+
+#: ../src/appointment.c:3290
+msgid "Yearly"
+msgstr "ทุกปี"
+
+#: ../src/appointment.c:3290
+msgid "Hourly"
+msgstr "ทุกชั่วโมง"
+
+#: ../src/appointment.c:3292
+msgid "Mon"
+msgstr "จ."
+
+#: ../src/appointment.c:3292
+msgid "Tue"
+msgstr "อ."
+
+#: ../src/appointment.c:3292
+msgid "Wed"
+msgstr "พ."
+
+#: ../src/appointment.c:3292
+msgid "Thu"
+msgstr "พฤ."
+
+#: ../src/appointment.c:3292
+msgid "Fri"
+msgstr "ศ."
+
+#: ../src/appointment.c:3292
+msgid "Sat"
+msgstr "ส."
+
+#: ../src/appointment.c:3292
+msgid "Sun"
+msgstr "อา."
+
+#: ../src/appointment.c:3297
+msgid "Recurrence"
+msgstr "การเวียนซ้ำ"
+
+#. complexity
+#: ../src/appointment.c:3303
+msgid "Complexity"
+msgstr "ความซับซ้อน"
+
+#: ../src/appointment.c:3306
+msgid "Basic"
+msgstr "พื้นฐาน"
+
+#: ../src/appointment.c:3312
+msgid "Advanced"
+msgstr "ขั้นสูง"
+
+#: ../src/appointment.c:3316
+msgid "Use this if you want regular repeating event"
+msgstr "ใช้ตัวเลือกนี้ถ้าคุณต้องการการเวียนซ้ำแบบสม่ำเสมอ"
+
+#: ../src/appointment.c:3318
+msgid ""
+"Use this if you need complex times like:\n"
+" Every Saturday and Sunday or \n"
+" First Tuesday every month"
+msgstr "ใช้ตัวเลือกนี้ถ้าคุณต้องการเวลาเวียนซ้ำที่ซับซ้อน เช่น:\n ทุกวันเสาร์และอาทิตย์ หรือ\n ทุกวันอังคารแรกของเดือน"
+
+#. frequency
+#: ../src/appointment.c:3324
+msgid "Frequency"
+msgstr "ความถี่"
+
+#: ../src/appointment.c:3330
+msgid "Each"
+msgstr "ทุกๆ"
+
+#: ../src/appointment.c:3337
+msgid "occurrence"
+msgstr "ครั้ง"
+
+#: ../src/appointment.c:3341
+msgid ""
+"Limit frequency to certain interval.\n"
+" For example: Every third day:\n"
+" Frequency = Daily and Interval = 3"
+msgstr "จำกัดความถี่เป็นระยะที่ต้องการ\n ตัวอย่างเช่น: ทุกสามวัน:\n ความถี่ = ทุกวัน และ ระยะ = 3"
+
+#: ../src/appointment.c:3386
+msgid "Limit"
+msgstr "จำกัด"
+
+#: ../src/appointment.c:3388
+msgid "Repeat forever"
+msgstr "เวียนซ้ำไปตลอด"
+
+#: ../src/appointment.c:3394
+msgid "Repeat "
+msgstr "เวียนซ้ำ "
+
+#: ../src/appointment.c:3410
+msgid "Repeat until "
+msgstr "เวียนซ้ำจนถึง "
+
+#. weekdays (only for complex settings)
+#: ../src/appointment.c:3423
+msgid "Weekdays"
+msgstr "วันในสัปดาห์"
+
+#: ../src/appointment.c:3435
+msgid "Which day"
+msgstr "วันไหน"
+
+#: ../src/appointment.c:3443
+msgid ""
+"Specify which weekday for monthly and yearly events.\n"
+" For example:\n"
+" Second Wednesday each month:\n"
+"\tFrequency = Monthly,\n"
+"\tWeekdays = check only Wednesday,\n"
+"\tWhich day = select 2 from the number below Wednesday"
+msgstr "ระบุลำดับวันในสัปดาห์สำหรับเหตุการณ์ประจำเดือนหรือประจำปี\n ตัวอย่างเช่น:\n ทุกวันพุธที่สองของทุกเดือน:\n\tความถี่ = ทุกเดือน\n\tวันในสัปดาห์ = เลือกเฉพาะวันพุธ\n\tวันไหน = เลือกเลข 2 ที่ปุ่มปรับเลขใต้วันพุธ"
+
+#. TODO base (only for TODOs)
+#: ../src/appointment.c:3450
+msgid "TODO base"
+msgstr "ฐานเวลาของสิ่งที่จะทำ"
+
+#: ../src/appointment.c:3463
+msgid ""
+"TODO reoccurs regularly starting on start time and repeating after each "
+"interval no matter when it was last completed"
+msgstr "สิ่งที่จะทำเกิดซ้ำเป็นประจำโดยเริ่มจากเวลาเริ่ม และเวียนซ้ำหลังระยะเวลาผ่านไป ไม่ว่ารายการนั้นจะเสร็จสิ้นครั้งล่าสุดเมื่อใด"
+
+#: ../src/appointment.c:3465
+msgid ""
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "การเกิดซ้ำของสิ่งที่จะทำนับจากเวลาที่ทำเสร็จ และเวียนซ้ำหลังระยะเวลาผ่านไป โดยนับจากเวลาที่เสร็จสิ้นครั้งล่าสุด\n(สังเกตว่าคุณจะไม่สามารถบอกได้เกี่ยวกับประวัติของสิ่งที่จะทำนี้ เนื่องจากฐานการนับเวลาเวียนซ้ำจะเปลี่ยนไปทุกครั้งหลังงานเสร็จสิ้น)"
+
+#. exceptions
+#: ../src/appointment.c:3471
+msgid "Exceptions"
+msgstr "ยกเว้น"
+
+#: ../src/appointment.c:3484
+msgid ""
+"Add more exception dates by clicking the calendar days below.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
+"Remove by clicking the data."
+msgstr "เพิ่มวันที่ยกเว้นโดยคลิกที่วันในปฏิทินด้านล่างนี้\nข้อยกเว้นจะเป็นการไม่นับรวม (-) หรือการนับเพิ่ม (+) ขึ้นอยู่กับการเลือก\nลบได้ด้วยการคลิกที่ข้อมูลที่จะลบ"
+
+#: ../src/appointment.c:3489
+msgid "Add excluded date (-)"
+msgstr "เพิ่มวันที่ไม่นับรวม (-)"
+
+#: ../src/appointment.c:3491
+msgid "Excluded days are full days where this appointment is not happening"
+msgstr "วันที่ไม่นับรวมคือวันทั้งวันที่นัดหมายนี้จะไม่เกิดขึ้น"
+
+#: ../src/appointment.c:3497
+msgid "Add included time (+)"
+msgstr "เพิ่มเวลาที่นับเพิ่ม (+)"
+
+#: ../src/appointment.c:3499
+msgid ""
+"Included times have same timezone than start time, but they may have "
+"different time"
+msgstr "เวลาที่นับเพิ่มจะอยู่ในเขตเวลาเดียวกับเวลาเริ่ม แต่เวลาอาจจะต่างกัน"
+
+#. calendars showing the action days
+#: ../src/appointment.c:3516
+msgid "Action dates"
+msgstr "วันที่กระทำ"
+
+#. ********* View menu *********
+#. View menu
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
+msgid "_View"
+msgstr "มุ_มมอง"
+
+#. ********* Go menu   *********
+#: ../src/day-view.c:303 ../src/event-list.c:1123
+msgid "_Go"
+msgstr "ไ_ป"
+
+#: ../src/day-view.c:377 ../src/event-list.c:1169
+msgid "New"
+msgstr "ใหม่"
+
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "ถอยกลับหนึ่งสัปดาห์"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "ถอยกลับหนึ่งวัน"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "ไปข้างหน้าหนึ่งวัน"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "ไปข้างหน้าหนึ่งสัปดาห์"
+
+#: ../src/day-view.c:395 ../src/event-list.c:1187
+msgid "Refresh"
+msgstr "ปรับแสดงใหม่"
+
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
+msgid "Close"
+msgstr "ปิด"
+
+#: ../src/day-view.c:549
+msgid "Unknown"
+msgstr "ไม่ทราบ"
+
+#: ../src/day-view.c:807
+msgid "       Number of days to show"
+msgstr "       จำนวนวันที่จะแสดง"
+
+#: ../src/day-view.c:1073
+msgid "Orage - day view"
+msgstr "Orage - ข้อมูลรายวัน"
+
+#. date only appointment
+#: ../src/event-list.c:191
+msgid "All day"
+msgstr "ทั้งวัน"
+
+#: ../src/event-list.c:596 ../src/event-list.c:1370
+msgid "Time"
+msgstr "เวลา"
+
+#: ../src/event-list.c:784
+msgid "No rows have been selected."
+msgstr "ไม่ได้เลือกแถวใด"
+
+#: ../src/event-list.c:785
+msgid "Click a row to select it and after that you can copy it."
+msgstr "คลิกเลือกแถวที่ต้องการ แล้วคุณจึงจะสามารถคัดลอกแถวที่เลือกได้"
+
+#: ../src/event-list.c:968
+msgid ""
+"You will permanently remove all\n"
+"selected appointments."
+msgstr "คุณกำลังจะลบนัดหมายที่เลือกอยู่ทิ้งหมด\nอย่างถาวร"
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "ใช่ ลบเลย"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "ถอยกลับ"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "ไปข้างหน้า"
+
+#: ../src/event-list.c:1189
+msgid "Find"
+msgstr "หา"
+
+#: ../src/event-list.c:1196
+msgid "Dayview"
+msgstr "ข้อมูลรายวัน"
+
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "จำนวนวันที่จะแสดงเพิ่ม:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "แสดงเฉพาะครั้งแรกที่เวียนซ้ำ"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "เลือกตัวเลือกนี้ถ้าคุณต้องการดูเฉพาะการเวียนซ้ำครั้งแรกของเหตุการณ์เท่านั้น โดยปกติแล้วจะแสดงเหตุการณ์ทั้งหมด\nสังเกตว่านี่จะเป็นการแสดงเหตุการณ์ทุกความเร่งด่วน\nสังเกตว่าเหตุการณ์ที่มีการเวียนซ้ำอาจขึ้นในลำดับต้นๆ ในรายการ เนื่องจากเป็นการแสดงแสดงการเวียนซ้ำครั้งแรกเท่านั้น"
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "เหตุการณ์เก่าด้วย"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "เลือกตัวเลือกนี้ถ้าคุณต้องการดูเหตุการณ์เก่าด้วย ตัวเลือกนี้จะสามารถเลือกได้หลังจากเลือก 'แสดงเฉพาะครั้งแรกที่เวียนซ้ำ' แล้วเท่านั้น เพื่อไม่ให้รายการยาวเกินไป\nสังเกตว่าการเลือกแสดงวันเพิ่มเติมยังคงมีผลถ้ามีการแสดงนัดหมายใหม่ๆ"
+
+#: ../src/event-list.c:1290
+msgid "Journal entries starting from:"
+msgstr "รายการบันทึกเริ่มจาก:"
+
+#: ../src/event-list.c:1310
+msgid "Search"
+msgstr "ค้นหา"
+
+#: ../src/event-list.c:1313
+msgid "Search text "
+msgstr "คำค้น "
+
+#: ../src/event-list.c:1378
+msgid "Flags"
+msgstr "แฟล็ก"
+
+#: ../src/event-list.c:1386
+msgid "Title"
+msgstr "เรื่อง"
+
+#: ../src/event-list.c:1412
+msgid ""
+"Double click line to edit it.\n"
+"\n"
+"Flags in order:\n"
+"\t 1. Alarm: n=no alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
+"\t 2. Recurrence: n=no recurrence\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t 3. Type: f=free B=Busy\n"
+"\t 4. Located in file:\n"
+"\t\tO=Orage A=Archive F=Foreign\n"
+"\t 5. Appointment type:\n"
+"\t\tE=Event T=Todo J=Journal"
+msgstr "ดับเบิลคลิกบรรทัดที่ต้องการแก้ไข\n\nแฟล็กตามลำดับ:\n\t 1. การปลุกเตือน: n=ไม่ปลุกเตือน\n\t\t A=ตั้งปลุกเตือนไว้ P=ตั้งปลุกเตือนแบบติดแน่นไว้\n\t 2. การเวียนซ้ำ: n=ไม่มีการเวียนซ้ำ\n\t\t H=ทุกชั่วโมง D=ทุกวัน W=ทุกสัปดาห์ M=ทุกเดือน Y=ทุกปี\n\t 3. ชนิด: f=ว่าง B=ไม่ว่าง\n\t 4. เก็บในแฟ้ม:\n\t\tO=Orage A=กรุ F=ต่างระบบ\n\t 5. ชนิดของนัดหมาย:\n\t\tE=เหตุการณ์ T=สิ่งที่จะทำ J=บันทึก"
+
+#. remove since it has ended
+#: ../src/ical-archive.c:267
+msgid "\tRecur ended, moving to archive file."
+msgstr "\tการเวียนซ้ำสิ้นสุดลงแล้ว จะย้ายเข้ากรุ"
+
+#: ../src/ical-archive.c:330
+msgid "Archiving not enabled. Exiting"
+msgstr "ไม่ได้เปิดใช้การทำกรุไว้ ขอจบการทำงาน"
+
+#: ../src/ical-archive.c:349
+#, c-format
+msgid "Archiving threshold: %d month(s)"
+msgstr "ขีดเริ่มของการเก็บเข้ากรุ: %d เดือน"
+
+#. yy mon day
+#: ../src/ical-archive.c:352
+#, c-format
+msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
+msgstr "\tกำลังเก็บเหตุการณ์เข้ากรุ สำหรับเหตุการณ์ที่เก่ากว่า: %04d-%02d-%02d"
+
+#: ../src/ical-archive.c:379
+#, c-format
+msgid "Archiving uid: %s"
+msgstr "uid ของการทำกรุ: %s"
+
+#. VTODO not completed, do not archive
+#: ../src/ical-archive.c:385
+msgid "\tVTODO not complete; not archived"
+msgstr "\tVTODO ไม่สมบูรณ์ จึงไม่เก็บเข้ากรุ"
+
+#. it is recurrent event
+#: ../src/ical-archive.c:390
+#, c-format
+msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
+msgstr "\tเวียนซ้ำอยู่ ปีที่สิ้นสุด: %04d, เดือน: %02d, วัน: %02d"
+
+#: ../src/ical-archive.c:407
+msgid "Archiving done\n"
+msgstr "เก็บเข้ากรุเรียบร้อยแล้ว\n"
+
+#. PHASE 1: go through base orage file and remove "repeat" shortcuts
+#: ../src/ical-archive.c:423
+msgid "Starting archive removal."
+msgstr "กำลังเริ่มลบกรุ"
+
+#: ../src/ical-archive.c:424
+msgid "\tPHASE 1: reset recurring appointments"
+msgstr "\tขั้นที่ 1: ล้างค่านัดหมายที่มีการเวียนซ้ำ"
+
+#. PHASE 2: go through archive file and add everything back to base orage.
+#. * After that delete the whole arch file
+#: ../src/ical-archive.c:446
+msgid "\tPHASE 2: return archived appointments"
+msgstr "\tขั้นที่ 2: ดึงข้อมูลนัดหมายในกรุกลับคืน"
+
+#: ../src/ical-archive.c:472
+msgid "Archive removal done\n"
+msgstr "ลบกรุเรียบร้อยแล้ว\n"
+
+#: ../src/ical-code.c:972
+msgid "Orage default alarm"
+msgstr "การปลุกเตือนปริยายของ Orage"
+
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "สร้างรายการปลุกเตือนสำหรับแฟ้มหลักของ Orage:"
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "สร้างรายการปลุกเตือนสำหรับแฟ้มต่างระบบ: %s (%s)"
+
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\tสร้างรายการปลุกเตือน %d รายการ ดำเนินการเหตุการณ์ %d รายการ"
+
+#: ../src/ical-code.c:3185
+#, c-format
+msgid ""
+"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
+msgstr "\tพบรายการปลุกเตือน %d รายการ ซึ่งมี %d รายการที่ทำงานอยู่ (ค้นรายการปลุกเตือนที่เวียนซ้ำ %d รายการ)"
+
+#: ../src/ical-expimp.c:123
+msgid "Starting import file preprocessing"
+msgstr "กำลังเริ่มประมวลผลขั้นต้นกับแฟ้มนำเข้า"
+
+#: ../src/ical-expimp.c:158
+msgid "... Patched DCREATED to be CREATED."
+msgstr "... แก้ DCREATED เป็น CREATED แล้ว"
+
+#: ../src/ical-expimp.c:197
+msgid "... Patched timezone to Orage format."
+msgstr "... แก้เขตเวลาให้เป็นรูปแบบของ Orage แล้ว"
+
+#: ../src/ical-expimp.c:206
+msgid "Import file preprocessing done"
+msgstr "ประมวลผลขั้นต้นกับแฟ้มนำเข้าเสร็จแล้ว"
+
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "พบการเปลี่ยนแปลงจากภายนอกในแฟ้ม %s"
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "กำลังปรับข้อมูลรายการปลุกเตือนและปฏิทินเนื่องจากมีการเปลี่ยนแปลงแฟ้มจากภายนอก"
+
+#: ../src/interface.c:271
+msgid "Calendar files"
+msgstr "แฟ้มปฏิทิน"
+
+#: ../src/interface.c:631
+msgid "Current foreign files"
+msgstr "แฟ้มต่างระบบปัจจุบัน"
+
+#: ../src/interface.c:648
+msgid "READ ONLY"
+msgstr "อ่านอย่างเดียว"
+
+#: ../src/interface.c:650
+msgid "READ WRITE"
+msgstr "อ่าน-เขียน"
+
+#: ../src/interface.c:669
+msgid "***** No foreign files *****"
+msgstr "***** ไม่มีแฟ้มต่างระบบ *****"
+
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "เพิ่มแฟ้มต่างระบบไม่สำเร็จ"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage สามารถจัดการแฟ้มต่างระบบได้เพียง 10 แฟ้มเท่านั้น ซึ่งได้ถึงขีดจำกัดแล้ว"
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "ชื่อแฟ้มว่างเปล่า"
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "ชื่อว่างเปล่า"
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "ไม่มีแฟ้มนี้อยู่"
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "มีแฟ้มชื่อเดียวกันอยู่ก่อนแล้วใน Orage"
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "มีชื่อเดียวกันอยู่ก่อนแล้วใน Orage"
+
+#: ../src/interface.c:965
+msgid "Import/export"
+msgstr "นำเข้า/ส่งออก"
+
+#: ../src/interface.c:972
+msgid "Import"
+msgstr "นำเข้า"
+
+#: ../src/interface.c:977
+msgid "Read from file:"
+msgstr "อ่านจากแฟ้ม:"
+
+#: ../src/interface.c:994
+msgid ""
+"Separate filenames with comma(,).\n"
+" NOTE: comma is not valid character in filenames for Orage."
+msgstr "คั่นชื่อแฟ้มด้วยจุลภาค (,)\n หมายเหตุ: ห้ามใช้จุลภาคในชื่อแฟ้มสำหรับ Orage"
+
+#: ../src/interface.c:999
+msgid "Export"
+msgstr "ส่งออก"
+
+#: ../src/interface.c:1004
+msgid "Write to file:"
+msgstr "เขียนลงในแฟ้ม:"
+
+#: ../src/interface.c:1025 ../src/interface.c:1037
+msgid "Select"
+msgstr "เลือก"
+
+#: ../src/interface.c:1028
+msgid "All appointments"
+msgstr "ทุกนัดหมาย"
+
+#: ../src/interface.c:1041
+msgid "Named appointments: "
+msgstr "นัดหมายที่ตั้งชื่อ: "
+
+#: ../src/interface.c:1053
+msgid ""
+"Note that only main file appointments are read.\n"
+"Archived and Foreign events are not exported."
+msgstr "สังเกตว่าจะอ่านเฉพาะนัดหมายในแฟ้มหลักเท่านั้น\nจะไม่ส่งออกเหตุการณ์ที่เก็บเข้ากรุแล้วและเหตุการณ์ต่างระบบ"
+
+#: ../src/interface.c:1056
+msgid ""
+"Note that only main file appointments are read.\n"
+"Foreign events are not exported."
+msgstr "สังเกตว่าจะอ่านเฉพาะนัดหมายในแฟ้มหลักเท่านั้น\nจะไม่ส่งออกเหตุการณ์ต่างระบบ"
+
+#: ../src/interface.c:1059
+msgid "You can easily drag these from event-list window."
+msgstr "คุณสามารถลากมาวางจากหน้าต่างรายการเหตุการณ์ได้"
+
+#: ../src/interface.c:1061
+msgid "Orage appointment UIDs separated by commas."
+msgstr "UID ของนัดหมายของ Orage คั่นด้วยจุลภาค"
+
+#: ../src/interface.c:1067
+msgid "Archive"
+msgstr "กรุ"
+
+#: ../src/interface.c:1075
+#, c-format
+msgid "Archive now (threshold: %d months)"
+msgstr "เก็บเข้ากรุเดี๋ยวนี้ (ขีดเริ่ม: %d เดือน)"
+
+#: ../src/interface.c:1085
+msgid "You can change archive threshold in parameters"
+msgstr "คุณสามารถเปลี่ยนขีดเริ่มการเก็บเข้ากรุได้ในพารามิเตอร์"
+
+#: ../src/interface.c:1092
+msgid "Revert archive now"
+msgstr "ดึงกลับจากกรุเดี๋ยวนี้"
+
+#: ../src/interface.c:1098
+msgid ""
+"Return all archived events into main orage file and remove arch file.\n"
+"This is useful for example when doing export and moving orage\n"
+"appointments to another system."
+msgstr "ดึงเหตุการณ์ทั้งหมดในกรุกลับมาในแฟ้มหลักของ Orage และลบแฟ้มกรุทิ้ง\nการดึงกลับนี้เป็นประโยชน์ในกรณีอย่างเช่นการส่งออกเพื่อย้ายนัดหมายของ Orage\nไปยังระบบอื่น"
+
+#: ../src/interface.c:1109
+msgid "Orage files"
+msgstr "แฟ้ม Orage"
+
+#: ../src/interface.c:1116
+msgid "Orage main calendar file"
+msgstr "แฟ้มปฏิทินหลักของ Orage"
+
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "แฟ้มปัจจุบัน:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "แฟ้มใหม่:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "ตัวเลือกของการกระทำ:"
+
+#: ../src/interface.c:1147 ../src/interface.c:1213
+msgid "Rename"
+msgstr "เปลี่ยนชื่อ"
+
+#: ../src/interface.c:1151
+msgid ""
+"Orage internal file rename only.\n"
+"Does not touch external filesystem at all.\n"
+"New file must exist."
+msgstr "เปลี่ยนชื่อแฟ้มภายในของ Orage เท่านั้น\nจะไม่แตะต้องระบบแฟ้มภายนอกใดๆ\nแฟ้มใหม่ต้องมีอยู่"
+
+#: ../src/interface.c:1155 ../src/interface.c:1218
+msgid "Copy"
+msgstr "คัดลอก"
+
+#: ../src/interface.c:1159
+msgid "Current file is copied and stays unmodified in the old place."
+msgstr "แฟ้มปัจจุบันจะถูกคัดลอกและคงอยู่ที่เดิมโดยไม่มีการเปลี่ยนแปลง"
+
+#: ../src/interface.c:1163 ../src/interface.c:1223
+msgid "Move"
+msgstr "ย้าย"
+
+#: ../src/interface.c:1167
+msgid "Current file is moved and vanishes from the old place."
+msgstr "แฟ้มปัจจุบันจะถูกย้ายและจะหายไปจากที่เดิม"
+
+#: ../src/interface.c:1181
+msgid "Archive file"
+msgstr "แฟ้มกรุ"
+
+#: ../src/interface.c:1245
+msgid "Foreign files"
+msgstr "แฟ้มต่างระบบ"
+
+#: ../src/interface.c:1252
+msgid "Add new foreign file"
+msgstr "เพิ่มแฟ้มต่างระบบแฟ้มใหม่"
+
+#: ../src/interface.c:1257
+msgid "Foreign file:"
+msgstr "แฟ้มต่างระบบ:"
+
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "ชื่อที่ปรากฏ:"
+
+#: ../src/interface.c:1285
+msgid "Read only"
+msgstr "อ่านอย่างเดียว"
+
+#: ../src/interface.c:1292
+msgid ""
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "กำหนดค่านี้ถ้าคุณต้องการแน่ใจว่าแฟ้มนี้จะไม่มีถูก Orage เปลี่ยนแปลงเลย\nสังเกตว่าการเปลี่ยนแปลงแฟ้มต่างระบบอาจทำให้แฟ้มดังกล่าวไม่สามารถเข้ากับเครื่องมือเดิมที่เป็นต้นตอ!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "ชื่อภายในชื่อนี้จะปรากฏต่อผู้ใช้แทนการใช้ชื่อแฟ้ม"
+
+#: ../src/interface.c:1308
+msgid "Exchange data - Orage"
+msgstr "แลกเปลี่ยนข้อมูล - Orage"
+
+#: ../src/main.c:275
+#, c-format
+msgid ""
+"\tThis is %s version %s\n"
+"\n"
+msgstr "\tนี่คือ %s รุ่น %s\n\n"
+
+#: ../src/main.c:277
+#, c-format
+msgid "\tReleased under the terms of the GNU General Public License.\n"
+msgstr "\tเผยแพร่ภายใต้เงื่อนไขของ GNU General Public License\n"
+
+#: ../src/main.c:278
+#, c-format
+msgid "\tCompiled against GTK+-%d.%d.%d, "
+msgstr "\tคอมไพล์กับ GTK+-%d.%d.%d, "
+
+#: ../src/main.c:280
+#, c-format
+msgid "using GTK+-%d.%d.%d.\n"
+msgstr "กำลังใช้ GTK+-%d.%d.%d\n"
+
+#: ../src/main.c:283
+#, c-format
+msgid "\tUsing DBUS for import.\n"
+msgstr "\tใช้ DBUS ในการนำเข้า\n"
+
+#: ../src/main.c:285
+#, c-format
+msgid "\tNot using DBUS. Import works only partially.\n"
+msgstr "\tไม่ได้ใช้ DBUS การนำเข้าจะทำงานได้เพียงบางส่วนเท่านั้น\n"
+
+#: ../src/main.c:288
+#, c-format
+msgid "\tUsing libnotify.\n"
+msgstr "\tใช้ libnotify\n"
+
+#: ../src/main.c:290
+#, c-format
+msgid "\tNot using libnotify.\n"
+msgstr "\tไม่ได้ใช้ libnotify\n"
+
+#: ../src/main.c:293
+#, c-format
+msgid "\tUsing automatic archiving.\n"
+msgstr "\tใช้การทำกรุอัตโนมัติ\n"
+
+#: ../src/main.c:295
+#, c-format
+msgid "\tNot using archiving.\n"
+msgstr "\tไม่ได้ใช้การทำกรุ\n"
+
+#: ../src/main.c:298
+#, c-format
+msgid "\tUsing operating system package libical.\n"
+msgstr "\tใช้แพกเกจ libical ของระบบปฏิบัติการ\n"
+
+#: ../src/main.c:300
+#, c-format
+msgid "\tUsing Orage local version of libical.\n"
+msgstr "\tใช้ libical ฉบับของ Orage เอง\n"
+
+#: ../src/main.c:313
+#, c-format
+msgid ""
+"Usage: orage [options] [files]\n"
+"\n"
+msgstr "วิธีใช้: orage [ตัวเลือก] [แฟ้ม]\n\n"
+
+#: ../src/main.c:314
+#, c-format
+msgid "Options:\n"
+msgstr "ตัวเลือก:\n"
+
+#: ../src/main.c:315
+#, c-format
+msgid "--version (-v) \t\tshow version of orage\n"
+msgstr "--version (-v) \t\tแสดงรุ่นของ orage\n"
+
+#: ../src/main.c:316
+#, c-format
+msgid "--help (-h) \t\tprint this text\n"
+msgstr "--help (-h) \t\tแสดงข้อความนี้\n"
+
+#: ../src/main.c:317
+#, c-format
+msgid "--preferences (-p) \tshow preferences form\n"
+msgstr "--preferences (-p) \tแสดงหน้าต่างปรับแต่ง\n"
+
+#: ../src/main.c:318
+#, c-format
+msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
+msgstr "--toggle (-t) \t\tสั่งแสดง/ซ่อน orage\n"
+
+#: ../src/main.c:319
+#, c-format
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) แฟ้ม [RW] [ชื่อ] \tเพิ่มแฟ้มต่างระบบ\n"
+
+#: ../src/main.c:320
+#, c-format
+msgid "--remove-foreign (-r) file \tremove a foreign file\n"
+msgstr "--remove-foreign (-r) แฟ้ม \tลบแฟ้มต่างระบบ\n"
+
+#: ../src/main.c:321
+#, c-format
+msgid ""
+"--export (-e) file [appointment...] \texport appointments from Orage to "
+"file\n"
+msgstr "--export (-e) แฟ้ม [นัดหมาย...] \tส่งออกนัดหมายจาก Orage ลงในแฟ้ม\n"
+
+#: ../src/main.c:323
+#, c-format
+msgid "files=ical files to load into orage\n"
+msgstr "files=แฟ้ม ical ที่จะโหลดเข้า orage\n"
+
+#: ../src/main.c:325
+#, c-format
+msgid "\tdbus not included in orage. \n"
+msgstr "\tไม่ได้รวม dbus เข้าใน orage\n"
+
+#: ../src/main.c:326
+#, c-format
+msgid ""
+"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
+"when starting orage \n"
+msgstr "\tถ้าไม่มี dbus [แฟ้ม] และตัวเลือกเกี่ยวกับแฟ้มต่างระบบ (-a & -r) จะสามารถใช้ได้ขณะเปิดใช้ Orage เท่านั้น\n"
+
+#: ../src/main.c:535
+#, c-format
+msgid ""
+"\n"
+"Unknown option %s\n"
+"\n"
+msgstr "\nไม่รู้จักตัวเลือก %s\n\n"
+
+#: ../src/mainbox.c:305
+msgid "_Exchange data"
+msgstr "แ_ลกเปลี่ยนข้อมูล"
+
+#. Edit menu
+#: ../src/mainbox.c:316
+msgid "_Edit"
+msgstr "แ_ก้ไข"
+
+#: ../src/mainbox.c:326
+msgid "View selected _date"
+msgstr "ดู_วันที่เลือก"
+
+#: ../src/mainbox.c:329
+msgid "View selected _week"
+msgstr "ดู_สัปดาห์ที่เลือก"
+
+#: ../src/mainbox.c:335
+msgid "Select _Today"
+msgstr "เลือกวัน_นี้"
+
+#: ../src/mainbox.c:341
+msgid "Show _Globaltime"
+msgstr "แสดงเวลา_สากล"
+
+#. Help menu
+#: ../src/mainbox.c:345
+msgid "_Help"
+msgstr "_วิธีใช้"
+
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "ไม่ได้กำหนดชื่อเรื่อง"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr " สถานที่: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n หมายเหตุ:\n%s"
+
+#: ../src/mainbox.c:489
+msgid "Never"
+msgstr "ไม่มี"
+
+#: ../src/mainbox.c:495
+#, c-format
+msgid ""
+"Title: %s\n"
+"%s Start:\t%s\n"
+" Due:\t%s\n"
+" Done:\t%s%s"
+msgstr "เรื่อง: %s\n%s เริ่ม:\t%s\n กำหนดเสร็จ:\t%s\n เสร็จ:\t%s%s"
+
+#: ../src/mainbox.c:503
+#, c-format
+msgid ""
+"Title: %s\n"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "เรื่อง: %s\n%s เริ่ม:\t%s\n จบ:\t%s%s"
+
+#: ../src/mainbox.c:613
+msgid "<b>To do:</b>"
+msgstr "<b>สิ่งที่จะทำ:</b>"
+
+#: ../src/mainbox.c:649
+#, c-format
+msgid "<b>Events for %s:</b>"
+msgstr "<b>เหตุการณ์สำหรับ %s:</b>"
+
+#: ../src/mainbox.c:660
+#, c-format
+msgid "<b>Events for %s - %s:</b>"
+msgstr "<b>เหตุการณ์สำหรับ %s - %s:</b>"
+
+#: ../src/parameters.c:492
+msgid "Main settings"
+msgstr "ค่าตั้งหลักๆ"
+
+#: ../src/parameters.c:498
+msgid "Timezone"
+msgstr "เขตเวลา"
+
+#: ../src/parameters.c:513
+msgid "You should always define your local timezone."
+msgstr "คุณควรกำหนดเขตเวลาท้องถิ่นของคุณเสมอ"
+
+#: ../src/parameters.c:521
+msgid "Archive threshold (months)"
+msgstr "ขีดเริ่มการเก็บเข้ากรุ (เดือน)"
+
+#: ../src/parameters.c:531
+msgid "(0 = no archiving)"
+msgstr "(0 = ไม่เก็บเข้ากรุ)"
+
+#: ../src/parameters.c:534
+msgid "Archiving is used to save time and space when handling events."
+msgstr "การทำกรุช่วยประหยัดเวลาและเนื้อที่ในการจัดการเหตุการณ์ต่างๆ"
+
+#: ../src/parameters.c:542
+msgid "Sound command"
+msgstr "คำสั่งเล่นเสียง"
+
+#: ../src/parameters.c:557
+msgid "This command is given to shell to make sound in alarms."
+msgstr "คำสั่งนี้จะส่งให้เชลล์เรียกทำงานเพื่อเล่นเสียงในการปลุกเตือน"
+
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "หน้าต่างปฏิทิน"
+
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "รายละเอียดการแสดงปฏิทิน"
+
+#: ../src/parameters.c:609
+msgid "Show borders"
+msgstr "แสดงกรอบหน้าต่าง"
+
+#: ../src/parameters.c:614
+msgid "Show menu"
+msgstr "แสดงเมนู"
+
+#: ../src/parameters.c:622
+msgid "Show day names"
+msgstr "แสดงชื่อวัน"
+
+#: ../src/parameters.c:627
+msgid "Show week numbers"
+msgstr "แสดงสัปดาห์ที่"
+
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "แสดงเดือนและปี"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "กล่องข้อมูลปฏิทิน"
+
+#: ../src/parameters.c:660
+msgid "Show todo list"
+msgstr "แสดงรายการสิ่งที่จะทำ"
+
+#: ../src/parameters.c:667
+msgid "Number of days to show in event window"
+msgstr "จำนวนวันที่แสดงในหน้าต่างเหตุการณ์"
+
+#: ../src/parameters.c:673
+msgid "0 = do not show event list at all"
+msgstr "0 = ไม่แสดงรายการเหตุการณ์เลย"
+
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "การปรากฏของปฏิทิน"
+
+#: ../src/parameters.c:691
+msgid "Show on all desktops"
+msgstr "แสดงบนทุกพื้นโต๊ะ"
+
+#: ../src/parameters.c:696
+msgid "Keep on top"
+msgstr "วางไว้บนสุด"
+
+#: ../src/parameters.c:704
+msgid "Show in taskbar"
+msgstr "แสดงในแถบงาน"
+
+#: ../src/parameters.c:709
+msgid "Show in pager"
+msgstr "แสดงในเครื่องมือสลับพื้นที่ทำงาน"
+
+#: ../src/parameters.c:717
+msgid "Show in systray"
+msgstr "แสดงในถาดระบบ"
+
+#: ../src/parameters.c:738
+msgid "Calendar start"
+msgstr "การเริ่มเปิดปฏิทิน"
+
+#: ../src/parameters.c:743
+msgid "Show"
+msgstr "แสดง"
+
+#: ../src/parameters.c:755
+msgid "Hide"
+msgstr "ซ่อน"
+
+#: ../src/parameters.c:767
+msgid "Minimized"
+msgstr "ย่อเก็บ"
+
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "ขณะเปิดหน้าต่างปฏิทิน"
+
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "เลือกวันนี้"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "เลือกวันที่ที่เลือกไว้ครั้งก่อน"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "เมื่อดับเบิลคลิกที่วันในปฏิทินจะแสดง"
+
+#: ../src/parameters.c:828
+msgid "Days view"
+msgstr "ข้อมูลรายวัน"
+
+#: ../src/parameters.c:840
+msgid "Event list"
+msgstr "รายการเหตุการณ์"
+
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "ค่าตั้งเพิ่มเติม"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "หน้าต่างรายการเหตุการณ์"
+
+#: ../src/parameters.c:874
+msgid "Number of extra days to show in event list"
+msgstr "จำนวนวันที่จะแสดงเพิ่มในรายการเหตุการณ์"
+
+#: ../src/parameters.c:883
+msgid ""
+"This is just the default value, you can change it in the actual eventlist "
+"window."
+msgstr "นี่เป็นค่าปริยายเท่านั้น คุณสามารถเปลี่ยนจำนวนวันจริงได้ในหน้าต่างรายการเหตุการณ์"
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "แสดงเฉพาะครั้งแรกของเหตุการณ์ที่เวียนซ้ำ"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "วันแรกโดยปริยายของหน้าต่างข้อมูลรายวัน"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "วันแรกของสัปดาห์"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "วันที่เลือก"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "ใช้ไอคอนถาดแบบพลวัต"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "ใช้ไอคอนแบบพลวัต"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "ไอคอนแบบพลวัตจะแสดงวันที่และเดือนปัจจุบัน"
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
+msgid "Use wakeup timer"
+msgstr "ใช้การตั้งเวลาตื่น"
+
+#: ../src/parameters.c:973
+msgid ""
+"Use this timer if Orage has problems waking up properly after suspend or "
+"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "ใช้การตั้งเวลานี้ถ้า Orage มีปัญหาในการตื่นหลังจากพักเครื่องหรือจำศีลเครื่อง (ตัวอย่างเช่น ไอคอนถาดไม่ปรับตามหรือรายการปลุกเตือนไม่ยอมปลุก)"
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "การปลุกเตือนด้วยภาพโดยปริยายสำหรับแฟ้มต่างระบบ"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "หน้าต่าง Orage"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "การแจ้งเหตุ"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "จบโปรแกรมเสมอเมื่อสั่งปิด"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "จบโปรแกรมเสมอ"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "โดยปกติ Orage จะยังคงเปิดทำงานเบื้องหลังอยู่เมื่อสั่งปิด ตัวเลือกนี้จะเปลี่ยนให้ Orage จบการทำงานและไม่ทำงานเบื้องหลังเมื่อสั่งปิด"
+
+#: ../src/parameters.c:1045
+msgid "Orage Preferences"
+msgstr "ปรับแต่ง Orage"
+
+#: ../src/parameters.c:1157
+msgid "First Orage start. Searching default timezone."
+msgstr "เริ่มเปิด Orage ครั้งแรก กำลังค้นหาเขตเวลาปริยาย"
+
+#: ../src/parameters.c:1176
+#, c-format
+msgid "Default timezone set to %s."
+msgstr "เขตเวลาปริยายถูกกำหนดเป็น %s"
+
+#: ../src/parameters.c:1179
+msgid "Default timezone not found, please, set it manually."
+msgstr "ไม่พบเขตเวลาปริยาย กรุณากำหนดเอง"
+
+#: ../src/reminder.c:562
+msgid "Reminder "
+msgstr "แจ้งเตือน "
+
+#: ../src/reminder.c:591
+msgid "Open"
+msgstr "เปิด"
+
+#: ../src/reminder.c:719
+msgid "Reminder - Orage"
+msgstr "แจ้งเตือน - Orage"
+
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "เลื่อน"
+
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
+msgstr "เตือนฉันอีกครั้งหลังเวลาที่ระบุ"
+
+#: ../src/reminder.c:1091
+msgid "Next active alarms:"
+msgstr "การปลุกเตือนถัดไป:"
+
+#: ../src/reminder.c:1145
+#, c-format
+msgid ""
+"\n"
+"%02d d %02d h %02d min to: %s"
+msgstr "\nอีก %02d วัน %02d ชม. %02d นาที: %s"
+
+#: ../src/reminder.c:1154
+#, c-format
+msgid ""
+"\n"
+"No active alarms found"
+msgstr "\nไม่พบรายการปลุกที่รอปลุก"
+
+#: ../src/timezone_names.c:36
+msgid "Africa"
+msgstr "แอฟริกา"
+
+#: ../src/timezone_names.c:37
+msgid "Africa/Abidjan"
+msgstr "แอฟริกา/อาบิดจัน"
+
+#: ../src/timezone_names.c:38
+msgid "Africa/Accra"
+msgstr "แอฟริกา/อักกรา"
+
+#: ../src/timezone_names.c:39
+msgid "Africa/Addis_Ababa"
+msgstr "แอฟริกา/แอดดิสอาบาบา"
+
+#: ../src/timezone_names.c:40
+msgid "Africa/Algiers"
+msgstr "แอฟริกา/แอลเจียร์"
+
+#: ../src/timezone_names.c:41
+msgid "Africa/Asmara"
+msgstr "แอฟริกา/แอสมารา"
+
+#: ../src/timezone_names.c:42
+msgid "Africa/Asmera"
+msgstr "แอฟริกา/แอสมารา"
+
+#: ../src/timezone_names.c:43
+msgid "Africa/Bamako"
+msgstr "แอฟริกา/บามาโก"
+
+#: ../src/timezone_names.c:44
+msgid "Africa/Bangui"
+msgstr "แอฟริกา/บังกี"
+
+#: ../src/timezone_names.c:45
+msgid "Africa/Banjul"
+msgstr "แอฟริกา/บันจูล"
+
+#: ../src/timezone_names.c:46
+msgid "Africa/Bissau"
+msgstr "แอฟริกา/บิสเซา"
+
+#: ../src/timezone_names.c:47
+msgid "Africa/Blantyre"
+msgstr "แอฟริกา/แบลนไทร์"
+
+#: ../src/timezone_names.c:48
+msgid "Africa/Brazzaville"
+msgstr "แอฟริกา/บราซซาวิล"
+
+#: ../src/timezone_names.c:49
+msgid "Africa/Bujumbura"
+msgstr "แอฟริกา/บูจุมบูรา"
+
+#: ../src/timezone_names.c:50
+msgid "Africa/Cairo"
+msgstr "แอฟริกา/ไคโร"
+
+#: ../src/timezone_names.c:51
+msgid "Africa/Casablanca"
+msgstr "แอฟริกา/คาซาบลังกา"
+
+#: ../src/timezone_names.c:52
+msgid "Africa/Ceuta"
+msgstr "แอฟริกา/เซวตา"
+
+#: ../src/timezone_names.c:53
+msgid "Africa/Conakry"
+msgstr "แอฟริกา/โกนากรี"
+
+#: ../src/timezone_names.c:54
+msgid "Africa/Dakar"
+msgstr "แอฟริกา/ดาการ์"
+
+#: ../src/timezone_names.c:55
+msgid "Africa/Dar_es_Salaam"
+msgstr "แอฟริกา/ดาร์-เอส-ซาลาม"
+
+#: ../src/timezone_names.c:56
+msgid "Africa/Djibouti"
+msgstr "แอฟริกา/จิบูตี"
+
+#: ../src/timezone_names.c:57
+msgid "Africa/Douala"
+msgstr "แอฟริกา/ดูอาลา"
+
+#: ../src/timezone_names.c:58
+msgid "Africa/El_Aaiun"
+msgstr ""
+
+#: ../src/timezone_names.c:59
+msgid "Africa/Freetown"
+msgstr "แอฟริกา/ฟรีทาวน์"
+
+#: ../src/timezone_names.c:60
+msgid "Africa/Gaborone"
+msgstr "แอฟริกา/กาโบโรเน"
+
+#: ../src/timezone_names.c:61
+msgid "Africa/Harare"
+msgstr "แอฟริกา/ฮาราเร"
+
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "แอฟริกา/จูบา"
+
+#: ../src/timezone_names.c:63
+msgid "Africa/Johannesburg"
+msgstr "แอฟริกา/โจฮันเนสเบิร์ก"
+
+#: ../src/timezone_names.c:64
+msgid "Africa/Kampala"
+msgstr "แอฟริกา/กัมปาลา"
+
+#: ../src/timezone_names.c:65
+msgid "Africa/Khartoum"
+msgstr "แอฟริกา/คาร์ทูม"
+
+#: ../src/timezone_names.c:66
+msgid "Africa/Kigali"
+msgstr "แอฟริกา/คิกาลี"
+
+#: ../src/timezone_names.c:67
+msgid "Africa/Kinshasa"
+msgstr "แอฟริกา/กินชาซา"
+
+#: ../src/timezone_names.c:68
+msgid "Africa/Lagos"
+msgstr "แอฟริกา/ลากอส"
+
+#: ../src/timezone_names.c:69
+msgid "Africa/Libreville"
+msgstr "แอฟริกา/ลีเบรอวิล"
+
+#: ../src/timezone_names.c:70
+msgid "Africa/Lome"
+msgstr "แอฟริกา/โลเม"
+
+#: ../src/timezone_names.c:71
+msgid "Africa/Luanda"
+msgstr "แอฟริกา/ลูอันดา"
+
+#: ../src/timezone_names.c:72
+msgid "Africa/Lubumbashi"
+msgstr "แอฟริกา/ลูบุมบาชี"
+
+#: ../src/timezone_names.c:73
+msgid "Africa/Lusaka"
+msgstr "แอฟริกา/ลูซากา"
+
+#: ../src/timezone_names.c:74
+msgid "Africa/Malabo"
+msgstr "แอฟริกา/มาลาโบ"
+
+#: ../src/timezone_names.c:75
+msgid "Africa/Maputo"
+msgstr "แอฟริกา/มาปูโต"
+
+#: ../src/timezone_names.c:76
+msgid "Africa/Maseru"
+msgstr "แอฟริกา/มาเซรู"
+
+#: ../src/timezone_names.c:77
+msgid "Africa/Mbabane"
+msgstr "แอฟริกา/อัมบาบาเน"
+
+#: ../src/timezone_names.c:78
+msgid "Africa/Mogadishu"
+msgstr "แอฟริกา/โมกาดิชู"
+
+#: ../src/timezone_names.c:79
+msgid "Africa/Monrovia"
+msgstr "แอฟริกา/มันโรเวีย"
+
+#: ../src/timezone_names.c:80
+msgid "Africa/Nairobi"
+msgstr "แอฟริกา/ไนโรบี"
+
+#: ../src/timezone_names.c:81
+msgid "Africa/Ndjamena"
+msgstr "แอฟริกา/อึนจาเมนา"
+
+#: ../src/timezone_names.c:82
+msgid "Africa/Niamey"
+msgstr "แอฟริกา/นีอาเม"
+
+#: ../src/timezone_names.c:83
+msgid "Africa/Nouakchott"
+msgstr "แอฟริกา/นูแอกชอต"
+
+#: ../src/timezone_names.c:84
+msgid "Africa/Ouagadougou"
+msgstr "แอฟริกา/วากาดูกู"
+
+#: ../src/timezone_names.c:85
+msgid "Africa/Porto-Novo"
+msgstr "แอฟริกา/ปอร์โต-โนโว"
+
+#: ../src/timezone_names.c:86
+msgid "Africa/Sao_Tome"
+msgstr "แอฟริกา/เซาตูเม"
+
+#: ../src/timezone_names.c:87
+msgid "Africa/Timbuktu"
+msgstr "แอฟริกา/ทิมบักตู"
+
+#: ../src/timezone_names.c:88
+msgid "Africa/Tripoli"
+msgstr "แอฟริกา/ตริโปลี"
+
+#: ../src/timezone_names.c:89
+msgid "Africa/Tunis"
+msgstr "แอฟริกา/ตูนิส"
+
+#: ../src/timezone_names.c:90
+msgid "Africa/Windhoek"
+msgstr "แอฟริกา/วินด์ฮุก"
+
+#: ../src/timezone_names.c:91
+msgid "America"
+msgstr "อเมริกา"
+
+#: ../src/timezone_names.c:92
+msgid "America/Adak"
+msgstr ""
+
+#: ../src/timezone_names.c:93
+msgid "America/Anchorage"
+msgstr "อเมริกา/แองเคอเรจ"
+
+#: ../src/timezone_names.c:94
+msgid "America/Anguilla"
+msgstr "อเมริกา/แองกวิลลา"
+
+#: ../src/timezone_names.c:95
+msgid "America/Antigua"
+msgstr "อเมริกา/แอนติกา"
+
+#: ../src/timezone_names.c:96
+msgid "America/Araguaina"
+msgstr "อเมริกา/อาราไกวย์นา"
+
+#: ../src/timezone_names.c:97
+msgid "America/Argentina/Buenos_Aires"
+msgstr "อเมริกา/อาร์เจนตินา/บัวโนสไอเรส"
+
+#: ../src/timezone_names.c:98
+msgid "America/Argentina/Catamarca"
+msgstr ""
+
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr ""
+
+#: ../src/timezone_names.c:100
+msgid "America/Argentina/Cordoba"
+msgstr "อเมริกา/อาร์เจนตินา/กอร์โดบา"
+
+#: ../src/timezone_names.c:101
+msgid "America/Argentina/Jujuy"
+msgstr ""
+
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "อเมริกา/อาร์เจนตินา/ลารีโอฮา"
+
+#: ../src/timezone_names.c:103
+msgid "America/Argentina/Mendoza"
+msgstr "อเมริกา/อาร์เจนตินา/เมนโดซา"
+
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "อเมริกา/อาร์เจนตินา/รีโอกาเยโกส"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "อเมริกา/อาร์เจนตินา/ซัลตา"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "อเมริกา/อาร์เจนตินา/ซันฮวน"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "อเมริกา/อาร์เจนตินา/ซันลุยส์"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr ""
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr ""
+
+#: ../src/timezone_names.c:110
+msgid "America/Aruba"
+msgstr "อเมริกา/อารูบา"
+
+#: ../src/timezone_names.c:111
+msgid "America/Asuncion"
+msgstr "อเมริกา/อะซุนซิออง"
+
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "อเมริกา/แอติโคคัน"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr ""
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "อเมริกา/บาเยีย"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr ""
+
+#: ../src/timezone_names.c:116
+msgid "America/Barbados"
+msgstr "อเมริกา/บาร์เบโดส"
+
+#: ../src/timezone_names.c:117
+msgid "America/Belem"
+msgstr "อเมริกา/เบเลง"
+
+#: ../src/timezone_names.c:118
+msgid "America/Belize"
+msgstr "อเมริกา/เบลีซ"
+
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr ""
+
+#: ../src/timezone_names.c:120
+msgid "America/Boa_Vista"
+msgstr "อเมริกา/บัววีชตา"
+
+#: ../src/timezone_names.c:121
+msgid "America/Bogota"
+msgstr "อเมริกา/โบโกตา"
+
+#: ../src/timezone_names.c:122
+msgid "America/Boise"
+msgstr "อเมริกา/บอยซี"
+
+#: ../src/timezone_names.c:123
+msgid "America/Buenos_Aires"
+msgstr "อเมริกา/บัวโนสไอเรส"
+
+#: ../src/timezone_names.c:124
+msgid "America/Cambridge_Bay"
+msgstr "อเมริกา/เคมบริดจ์เบย์"
+
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "อเมริกา/กัมปูกรันดี"
+
+#: ../src/timezone_names.c:126
+msgid "America/Cancun"
+msgstr "อเมริกา/กันกุน"
+
+#: ../src/timezone_names.c:127
+msgid "America/Caracas"
+msgstr "อเมริกา/การากัส"
+
+#: ../src/timezone_names.c:128
+msgid "America/Catamarca"
+msgstr ""
+
+#: ../src/timezone_names.c:129
+msgid "America/Cayenne"
+msgstr "อเมริกา/กาแยน"
+
+#: ../src/timezone_names.c:130
+msgid "America/Cayman"
+msgstr "อเมริกา/เคย์แมน"
+
+#: ../src/timezone_names.c:131
+msgid "America/Chicago"
+msgstr "อเมริกา/ชิคาโก"
+
+#: ../src/timezone_names.c:132
+msgid "America/Chihuahua"
+msgstr "อเมริกา/ชีวาวา"
+
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "อเมริกา/คอรัลฮาร์เบอร์"
+
+#: ../src/timezone_names.c:134
+msgid "America/Cordoba"
+msgstr "อเมริกา/กอร์โดบา"
+
+#: ../src/timezone_names.c:135
+msgid "America/Costa_Rica"
+msgstr "อเมริกา/คอสตาริกา"
+
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "อเมริกา/เครสตัน"
+
+#: ../src/timezone_names.c:137
+msgid "America/Cuiaba"
+msgstr "อเมริกา/กุยาบา"
+
+#: ../src/timezone_names.c:138
+msgid "America/Curacao"
+msgstr "อเมริกา/กูราเซา"
+
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: ../src/timezone_names.c:140
+msgid "America/Dawson"
+msgstr "อเมริกา/ดอว์สัน"
+
+#: ../src/timezone_names.c:141
+msgid "America/Dawson_Creek"
+msgstr ""
+
+#: ../src/timezone_names.c:142
+msgid "America/Denver"
+msgstr "อเมริกา/เดนเวอร์"
+
+#: ../src/timezone_names.c:143
+msgid "America/Detroit"
+msgstr "อเมริกา/ดีทรอยต์"
+
+#: ../src/timezone_names.c:144
+msgid "America/Dominica"
+msgstr "อเมริกา/โดมินิกา"
+
+#: ../src/timezone_names.c:145
+msgid "America/Edmonton"
+msgstr "อเมริกา/เอดมันตัน"
+
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "อเมริกา/เอนเซนาดา"
+
+#: ../src/timezone_names.c:147
+msgid "America/Eirunepe"
+msgstr ""
+
+#: ../src/timezone_names.c:148
+msgid "America/El_Salvador"
+msgstr "อเมริกา/เอลซัลวาดอร์"
+
+#: ../src/timezone_names.c:149
+msgid "America/Fortaleza"
+msgstr "อเมริกา/ฟอร์ตาเลซา"
+
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "อเมริกา/ฟอร์ตเวย์น"
+
+#: ../src/timezone_names.c:151
+msgid "America/Glace_Bay"
+msgstr ""
+
+#: ../src/timezone_names.c:152
+msgid "America/Godthab"
+msgstr "อเมริกา/กอตฮอบ"
+
+#: ../src/timezone_names.c:153
+msgid "America/Goose_Bay"
+msgstr ""
+
+#: ../src/timezone_names.c:154
+msgid "America/Grand_Turk"
+msgstr "อเมริกา/แกรนด์เติร์ก"
+
+#: ../src/timezone_names.c:155
+msgid "America/Grenada"
+msgstr "อเมริกา/เกรเนดา"
+
+#: ../src/timezone_names.c:156
+msgid "America/Guadeloupe"
+msgstr "อเมริกา/กวาเดอลูป"
+
+#: ../src/timezone_names.c:157
+msgid "America/Guatemala"
+msgstr "อเมริกา/กัวเตมาลา"
+
+#: ../src/timezone_names.c:158
+msgid "America/Guayaquil"
+msgstr "อเมริกา/ไกวย์อากิล"
+
+#: ../src/timezone_names.c:159
+msgid "America/Guyana"
+msgstr "อเมริกา/กายอานา"
+
+#: ../src/timezone_names.c:160
+msgid "America/Halifax"
+msgstr "อเมริกา/แฮลิแฟกซ์"
+
+#: ../src/timezone_names.c:161
+msgid "America/Havana"
+msgstr "อเมริกา/ฮาวานา"
+
+#: ../src/timezone_names.c:162
+msgid "America/Hermosillo"
+msgstr "อเมริกา/เอร์โมซีโย"
+
+#: ../src/timezone_names.c:163
+msgid "America/Indiana/Indianapolis"
+msgstr "อเมริกา/อินดีแอนา/อินเดียแนโพลิส"
+
+#: ../src/timezone_names.c:164
+msgid "America/Indiana/Knox"
+msgstr "อเมริกา/อินดีแอนา/นอกซ์"
+
+#: ../src/timezone_names.c:165
+msgid "America/Indiana/Marengo"
+msgstr ""
+
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "อเมริกา/อินดีแอนา/ปีเตอร์สเบิร์ก"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr ""
+
+#: ../src/timezone_names.c:168
+msgid "America/Indiana/Vevay"
+msgstr ""
+
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "อเมริกา/อินดีแอนา/วินเซนส์"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr ""
+
+#: ../src/timezone_names.c:171
+msgid "America/Indianapolis"
+msgstr "อเมริกา/อินเดียแนโพลิส"
+
+#: ../src/timezone_names.c:172
+msgid "America/Inuvik"
+msgstr "อเมริกา/อินูวิก"
+
+#: ../src/timezone_names.c:173
+msgid "America/Iqaluit"
+msgstr "อเมริกา/อีกวาลิต"
+
+#: ../src/timezone_names.c:174
+msgid "America/Jamaica"
+msgstr "อเมริกา/จาเมกา"
+
+#: ../src/timezone_names.c:175
+msgid "America/Jujuy"
+msgstr ""
+
+#: ../src/timezone_names.c:176
+msgid "America/Juneau"
+msgstr "อเมริกา/จูโน"
+
+#: ../src/timezone_names.c:177
+msgid "America/Kentucky/Louisville"
+msgstr "อเมริกา/เคนทักกี/ลุยสวิล"
+
+#: ../src/timezone_names.c:178
+msgid "America/Kentucky/Monticello"
+msgstr "อเมริกา/เคนทักกี/มอนติเชลโล"
+
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "America/นอกซ์-IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr ""
+
+#: ../src/timezone_names.c:181
+msgid "America/La_Paz"
+msgstr "อเมริกา/ลาปาซ"
+
+#: ../src/timezone_names.c:182
+msgid "America/Lima"
+msgstr "อเมริกา/ลิมา"
+
+#: ../src/timezone_names.c:183
+msgid "America/Los_Angeles"
+msgstr "อเมริกา/ลอสแองเจลีส"
+
+#: ../src/timezone_names.c:184
+msgid "America/Louisville"
+msgstr "อเมริกา/ลุยสวิล"
+
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr ""
+
+#: ../src/timezone_names.c:186
+msgid "America/Maceio"
+msgstr "อเมริกา/มาเซโอ"
+
+#: ../src/timezone_names.c:187
+msgid "America/Managua"
+msgstr "อเมริกา/มานากัว"
+
+#: ../src/timezone_names.c:188
+msgid "America/Manaus"
+msgstr "อเมริกา/มาเนาส์"
+
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "อเมริกา/มาริกอต"
+
+#: ../src/timezone_names.c:190
+msgid "America/Martinique"
+msgstr "อเมริกา/มาร์ตินีก"
+
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "อเมริกา/มาตาโมโรส"
+
+#: ../src/timezone_names.c:192
+msgid "America/Mazatlan"
+msgstr "อเมริกา/มาซาตลาน"
+
+#: ../src/timezone_names.c:193
+msgid "America/Mendoza"
+msgstr "อเมริกา/เมนโดซา"
+
+#: ../src/timezone_names.c:194
+msgid "America/Menominee"
+msgstr "อเมริกา/มีนอมินี"
+
+#: ../src/timezone_names.c:195
+msgid "America/Merida"
+msgstr "อเมริกา/เมรีดา"
+
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr ""
+
+#: ../src/timezone_names.c:197
+msgid "America/Mexico_City"
+msgstr "อเมริกา/เม็กซิโกซิตี"
+
+#: ../src/timezone_names.c:198
+msgid "America/Miquelon"
+msgstr "อเมริกา/มีเกอลง"
+
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "อเมริกา/มองก์ตัน"
+
+#: ../src/timezone_names.c:200
+msgid "America/Monterrey"
+msgstr "อเมริกา/มอนเตร์เรย์"
+
+#: ../src/timezone_names.c:201
+msgid "America/Montevideo"
+msgstr "อเมริกา/มอนเตวิเดโอ"
+
+#: ../src/timezone_names.c:202
+msgid "America/Montreal"
+msgstr "อเมริกา/มอนทรีออล"
+
+#: ../src/timezone_names.c:203
+msgid "America/Montserrat"
+msgstr "อเมริกา/มอนต์เซอร์รัต"
+
+#: ../src/timezone_names.c:204
+msgid "America/Nassau"
+msgstr "อเมริกา/แนสซอ"
+
+#: ../src/timezone_names.c:205
+msgid "America/New_York"
+msgstr "อเมริกา/นิวยอร์ก"
+
+#: ../src/timezone_names.c:206
+msgid "America/Nipigon"
+msgstr "อเมริกา/นิพิกอน"
+
+#: ../src/timezone_names.c:207
+msgid "America/Nome"
+msgstr "อเมริกา/โนม"
+
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr ""
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "อเมริกา/นอร์ทดาโคตา/นิวเซเลม"
+
+#: ../src/timezone_names.c:211
+msgid "America/Noronha"
+msgstr ""
+
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "อเมริกา/โอฮินากา"
+
+#: ../src/timezone_names.c:213
+msgid "America/Panama"
+msgstr "อเมริกา/ปานามา"
+
+#: ../src/timezone_names.c:214
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: ../src/timezone_names.c:215
+msgid "America/Paramaribo"
+msgstr "อเมริกา/ปารามาริโบ"
+
+#: ../src/timezone_names.c:216
+msgid "America/Phoenix"
+msgstr "อเมริกา/ฟินิกซ์"
+
+#: ../src/timezone_names.c:217
+msgid "America/Port-au-Prince"
+msgstr "อเมริกา/ปอร์โตแปรงซ์"
+
+#: ../src/timezone_names.c:218
+msgid "America/Port_of_Spain"
+msgstr "อเมริกา/พอร์ต-ออฟ-สเปน"
+
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "อเมริกา/ปอร์ตูอาเกร"
+
+#: ../src/timezone_names.c:220
+msgid "America/Porto_Velho"
+msgstr "อเมริกา/ปอร์ตูเวลโย"
+
+#: ../src/timezone_names.c:221
+msgid "America/Puerto_Rico"
+msgstr "อเมริกา/เปอร์โตริโก"
+
+#: ../src/timezone_names.c:222
+msgid "America/Rainy_River"
+msgstr ""
+
+#: ../src/timezone_names.c:223
+msgid "America/Rankin_Inlet"
+msgstr "อเมริกา/แรงคินอินเลต"
+
+#: ../src/timezone_names.c:224
+msgid "America/Recife"
+msgstr "อเมริกา/เรซีเฟ"
+
+#: ../src/timezone_names.c:225
+msgid "America/Regina"
+msgstr "อเมริกา/ริไจนา"
+
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "อเมริกา/รีโซลูต"
+
+#: ../src/timezone_names.c:227
+msgid "America/Rio_Branco"
+msgstr "อเมริกา/รีโอบรังโก"
+
+#: ../src/timezone_names.c:228
+msgid "America/Rosario"
+msgstr "อเมริกา/โรซารีโอ"
+
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr ""
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "อเมริกา/ซันตาเร็ง"
+
+#: ../src/timezone_names.c:231
+msgid "America/Santiago"
+msgstr "อเมริกา/ซันติอาโก"
+
+#: ../src/timezone_names.c:232
+msgid "America/Santo_Domingo"
+msgstr "อเมริกา/ซันโตโดมิงโก"
+
+#: ../src/timezone_names.c:233
+msgid "America/Sao_Paulo"
+msgstr "อเมริกา/เซาเปาลู"
+
+#: ../src/timezone_names.c:234
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: ../src/timezone_names.c:235
+msgid "America/Shiprock"
+msgstr ""
+
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "อเมริกา/ซิตกา"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr ""
+
+#: ../src/timezone_names.c:238
+msgid "America/St_Johns"
+msgstr "อเมริกา/เซนต์จอนส์"
+
+#: ../src/timezone_names.c:239
+msgid "America/St_Kitts"
+msgstr "อเมริกา/เซนต์คิต"
+
+#: ../src/timezone_names.c:240
+msgid "America/St_Lucia"
+msgstr "อเมริกา/เซนต์ลูเซีย"
+
+#: ../src/timezone_names.c:241
+msgid "America/St_Thomas"
+msgstr ""
+
+#: ../src/timezone_names.c:242
+msgid "America/St_Vincent"
+msgstr "อเมริกา/เซนต์วินเซนต์"
+
+#: ../src/timezone_names.c:243
+msgid "America/Swift_Current"
+msgstr "อเมริกา/สวิฟต์เคอร์เรนต์"
+
+#: ../src/timezone_names.c:244
+msgid "America/Tegucigalpa"
+msgstr "อเมริกา/เตกูซิกัลปา"
+
+#: ../src/timezone_names.c:245
+msgid "America/Thule"
+msgstr ""
+
+#: ../src/timezone_names.c:246
+msgid "America/Thunder_Bay"
+msgstr "อเมริกา/ทันเดอร์เบย์"
+
+#: ../src/timezone_names.c:247
+msgid "America/Tijuana"
+msgstr "อเมริกา/ตีฮัวนา"
+
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "อเมริกา/โทรอนโต"
+
+#: ../src/timezone_names.c:249
+msgid "America/Tortola"
+msgstr ""
+
+#: ../src/timezone_names.c:250
+msgid "America/Vancouver"
+msgstr "อเมริกา/แวนคูเวอร์"
+
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "อเมริกา/เวอร์จิน"
+
+#: ../src/timezone_names.c:252
+msgid "America/Whitehorse"
+msgstr "อเมริกา/ไวต์ฮอร์ส"
+
+#: ../src/timezone_names.c:253
+msgid "America/Winnipeg"
+msgstr "อเมริกา/วินนิเพก"
+
+#: ../src/timezone_names.c:254
+msgid "America/Yakutat"
+msgstr "อเมริกา/แยคุแทต"
+
+#: ../src/timezone_names.c:255
+msgid "America/Yellowknife"
+msgstr "อเมริกา/เยลโลว์ไนฟ์"
+
+#: ../src/timezone_names.c:256
+msgid "Antarctica"
+msgstr "แอนตาร์กติกา"
+
+#: ../src/timezone_names.c:257
+msgid "Antarctica/Casey"
+msgstr "แอนตาร์กติกา/เคซีย์"
+
+#: ../src/timezone_names.c:258
+msgid "Antarctica/Davis"
+msgstr "แอนตาร์กติกา/เดวิส"
+
+#: ../src/timezone_names.c:259
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr ""
+
+#: ../src/timezone_names.c:261
+msgid "Antarctica/Mawson"
+msgstr ""
+
+#: ../src/timezone_names.c:262
+msgid "Antarctica/McMurdo"
+msgstr "แอนตาร์กติกา/แมคเมอร์โด"
+
+#: ../src/timezone_names.c:263
+msgid "Antarctica/Palmer"
+msgstr "แอนตาร์กติกา/พาล์เมอร์"
+
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr ""
+
+#: ../src/timezone_names.c:265
+msgid "Antarctica/South_Pole"
+msgstr "แอนตาร์กติกา/ขั้วโลกใต้"
+
+#: ../src/timezone_names.c:266
+msgid "Antarctica/Syowa"
+msgstr ""
+
+#: ../src/timezone_names.c:267
+msgid "Antarctica/Vostok"
+msgstr "แอนตาร์กติกา/วอสต็อก"
+
+#: ../src/timezone_names.c:268
+msgid "Arctic"
+msgstr "อาร์กติก"
+
+#: ../src/timezone_names.c:269
+msgid "Arctic/Longyearbyen"
+msgstr "อาร์กติก/ลองเยียร์เบียน"
+
+#: ../src/timezone_names.c:270
+msgid "Asia"
+msgstr "เอเชีย"
+
+#: ../src/timezone_names.c:271
+msgid "Asia/Aden"
+msgstr "เอเชีย/เอเดน"
+
+#: ../src/timezone_names.c:272
+msgid "Asia/Almaty"
+msgstr "เอเชีย/อัลมาตี"
+
+#: ../src/timezone_names.c:273
+msgid "Asia/Amman"
+msgstr "เอเชีย/อัมมาน"
+
+#: ../src/timezone_names.c:274
+msgid "Asia/Anadyr"
+msgstr "เอเชีย/อะนาดีร์"
+
+#: ../src/timezone_names.c:275
+msgid "Asia/Aqtau"
+msgstr ""
+
+#: ../src/timezone_names.c:276
+msgid "Asia/Aqtobe"
+msgstr ""
+
+#: ../src/timezone_names.c:277
+msgid "Asia/Ashgabat"
+msgstr "เอเชีย/อาชกาบัต"
+
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr ""
+
+#: ../src/timezone_names.c:279
+msgid "Asia/Baghdad"
+msgstr "เอเชีย/แบกแดด"
+
+#: ../src/timezone_names.c:280
+msgid "Asia/Bahrain"
+msgstr "เอเชีย/บาห์เรน"
+
+#: ../src/timezone_names.c:281
+msgid "Asia/Baku"
+msgstr "เอเชีย/บากู"
+
+#: ../src/timezone_names.c:282
+msgid "Asia/Bangkok"
+msgstr "เอเชีย/กรุงเทพฯ"
+
+#: ../src/timezone_names.c:283
+msgid "Asia/Beirut"
+msgstr "เอเชีย/เบรุต"
+
+#: ../src/timezone_names.c:284
+msgid "Asia/Bishkek"
+msgstr "เอเชีย/บิชเคก"
+
+#: ../src/timezone_names.c:285
+msgid "Asia/Brunei"
+msgstr "เอเชีย/บรูไน"
+
+#: ../src/timezone_names.c:286
+msgid "Asia/Calcutta"
+msgstr "เอเชีย/กัลกัตตา"
+
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr ""
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "เอเชีย/ฉงชิ่ง"
+
+#: ../src/timezone_names.c:289
+msgid "Asia/Chungking"
+msgstr "เอเชีย/จุงกิง"
+
+#: ../src/timezone_names.c:290
+msgid "Asia/Colombo"
+msgstr "เอเชีย/โคลัมโบ"
+
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "เอเชีย/ดักกา"
+
+#: ../src/timezone_names.c:292
+msgid "Asia/Damascus"
+msgstr "เอเชีย/ดามัสกัส"
+
+#: ../src/timezone_names.c:293
+msgid "Asia/Dhaka"
+msgstr "เอเชีย/ธากา"
+
+#: ../src/timezone_names.c:294
+msgid "Asia/Dili"
+msgstr "เอเชีย/ดิลี"
+
+#: ../src/timezone_names.c:295
+msgid "Asia/Dubai"
+msgstr "เอเชีย/ดูไบ"
+
+#: ../src/timezone_names.c:296
+msgid "Asia/Dushanbe"
+msgstr "เอเชีย/ดูชานเบ"
+
+#: ../src/timezone_names.c:297
+msgid "Asia/Gaza"
+msgstr "เอเชีย/กาซา"
+
+#: ../src/timezone_names.c:298
+msgid "Asia/Harbin"
+msgstr "เอเชีย/ฮาร์บิน"
+
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "เอเชีย/ฮีบรอน"
+
+#: ../src/timezone_names.c:300
+msgid "Asia/Hong_Kong"
+msgstr "เอเชีย/ฮ่องกง"
+
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "เอเชีย/โฮจิมินห์"
+
+#: ../src/timezone_names.c:302
+msgid "Asia/Hovd"
+msgstr "เอเชีย/ฮอฟด์"
+
+#: ../src/timezone_names.c:303
+msgid "Asia/Irkutsk"
+msgstr "เอเชีย/อีร์คุตสค์"
+
+#: ../src/timezone_names.c:304
+msgid "Asia/Istanbul"
+msgstr "เอเชีย/อิสตันบูล"
+
+#: ../src/timezone_names.c:305
+msgid "Asia/Jakarta"
+msgstr "เอเชีย/จาการ์ตา"
+
+#: ../src/timezone_names.c:306
+msgid "Asia/Jayapura"
+msgstr "เอเชีย/จายาปุระ"
+
+#: ../src/timezone_names.c:307
+msgid "Asia/Jerusalem"
+msgstr "เอเชีย/เยรูซาเลม"
+
+#: ../src/timezone_names.c:308
+msgid "Asia/Kabul"
+msgstr "เอเชีย/คาบูล"
+
+#: ../src/timezone_names.c:309
+msgid "Asia/Kamchatka"
+msgstr ""
+
+#: ../src/timezone_names.c:310
+msgid "Asia/Karachi"
+msgstr "เอเชีย/การาจี"
+
+#: ../src/timezone_names.c:311
+msgid "Asia/Kashgar"
+msgstr ""
+
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "เอเชีย/กาฐมาณฑุ"
+
+#: ../src/timezone_names.c:313
+msgid "Asia/Katmandu"
+msgstr "เอเชีย/กาฐมาณฑุ"
+
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr ""
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "เอเชีย/โกลกาตา"
+
+#: ../src/timezone_names.c:316
+msgid "Asia/Krasnoyarsk"
+msgstr "เอเชีย/ครัสโนยาร์สค์"
+
+#: ../src/timezone_names.c:317
+msgid "Asia/Kuala_Lumpur"
+msgstr "เอเชีย/กัวลาลัมเปอร์"
+
+#: ../src/timezone_names.c:318
+msgid "Asia/Kuching"
+msgstr "เอเชีย/กูชิง"
+
+#: ../src/timezone_names.c:319
+msgid "Asia/Kuwait"
+msgstr "เอเชีย/คูเวต"
+
+#: ../src/timezone_names.c:320
+msgid "Asia/Macao"
+msgstr "เอเชีย/มาเก๊า"
+
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "เอเชีย/มาเก๊า"
+
+#: ../src/timezone_names.c:322
+msgid "Asia/Magadan"
+msgstr "เอเชีย/มากาดาน"
+
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "เอเชีย/มะกัสซาร์"
+
+#: ../src/timezone_names.c:324
+msgid "Asia/Manila"
+msgstr "เอเชีย/มะนิลา"
+
+#: ../src/timezone_names.c:325
+msgid "Asia/Muscat"
+msgstr "เอเชีย/มัสกัต"
+
+#: ../src/timezone_names.c:326
+msgid "Asia/Nicosia"
+msgstr "เอเชีย/นิโคเซีย"
+
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "เอเชีย/โนโวคุซเนตสค์"
+
+#: ../src/timezone_names.c:328
+msgid "Asia/Novosibirsk"
+msgstr "เอเชีย/โนโวสิเบียรสก์"
+
+#: ../src/timezone_names.c:329
+msgid "Asia/Omsk"
+msgstr "เอเชีย/ออมสค์"
+
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr ""
+
+#: ../src/timezone_names.c:331
+msgid "Asia/Phnom_Penh"
+msgstr "เอเชีย/พนมเปญ"
+
+#: ../src/timezone_names.c:332
+msgid "Asia/Pontianak"
+msgstr "เอเชีย/ปอนตีอานัก"
+
+#: ../src/timezone_names.c:333
+msgid "Asia/Pyongyang"
+msgstr "เอเชีย/เปียงยาง"
+
+#: ../src/timezone_names.c:334
+msgid "Asia/Qatar"
+msgstr "เอเชีย/กาตาร์"
+
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: ../src/timezone_names.c:336
+msgid "Asia/Rangoon"
+msgstr "เอเชีย/ย่างกุ้ง"
+
+#: ../src/timezone_names.c:337
+msgid "Asia/Riyadh"
+msgstr "เอเชีย/ริยาด"
+
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "เอเชีย/ริยาด87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "เอเชีย/ริยาด88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "เอเชีย/ริยาด89"
+
+#: ../src/timezone_names.c:341
+msgid "Asia/Saigon"
+msgstr "เอเชีย/ไซ่ง่อน"
+
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "เอเชีย/ซาคาลิน"
+
+#: ../src/timezone_names.c:343
+msgid "Asia/Samarkand"
+msgstr "เอเชีย/ซามาร์คันด์"
+
+#: ../src/timezone_names.c:344
+msgid "Asia/Seoul"
+msgstr "เอเชีย/โซล"
+
+#: ../src/timezone_names.c:345
+msgid "Asia/Shanghai"
+msgstr "เอเชีย/ช่างไห่(เซี่ยงไฮ้)"
+
+#: ../src/timezone_names.c:346
+msgid "Asia/Singapore"
+msgstr "เอเชีย/สิงคโปร์"
+
+#: ../src/timezone_names.c:347
+msgid "Asia/Taipei"
+msgstr "เอเชีย/ไทเป"
+
+#: ../src/timezone_names.c:348
+msgid "Asia/Tashkent"
+msgstr "เอเชีย/ทาชเคนต์"
+
+#: ../src/timezone_names.c:349
+msgid "Asia/Tbilisi"
+msgstr "เอเชีย/ทบิลิซี"
+
+#: ../src/timezone_names.c:350
+msgid "Asia/Tehran"
+msgstr "เอเชีย/เตหะราน"
+
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "เอเชีย/เทลอาวีฟ"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "เอเชีย/ทิมพู"
+
+#: ../src/timezone_names.c:353
+msgid "Asia/Thimphu"
+msgstr "เอเชีย/ทิมพู"
+
+#: ../src/timezone_names.c:354
+msgid "Asia/Tokyo"
+msgstr "เอเชีย/โตเกียว"
+
+#: ../src/timezone_names.c:355
+msgid "Asia/Ujung_Pandang"
+msgstr "เอเชีย/อูจุงปันดัง"
+
+#: ../src/timezone_names.c:356
+msgid "Asia/Ulaanbaatar"
+msgstr "เอเชีย/อูลานบาตอร์"
+
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "เอเชีย/อูลานบาตอร์"
+
+#: ../src/timezone_names.c:358
+msgid "Asia/Urumqi"
+msgstr "เอเชีย/อุรุมชี"
+
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr ""
+
+#: ../src/timezone_names.c:360
+msgid "Asia/Vientiane"
+msgstr "เอเชีย/เวียงจันทน์"
+
+#: ../src/timezone_names.c:361
+msgid "Asia/Vladivostok"
+msgstr "เอเชีย/วลาดีวอสต็อก"
+
+#: ../src/timezone_names.c:362
+msgid "Asia/Yakutsk"
+msgstr "เอเชีย/ยาคุตสค์"
+
+#: ../src/timezone_names.c:363
+msgid "Asia/Yekaterinburg"
+msgstr "เอเชีย/เยคาเตรินบูร์ก"
+
+#: ../src/timezone_names.c:364
+msgid "Asia/Yerevan"
+msgstr "เอเชีย/เยเรวาน"
+
+#: ../src/timezone_names.c:365
+msgid "Atlantic"
+msgstr "แอตแลนติก"
+
+#: ../src/timezone_names.c:366
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: ../src/timezone_names.c:367
+msgid "Atlantic/Bermuda"
+msgstr "แอตแลนติก/เบอร์มิวดา"
+
+#: ../src/timezone_names.c:368
+msgid "Atlantic/Canary"
+msgstr "แอตแลนติก/คะเนรี"
+
+#: ../src/timezone_names.c:369
+msgid "Atlantic/Cape_Verde"
+msgstr "แอตแลนติก/เคปเวิร์ด"
+
+#: ../src/timezone_names.c:370
+msgid "Atlantic/Faeroe"
+msgstr "แอตแลนติก/แฟโร"
+
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "แอตแลนติก/แฟโร"
+
+#: ../src/timezone_names.c:372
+msgid "Atlantic/Jan_Mayen"
+msgstr "แอตแลนติก/ยานไมเอน"
+
+#: ../src/timezone_names.c:373
+msgid "Atlantic/Madeira"
+msgstr "แอตแลนติก/มาเดรา"
+
+#: ../src/timezone_names.c:374
+msgid "Atlantic/Reykjavik"
+msgstr "แอตแลนติก/เรคยาวิก"
+
+#: ../src/timezone_names.c:375
+msgid "Atlantic/South_Georgia"
+msgstr "แอตแลนติก/เซาท์จอร์เจีย"
+
+#: ../src/timezone_names.c:376
+msgid "Atlantic/St_Helena"
+msgstr "แอตแลนติก/เซนต์เฮเลนา"
+
+#: ../src/timezone_names.c:377
+msgid "Atlantic/Stanley"
+msgstr "แอตแลนติก/สแตนลีย์"
+
+#: ../src/timezone_names.c:378
+msgid "Australia"
+msgstr "ออสเตรเลีย"
+
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "ออสเตรเลีย/ACT"
+
+#: ../src/timezone_names.c:380
+msgid "Australia/Adelaide"
+msgstr "ออสเตรเลีย/แอดิเลด"
+
+#: ../src/timezone_names.c:381
+msgid "Australia/Brisbane"
+msgstr "ออสเตรเลีย/บริสเบน"
+
+#: ../src/timezone_names.c:382
+msgid "Australia/Broken_Hill"
+msgstr "ออสเตรเลีย/โบรเคนฮิลล์"
+
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr ""
+
+#: ../src/timezone_names.c:384
+msgid "Australia/Darwin"
+msgstr "ออสเตรเลีย/ดาร์วิน"
+
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "ออสเตรเลีย/ยูคลา"
+
+#: ../src/timezone_names.c:386
+msgid "Australia/Hobart"
+msgstr "ออสเตรเลีย/โฮบาร์ต"
+
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr ""
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr ""
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "ออสเตรเลีย/เมลเบิร์น"
+
+#: ../src/timezone_names.c:390
+msgid "Australia/Perth"
+msgstr "ออสเตรเลีย/เพิร์ท"
+
+#: ../src/timezone_names.c:391
+msgid "Australia/Sydney"
+msgstr "ออสเตรเลีย/ซิดนีย์"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "บราซิล"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "บราซิล/อาเกร"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr ""
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "บราซิล/ตะวันออก"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "บราซิล/ตะวันตก"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "แคนาดา"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "แคนาดา/แอตแลนติก"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "แคนาดา/ตอนกลาง"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "แคนาดา/ซัสแคตเชวันตะวันออก"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "แคนาดา/ตะวันออก"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "แคนาดา/ภูเขา"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "แคนาดา/นิวฟันด์แลนด์"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "แคนาดา/แปซิฟิก"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "แคนาดา/ซัสแคตเชวัน"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "แคนาดา/ยูคอน"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "ชิลี"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "ชิลี/ภาคพื้นทวีป"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "ชิลี/เกาะอีสเทอร์"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "อื่นๆ"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "อื่นๆ/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "อื่นๆ/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "อื่นๆ/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "อื่นๆ/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "อื่นๆ/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "อื่นๆ/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "อื่นๆ/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "อื่นๆ/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "อื่นๆ/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "อื่นๆ/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "อื่นๆ/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "อื่นๆ/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "อื่นๆ/GMT+8"
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "อื่นๆ/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "อื่นๆ/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "อื่นๆ/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "อื่นๆ/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "อื่นๆ/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "อื่นๆ/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "อื่นๆ/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "อื่นๆ/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "อื่นๆ/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "อื่นๆ/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "อื่นๆ/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "อื่นๆ/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "อื่นๆ/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "อื่นๆ/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "อื่นๆ/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "อื่นๆ/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "อื่นๆ/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "อื่นๆ/กรีนิช"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "อื่นๆ/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "อื่นๆ/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "อื่นๆ/สากล"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "อื่นๆ/ซูลู"
+
+#: ../src/timezone_names.c:446
+msgid "Europe"
+msgstr "ยุโรป"
+
+#: ../src/timezone_names.c:447
+msgid "Europe/Amsterdam"
+msgstr "ยุโรป/อัมสเตอร์ดัม"
+
+#: ../src/timezone_names.c:448
+msgid "Europe/Andorra"
+msgstr "ยุโรป/อันดอร์รา"
+
+#: ../src/timezone_names.c:449
+msgid "Europe/Athens"
+msgstr "ยุโรป/เอเธนส์"
+
+#: ../src/timezone_names.c:450
+msgid "Europe/Belfast"
+msgstr "ยุโรป/เบลฟัสต์"
+
+#: ../src/timezone_names.c:451
+msgid "Europe/Belgrade"
+msgstr "ยุโรป/เบลเกรด"
+
+#: ../src/timezone_names.c:452
+msgid "Europe/Berlin"
+msgstr "ยุโรป/เบอร์ลิน"
+
+#: ../src/timezone_names.c:453
+msgid "Europe/Bratislava"
+msgstr "ยุโรป/บราติสลาวา"
+
+#: ../src/timezone_names.c:454
+msgid "Europe/Brussels"
+msgstr "ยุโรป/บรัสเซลส์"
+
+#: ../src/timezone_names.c:455
+msgid "Europe/Bucharest"
+msgstr "ยุโรป/บูคาเรสต์"
+
+#: ../src/timezone_names.c:456
+msgid "Europe/Budapest"
+msgstr "ยุโรป/บูดาเปสต์"
+
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "ยุโรป/บึสซิงเงิน"
+
+#: ../src/timezone_names.c:458
+msgid "Europe/Chisinau"
+msgstr "ยุโรป/คีชีเนา"
+
+#: ../src/timezone_names.c:459
+msgid "Europe/Copenhagen"
+msgstr "ยุโรป/โคเปนเฮเกน"
+
+#: ../src/timezone_names.c:460
+msgid "Europe/Dublin"
+msgstr "ยุโรป/ดับลิน"
+
+#: ../src/timezone_names.c:461
+msgid "Europe/Gibraltar"
+msgstr "ยุโรป/ยิบรอลตาร์"
+
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "ยุโรป/เกิร์นซีย์"
+
+#: ../src/timezone_names.c:463
+msgid "Europe/Helsinki"
+msgstr "ยุโรป/เฮลซิงกิ"
+
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "ยุโรป/เกาะแมน"
+
+#: ../src/timezone_names.c:465
+msgid "Europe/Istanbul"
+msgstr "ยุโรป/อิสตันบูล"
+
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "ยุโรป/เจอร์ซีย์"
+
+#: ../src/timezone_names.c:467
+msgid "Europe/Kaliningrad"
+msgstr "ยุโรป/คาลินนินกราด"
+
+#: ../src/timezone_names.c:468
+msgid "Europe/Kiev"
+msgstr "ยุโรป/เคียฟ"
+
+#: ../src/timezone_names.c:469
+msgid "Europe/Lisbon"
+msgstr "ยุโรป/ลิสบอน"
+
+#: ../src/timezone_names.c:470
+msgid "Europe/Ljubljana"
+msgstr "ยุโรป/ลูบลิยานา"
+
+#: ../src/timezone_names.c:471
+msgid "Europe/London"
+msgstr "ยุโรป/ลอนดอน"
+
+#: ../src/timezone_names.c:472
+msgid "Europe/Luxembourg"
+msgstr "ยุโรป/ลักเซมเบิร์ก"
+
+#: ../src/timezone_names.c:473
+msgid "Europe/Madrid"
+msgstr "ยุโรป/มาดริด"
+
+#: ../src/timezone_names.c:474
+msgid "Europe/Malta"
+msgstr "ยุโรป/มอลตา"
+
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "ยุโรป/มารีฮามน์"
+
+#: ../src/timezone_names.c:476
+msgid "Europe/Minsk"
+msgstr "ยุโรป/มินสก์"
+
+#: ../src/timezone_names.c:477
+msgid "Europe/Monaco"
+msgstr "ยุโรป/โมนาโก"
+
+#: ../src/timezone_names.c:478
+msgid "Europe/Moscow"
+msgstr "ยุโรป/มอสโก"
+
+#: ../src/timezone_names.c:479
+msgid "Europe/Nicosia"
+msgstr "ยุโรป/นิโคเซีย"
+
+#: ../src/timezone_names.c:480
+msgid "Europe/Oslo"
+msgstr "ยุโรป/ออสโล"
+
+#: ../src/timezone_names.c:481
+msgid "Europe/Paris"
+msgstr "ยุโรป/ปารีส"
+
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "ยุโรป/พอดกอรีตซา"
+
+#: ../src/timezone_names.c:483
+msgid "Europe/Prague"
+msgstr "ยุโรป/ปราก"
+
+#: ../src/timezone_names.c:484
+msgid "Europe/Riga"
+msgstr "ยุโรป/รีกา"
+
+#: ../src/timezone_names.c:485
+msgid "Europe/Rome"
+msgstr "ยุโรป/โรม"
+
+#: ../src/timezone_names.c:486
+msgid "Europe/Samara"
+msgstr "ยุโรป/ซามารา"
+
+#: ../src/timezone_names.c:487
+msgid "Europe/San_Marino"
+msgstr "ยุโรป/ซานมารีโน"
+
+#: ../src/timezone_names.c:488
+msgid "Europe/Sarajevo"
+msgstr "ยุโรป/ซาราเยโว"
+
+#: ../src/timezone_names.c:489
+msgid "Europe/Simferopol"
+msgstr "ยุโรป/ซิมเฟรอปอล"
+
+#: ../src/timezone_names.c:490
+msgid "Europe/Skopje"
+msgstr "ยุโรป/สโกเปีย"
+
+#: ../src/timezone_names.c:491
+msgid "Europe/Sofia"
+msgstr "ยุโรป/โซเฟีย"
+
+#: ../src/timezone_names.c:492
+msgid "Europe/Stockholm"
+msgstr "ยุโรป/สตอกโฮล์ม"
+
+#: ../src/timezone_names.c:493
+msgid "Europe/Tallinn"
+msgstr "ยุโรป/ทาลลินน์"
+
+#: ../src/timezone_names.c:494
+msgid "Europe/Tirane"
+msgstr "ยุโรป/ติรานา"
+
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "ยุโรป/ตีรัสปอล"
+
+#: ../src/timezone_names.c:496
+msgid "Europe/Uzhgorod"
+msgstr "ยุโรป/อุจกอรอด"
+
+#: ../src/timezone_names.c:497
+msgid "Europe/Vaduz"
+msgstr "ยุโรป/วาดุซ"
+
+#: ../src/timezone_names.c:498
+msgid "Europe/Vatican"
+msgstr "ยุโรป/วาติกัน"
+
+#: ../src/timezone_names.c:499
+msgid "Europe/Vienna"
+msgstr "ยุโรป/เวียนนา"
+
+#: ../src/timezone_names.c:500
+msgid "Europe/Vilnius"
+msgstr "ยุโรป/วิลนีอุส"
+
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "ยุโรป/วอลโกกราด"
+
+#: ../src/timezone_names.c:502
+msgid "Europe/Warsaw"
+msgstr "ยุโรป/วอร์ซอ"
+
+#: ../src/timezone_names.c:503
+msgid "Europe/Zagreb"
+msgstr "ยุโรป/ซาเกร็บ"
+
+#: ../src/timezone_names.c:504
+msgid "Europe/Zaporozhye"
+msgstr "ยุโรป/ซาปอริจเชีย"
+
+#: ../src/timezone_names.c:505
+msgid "Europe/Zurich"
+msgstr "ยุโรป/ซูริก"
+
+#: ../src/timezone_names.c:506
+msgid "Indian"
+msgstr "มหาสมุทรอินเดีย"
+
+#: ../src/timezone_names.c:507
+msgid "Indian/Antananarivo"
+msgstr "มหาสมุทรอินเดีย/อันตานานาริโว"
+
+#: ../src/timezone_names.c:508
+msgid "Indian/Chagos"
+msgstr "มหาสมุทรอินเดีย/ชากอส"
+
+#: ../src/timezone_names.c:509
+msgid "Indian/Christmas"
+msgstr "มหาสมุทรอินเดีย/คริสต์มาส"
+
+#: ../src/timezone_names.c:510
+msgid "Indian/Cocos"
+msgstr "มหาสมุทรอินเดีย/โคโคส"
+
+#: ../src/timezone_names.c:511
+msgid "Indian/Comoro"
+msgstr "มหาสมุทรอินเดีย/คอโมโรส"
+
+#: ../src/timezone_names.c:512
+msgid "Indian/Kerguelen"
+msgstr "มหาสมุทรอินเดีย/เคอร์เกอเลน"
+
+#: ../src/timezone_names.c:513
+msgid "Indian/Mahe"
+msgstr "มหาสมุทรอินเดีย/มาเอ"
+
+#: ../src/timezone_names.c:514
+msgid "Indian/Maldives"
+msgstr "มหาสมุทรอินเดีย/มัลดีฟส์"
+
+#: ../src/timezone_names.c:515
+msgid "Indian/Mauritius"
+msgstr "มหาสมุทรอินเดีย/มอริเชียส"
+
+#: ../src/timezone_names.c:516
+msgid "Indian/Mayotte"
+msgstr "มหาสมุทรอินเดีย/มายอต"
+
+#: ../src/timezone_names.c:517
+msgid "Indian/Reunion"
+msgstr "มหาสมุทรอินเดีย/เรอูนียง"
+
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "เม็กซิโก"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "เม็กซิโก/บาฮานอร์เต"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "เม็กซิโก/บาฮาซูร์"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "เม็กซิโก/ทั่วไป"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "ตะวันออกกลาง"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "ตะวันออกกลาง/ริยาด87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "ตะวันออกกลาง/ริยาด88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "ตะวันออกกลาง/ริยาด89"
+
+#: ../src/timezone_names.c:526
+msgid "Pacific"
+msgstr "แปซิฟิก"
+
+#: ../src/timezone_names.c:527
+msgid "Pacific/Apia"
+msgstr "แปซิฟิก/อาปีอา"
+
+#: ../src/timezone_names.c:528
+msgid "Pacific/Auckland"
+msgstr "แปซิฟิก/โอคแลนด์"
+
+#: ../src/timezone_names.c:529
+msgid "Pacific/Chatham"
+msgstr "แปซิฟิก/แชตแธม"
+
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr ""
+
+#: ../src/timezone_names.c:531
+msgid "Pacific/Easter"
+msgstr "แปซิฟิก/อีสเทอร์"
+
+#: ../src/timezone_names.c:532
+msgid "Pacific/Efate"
+msgstr ""
+
+#: ../src/timezone_names.c:533
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: ../src/timezone_names.c:534
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: ../src/timezone_names.c:535
+msgid "Pacific/Fiji"
+msgstr "แปซิฟิก/ฟิจิ"
+
+#: ../src/timezone_names.c:536
+msgid "Pacific/Funafuti"
+msgstr "แปซิฟิก/ฟูนะฟูตี"
+
+#: ../src/timezone_names.c:537
+msgid "Pacific/Galapagos"
+msgstr "แปซิฟิก/กาลาปาโกส"
+
+#: ../src/timezone_names.c:538
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: ../src/timezone_names.c:539
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: ../src/timezone_names.c:540
+msgid "Pacific/Guam"
+msgstr "แปซิฟิก/กวม"
+
+#: ../src/timezone_names.c:541
+msgid "Pacific/Honolulu"
+msgstr "แปซิฟิก/โฮโนลูลู"
+
+#: ../src/timezone_names.c:542
+msgid "Pacific/Johnston"
+msgstr "แปซิฟิก/จอห์นสตัน"
+
+#: ../src/timezone_names.c:543
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: ../src/timezone_names.c:544
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: ../src/timezone_names.c:545
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: ../src/timezone_names.c:546
+msgid "Pacific/Majuro"
+msgstr "แปซิฟิก/มาจูโร"
+
+#: ../src/timezone_names.c:547
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: ../src/timezone_names.c:548
+msgid "Pacific/Midway"
+msgstr "แปซิฟิก/มิดเวย์"
+
+#: ../src/timezone_names.c:549
+msgid "Pacific/Nauru"
+msgstr "แปซิฟิก/นาอูรู"
+
+#: ../src/timezone_names.c:550
+msgid "Pacific/Niue"
+msgstr "แปซิฟิก/นีอูเอ"
+
+#: ../src/timezone_names.c:551
+msgid "Pacific/Norfolk"
+msgstr "แปซิฟิก/นอร์ฟอล์ก"
+
+#: ../src/timezone_names.c:552
+msgid "Pacific/Noumea"
+msgstr "แปซิฟิก/นูเมอา"
+
+#: ../src/timezone_names.c:553
+msgid "Pacific/Pago_Pago"
+msgstr "แปซิฟิก/ปาโกปาโก"
+
+#: ../src/timezone_names.c:554
+msgid "Pacific/Palau"
+msgstr "แปซิฟิก/ปาเลา"
+
+#: ../src/timezone_names.c:555
+msgid "Pacific/Pitcairn"
+msgstr "แปซิฟิก/พิตแคร์น"
+
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr ""
+
+#: ../src/timezone_names.c:557
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: ../src/timezone_names.c:558
+msgid "Pacific/Port_Moresby"
+msgstr "แปซิฟิก/พอร์ตมอร์สบี"
+
+#: ../src/timezone_names.c:559
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: ../src/timezone_names.c:560
+msgid "Pacific/Saipan"
+msgstr "แปซิฟิก/ไซปัน"
+
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "แปซิฟิก/ซามัว"
+
+#: ../src/timezone_names.c:562
+msgid "Pacific/Tahiti"
+msgstr "แปซิฟิก/ตาฮิติ"
+
+#: ../src/timezone_names.c:563
+msgid "Pacific/Tarawa"
+msgstr "แปซิฟิก/ตาระวา"
+
+#: ../src/timezone_names.c:564
+msgid "Pacific/Tongatapu"
+msgstr "แปซิฟิก/ตองกาตาปู"
+
+#: ../src/timezone_names.c:565
+msgid "Pacific/Truk"
+msgstr ""
+
+#: ../src/timezone_names.c:566
+msgid "Pacific/Wake"
+msgstr "แปซิฟิก/เวก"
+
+#: ../src/timezone_names.c:567
+msgid "Pacific/Wallis"
+msgstr "แปซิฟิก/วาลลิส"
+
+#: ../src/timezone_names.c:568
+msgid "Pacific/Yap"
+msgstr ""
+
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "สหรัฐ"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "สหรัฐ/อะแลสกา"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr ""
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "สหรัฐ/แอริโซนา"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "สหรัฐ/ตอนกลาง"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "สหรัฐ/ตะวันออก"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "สหรัฐ/อินดีแอนาตะวันออก"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "สหรัฐ/ฮาวาย"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr ""
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "สหรัฐ/มิชิแกน"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "สหรัฐ/ภูเขา"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "สหรัฐ/แปซิฟิก"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "สหรัฐ/แปซิฟิก-ใหม่"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "สหรัฐ/ซามัว"
+
+#: ../src/tray_icon.c:469
+msgid "New appointment"
+msgstr "เพิ่มนัดหมายใหม่"
+
+#: ../src/tray_icon.c:485
+msgid "About Orage"
+msgstr "เกี่ยวกับ Orage"
+
+#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
+msgid "Orage Panel Clock"
+msgstr "นาฬิกาพาเนล Orage"
+
+#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
+msgid "Show time and date?"
+msgstr "แสดงวันที่และเวลา"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
+msgid "Orage preferences"
+msgstr "ปรับแต่ง Orage"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr "ตั้งค่าโปรแกรมปฏิทินของ Xfce 4 (Orage)"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "ตั้งค่าปฏิทิน Orage"
+
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "ปฏิทิน"
+
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr "ปฏิทิน Orage"
+
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "ปฏิทินบนพื้นโต๊ะ"
diff -Nru orage-4.8.3/po/tr.po orage-4.12.1/po/tr.po
--- orage-4.8.3/po/tr.po	2012-01-03 12:01:10.000000000 +0000
+++ orage-4.12.1/po/tr.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,30 +1,44 @@
-# Turkish translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-#
-#
-# Erçin EKER <erc.caldera@gmx.net>, 2003.
-# Gökmen Görgen <gkmngrgn@gmail.com>, 2008.
-# Samed Beyribey <beyribey@gmail.com>, 2008.
-# Ayhan YALÇINSOY <ayhanyalcinsoy@gmail.com>, 2010.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Ayhan YALÇINSOY <ayhanyalcinsoy@gmail.com>, 2010
+# Erçin EKER <erc.caldera@gmx.net>, 2003
+# Gökmen Görgen <gkmngrgn@gmail.com>, 2008
+# Necdet Yücel <necdetyucel@gmail.com>, 2013-2014
+# Samed Beyribey <beyribey@gmail.com>, 2008
+# Volkan Gezer <volkangezer@gmail.com>, 2013-2014
+# yakup <mutouk@yandex.ru>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2010-06-12 23:20+0300\n"
-"Last-Translator: Ayhan YALÇINSOY <ayhanyalcinsoy@gmail.com>\n"
-"Language-Team: Turkish <xfce-i18n@xfce.org>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2014-12-02 22:47+0000\n"
+"Last-Translator: Necdet Yücel <necdetyucel@gmail.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/xfce-apps/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Poedit-SourceCharset: iso-8859-9\n"
-"X-Poedit-Basepath: /home/gkmngrgn/archives/others/poedit_tm/tr\n"
-"X-Poedit-Country: TURKEY\n"
-"X-Poedit-Language: Turkish\n"
-"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "altını çizme"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "tek"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "çift"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "düşük"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -40,9 +54,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"saati değiştirmek için tıkla"
+msgstr "%s\nsaati değiştirmek için tıkla"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -52,9 +64,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"1. düğme, özellikleri değiştirmek için\n"
-"2. düğme, saatlerin zamanını ayarlamak için"
+msgstr "1. düğme, özellikleri değiştirmek için\n2. düğme, saatlerin zamanını ayarlamak için"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -63,9 +73,11 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"değişim dakikasını ayarla. Sadece 1 dakika değiştirmek için düğme 2 ile "
-"okları tıklayın."
+msgstr "değişim dakikasını ayarla. Sadece 1 dakika değiştirmek için düğme 2 ile okları tıklayın."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Evrensel Zaman"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -267,6 +279,10 @@
 msgid "Use normal decorations"
 msgstr "Normal süslemeleri kullan"
 
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Hiçbiri"
+
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
 msgstr "Pencere süslemelerini gösterme"
@@ -342,7 +358,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Yer"
@@ -403,96 +419,108 @@
 msgid "floating"
 msgstr "kayan"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Evrensel Zaman"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Orage Evrensel Zaman"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "Farklı ülkelerden saatleri göster"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Evrensel Zaman"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Dönme yok"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Sola döndür"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Sağa döndür"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "Görünüm"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
 msgstr "_Kenarlığı göster"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
 msgstr "önpla_n rengini belirle:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
 msgstr "_arkaplan rengini belirle:"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
 msgstr "yük_sekliği belirle:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
 msgstr "Yatay panellerin yüksekliğini değiştirmezsiniz"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
 msgstr "g_enişliği belirle:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
 msgstr "Dikey panellerin genişliğini değiştiremezsiniz"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Satırları _dikey göster"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "Saat Ayarları"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
 msgstr "zaman dilimi:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "Satır %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
 msgstr "Geçerli bir \"strftime\" parametresi gir."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
 msgstr "İpuçları:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
 msgstr "askıya alma ve uyku kipinden sonra saati düzelt"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Bu seçeneğe kısa süredeki (5 saatten daha az) askıya alma ve uyku kipi "
-"işlemi için ihtiyaç duyabilirsiniz ve saatiniz saniye içermemelidir. Böyle "
-"ayarlamazsanız, Orage saati yanlış gösterebilir. (bu özelliği seçmek, "
-"işlemci ve kaydetme işlemleri kesiminin çalışmasını engeller.)"
+msgstr "Bu seçeneğe kısa süredeki (5 saatten daha az) askıya alma ve uyku kipi işlemi için ihtiyaç duyabilirsiniz ve saatiniz saniye içermemelidir. Böyle ayarlamazsanız, Orage saati yanlış gösterebilir. (bu özelliği seçmek, işlemci ve kaydetme işlemleri kesiminin çalışmasını engeller.)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -502,23 +530,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Bu uygulama zaman ve tarih bilgisini almak için \"strftime\" fonksiyonu "
-"kullanır.\n"
-"Sen de geçerli kodu kullanarak istediğin biçimde zamanı ve tarihi "
-"alabilirsin.\n"
-"İşte birkaç örnek:\n"
-"\t%A = haftanın günü \t\t\t%B = ay\n"
-"\t%c = tarih ve zaman \t\t\t%R = saat ve dakika\n"
-"\t%V = hafta numarası \t\t\t%Z = kullanımdaki zaman dilimi\n"
-"\t%H = saat \t\t\t\t\t%M = dakika\n"
-"\t%X = yerel zaman\t\t\t%x = yerel tarih"
+msgstr "Bu uygulama zaman ve tarih bilgisini almak için \"strftime\" fonksiyonu kullanır.\nSen de geçerli kodu kullanarak istediğin biçimde zamanı ve tarihi alabilirsin.\nİşte birkaç örnek:\n\t%A = haftanın günü \t\t\t%B = ay\n\t%c = tarih ve zaman \t\t\t%R = saat ve dakika\n\t%V = hafta numarası \t\t\t%Z = kullanımdaki zaman dilimi\n\t%H = saat \t\t\t\t\t%M = dakika\n\t%X = yerel zaman\t\t\t%x = yerel tarih"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
 msgstr "Orage saat Özellikleri"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -527,8 +544,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
 
@@ -543,7 +559,7 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Son"
 
@@ -551,13 +567,13 @@
 msgid "Due"
 msgstr "Uygun"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Bir dosya seç..."
 
@@ -565,225 +581,281 @@
 msgid "Sound Files"
 msgstr "Ses Dosyaları"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Tüm Dosyalar"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Görev bilgisi değiştirildi."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "Devam etmek istiyor musun?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Hayır, ayrılma"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Evet, değişiklikleri yoksay ve ayrıl"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "Görevin bitiş tarihi başlangıç tarihinden daha önce."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "Belirtilmemiş"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Bu dosyaya yeni bir randevu ekle."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Orage varsayılan dosyası"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Randevu eklenemedi."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Randevu eklenirken hata oluştu. Ayrıntılar için günlük dosyasına bakın."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Randevu güncellenemedi."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Daha fazla ayrıntı için günlük dosyasına bakın. (Dosya Orage tarafından güncellenmiştir?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
 msgstr "Bu görev kalıcı olarak silinmiş olacak."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Hayır, kaldırmayı iptal et"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Evet, kaldır"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Tarihi seç"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Bugün"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "Böyle bir görev mevcut değil."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
 msgstr "Muhtemelen silinmiş, lütfen ekranı yenileyiniz."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Son başlıklar"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Renkle yeni bölüm ekle"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Bölüm:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Bölümlerin renkleri - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr "*** KOPYA ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "Yeni görev - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Dosya"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "Kayd_et ve kapat"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "K_opyala"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Kaydet"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Kaydet ve kapat"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Önceki duruma dön"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Kopyala"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Sil"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Uygun"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Meşgul"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Genel"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Tür "
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Olay"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Bazen gerçekleşebilecek görevler. Örneğin:\n"
-"Buluşma, doğum günü veya TV programı."
+msgstr "Bazen gerçekleşebilecek görevler. Örneğin:\nBuluşma, doğum günü veya TV programı."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "Yapılacak"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Bazen yapabileceğiniz bazı şeyler. Örneğin:\n"
-"Arabayı yıka, Orage'ın yeni sürümünü dene."
+msgstr "Bazen yapabileceğiniz bazı şeyler. Örneğin:\nArabayı yıka, Orage'ın yeni sürümünü dene."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Günlük"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Bazen olabilecek şeyleri not edebilirsiniz. Örneğin:\n"
-"Arkadaşımı arayacağım, yılın ilk karı bu tarihte yağdı vs."
+msgstr "Bazen olabilecek şeyleri not edebilirsiniz. Örneğin:\nArkadaşımı arayacağım, yılın ilk karı bu tarihte yağdı vs."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Başlık"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "Tüm gün olay"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Başlangıç"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Belirle"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Süre"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "günler"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "saatler"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "dakikalar"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Durum"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Tamamlanmış"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "Yapıldı"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Bölümler"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
 msgstr "Bu kategori liste görünümünde renkli gösterileceği için özeldir."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "Bölümlerin renklerini güncelle"
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "Öncelik"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Eğer bunu 8 veya daha büyük yaparsanız, randevular pencere listesine GÖSTERİLMEZ.\nBu özelliği liste pencerelerinizin karmaşık olmasını önlemek için kullanabilirsiniz, ancak bir randevuyu bulmak bununla birlikte daha zorlaşır.\n(Alarmlar hala normal olarak çalacaktır.)\n(Belgelendirilmemiş bir parametre bulunmaktadır. Böylece öntanımlı 8 sınırını değiştirebilirsiniz.)"
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Not"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -792,140 +864,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"Bu kısayol komutları derhal etkilenecek:\n"
-"    <D> yerel tarih biçiminde mevcut tarihi gir\n"
-"    <T> zamanı gir ve\n"
-"    <DT> tarih ve zamanı gir.\n"
-"\n"
-"Bunlar göründüklerinde dönüştürülür:\n"
-"    <&Ynnnn> geçerli dakika nnnn'ye dönüştürülür.\n"
-"(Bu örnek olarak personelin doğum günü hatırlatmasında kaç yaşında olacağını "
-"söyleyecek.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Bu kısayol komutları derhal etkilenecek:\n    <D> yerel tarih biçiminde mevcut tarihi gir\n    <T> zamanı gir ve\n    <DT> tarih ve zamanı gir.\n\nBunlar göründüklerinde dönüştürülür:\n    <&Ynnnn> geçerli dakika nnnn'ye dönüştürülür.\n(Bu örnek olarak personelin doğum günü hatırlatmasında kaç yaşında olacağını söyleyecek.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "Başlamadan Önce"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "Bitmeden Önce"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "Başladıktan Sonra"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "Bittikten Sonra"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "alârm"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Alârm zamanı"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Genellikle hatırlatma uyarısını şu şekillerde isteyebilirsiniz:\n"
-" 1) Görev başlamadan önce\n"
-" 2) Yapılacak işler bitmeden önce\n"
-" 3) Yapılacak işler başladıktan sonra"
+msgstr "Genellikle hatırlatma uyarısını şu şekillerde isteyebilirsiniz:\n 1) Görev başlamadan önce\n 2) Yapılacak işler bitmeden önce\n 3) Yapılacak işler başladıktan sonra"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr "Sürekli alârm"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Bu seçeneği eğer alârm devrede olduğu sırada işlem etkin değilse Orage'ın "
-"sizi uyarması için kullanabilirsiniz."
+msgstr "Bu seçeneği eğer alârm devrede olduğu sırada işlem etkin değilse Orage'ın sizi uyarması için kullanabilirsiniz."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Ses"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "Kullan"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
 msgstr "Sesli alârm için bu özelliği seçiniz"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "alârm sesini tekrarla"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "zamanlar"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "saniye aralığı"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "Görsel"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Orage penceresini kullan"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
 msgstr "Orage penceresi uyarısı istiyorsanız, bunu seçin"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Bildiri penceresi kullan"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
 msgstr "Eğer bildiri penceresi çıksın istiyorsanız, bunu seçin"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "Dinlenme saatini belirle"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
 msgstr "Alârmın otomatik olarak sonlanmasını istiyorsanız bunu seçiniz"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 = öntanımlı sistem sonlanma tarihi"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "saniyeler"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Yöntem"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
 msgstr "Herhangi bir işlem veya alârm betiği için bu özelliği seçiniz"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -935,156 +991,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
+msgstr "Tüm kaçış vb. karakterlerini kendiniz girmelisiniz.\nBu metin sadece işlenebilmesi için kabuğa verilir.\nAşağıdaki özel komutlar çalışma zamanında değiştirilir:\n\t<&T>  randevu başlığı\n\t<&D>  randevu açıklaması\n\t<&AT> alarm zamanı\n\t<&ST> randevu başlangıç zamanı\n\t<&ET> randevu bitiş zamanı"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
 msgstr "Şuandan itibaren çalışacak bu alârmı test et"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "<b>Öntanımlı alârm</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
 msgstr "Mevcut ayarları öntanımlı alârm olarak sakla"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
 msgstr "Mevcut ayarları öntanımlı alârmdan ayarla"
 
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Hiçbiri"
-
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Günlük"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Haftalık"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Aylık"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Yıllık"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
 msgstr "Saatlik"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Pzt"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Sal"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Çrş"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Prş"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Cum"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "Cmt"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "Pzr"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Tekrarlama"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Karmaşıklık"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Temel"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "Düzenli tekrarlanan görevler için bu özelliği kullanabilirsiniz"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Karmaşık tarihler belirlemek için bunu kullanabilirsiniz, mesela:\n"
-" Her Cumartesi ve Pazar veya \n"
-" Her ay ilk Pazartesi"
+msgstr "Karmaşık tarihler belirlemek için bunu kullanabilirsiniz, mesela:\n Her Cumartesi ve Pazar veya \n Her ay ilk Pazartesi"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Sıklık"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Her"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "olay"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Sıklığı kesin aralığa kısıtla.\n"
-" Örnek: Her üç gün:\n"
-" Sıklık = Günlük ve aralık = 3"
+msgstr "Sıklığı kesin aralığa kısıtla.\n Örnek: Her üç gün:\n Sıklık = Günlük ve aralık = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Kısıtla"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Sürekli tekrarla"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Tekrarla "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Şu zamana kadar tekrarla "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Haftanın günü"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "Hangi gün"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1092,284 +1138,297 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Aylık ve yıllık görevler için haftanın bir gününü belirtebilirsiniz.\n"
-" Örneğin:\n"
-" Her ayın ikinci Çarşamba'sı:\n"
-"\tSıklık = Aylık,\n"
-"\tHaftanın günü = sadece Çarşambayı işaretleyin,\n"
-"\tHangi gün = Çarşambanın altındaki sayılardan 2'yi seçin"
+msgstr "Aylık ve yıllık görevler için haftanın bir gününü belirtebilirsiniz.\n Örneğin:\n Her ayın ikinci Çarşamba'sı:\n\tSıklık = Aylık,\n\tHaftanın günü = sadece Çarşambayı işaretleyin,\n\tHangi gün = Çarşambanın altındaki sayılardan 2'yi seçin"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr "YAPILACAK temel"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"YAPILACAK başlama zamanında düzenli olarak yeniden başlayacak ve her "
-"aralıkta sorunsuz tamamlandıktan sonra tekrarlayacak."
+msgstr "YAPILACAK başlama zamanında düzenli olarak yeniden başlayacak ve her aralıkta sorunsuz tamamlandıktan sonra tekrarlayacak."
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "YAPILACAKlar tekrar olma olasılığı, son tamamlama zamanından itibaren sayılan aralıktan sonra tamamlama zamanı ve tekrar sayısına bağlıdır.\n(Tekrar olma olasılığı her tamamlanmadan sonra değiştiğinden YAPILACAKların geçmişi hakkında herhangi bir yorum yapamayacağınızı göz önünde bulundurun.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "İstisnalar"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
+msgstr "Aşağıdaki takvim günlerine tıklayarak daha fazla dışlanacak tarih girin.\nDışlamalar seçime bağlı olarak hariç tutulmalar(-) veya dahil edilmeler(+) olabilir.\nVeriye tıklayarak kaldırın."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr "(-) hariç tarih ekle"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
+msgstr "Hariç tutulan günler, bu randevunun olmadığı tüm günlerdir"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
 msgstr "(+) içeren zaman ekle"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"Zaman başladıktan sonra aynı zaman dilimindeki zamanları kapsar, ancak "
-"farklı zamanlar olabilir"
+msgstr "Zaman başladıktan sonra aynı zaman dilimindeki zamanları kapsar, ancak farklı zamanlar olabilir"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
 msgstr "Eylem tarihleri"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Görüntüle"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "G_it"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Yeni"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Geri"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Bugün"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "İleri"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Bir hafta geri"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Bir gün geri"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Bir gün ileri"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Bir hafta ileri"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Yenile"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Kapat"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "       Gösterilecek günlerin sayısı"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - gün görünümü"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Tüm gün"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Zaman"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "Satır seçilmedi."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
-msgstr ""
-"Seçmek için bir satıra tıklamalısınız, daha sonra onu kopyalayabilirsiniz."
+msgstr "Seçmek için bir satıra tıklamalısınız, daha sonra onu kopyalayabilirsiniz."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
 msgstr "Seçili tüm görevler silinecek."
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Evet, kaldır"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Geri"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "İleri"
+
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Bul"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "Gün görünümü"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Şu kadar günü göster:"
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Gösterilecek ilave günler:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "sadece ilk tekrar eden"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Eğer sadece ilk tekrarlanan olayı görmek istiyorsanız bunu işareyleyin. Öntanımlı olarak tümü gösterilir.\nBunun ayrıca önemleri de göstereceğini dikkate alın.\nSadece ilk sonuç listeleneceğinden, tekrarlanan olayların daha önceden görüneceğini unutmayın."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "eskiler de"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Eğer eski olayları da görmek istiyorsanız bunu işaretleyin. Bu, uzun listeleri önleyebilmek adına sadece 'sadece ilk tekrarlananı göster' etkin ise seçilebilir.\nEk gün seçiminin daha yeni randevular listelenmişse hala tanımlı olacağını unutmayın."
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "Şu tarihten itibaren günlük girdilerini göster:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Arama"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "Metin ara:"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Bayraklar"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Başlık"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Satırı düzenlemek için çift tıklayınız.\n"
-"\n"
-"İşlem sırası:\n"
-"\t 1. Alârm: n=alârm yok\n"
-"\t\t A=görsel alârm S= sesli alârm\n"
-"\t 2. Tekrarlama: n=tekrarlama yok\n"
-"\t\t D=Günlük W=Haftalık M=Aylık Y=Yıllık\n"
-"\t 3. Tür: f=boş B=meşgul\n"
-"\t 4. Dosya türü:\n"
-"\t\tO=Orage A=Arşiv F=Harici\n"
-"\t 5. Görev türü:\n"
-"\t\tE=Eylem T=Yapılacak J=Günlük"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Tarihi seç"
+msgstr "Satırı düzenlemek için çift tıklayın.\n\nSırasıyla bayraklar:\n\t 1. Alarm: n=alarm yok\n\t\t A=Alarm ayarlı P=Kalıcı alarm ayarlı\n\t 2. Yineleme: n=yineleme yok\n\t\t H=Her saat D=Günlük W=Haftalık M=Aylık Y=Yıllık\n\t 3. Tür: f=uygun B=Meşgul\n\t 4. Konumlandırılmış: dosya\n\t\tO=Orage A=Arşiv F=Yabancı\n\t 5. Randevu türü:\n\t\tE=Etkinlik T=Yapılacak J=Günlük"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tTekrarlama sona erdi, arşiv dosyasına taşınıyor."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Arşivleme etkin değil. Kapatılıyor"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Arşivleme eşiği: %d ay"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\t%04d-%02d-%02d değerinden daha eski görevler arşivleniyor"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "uid arşivleniyor: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tVTODO tamam değil, arşivlenmeyecek"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tTekrarlama. Bitiş yıl:  %04d, ay:  %02d,  gün:  %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Arşivleme tamamlandı\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Arşiv temizliği başlatılıyor."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tAŞAMA 1: tekrarlanan görevleri sıfırla"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tAŞAMA 2: arşivlenmiş görevlere dön"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Arşiv temizliği tamamlandı\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Orage öntanımlı alârm"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Asıl Orage dosyası için oluşturulan alarm listesi:"
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-"alârm listesi oluşturuldu:  %d alarm eklendi, %d görev gerçekleştirildi."
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Harici dosya için oluşturulmuş alarmlar: %s (%s)"
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\t%d alarm eklendi. %d olay işlendi."
+
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\t%2$d etkin uyarıdan %1$d tanesi bulundu. (%3$d tekrarlanan alârm arandı)"
+msgstr "\t%2$d etkin uyarıdan %1$d tanesi bulundu. (%3$d tekrarlanan alârm arandı)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1387,7 +1446,16 @@
 msgid "Import file preprocessing done"
 msgstr "İçe aktarım önhazırlığı tamamlandı"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "%s dosyasında harici güncelleme bulundu."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Harici güncelleme dosyasına göre alarmlar ve takvimler yenileniyor."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Takvim dosyaları"
 
@@ -1395,614 +1463,670 @@
 msgid "Current foreign files"
 msgstr "Son eklenen dosyalar"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "SADECE OKUMA İZNİ"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "SADECE YAZMA İZNİ"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Hiç ek dosya yok *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Harici dosya ekleme başarısız"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage en fazla 10 harici dosyayı işleyebilir. Sınıra ulaşıldı."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Dosya adı boş."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "İsim boş."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Dosya mevcut değil."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Aynı isimli başka bir dosya mevcut."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Aynı isim mevcut."
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Aktar"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "İçe aktar"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Dosyadan oku:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Dosya isimlerini virgül(,) ile ayırabilirsiniz.\n"
-" NOT: Dosya isimlerinizin virgül içermemesine dikkat ediniz."
+msgstr "Dosya isimlerini virgül(,) ile ayırabilirsiniz.\n NOT: Dosya isimlerinizin virgül içermemesine dikkat ediniz."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Dışa aktar"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Dosyaya yaz:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Seç"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Tüm görevler"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "İsimlendirilmiş görevler:"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Sadece esas dosya görevleri okunacaktır.\n"
-"Arşivlenmiş ve harici görevler dışa aktarılmayacaktır."
+msgstr "Sadece esas dosya görevleri okunacaktır.\nArşivlenmiş ve harici görevler dışa aktarılmayacaktır."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Sadece esas dosya görevleri okunacaktır.\n"
-"Harici görevler gösterilmemektedir."
+msgstr "Sadece esas dosya görevleri okunacaktır.\nHarici görevler gösterilmemektedir."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "Bunları olaylar penceresinden kolayca sürükleyebilirsiniz."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "Orage görev UID'lerini virgülle ayırabilirsiniz."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Arşiv"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Şimdi arşivle (eşik: %d ay)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Arşiv eşiğini parametrelerle değiştirebilirsiniz"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Şimdi arşive dön"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Bütün arşivleri esas orage dosyasına getirir ve arch dosyasını siler.\n"
-"Bu işlem dışa aktarmada ve farklı sistemlerde orage kullanmak için\n"
-"örnek sayılabilir."
+msgstr "Bütün arşivleri esas orage dosyasına getirir ve arch dosyasını siler.\nBu işlem dışa aktarmada ve farklı sistemlerde orage kullanmak için\nörnek sayılabilir."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Orage dosyaları"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Orage ana takvim dosyası"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Yürürlükteki dosya"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Yeni dosya"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Eylem seçenekleri"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Güncel dosya:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Yeni dosya:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Eylem seçenekleri:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Yeniden adlandır"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Sadece Orage iç dosyasını yeniden adlandırır.\n"
-"Dış dosya sistemine dokunmaz.\n"
-"Yeni dosya mutlaka bulunmalıdır."
+msgstr "Sadece Orage iç dosyasını yeniden adlandırır.\nDış dosya sistemine dokunmaz.\nYeni dosya mutlaka bulunmalıdır."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Kopyala"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr "Mevcut dosya kopyalandı ve değiştirilmeden eski yerinde barınmakta."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Taşı"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "Mevcut dosya taşındı ve eski yerinde bulunmuyor."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Arşiv dosyası"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Ek dosyalar"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Yeni dosya ekle"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Ek dosya:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Tercihler"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Görünür isim:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Sadece okuma izni"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Bu özelliği eğer Orage dosyaya hiç müdahale etmemişse kullanın.\n"
-"Eğer harici dosyaya müdahale etmiş iseniz, dosyayı aldığınız programla o "
-"dosya uyumsuzluk gösterebilir!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Bu özelliği eğer Orage dosyaya hiç müdahale etmemişse kullanın.\nEğer harici dosyaya müdahale etmiş iseniz, dosyayı aldığınız programla o dosya uyumsuzluk gösterebilir!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Bu iç isim dosya adı yerine kullanıcıya gösterilecektir."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Veritabanını değiştir - Orage"
 
-#: ../src/main.c:268
-#, fuzzy, c-format
+#: ../src/main.c:275
+#, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\t$3%s için $1%s yazılımı $2%s sürümü \n"
-"\n"
+msgstr "\tBu %s sürüm %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tGNU Genel Kamu Lisansı hükümleri altında dağıtılmaktadır.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tGTK+-%d.%d.%d sürümü kullanılarak derlenmiştir,"
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "GTK+-%d.%d.%d kullanılıyor.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tAktarım işlemi için DBUS kullanılıyor.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tDBUS kullanılmıyor. İçe aktarma kısmi çalışacaktır.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tlibnotify kullanılıyor.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tlibnotify kullanılmıyor.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tOtomatik arşivleme kullanılıyor.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tArşivleme kullanılmıyor.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tİşletmi sistemi paketi libical kullanımı.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tLibical'in Orage yerel sürümünü kullanımı.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Kullanım: orage [seçenekler] [dosyalar]\n"
-"\n"
+msgstr "Kullanım: orage [seçenekler] [dosyalar]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Seçenekler:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tOrage'in sürümünü göster\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tbu metni yazdır\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \ttercihler formunu göster\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\tOrage'i görünür / görünmez yap\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) dosya [RW] \tdışarıdan dosya ekle\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) file [RW] [name] \tharici bir dosya ekle\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) dosya \tsonradan eklenmiş dosyayı sil\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--export (-e) dosya [randevu...] \trandevuları Orage'den dosyaya aktar\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "dosyalar=orage'a yüklenecek ical dosyaları\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\torage dbus'ı kapsamamaktadır. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tdbus olmadığı zaman orage sadece [dosyalar] ve diğer dosya seçenekleri (-a "
-"& -r) parametreleriyle çalışabilir \n"
+msgstr "\tdbus olmadığı zaman orage sadece [dosyalar] ve diğer dosya seçenekleri (-a & -r) parametreleriyle çalışabilir \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Bilinmeyen seçenek %s\n"
-"\n"
+msgstr "\nBilinmeyen seçenek %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "V_eritabanını değiştir"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "Düz_enle"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Seçilen _günü göster"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Seçilen _hatfayı göster"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "_Bugünü Seç"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Göster _Globaltime"
+msgstr "Evren_sel Zamanı Göster"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Yardım"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Tanımlı başlık yok"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr "Konum: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n Note:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Asla"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Başlık: %s\n"
-" Başlangıç:\t%s\n"
-" Bitiş:\t%s\n"
-" Not:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "Başlık: %s\n%s Başlangıç:\t%s\n Bitiş:\t%s\n Tamamlanma:\t%s%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Başlık: %s\n"
-" Başlangıç:\t%s\n"
-" Bitiş:\t%s\n"
-" Not:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Başlık: %s\n%s Başlangıç:\t%s\n Bitiş:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Yapılacak:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>%s etkinlikleri:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>%s-%s için olaylar:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "Ana ayarlar"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Zaman dilimi"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "Her zaman yerel zaman diliminizi tanımlamalısınız."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "Arşiv eşiği (aylara göre)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = arşivleme yok)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Arşivleme olayların işlenmesinde yer ve zaman kazanmak için kullanılmaktadır."
+msgstr "Arşivleme olayların işlenmesinde yer ve zaman kazanmak için kullanılmaktadır."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Ses dosyası çalıştırma komutu"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
 msgstr "Bu komut alârm sesi oluşturmak için uçbirime verilecektir."
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "Görünüm ayarları"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Takvim ana penceresi"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Takvim penceresi"
+
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Takvim görsel ayrıntıları"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "Pencere kenarlıklarını göster"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "Menüyü göster"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Ay ve yılı göster"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
 msgstr "Gün adlarını göster"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
 msgstr "Hafta numaralarını göster"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Ay ve yılı göster"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Takvim bilgi kutuları"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "Yapılacak listesini göster"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
 msgstr "Olay penceresinde gösterilecek gün sayısı"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
 msgstr "0=olay listesi görüntüleme"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Takvim görünürlüğü"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
 msgstr "Tüm masaüstülerde göster"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
 msgstr "Her zaman üstte göster"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "Görev çubuğunda göster"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "Sayfalayıcıda göster"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "Sistem çekmecesinde göster"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "Takvim başlama biçimi"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Göster"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Gizle"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Simge durumuna küçült"
 
-#: ../src/parameters.c:793
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "Takvim penceresi açıldığında"
+
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Bugünün tarihini seç"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "Daha önce seçilen tarihi seç"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Takvim gününe çift tıklandığında gösterilmesi istenen:"
+
+#: ../src/parameters.c:828
+msgid "Days view"
+msgstr "Günler görünümü"
+
+#: ../src/parameters.c:840
+msgid "Event list"
+msgstr "Olay listesi"
+
+#: ../src/parameters.c:862
 msgid "Extra settings"
 msgstr "Diğer ayarlar"
 
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Takvim ana penceresi"
-
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "Bugünü Seç"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr "Daha Önce Seçilen Tarihi Seç"
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "Olay liste penceresi"
+
+#: ../src/parameters.c:874
+msgid "Number of extra days to show in event list"
+msgstr "Olay listesinde gösterilecek ilave günlerin sayısı"
+
+#: ../src/parameters.c:883
+msgid ""
+"This is just the default value, you can change it in the actual eventlist "
+"window."
+msgstr "Bu geçerli değer, gerçek olay listesi penceresinde değiştirebilirsiniz."
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Sadece ilk tekrar eden olayı göster"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Öntanımlı ilk gün olan gün görünüm penceresi"
 
-#: ../src/parameters.c:836
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Haftanın ilk günü"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Seçilen gün"
+
+#: ../src/parameters.c:943
 msgid "Use dynamic tray icon"
 msgstr "Hareketli sistem simgesi kullan"
 
-#: ../src/parameters.c:841
+#: ../src/parameters.c:948
 msgid "Use dynamic icon"
 msgstr "Hareketli simge kullan"
 
-#: ../src/parameters.c:847
+#: ../src/parameters.c:954
 msgid "Dynamic icon shows current month and day of the month."
 msgstr "Hareketli simge mevcut ayı ve günlerini gösterir."
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Takvimde çift tıklama yapılırsa açılması istenen:"
+#: ../src/parameters.c:962 ../src/parameters.c:967
+msgid "Use wakeup timer"
+msgstr "Uyanma zamanlayıcısını kullan"
 
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr "Günler görünümü"
+#: ../src/parameters.c:973
+msgid ""
+"Use this timer if Orage has problems waking up properly after suspend or "
+"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "Eğer Orage hazırda beklettikten veya uykudan sonra düzgün uyanmıyorsa, bu zamanlayıcıyı kullanın. (Örneğin sistem çekmece simgesi yenilenmiyor veya alarmlar çalışmıyor ise.)"
 
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr "Olay listesi"
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Yabancı dosya öntanımlı görsel alarm"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr "Olay listesi penceresi"
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Orage penceresi"
 
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr "Olay listesinde gösterilecek ilave günlerin sayısı"
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Bildirim göster"
 
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-"Bu geçerli değer, gerçek olay listesi penceresinde değiştirebilirsiniz."
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Kapatılmak istendiğinde her zaman çık"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr ""
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Her zaman çık"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:1029
 msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Kapatılmak istendiğinde Orage varsayılan olarak arka planda açık durmaya devam eder. Bu seçenek Orage davranışını değiştirir ve kapatıldığında asla arka planda açık kalmaz."
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Orage Özellikleri"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
 msgstr "Öncelikle Orage'ı başlat. Yerel saat dilimi aranıyor."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Öntanımlı zaman dilimi %s olarak belirlendi."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
 msgstr "Yerel saat dilimi bulunamadı, lütfen ele ayarlayınız."
 
@@ -2014,40 +2138,35 @@
 msgid "Open"
 msgstr "Aç"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Hatırlatıcı - Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Ertele"
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "Zamanı belirledikten sonra beni tekrar hatırla"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr "Zamanı belirledikten sonra bana tekrar hatırlatmak için <Yürüt>'e bas:"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Sonraki ayarlanmış uyarılar:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d gün %02d sa %02d dak: %s"
+msgstr "\n%02d gün %02d sa %02d dak: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-" Ayarlanmış alârm bulunamadı"
+msgstr "\n Ayarlanmış alârm bulunamadı"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2070,1537 +2189,2229 @@
 msgstr "Afrika/Algiers"
 
 #: ../src/timezone_names.c:41
+msgid "Africa/Asmara"
+msgstr "Afrika/Asmara"
+
+#: ../src/timezone_names.c:42
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
-#: ../src/timezone_names.c:42
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "Afrika/Banjul"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "Afrika/Cairo"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "Afrika/Conakry"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_Salaam"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "Afrika/Djibouti"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "Afrika/Douala"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Aaiun"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "Afrika/Freetown"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaborone"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "Afrika/Juba"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johannesburg"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "Afrika/Khartoum"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinshasa"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "Afrika/Libreville"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbashi"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "AfrikaMaseru"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "Afrika/Mogadishu"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovia"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndjamena"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamey"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nouakchott"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ouagadougou"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripoli"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "Afrika/Windhoek"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "Amerika"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "Amerika/Anchorage"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "Amerika/Anguilla"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "Amerika/Antigua"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "Amerika/Araguaina"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "Amerika/Argentina/Buenos_Aires"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "AmerikaArgentina/Catamarca"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "Amerika/Arjantin/ComodRivadavia"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "Amerika/Argentina/Cordoba"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "Amerika/Argentina/Jujuy"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "Amerka/Arjantina/La_Rioja"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "Amerika/Argentina/Mendoza"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "Amerika/Arjantin/Rio_Gallegos"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "Amerika/Arjantin/Salta"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "Amerika/Arjantin/San_Juan"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "Amerka/Arjantina/San_Luis"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "Amerika/Arjantin/Tucuman"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "Amerika/Arjantin/Ushuaia"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "Amerika/Asuncion"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "Amerika/Atikokan"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "Amerika/Atka"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "Amerika/Bahia"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "Amerika/Bahia_Banderas"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "Amerika/Blanc-Sablon"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "Amerika/Boise"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Cambridge_Bay"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "Amerika/Campo_Grande"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "Amerika/Cancun"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "Amerika/Caracas"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "Amerika/Catamarca"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "Amerika/Cayenne"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "Amerika/Cayman"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "Amerika/Chicago"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "Amerika/Chihuahua"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "Amerika/Coral_Harbour"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "Amerika/Cordoba"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "Amerika/Costa_Rica"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "Amerika/Creston"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "Amerika/Cuiaba"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "Amerika/Curacao"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "Amerika/Danmarkshavn"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "Amerika/Dawson"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Dawson_Creek"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "Amerika/Dominica"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "Amerika/Ensenada"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "Amerika/Eirunepe"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "Amerika/Fort_Wayne"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glace_Bay"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "Amerika/Godthab"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "Amerika/Goose_Bay"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grand_Turk"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "Amerika/Guadeloupe"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "Amerika/Guatemala"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "Amerika/Guayaquil"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "Amerika/Guyana"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "Amerika/Halifax"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosillo"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indiana/Indianapolis"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indiana/Knox"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indiana/Marengo"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "Amerika/Indiana/Petersburg"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "Amerika/Indiana/Tell_City"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indiana/Vevay"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "Amerika/Indiana/Vincennes"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "Amerika/Indiana/Winamac"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "Amerika/Indianapolis"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "Amerika/Iqaluit"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "Amerika/Jamaica"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "Amerika/Jujuy"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "Amerika/Juneau"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentucky/Louisville"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentucky/Monticello"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "Amerika/Knox_IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "Amerika/Kralendijk"
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "Amerika/La_Paz"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Angeles"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "Amerika/Louisville"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "Amerika/Lower_Princes"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "Amerika/Maceio"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "Amerika/Managua"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "Amerika/Marigot"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "Amerika/Martinique"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "Amerika/Matamoros"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "Amerika/Mazatlan"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "Amerika/Menominee"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "Amerika/Metlakatla"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "Amerika/Mexico_City"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "Amerika/Miquelon"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "Amerika/Moncton"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "Amerika/Monterrey"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "Amerika/Montserrat"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "Amerika/Nome"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "Amerika/North_Dakota/Beulah"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "Amerika/North_Dakota/Center"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "Amerika/North_Dakota/New_Salem"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "Amerika/Noronha"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "Amerika/Ojinaga"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "Amerika/Phoenix"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Port-au-Prince"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_of_Spain"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "Amerika/Porto_Acre"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "Amerika/Porto_Velho"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Puerto_Rico"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "Amerika/Rainy_River"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Rankin_Inlet"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "Amerika/Recife"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "Amerika/Resolute"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branco"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "Amerika/Rosario"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "Amerika/Santa_Isabel"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "Amerika/Santarem"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "Amerika/Santiago"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo_Domingo"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao_Paulo"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "Amerika/Scoresbysund"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "Amerika/Shiprock"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "Amerika/Sitka"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "Amerika/St_Barthelemy"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "Amerika/St_Johns"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "Amerika/St_Kitts"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "Amerika/St_Lucia"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "Amerika/St_Thomas"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "Amerika/St_Vincent"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "Amerika/Swift_Current"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegucigalpa"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "Amerika/Thule"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Thunder_Bay"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "Amerika/Tijuana"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "Amerika/Toronto"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "Amerika/Vancouver"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "Amerika/Virgin"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "Amerika/Whitehorse"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "Amerika/Winnipeg"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "Amerika/Yakutat"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "Amerika/Yellowknife"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Antarktika/Casey"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Antarktika/Davis"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktika/DumontDUrville"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Antartika/Macquarie"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Antarktika/Mawson"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Antarktika/McMurdo"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Antarktika/Palmer"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Antartika/Rothera"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Antarktika/South_Pole"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "Antarktika/Syowa"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Antarktika/Vostok"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Arktik"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Arktik/Longyearbyen"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Asya"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Asya/Aden"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Asya/Almaty"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Asya/Amman"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Asya/Anadyr"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Asya/Aqtau"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Asya/Aqtobe"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "Asya/Ashgabat"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Asya/Aşkabat"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "Asya/Baghdad"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Asya/Bahrain"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Asya/Baku"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Asya/Bangkok"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Asya/Beirut"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Asya/Bishkek"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Asya/Brunei"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Asya/Calcutta"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Asya/Choibalsan"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "Asya/Chongqing"
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "Asya/Chungking"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Asya/Colombo"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Asya/Dakka"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "Asya/Damascus"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Asya/Dhaka"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Asya/Dili"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Asya/Dubai"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Asya/Dushanbe"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Asya/Gaza"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Asya/Harbin"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Asya/Hebron"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Asya/Hong_Kong"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Asya/Ho_Chi_Minh"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Asya/Hovd"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Asya/Irkutsk"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Asya/İstanbul"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Asya/Jakarta"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Asya/Jayapura"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Asya/Jerusalem"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Asya/Kabul"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Asya/Kamchatka"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Asya/Karachi"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Asya/Kashgar"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Asya/Kathmandu"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Asya/Katmandu"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Asya/Khandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Asya/Kolkata"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Asya/Krasnoyarsk"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asya/Kuala_Lumpur"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Asya/Kuching"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Asya/Kuwait"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Asya/Macao"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Asya/Macau"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Asya/Magadan"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Asya/Makassar"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Asya/Manila"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Asya/Muscat"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Asya/Nicosia"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Asya/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Asya/Novosibirsk"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Asya/Omsk"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Asya/Oral"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Asya/Phnom_Penh"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Asya/Pontianak"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Asya/Pyongyang"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Asya/Qatar"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Asya/Qyzylorda"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Asya/Rangoon"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Asya/Riyadh"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Asya/Riyad87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Asya/Riyad88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Asya//Riyad89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Asya/Saigon"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Asya//Sakhalin"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Asya/Samarkand"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Asya/Seoul"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Asya/Shanghai"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Asya/Singapore"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Asya/Taipei"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Asya/Tashkent"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Asya/Tbilisi"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Asya/Tehran"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Asya//Tel_Aviv"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Asya/Thimbu"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Asya/Thimphu"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Asya/Tokyo"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "Asya/Ujung_Pandang"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Asya/Ulaanbaatar"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Asya/Ulan_Bator"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Asya/Urumqi"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Asya/Ust-Nera"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Asya/Vientiane"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Asya/Vladivostok"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Asya/Yakutsk"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Asya/Yekaterinburg"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Asya/Yerevan"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Atlantik"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azores"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermuda"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Atlantik/Canary"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Cape_Verde"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "Atlantik/Faeroe"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Atlantik/Faroe"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantik/Jan_Mayen"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "Atlantik/Madeira"
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantik/Reykjavik"
 
-#: ../src/timezone_names.c:306
+#: ../src/timezone_names.c:375
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantik/South_Georgia"
 
-#: ../src/timezone_names.c:307
+#: ../src/timezone_names.c:376
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/St_Helena"
 
-#: ../src/timezone_names.c:308
+#: ../src/timezone_names.c:377
 msgid "Atlantic/Stanley"
 msgstr "Atlantik/Stanley"
 
-#: ../src/timezone_names.c:309
+#: ../src/timezone_names.c:378
 msgid "Australia"
 msgstr "Avustralya"
 
-#: ../src/timezone_names.c:310
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Avusturalya/ACT"
+
+#: ../src/timezone_names.c:380
 msgid "Australia/Adelaide"
 msgstr "Avustralya/Adelaide"
 
-#: ../src/timezone_names.c:311
+#: ../src/timezone_names.c:381
 msgid "Australia/Brisbane"
 msgstr "Avustralya/Brisbane"
 
-#: ../src/timezone_names.c:312
+#: ../src/timezone_names.c:382
 msgid "Australia/Broken_Hill"
 msgstr "Avustralya/Broken_Hill"
 
-#: ../src/timezone_names.c:313
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Avusturalya/Currie"
+
+#: ../src/timezone_names.c:384
 msgid "Australia/Darwin"
 msgstr "Avustralya/Darwin"
 
-#: ../src/timezone_names.c:314
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Avusturalya/Eucla"
+
+#: ../src/timezone_names.c:386
 msgid "Australia/Hobart"
 msgstr "Avustralya/Hobart"
 
-#: ../src/timezone_names.c:315
+#: ../src/timezone_names.c:387
 msgid "Australia/Lindeman"
 msgstr "Avustralya/Lindeman"
 
-#: ../src/timezone_names.c:316
+#: ../src/timezone_names.c:388
 msgid "Australia/Lord_Howe"
 msgstr "Avustralya/Lord_Howe"
 
-#: ../src/timezone_names.c:317
+#: ../src/timezone_names.c:389
 msgid "Australia/Melbourne"
 msgstr "Avustralya/Melbourne"
 
-#: ../src/timezone_names.c:318
+#: ../src/timezone_names.c:390
 msgid "Australia/Perth"
 msgstr "Avustralya/Perth"
 
-#: ../src/timezone_names.c:319
+#: ../src/timezone_names.c:391
 msgid "Australia/Sydney"
 msgstr "Avustralya/Sydney"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Brezilya"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Brezilya/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Brezilya/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Brezilya/Doğu"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Brezilya/Batı"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Kanada/Atlantik"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Kanada/Central"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Kanada/East-Saskatchewan"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Kanada/Eastern"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Kanada/Mountain"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Kanada/Newfoundland"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Kanada/Pasifik"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Kanada/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Kanada/Yukon"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Şili"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Şili/Continental"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Şili/EasterIsland"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Greenwich"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Universal"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Zulu"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Avrupa"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "Avrupa/Amsterdam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Avrupa/Andorra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Avrupa/Athens"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Avrupa/Belfast"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Avrupa/Belgrade"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Avrupa/Berlin"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Avrupa/Bratislava"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Avrupa/Brussels"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Avrupa/Bucharest"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Avrupa/Budapest"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Avrupa/Busingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Avrupa/Chisinau"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Avrupa/Copenhagen"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "Avrupa/Dublin"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Avrupa/Gibraltar"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Avrupa/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Avrupa/Helsinki"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Avrupa/Isle_of_Man"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Avrupa/İstanbul"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Avrupa/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Avrupa/Kaliningrad"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Avrupa/Kiev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Avrupa/Lisbon"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "Avrupa/Ljubljana"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Avrupa/London"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Avrupa/Luxembourg"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Avrupa/Madrid"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Avrupa/Malta"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Avrupa/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Avrupa/Minsk"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Avrupa/Monaco"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Avrupa/Moscow"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "Avrupa/Nicosia"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Avrupa/Oslo"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Avrupa/Paris"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Avrupa/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Avrupa/Prague"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Avrupa/Riga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Avrupa/Rome"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Avrupa/Samara"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Avrupa/San_Marino"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Avrupa/Sarajevo"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "Avrupa/Simferopol"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "Avrupa/Skopje"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Avrupa/Sofia"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Avrupa/Stockholm"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Avrupa/Tallinn"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Avrupa/Tirane"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Avrupa/Tiraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "Avrupa/Uzhgorod"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Avrupa/Vaduz"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Avrupa/Vatican"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Avrupa/Vienna"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "Avrupa/Vilnius"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Avrupa/Volgograd"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "Avrupa/Warsaw"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Avrupa/Zagreb"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "Avrupa/Zaporozhye"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "Avrupa/Zurich"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Hindistan"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "Hindistan/Antananarivo"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "Hindistan/Chagos"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "Hindistan/Christmas"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "Hindistan/Cocos"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "Hindistan/Comoro"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "Hindistan/Kerguelen"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "Hindistan/Mahe"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "Hindistan/Maldives"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "Hindistan/Mauritius"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "Hindistan/Mayotte"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "Hindistan/Reunion"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Meksika"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Meksika/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Meksika/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Meksika/General"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Orta doğu"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "Orta doğu/Riyad87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "Orta doğu/Riyad88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "Orta doğu/Riyad89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Pasifik"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "Pasifik/Apia"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Pasifik/Auckland"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Pasifik/Chatham"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Pasifik/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "Pasifik/Easter"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "Pasifik/Efate"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "Pasifik/Enderbury"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Pasifik/Fakaofo"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "Pasifik/Fiji"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Pasifik/Funafuti"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Pasifik/Galapagos"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Pasifik/Gambier"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "Pasifik/Guadalcanal"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Pasifik/Guam"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Pasifik/Honolulu"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Pasifik/Johnston"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "Pasifik/Kiritimati"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "Pasifik/Kosrae"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "Pasifik/Kwajalein"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Pasifik/Majuro"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Pasifik/Marquesas"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Pasifik/Midway"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Pasifik/Nauru"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Pasifik/Niue"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Pasifik/Norfolk"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "Pasifik/Noumea"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Pasifik/Pago_Pago"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Pasifik/Palau"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "Pasifik/Pitcairn"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Pasifik/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "Pasifik/Ponape"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Pasifik/Port_Moresby"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Pasifik/Rarotonga"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Pasifik/Saipan"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Pasifik/Samoa"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Pasifik/Tahiti"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Pasifik/Tarawa"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Pasifik/Tongatapu"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Pasifik/Truk"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Pasifik/Wake"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Pasifik/Wallis"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "Pasifik/Yap"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "US"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "US/Alaska"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "US/Aleutian"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "US/Arizona"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "US/Central"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "US/Eastern"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "US/East-Indiana"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "US/Hawaii"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "US/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "US/Michigan"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "US/Mountain"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "US/Pacific"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "US/Pacific-New"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "US/Samoa"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "Yeni görevi"
@@ -3618,208 +4429,26 @@
 msgstr "Saati ve tarihi göster?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Takvim"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Orage Takvim Özellikleri"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Orage özellikleri"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Xfce4 Takvim Uygulaması (Orage) için Ayarlar"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Masaüstü takvimi"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Orage Takvim Özellikleri"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Takvim"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Orage  Takvim"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Başlık: %s\n"
-#~ " Başlangıç:\t%s\n"
-#~ " Son Tarih:\t%s\n"
-#~ " Tamamlanma:\t%s\n"
-#~ "Not:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Bütün karakterleri kendiniz girmelisiniz.\n"
-#~ " Bu dizgi işlemek için konsola verilecektir"
-
-#~ msgid "Orage clock"
-#~ msgstr "Orage saati"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Baş yazar, eski sürüm yöneticisi"
-
-#~ msgid "Contributor"
-#~ msgstr "Katkıcı"
-
-#~ msgid "Info"
-#~ msgstr "Bilgi"
-
-#~ msgid "Warning"
-#~ msgstr "Uyarı"
-
-#~ msgid "Error"
-#~ msgstr "Hata"
-
-#~ msgid "Set sticked"
-#~ msgstr "Tüm masaüstlerinde göster"
-
-#~ msgid "Select always today"
-#~ msgstr "Herzaman bugünü seç"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Esas takvim gösterilirken, işaretçiyi önceden seçilmiş bir güne veya "
-#~ "bugüne ayarlar."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Bitiş saati ayarlama modu"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Başlama saati ayarlama modu"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "dakikayı ayarla"
-
-#~ msgid "Vary"
-#~ msgstr "Değişiklik"
-
-#~ msgid "Select timezone"
-#~ msgstr "Zaman dilimini seç"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Saat Değişikliği"
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "saatin zaman dilimini gir,\n"
-#~ "(=herhangi geçerli bir TZ değeri)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Değiştirilmiş Özellikler"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Yerel saati giriniz. (saatten sonra +/- kullanılmışsa önceki(-) ve sonraki"
-#~ "(+) tarih biçiminde gösterilir)"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr "Geçerli zaman dilimi (=TZ) değeri belirt veya listeden seç."
-
-#~ msgid "show line _1:"
-#~ msgstr "_1. satırı göster:"
-
-#~ msgid "show line _2:"
-#~ msgstr "_2. satırı göster:"
-
-#~ msgid "show line _3:"
-#~ msgstr "_3. satırı göster:"
-
-#~ msgid "Properties"
-#~ msgstr "Özellikler"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "'orage  -p' komutu hata verdi"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D>, yerel tarih biçiminde son tarihi ekler.\n"
-#~ "<T>, zamanı ekler.\n"
-#~ "<DT> ise, hem zamanı, hem de tarihi ekler."
-
-#~ msgid "Show event list"
-#~ msgstr "Olay listesini göster"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = statik simgeyi kullan)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Dinamik simge bugünü ve içinde bulunulan ayı gösterir. Sistem "
-#~ "çekmecesinden gösterilmektedir. Eğer sistem çekmecesi boyutu çok küçük "
-#~ "ise, Orage statik simgeye dönecektir."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Takvim Ayarları"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Xfce4 Takvim Ayarları"
-
-#~ msgid "Monday"
-#~ msgstr "Bugün"
-
-#~ msgid "Tuesday"
-#~ msgstr "Bugün"
-
-#~ msgid "Wednesday"
-#~ msgstr "Bugün"
-
-#~ msgid "Thursday"
-#~ msgstr "Bugün"
-
-#~ msgid "Friday"
-#~ msgstr "Bugün"
-
-#~ msgid "Sunday"
-#~ msgstr "Pazar"
-
-#~ msgid "Days"
-#~ msgstr "Bugün"
-
-#~ msgid "Calendar Files"
-#~ msgstr "Xfcalendar"
-
-#~ msgid "Calendar borders"
-#~ msgstr "Xfcalendar"
-
-#~ msgid "Core developer"
-#~ msgstr "Ana geliştirici"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Bu tarihle ilgili tüm \n"
-#~ "bilgileri silmiş olacaksınız."
-
-#~ msgid "Clear"
-#~ msgstr "Temizle"
-
-#~ msgid "This should not happen"
-#~ msgstr "Bunun olmaması gerekiyor"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "MCS istemci kanalı oluşturulamıyor"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Masaüstü takvimi"
diff -Nru orage-4.8.3/po/ug.po orage-4.12.1/po/ug.po
--- orage-4.8.3/po/ug.po	2012-01-03 12:01:10.000000000 +0000
+++ orage-4.12.1/po/ug.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,31 +1,30 @@
-# $Id$
-# 
-# Uyghur translations for orage package.
-# Copyright (C) 2003-2007 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Gheyret T.Kenji <gheyret@gmail.com>, 2010.
-# 
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Abduqadir Abliz <sahran.ug@gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.5.9.6\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2010-03-27 19:23+0900\n"
-"Last-Translator: Gheyret T.Kenji <gheyret@gmail.com>\n"
-"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
+"POT-Creation-Date: 2013-11-18 18:30+0100\n"
+"PO-Revision-Date: 2013-11-19 15:56+0000\n"
+"Last-Translator: Xfce <transifex@xfce.org>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/xfce/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Japanese\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Language: ug\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr "GlobalTime كۆزنىكى كوتۇرۇلىۋاتىدۇ..."
+msgstr "دۇنيا ۋاقتى(GlobalTime) كۆزنىكى كۆتۈرۈلۈۋاتىدۇ..."
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
-msgstr "GlobalTime كۆزنىكى كۆتۈرۈش مەغلۇپ بولدى"
+msgstr "دۇنيا ۋاقتى(GlobalTime) كۆزنىكىنى كۆتۈرۈش مەغلۇپ بولدى"
 
 #. ********** timezone tooltip **********
 #: ../globaltime/globaltime.c:277
@@ -33,9 +32,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"چېكىپ ساەتنى توغرىلاڭ"
+msgstr "%s\nچېكىپ سائەتنى توغرىلاڭ"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -45,20 +42,16 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"توپچە 1 تەڭشەكنى ئۆزگەرتىدۇ \n"
-"توپچە 2 ۋاقىتنى توغرىلايدۇ"
+msgstr "توپچە 1 تەڭشەكنى ئۆزگەرتىدۇ \nتوپچە 2 ۋاقىتنى توغرىلايدۇ"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
-msgstr "ساەتنى توغرىلايدۇ"
+msgstr "سائەتنى توغرىلايدۇ"
 
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"مىنۇتنى توغرىلايدۇ. توپچە 2 نى ئىستەرەلكا بىلەن قوشۇپ چەكسە بىر مىنۇت "
-"ئۆزگىرىدۇ."
+msgstr "مىنۇتنى توغرىلايدۇ. توپچە 2 نى ئىسترېلكا بىلەن قوشۇپ چەكسە بىر مىنۇت ئۆزگىرىدۇ."
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -70,11 +63,11 @@
 
 #: ../globaltime/gt_prefs.c:310
 msgid "Not possible to delete the last clock."
-msgstr "ئەڭ ئاخىرقى ساەتنى ئۆچۈرۈش مۇمكىن ئەمەس."
+msgstr "ئەڭ ئاخىرقى سائەتنى ئۆچۈرۈش مۇمكىن ئەمەس."
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
-msgstr "بۇ ساەتنى يېڭىلا"
+msgstr "بۇ سائەتنى يېڭىلا"
 
 #: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
 msgid "add new empty clock"
@@ -82,31 +75,31 @@
 
 #: ../globaltime/gt_prefs.c:526
 msgid "add new clock using this clock as model"
-msgstr "مۇشۇ ساەتنى ئۈلگە قىلىپ يېڭى سائەت قوش"
+msgstr "مۇشۇ سائەتنى ئۈلگە قىلىپ يېڭى سائەت قوش"
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
-msgstr "بۇ ساەتنى ئۆچۈر"
+msgstr "بۇ سائەتنى ئۆچۈر"
 
 #: ../globaltime/gt_prefs.c:539
 msgid "move this clock first"
-msgstr "ئاۋۋال بۇ ساەتنى يۆتكە"
+msgstr "ئاۋۋال بۇ سائەتنى يۆتكە"
 
 #: ../globaltime/gt_prefs.c:544
 msgid "move this clock left"
-msgstr "بۇ ساەتنى سولغا يۆتكە"
+msgstr "بۇ سائەتنى سولغا يۆتكە"
 
 #: ../globaltime/gt_prefs.c:549
 msgid "move this clock right"
-msgstr "بۇ ساەتنى ئونغا يۆتكە"
+msgstr "بۇ سائەتنى ئونغا يۆتكە"
 
 #: ../globaltime/gt_prefs.c:554
 msgid "move this clock last"
-msgstr "بۇ ساەتنى ئەڭ ئاخىرىغا يۆتكە"
+msgstr "بۇ سائەتنى ئەڭ ئاخىرىغا يۆتكە"
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
-msgstr "بۇ ساەتنىڭ ۋاقىت رايونىنى يەرلىك ۋاقىت رايونىغا تەڭشە"
+msgstr "بۇ سائەتنىڭ ۋاقىت رايونىنى يەرلىك ۋاقىت رايونىغا تەڭشە"
 
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
@@ -114,7 +107,7 @@
 
 #: ../globaltime/gt_prefs.c:590
 msgid "Globaltime preferences "
-msgstr "Globaltime تەڭشەكلىرى "
+msgstr "دۇنيا ۋاقتى(GlobalTime) تەڭشەكلىرى "
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -131,11 +124,11 @@
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
-msgstr "ساەتنىڭ ۋاقىت رايونى:"
+msgstr "سائەتنىڭ ۋاقىت رايونى:"
 
 #: ../globaltime/gt_prefs.c:643
 msgid "Text Formatting"
-msgstr "تېكست فورماتى"
+msgstr "تېكىست فورماتى"
 
 #. ------------------------background-------------------------
 #: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
@@ -144,7 +137,7 @@
 
 #: ../globaltime/gt_prefs.c:656
 msgid "Click to change background colour for clock"
-msgstr "چېكىپ ساەتنىڭ تەگلىك رېڭىنى ئۆزگەرت"
+msgstr "چېكىپ سائەتنىڭ تەگلىك رېڭىنى ئۆزگەرت"
 
 #: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
 #: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
@@ -163,20 +156,20 @@
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
 msgid "Foreground (=text) color:"
-msgstr "ئالدى (=تەسكىت) رېڭى:"
+msgstr "ئالدى (=تېكىست) رېڭى:"
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
-msgstr "چېكىپ ساەتنىڭ ئالدى رېڭىنى ئۆزگەرت"
+msgstr "چېكىپ سائەتنىڭ ئالدى رېڭىنى ئۆزگەرت"
 
 #. ------------------------name font-------------------------
 #: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
 msgid "Font for name of clock:"
-msgstr "ساەتنىڭ فونت ئاتى:"
+msgstr "سائەتنىڭ فونت ئاتى:"
 
 #: ../globaltime/gt_prefs.c:720
 msgid "Click to change font for clock name"
-msgstr "چېكىپ ساەتنىڭ فونت ئاتىنى ئۆزگەرت"
+msgstr "چېكىپ سائەتنىڭ فونت ئاتىنى ئۆزگەرت"
 
 #. ------------------------time font-------------------------
 #: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
@@ -190,30 +183,28 @@
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:780
 msgid "Underline name of clock:"
-msgstr "ساەتنىڭ Underline ئاتى:"
+msgstr "سائەتنىڭ Underline ئاتى:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:810
 msgid "Underline time of clock:"
-msgstr "ساەتنىڭ Underline ۋاقتى:"
+msgstr "سائەتنىڭ Underline ۋاقتى:"
 
 #: ../globaltime/gt_prefs.c:850
 msgid "Text Default Formatting"
-msgstr "تەسكىتنىڭ كۆڭۈلدىكى فورماتى"
+msgstr "تېكىستنىڭ كۆڭۈلدىكى فورماتى"
 
 #: ../globaltime/gt_prefs.c:863
 msgid "Click to change default background colour for clocks"
-msgstr "چېكىپ ساەتنىڭ كۆڭۈلدىكى تەگلىك رەڭگىنى ئۆزگەرت"
+msgstr "چېكىپ سائەتنىڭ كۆڭۈلدىكى تەگلىك رەڭگىنى ئۆزگەرت"
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
-"تاللانغان رەڭنى ئىشلەتمەي سىستېمىنىڭ كۆڭۈلدىكى رېڭىنى ئىشلىتىش ئۈچۈن بۇنى "
-"سىزىۋەت"
+msgstr "تاللانغان رەڭنى ئىشلەتمەي سىستېمىنىڭ كۆڭۈلدىكى رېڭىنى ئىشلىتىش ئۈچۈن بۇنى سىزىۋەت"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
-msgstr "چېكىپ سائەت كۆڭۈلدىكى تەسكىت رەڭگىنى ئۆزگەرت"
+msgstr "چېكىپ سائەت كۆڭۈلدىكى تېكىست رەڭگىنى ئۆزگەرت"
 
 #: ../globaltime/gt_prefs.c:929
 msgid "Click to change default font for clock name"
@@ -221,9 +212,7 @@
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"تاللانغان فونتنى ئىشلەتمەي سىستېمىنىڭ كۆڭۈلدىكى فونتىنى ئىشلىتىش ئۈچۈن بۇنى "
-"سىزىۋەت"
+msgstr "تاللانغان فونتنى ئىشلەتمەي سىستېمىنىڭ كۆڭۈلدىكى فونتىنى ئىشلىتىش ئۈچۈن بۇنى سىزىۋەت"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -232,12 +221,12 @@
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:990
 msgid "Underline for name of clock:"
-msgstr "ساەتنىڭ Underline ئاتى:"
+msgstr "سائەتنىڭ Underline ئاتى:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:1004
 msgid "Underline for time of clock:"
-msgstr "ساەتنىڭ Underline ۋاقتى:"
+msgstr "سائەتنىڭ Underline ۋاقتى:"
 
 #: ../globaltime/gt_prefs.c:1027
 msgid "update preferences"
@@ -245,7 +234,7 @@
 
 #: ../globaltime/gt_prefs.c:1062
 msgid "Globaltime Preferences"
-msgstr "Globaltime تەڭشەكلىرى"
+msgstr "دۇنيا ۋاقتى(GlobalTime) تەڭشەكلىرى"
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
@@ -325,13 +314,11 @@
 msgid "forward"
 msgstr "ئالدىغا"
 
-# Summer time shift - previous
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
 msgid "not changed"
 msgstr "ئۆزگەرتىلمىدى"
 
-# Summer time shift - next
 #: ../globaltime/timezone_selection.c:195
 #: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
 msgid "not changing"
@@ -341,7 +328,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2771
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "ئورنى"
@@ -374,7 +361,6 @@
 msgid "Pick timezone"
 msgstr "ۋاقىت رايونى تاللا"
 
-# Change timezone view
 #: ../globaltime/timezone_selection.c:302
 #: ../globaltime/timezone_selection.c:312
 #: ../panel-plugin/timezone_selection.c:303
@@ -403,17 +389,17 @@
 msgid "floating"
 msgstr "لەيلىمە"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Globaltime"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "Orage يەرشارى ۋاقتى"
+msgstr "ئورىج(Orage) دۇنيا ۋاقتى"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
-msgstr "ئوخشىمىغان دۆلەتلەرنىڭ ساىتىنى كۆرسەت"
+msgstr "ئوخشىمىغان دۆلەتلەرنىڭ سائىتىنى كۆرسەت"
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "دۇنيا ۋاقتى(GlobalTime)"
 
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
@@ -422,7 +408,7 @@
 #. show frame
 #: ../panel-plugin/oc_config.c:229
 msgid "Show _frame"
-msgstr "frame نى كۆرسەت(_F)"
+msgstr "كاندۇكنى كۆرسەت(_F)"
 
 #. foreground color
 #: ../panel-plugin/oc_config.c:239
@@ -441,7 +427,7 @@
 
 #: ../panel-plugin/oc_config.c:277
 msgid "Note that you can not change the height of horizontal panels"
-msgstr "دىققەت، گورىزونتال panel لارنىڭ ئېگىزلىكىنى ئۆزگەرتكىلى بولمايدۇ"
+msgstr "دىققەت، گورىزونتال كۆزنەكلەرنىڭ ئېگىزلىكىنى ئۆزگەرتكىلى بولمايدۇ"
 
 #: ../panel-plugin/oc_config.c:282
 msgid "set _width:"
@@ -449,7 +435,7 @@
 
 #: ../panel-plugin/oc_config.c:293
 msgid "Note that you can not change the width of vertical panels"
-msgstr "دىققەت، ۋەرىتاچال panel لارنىڭ كەڭلىكىنى ئۆزگەرتكىلى بولمايدۇ"
+msgstr "دىققەت، تىك كۆزنەكلەرنىڭ كەڭلىكىنى ئۆزگەرتكىلى بولمايدۇ"
 
 #: ../panel-plugin/oc_config.c:316
 msgid "Clock Options"
@@ -467,17 +453,17 @@
 
 #: ../panel-plugin/oc_config.c:357
 msgid "Enter any valid strftime function parameter."
-msgstr "strftime فۇنكىسىيىسىنىڭ خالىغان ئىنۋەتلىك پارامېتىرىنى كىرگۈزۈڭ."
+msgstr "strftime فۇنكسىيىسىنىڭ خالىغان ئىناۋەتلىك پارامېتىرىنى كىرگۈزۈڭ."
 
 #. Tooltip hint
 #: ../panel-plugin/oc_config.c:401
 msgid "Tooltip:"
-msgstr "Tooltip:"
+msgstr "كۆرسەتمە:"
 
 #. special timing for SUSPEND/HIBERNATE
 #: ../panel-plugin/oc_config.c:411
 msgid "fix time after suspend/hibernate"
-msgstr "تەنەپۇس قىلىش/ئوچەككە كىرىشتىن كەيىنكى fix ۋاقتى"
+msgstr "تەنەپپۇس قىلىش/ئۈچەككە كىرىشتىن كېيىنكى fix ۋاقتى"
 
 #: ../panel-plugin/oc_config.c:415
 msgid ""
@@ -486,7 +472,7 @@
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
+msgstr "بۇ تاللانما، قىسقا ۋاقىت(5 سائەتتىن ئاز)لىق توڭلىتىش، ياكى ئۈچەككە كىرگۈزۈش ئېلىپ بارغاندا، سائەتتە سېكۇنتنى كۆرسەتمەيدىغان ۋاقىتتىلا ئىشلىتىلىدۇ. بۇ خىل شەرت ئاستىدا، مەزكۇر تاللانما تاللانمىسا، Orage نىڭ سائىتى توغرا كۆرسىتىلمەسلىكى مۇمكىن(بۇ تاللانسا، CPU ۋە ئۈزۈلۈش(interrupt) نىڭ ئىشلىشىدىن ساقلانغىلى بولىدۇ)."
 
 #: ../panel-plugin/oc_config.c:432
 msgid ""
@@ -498,21 +484,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"بۇ پروگرامما ۋاقىتقا strftime نى ئىشلىتىدۇ.\n"
-"ئۆزىڭىز ياخشى كۆرىدىغان ۋاقىت فورماتى ئۈچۈن بىرەر ئىناۋەتلىك كود ئىشلىتىڭ.\n"
-"بەزى كوپ ئىشلىتىغان كودلار:\n"
-"\t%A = ھەپتە\t\t\t%B = ئاي\n"
-"\t%c = چېسلا & ۋاقىت\t\t%R = سائەت & مىنۇت\n"
-"\t%V = ھەپتە نومۇرى\t\t%Z = ئىشلىتىۋاتقان ۋاقىت رايونى\n"
-"\t%H = سائەت \t\t\t\t%M = مىنۇت\n"
-"\t%X = يەرلىك ۋاقىت\t\t\t%x = يەرلىك چېسلا"
+msgstr "بۇ پروگرامما ۋاقىتقا strftime نى ئىشلىتىدۇ.\nئۆزىڭىز ياخشى كۆرىدىغان ۋاقىت فورماتى ئۈچۈن بىرەر ئىناۋەتلىك كود ئىشلىتىڭ.\nبەزى كۆپ ئىشلىتىدىغان كودلار:\n\t%A = ھەپتە\t\t\t%B = ئاي\n\t%c = چېسلا & ۋاقىت\t\t%R = سائەت & مىنۇت\n\t%V = ھەپتە نومۇرى\t\t%Z = ئىشلىتىۋاتقان ۋاقىت رايونى\n\t%H = سائەت \t\t\t\t%M = مىنۇت\n\t%X = يەرلىك ۋاقىت\t\t\t%x = يەرلىك چېسلا"
 
 #: ../panel-plugin/oc_config.c:457
 msgid "Orage clock Preferences"
 msgstr "Orage سائەت تەڭشەكلىرى"
 
-# FIXME: On IRIX, it makes sense at least
 #. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
@@ -522,7 +499,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr "%Y/%B/%d %A %V"
@@ -532,28 +509,27 @@
 msgstr "مەسئۇل ئادەم"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "ۋاقىتنى Xfce4 دە باشقۇرۇش"
+msgstr "ۋاقىتنى Orage دە باشقۇرۇش"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2800
 msgid "End"
 msgstr "تامام"
 
 #: ../src/appointment.c:333
 msgid "Due"
-msgstr ""
+msgstr "مۆھلىتى"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "ھۆججەت تاللا...."
 
@@ -561,228 +537,273 @@
 msgid "Sound Files"
 msgstr "ئۈن ھۆججەتلىرى"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
-msgstr "ھەممە ھۆججەت"
+msgstr "ھەممە ھۆججەتلەر"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "دېيىشمە ئۇچۇرلىرى ئۆزگەرتىلدى"
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1282 ../src/event-list.c:921
 msgid "Do you want to continue?"
 msgstr "داۋاملاشتۇرامسىز؟"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr ""
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr ""
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
-msgstr "دەيىشمەنىڭ ئاخىرقى ۋاقتى باشلىنىش ۋاقتىدىن بۇرۇن بولۇپ قالدى."
+msgstr "دېيىشمىنىڭ ئاخىرقى ۋاقتى باشلىنىش ۋاقتىدىن بۇرۇن بولۇپ قالدى."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1918
 msgid "Not set"
 msgstr "بەلگىلەنمىگەن"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1220
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1221
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1231
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1232
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1281
 msgid "This appointment will be permanently removed."
 msgstr "بۇ دېيىشمە مەڭگۈلۈككە ئۆچۈرۈلىدۇ."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1283 ../src/event-list.c:922
+msgid "No, cancel the removal"
+msgstr ""
+
+#: ../src/appointment.c:1284
+msgid "Yes, remove it"
+msgstr ""
+
+#: ../src/appointment.c:1373 ../src/appointment.c:1388 ../src/day-view.c:457
+#: ../src/event-list.c:980
+msgid "Pick the date"
+msgstr ""
+
+#: ../src/appointment.c:1375 ../src/appointment.c:1390 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:982 ../src/event-list.c:1132
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "بۈگۈن"
+
+#: ../src/appointment.c:1798
 msgid "This appointment does not exist."
 msgstr "بۇ دېيىشمە مەۋجۇت ئەمەس."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1799
 msgid "It was probably removed, please refresh your screen."
 msgstr "ئۆچۈرۈلۈپ كەتكەندەك قىلىدۇ، ئېكرانىڭىزنى يېڭىلاڭ."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2100
 msgid "Current categories"
-msgstr "ھازىرقى كاتېگورىيىلەر"
+msgstr "ھازىرقى كاتېگورىيەلەر"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2115
 msgid "Add new category with color"
 msgstr "يېڭىدىن رەڭلىك كاتېگورىيە قوشۇش"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2119
 msgid "Category:"
 msgstr "كاتېگورىيە:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2150
 msgid "Colors of categories - Orage"
 msgstr "كاتېگورىيە رېڭى - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2196
 msgid " *** COPY ***"
 msgstr " *** COPY ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2461
 msgid "New appointment - Orage"
 msgstr "يېڭى دېيىشمە -  Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2491 ../src/day-view.c:279 ../src/event-list.c:1033
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "ھۆججەت(_F)"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2497
 msgid "Sav_e and close"
 msgstr "ساقلاپ تاقا(_E)"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2510 ../src/event-list.c:1039
 msgid "D_uplicate"
 msgstr "كۆپەيت(_u)"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2697
 msgid "Save"
 msgstr "ساقلا"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2699
 msgid "Save and close"
 msgstr "ساقلاپ ئاندىن تاقايدۇ"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2704
 msgid "Revert"
 msgstr "ئەسلىگە قايتۇر"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2706 ../src/event-list.c:1123
 msgid "Duplicate"
 msgstr "كۆچۈرۈلمە نۇسخا"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2711 ../src/event-list.c:1125
 msgid "Delete"
 msgstr "ئۆچۈر"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Free"
 msgstr "ئەركىن"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Busy"
 msgstr "ئالدىراش"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2733
 msgid "General"
 msgstr "ئادەتتىكى"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2739
 msgid "Type "
 msgstr "تىپى "
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2741 ../src/event-list.c:1176
 msgid "Event"
 msgstr "ھادىسە"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2744
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"بەزىدە ئالاھىدە ئىش تۇز بېرىدۇ.مەسىلەن:\n"
-"يىغىن ياكى تۇغۇلغان كۈن ياكى تېلېۋىزىيە ئويۇنى دېگەندەك."
+msgstr "بەزىدە ئالاھىدە ئىش تۇز بېرىدۇ.مەسىلەن:\nيىغىن ياكى تۇغۇلغان كۈن ياكى تېلېۋىزىيە ئويۇنى دېگەندەك."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2747 ../src/event-list.c:1196
 msgid "Todo"
 msgstr "قىلىدىغان ئىشلار:"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2750
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"بەزىدە قىلىدىغان ئىشلار. مەسىلەن:\n"
-"ماشىنىنى يۇيىدىغان ياكى تەكشۈرىدىغان ياكى بولمىسا Orage نىڭ يېڭى نەشرىنى "
-"سىنايدىغان دېگەندەك."
+msgstr "بەزىدە قىلىدىغان ئىشلار. مەسىلەن:\nماشىنىنى يۇيىدىغان ياكى تەكشۈرىدىغان ياكى بولمىسا Orage نىڭ يېڭى نەشرىنى سىنايدىغان دېگەندەك."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2753 ../src/event-list.c:1209
 msgid "Journal"
 msgstr "ژۇرنال"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2757
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"يۈز بەرگەن ئىشلارنى خاتىرىگە يېزىپ قويۇش. مەسىلەن:\n"
-"ئانىڭىزنىڭ تېلېفون ئۇرغانلىرى ياكى تۇنجى قار ياققان ۋاقىت دېگەندەك."
+msgstr "يۈز بەرگەن ئىشلارنى خاتىرىگە يېزىپ قويۇش. مەسىلەن:\nئانىڭىزنىڭ تېلېفون ئۇرغانلىرى ياكى تۇنجى قار ياققان ۋاقىت دېگەندەك."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2764
 msgid "Title "
 msgstr "ماۋزۇ "
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2779
 msgid "All day event"
 msgstr "پۈتۈن كۈنلۈك ئىشلار"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2785 ../src/appointment.c:3446 ../src/day-view.c:801
 msgid "Start"
 msgstr "باشلا"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2805
 msgid "Set      "
 msgstr "تەڭشەك      "
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2826
 msgid "Duration"
-msgstr "داۋاملىشىش ۋاقتى"
+msgstr "ۋاقتى"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2830 ../src/appointment.c:3020 ../src/reminder.c:758
 msgid "days"
 msgstr "كۈن"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2832 ../src/appointment.c:3022 ../src/reminder.c:760
 msgid "hours"
 msgstr "سائەت"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2834 ../src/appointment.c:3024 ../src/reminder.c:762
 msgid "mins"
 msgstr "مىنۇت"
 
-# FIXME:
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2846
 msgid "Availability"
 msgstr "بارى"
 
-# XXX
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2854 ../src/appointment.c:3452
 msgid "Completed"
 msgstr "تاماملاندى"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2857
 msgid "Done"
 msgstr "تامام"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2878
 msgid "Categories"
 msgstr "كاتېگورىيە"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2890
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
+msgstr "بۇ ئالاھىدە كاتېگورىيە بولۇپ، تىزىم كۆرۈنۈشىدىكى دېيىشمىلەر رەڭلىك كۆرسىتىلىدۇ."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2895
 msgid "update colors for categories."
-msgstr "كوتەگورىيىنىڭ رەڭلىرىنى يېڭىلايدۇ."
+msgstr "كاتېگورىيەنىڭ رەڭلىرىنى يېڭىلايدۇ."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2901
 msgid "Priority"
-msgstr "ئالدىنلىق"
+msgstr "مەرتىۋىسى"
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2911
 msgid "Note"
 msgstr "ئىزاھ"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2932
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -791,129 +812,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "تۆۋەندىكى قىسقا بۇيرۇقلار شۇ ھامان ئىجرا بولىدۇ:\n    <D> نۆۋەتتىكى ۋاقىت ۋە چېسلانى يەرلىك پىچىمدا قىستۇرىدۇ\n    <T> ۋاقىتنى قىستۇرىدۇ\n    <DT> ۋاقىت ۋە چېسلانى قىستۇرىدۇ.\n\nتۆۋەندىكىلەر بۇلار كۆرسىتىلگەندىلا ئايلاندۇرۇلىدۇ:\n    <&Ynnnn> ھازىرقى يىلدىن nnnn نى ئالغان نەتىجىنى كۆرسىتىدۇ.\n(بۇنى ئادەتتە تۇغۇلغان كۈننى خەۋەر قىلغاندا، شۇ كىشىنىڭ قانچە ياشقا كىرگەنلىكىنى بىلدۈرۈشتە ئىشلەتسە بولىدۇ.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before Start"
 msgstr "باشلىنىشتىن بۇرۇن"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before End"
-msgstr "تاماملىنىھستىن بۇرۇن"
+msgstr "تاماملىنىشتىن بۇرۇن"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After Start"
 msgstr "باشلانغاندىن كېيىن"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After End"
 msgstr "تاماملانغاندىن كېيىن"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3011
 msgid "Alarm"
 msgstr "گۈدۈك"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3017
 msgid "Alarm time"
 msgstr "گۈدۈك ۋاقتى"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3041
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"گۈدۈكنى چالىدىغان ۋاقىت:\n"
-" 1) ئالاھىدە ئىشتىن بۇرۇن\n"
-" 2) قىلىدىغان ئىشلار تاماملانغاندا\n"
-" 3) قىلدىىغان ئىشلار باشلانغاندىن كېيىن"
+msgstr "گۈدۈكنى چالىدىغان ۋاقىت:\n 1) ئالاھىدە ئىشتىن بۇرۇن\n 2) قىلىدىغان ئىشلار تاماملانغاندا\n 3) قىلىدىغان ئىشلار باشلانغاندىن كېيىن"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3046
 msgid "Persistent alarm"
-msgstr ""
+msgstr "ئۆزگەرمەس قوڭغۇراق"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3048
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
+msgstr "قوڭغۇراق چېلىنغاندا، Orage نى قوزغاتماي، كېيىن Orage قوزغىتىلغاندا خەۋەر قىلماقچى بولغاندا تاللىسا بولىدۇ."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3057
 msgid "Sound"
 msgstr "ئاۋاز"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3061 ../src/appointment.c:3181
 msgid "Use"
 msgstr "ئىشلەت"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3063
 msgid "Select this if you want audible alarm"
 msgstr "ئاۋازلىق گۈدۈك ئۈچۈن بۇنى تاللاڭ"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3080
 msgid "Repeat alarm sound"
-msgstr "ئاۋازقىق گۈدۈكنى تەكرارلىسۇن"
+msgstr "ئاۋازلىق گۈدۈكنى تەكرارلىسۇن"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3096 ../src/appointment.c:3395
 msgid "times"
 msgstr "ۋاقىت"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3112
 msgid "sec interval"
 msgstr "ئارقىلىق بەلگىلە"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3122
 msgid "Visual"
 msgstr "كۆرۈنۈشلۈك"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3126
 msgid "Use Orage window"
 msgstr "Orage كۆزنىكىنى ئىشلەت"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3128
 msgid "Select this if you want Orage window alarm"
 msgstr "Orage كۆزنەك گۈدۈكى ئۈچۈن بۇنى تاللاڭ"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3140
 msgid "Use notification"
 msgstr "ئۇقتۇرۇش ئىشلەت"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3142
 msgid "Select this if you want notification alarm"
 msgstr "ئۇقتۇرۇش گۈدۈكى ئۈچۈن بۇنى تاللاڭ"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3148
 msgid "Set timeout"
 msgstr "ۋاقىت چېكىنى بەلگىلە"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3150
 msgid "Select this if you want notification to expire automatically"
-msgstr ""
+msgstr "ئۇقتۇرۇشنىڭ مۇددىتىنى ئاپتوماتىك ئۆتكۈزۈۋەتمەكچى بولسىڭىز بۇنى تاللاڭ"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3161
 msgid "0 = system default expiration time"
 msgstr "0 = سىستېمىنىڭ كۆڭۈلدىكى ۋاقىت چېكى"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3166
 msgid "seconds"
 msgstr "سېكۇنت"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3177
 msgid "Procedure"
-msgstr ""
+msgstr "جەريان"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3183
 msgid "Select this if you want procedure or script alarm"
-msgstr ""
+msgstr "پروگرامما ياكى قوليازمىدا خەۋەر قىلىدىغان چاغدا تاللىسا بولىدۇ"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3189
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -923,156 +939,150 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
+msgstr "بىر قىسىم قاچۇرغۇچى ھەرپلەرنى ئۆزىڭىز كىرگۈزۈڭ.\nمەزكۇر تېكىست shell غا يوللاپ بېرىلىدۇ.\nتۆۋەندىكىلەر بولسا، ئىجرا قىلىنىۋاتقان ۋاقىتتا ئالماشتۇرۇلىدىغان ئالاھىدە بۇيرۇقلاردۇر:\n\t<&T>  دېيىشمە ماۋزۇسى\n\t<&D>  دېيىشمە تەپسىلاتى\n\t<&AT> قوڭغۇراق ۋاقتى\n\t<&ST> دېيىشمىنىڭ باشلىنىش ۋاقتى\n\t<&ET> دېيىشمىنىڭ ئاخىرلىشىش ۋاقتى"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3201
 msgid "Test this alarm by raising it now"
 msgstr "بۇ گۈدۈكنى ھازىرلا سىنا"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3208
 msgid "<b>Default alarm</b>"
 msgstr "<b>كۆڭۈلدىكى قوڭغۇراق</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3216
 msgid "Store current settings as default alarm"
 msgstr "ھازىرقى تەڭشەكنى كۆڭۈلدىكى گۈدۈك قىلىپ ساقلا"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3221
 msgid "Set current settings from default alarm"
 msgstr "كۆڭۈلدىكى گۈدۈكنى ھازىرقى تەڭشەككە قوللان"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "None"
 msgstr "يوق"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Daily"
 msgstr "كۈندىلىك"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Weekly"
 msgstr "ھەپتىلىك"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Monthly"
 msgstr "ئايلىق"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Yearly"
 msgstr "يىللىق"
 
-#: ../src/appointment.c:3176
-#, fuzzy
+#: ../src/appointment.c:3283
 msgid "Hourly"
-msgstr "دۆلەت"
+msgstr "ھەر سائەتتە"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Mon"
 msgstr "دۈشەنبە"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Tue"
 msgstr "سەيشەنبە"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Wed"
 msgstr "چارشەنبە"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Thu"
 msgstr "پەيشەنبە"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Fri"
 msgstr "جۈمە"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sat"
 msgstr "شەنبە"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sun"
 msgstr "قۇياش"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3290
 msgid "Recurrence"
-msgstr ""
+msgstr "قايتىلىنىش"
 
-# XXX
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3296
 msgid "Complexity"
 msgstr "مۇرەككەپ"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3299
 msgid "Basic"
 msgstr "ئاساس"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3305
 msgid "Advanced"
 msgstr "ئالىي"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3309
 msgid "Use this if you want regular repeating event"
-msgstr ""
+msgstr "ئەگەر قەرەللىك ۋاقىتتا تەكرارلاشنى خالىسىڭىز بۇنى ئىشلىتىڭ"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3311
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"تۆۋەندىكىدەك مۇرەككەپ تەڭشەك ئۈچۈن بۇنى ئىشلىتىڭ:\n"
-" ھەر شەنبە ياكى يەكشەنبە ياكى \n"
-" ھەر ئاينىڭ تۇنجى دۈشەنبە كۈنى دېگەندەكلەر ئۈچۈن"
+msgstr "تۆۋەندىكىدەك مۇرەككەپ تەڭشەك ئۈچۈن بۇنى ئىشلىتىڭ:\n ھەر شەنبە ياكى يەكشەنبە ياكى \n ھەر ئاينىڭ تۇنجى دۈشەنبە كۈنى دېگەندەكلەر ئۈچۈن"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3317
 msgid "Frequency"
 msgstr "Frequency"
 
-# ja: This word is unnecessary for ja translation.
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3323
 msgid "Each"
 msgstr "ھەر بىر"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3330
 msgid "occurrence"
-msgstr "كورۇلۇش"
+msgstr "كۆرۈلۈش"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3334
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
+msgstr "تەكرارلىققا مەلۇم دائىرىدە چەك قويىدۇ.\n مەسىلەن: ھەر ئۇچ كۈندە بىر قېتىم:\n تەكرارلىقى = ھەر كۈنى، ئارىلىقى = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3379
 msgid "Limit"
 msgstr "لىمىت"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3381
 msgid "Repeat forever"
 msgstr "مەڭگۈ قايتىلىسۇن"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3387
 msgid "Repeat "
 msgstr "قايتىلا "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3403
 msgid "Repeat until "
-msgstr "بۇنىنغىچە قايتىلىسۇن "
+msgstr "بۇنىڭغىچە قايتىلىسۇن "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3416
 msgid "Weekdays"
 msgstr "ئىش كۈنىدە"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3428
 msgid "Which day"
 msgstr "قايسى كۈن"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3436
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1080,111 +1090,108 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
+msgstr "ئايلىق پائالىيەت ۋە يىللىق پائالييەتنىڭ قايسىي خىزمەت كۈنى ئىكەنلىكىنى بەلگىلەيدۇ.\nمەسىلەن:\nھەر ئاينىڭ ئۈچىنچى چارشەنبە كۈنى: \nچاستوتىسى ھەر ئاي، خىزمەت كۈنى پەقەت چارشەنبىنىلا تەكشۈرىدۇ، قايسى كۈنى چارشەنبىنىڭ سانىدىن 2 تاللىنىدۇ"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3443
 msgid "TODO base"
-msgstr ""
+msgstr "بىجىرىلىدىغان ئىش ئاساسى"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3456
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
+msgstr "بىجىرىلىدىغان ئىش قانۇنىيەتلىك ھالدا باشلىنىدىغان ۋاقىتتا قوزغىتىلىپ ھەمدە ھەر ئارىلىقتا تەكرارلىنىدۇ، ئالدىنقى قېتىم قاچان تاماملىنىشتىن قەتئىنەزەر ئۇ تەكرار يۈز بېرىدۇ"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3458
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3464
 msgid "Exceptions"
 msgstr "مۇستەسنا"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3477
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
 msgstr ""
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3482
 msgid "Add excluded date (-)"
 msgstr "چىقىرىۋېتىدىغان كۈنلەرنى قوش(-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3484
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-"چىقىرىۋېتىدىغان كۈنلەر پۈتۈن كۈن بولىدۇ، ھەم بۇ كۈندە دەيىشمەلەرنىڭ "
-"ھېچقايسىسى ئېلىپ بېرىلمايدۇ"
+msgstr "چىقىرىۋېتىدىغان كۈنلەر پۈتۈن كۈن بولىدۇ، ھەم بۇ كۈندە دېيىشمىلەرنىڭ ھېچقايسىسى ئېلىپ بېرىلمايدۇ"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3490
 msgid "Add included time (+)"
 msgstr "قوشۇلىدىغان ۋاقىتنى قوش(+)"
 
-# FIXME:
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3492
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
 msgstr ""
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3509
 msgid "Action dates"
-msgstr "مەشغۇلات چىسلاسى"
+msgstr "مەشغۇلات چېسلاسى"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1056 ../src/mainbox.c:323
 msgid "_View"
 msgstr "كۆرۈنۈش(_V)"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1075
 msgid "_Go"
 msgstr "يۆتكەل(_G)"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1121
 msgid "New"
 msgstr "يېڭى"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "قايت"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr ""
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "بۈگۈن"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "ئالدىغا"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1139
 msgid "Refresh"
 msgstr "يېڭىلا"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1146 ../src/interface.c:834
 msgid "Close"
 msgstr "تاقا"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "نامەلۇم"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "       كۆرسىتىدىغان كۈنلەرنىڭ سانى"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - كۈنلەرنى كۆرۈش"
 
@@ -1193,67 +1200,77 @@
 msgid "All day"
 msgstr "بارلىق كۈنلەر"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:583 ../src/event-list.c:1292
 msgid "Time"
 msgstr "ۋاقىت"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:751
 msgid "No rows have been selected."
 msgstr "قۇر تاللانمىغان"
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:752
 msgid "Click a row to select it and after that you can copy it."
 msgstr "چېكىپ قۇرنى تاللىغىلى بولىدۇ ئاندىن كېيىن ئۇنى كۆچۈرۈشكە بولىدۇ."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:920
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
+msgstr "تاللانغان بارلىق دېيىشمىلەر \nمەڭگۈلۈككە ئۆچۈرۈلىدۇ"
+
+#: ../src/event-list.c:923
+msgid "Yes, remove them"
 msgstr ""
-"تاللانغان بارلىق دەيىشمەلەر \n"
-"مەڭگۈلۈككە ئۆچۈرۈلىدۇ"
 
 #: ../src/event-list.c:1130
+msgid "Back"
+msgstr "ئارقىسىغا"
+
+#: ../src/event-list.c:1134
+msgid "Forward"
+msgstr "ئالدىغا"
+
+#: ../src/event-list.c:1141
 msgid "Find"
 msgstr "ئىزدە"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1148
 msgid "Dayview"
 msgstr ""
 
-#: ../src/event-list.c:1170
+#: ../src/event-list.c:1181
 msgid "Extra days to show "
-msgstr ""
+msgstr "كۆرسىتىدىغان قوشۇمچە كۈنلەر "
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1212
 msgid "Journal entries starting from:"
 msgstr ""
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1232
 msgid "Search"
 msgstr "ئىزدە"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1235
 msgid "Search text "
 msgstr "ئىزدەيدىغان تېكىست "
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1300
 msgid "Flags"
-msgstr "Flag لار"
+msgstr "بەلگىلەر"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1308
 msgid "Title"
 msgstr "ماۋزۇ"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1334
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
@@ -1261,79 +1278,84 @@
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
 
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr ""
-
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr ""
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "ئارخىپلاشنى ئىشلەتكىلى بولمايدۇ. ئاخىرلاشتۇرۇۋاتىدۇ"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "ئارخىپلاش بوسۇغىسى: %d ئاي"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\t%04d-%02d-%02d دىن كونا بولغان ئارخىپلاش ھادىسىسى"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "ئارخىپلاش uid: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tVTODO تاماملانمىدى؛ ئارخىپلانمايدۇ"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr ""
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "ئارخىپلاش تاماملاندى\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "ئارخىپ ئۆچۈرۈشنى باشلاندى."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr ""
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr ""
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "ئارخىپ ئۆچۈرۈش تاماملاندى.\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Orage كۆڭۈلدىكى گۈدۈك"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "گۈدۈك تۇرغۇزۇش: %d گۈدۈك قوشۇلدى. %d ھادىسە بىر تەرەپ قىلىندى."
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr ""
+
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr ""
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
@@ -1355,7 +1377,16 @@
 msgid "Import file preprocessing done"
 msgstr "ھۆججەت ئىمپورت قىلىش تاماملاندى"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "يىلنامە ھۆججىتى"
 
@@ -1363,603 +1394,667 @@
 msgid "Current foreign files"
 msgstr "ھازىرقى سىرتقى ھۆججەتلەر"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "پەقەتلا ئوقۇش"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "ئوقۇپ يېزىش"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** سىرتقى ھۆججەت يوق *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr ""
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "ئەكىرىش/چىقىرىش"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "ئەكىر"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "ھۆججەتتىن ئوقۇ:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"ھۆججەت نامى پەش ئارقىلىق ئايرىلسۇن(,).\n"
-" دىققەت: Orage دا پەشنى ھۆججەت نامىدا ئىشلەتكىلى بولمايدۇ."
+msgstr "ھۆججەت نامى پەش ئارقىلىق ئايرىلسۇن(,).\n دىققەت: Orage دا پەشنى ھۆججەت نامىدا ئىشلەتكىلى بولمايدۇ."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "چىقار"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "ھۆججەت ياز:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "تاللا"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
-msgstr "بارلىق دەيىشمەلەر"
+msgstr "بارلىق دېيىشمىلەر"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
-msgstr "ئىسىملىك دەيىشمەلەر: "
+msgstr "ئىسىملىك دېيىشمىلەر: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "event-list كۆزنىكىدىن ئوڭايلا سۆرەپ ئەكىرگىلى بولىدۇ."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr ""
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "ئارخىپ"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "ھازىر ئارخىپلا(بوسۇغا: %d ئاي)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "ئارخىپ بوسۇغىسىنى پارامېتىر ئارىلىق ئۆزگەرتكىلى بولىدۇ"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr ""
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
 msgstr ""
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Orage ھۆججەتلىرى"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Orage ئاساسلىق يىلنامە ھۆججىتى"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "ھازىرقى ھۆججەت"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "يېڭى ھۆججەت"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "مەشغۇلات تاللانمىلىرى"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr ""
+
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
-msgstr "ئاتىنى ئۆزگەرت"
+msgstr "ئات ئۆزگەرت"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
 msgstr ""
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "كۆچۈر"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-"ھازىرقى ھۆججەت كۆچۈرۈلىدۇ، بۇرۇنقى ئورۇندىكىسى شۇ پېتى قالىدۇ، ئۆزگەرمەيدۇ."
+msgstr "ھازىرقى ھۆججەت كۆچۈرۈلىدۇ، بۇرۇنقى ئورۇندىكىسى شۇ پېتى قالىدۇ، ئۆزگەرمەيدۇ."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "يۆتكە"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "ھازىرقى ھۆججەت يۆتكىۋېتىلىدۇ ھەم بۇرۇنقى ئورۇندىن غايىب بولۇپ كېتىدۇ."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "ئارخىپ ھۆججىتى"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "سىرتتىن كەلگەن ھۆججەتلەر"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "يېڭىدىن سىرتقى ھۆججەت قوش"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "سىرتتىن كەلگەن ھۆججەت:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "تاللانما"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "پەقەتلا ئوقۇش"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr ""
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
 msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr ""
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
+msgstr "\tبۇ بولسا %s نەشرى %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
+msgstr "\tمەزكۇر پروگرامما GNU General Public License, 2-نەشرى ئاساسىدا تارقىتىلغان\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr ""
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "GTK+-%d.%d.%d. نى ئىشلىتىش.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
-msgstr ""
+msgstr "\tئىمپورت قىلىشتا DBUS ئىشلىتىدۇ.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
+msgstr "\tبۇنىڭدا DBUS ئىشلەتمەيدۇ، ئىمپورت قىلىش تولۇق ئىشلىمەيدۇ.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
-msgstr ""
+msgstr "\tبۇنىڭدا libnotify ئىشلىتىدۇ.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
-msgstr ""
+msgstr "\tبۇنىڭدا libnotify ئىشلەتمەيدۇ.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
-msgstr ""
+msgstr "\tبۇنىڭدا ئاپتوماتىك ئارخىپلاش ئىشلىتىدۇ.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
-msgstr ""
+msgstr "\tبۇنىڭدا ئارخىپلاش ئىشلەتمەيدۇ.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
-msgstr ""
+msgstr "\tمەشغۇلات سىستېمىسىنىڭ  libical بوغچىسىنى ئىشلىتىدۇ.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
+msgstr "\tبۇنىڭدا Orage نىڭ ئۆزىنىڭ libical بوغچىسىنى ئىشلىتىدۇ.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"ئىشلىتىش ئۇسۇلى: orage [تاللانما] [ھۆججەتلەر]\n"
-"\n"
+msgstr "ئىشلىتىش ئۇسۇلى: orage [تاللانما] [ھۆججەتلەر]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "تاللانمىلار:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\t orage نىڭ نەشرىنى كۆرسىتىپ بېرىدۇ\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tمەزكۇر تېكىستنى بېسىپ چىقىرىدۇ\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \tتەڭشەك form نى كۆرسىتىدۇ\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\torage كۆرۈنىدىغان ياكى كۆرۈنمەيدىغان قىلىدۇ\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) file [RW] \t سىرتقى ھۆججەت قوشىدۇ\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) file \tسىرتقى ھۆججەت ئۆچۈرىدۇ\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
 msgstr ""
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
-msgstr "files=orage گە يۇكلەيدىغان ical ھوججەتلىرى\n"
+msgstr "files=orage گە يۈكلەيدىغان ical ھۆججەتلىرى\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tdbus orage نىڭ ئىچىدە يوق. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
 msgstr ""
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"نامەلۇم تاللانما %s\n"
-"\n"
+msgstr "\nنامەلۇم تاللانما %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "سانلىق ئاساس ئالماشتۇر(_E)"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "تەھرىر(_E)"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "تاللانغان چېسلانى كۆرسەت(_D)"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "تاللانغان ھەپتىنى كۆرسەت(_W)"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "بۈگۈننى تاللا(_T)"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Globaltime"
+msgstr "دۇنيا ۋاقتىنى كۆرسەت(_G)"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "ياردەم(_H)"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr ""
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr ""
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr ""
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "زادىلا"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
-"ماۋزۇ: %s\n"
-" باشلانغان:\t%s\n"
-" ئاخىرلاشقان:\t%s\n"
-" ئىزاھات:\n"
-"%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
-"ماۋزۇ: %s\n"
-" باشلانغان:\t%s\n"
-" ئاخىرلاشقان:\t%s\n"
-" ئىزاھات:\n"
-"%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>ئىشلار:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>%s نىڭ ھادىسىلىرى:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>%s- %s نىڭ ھادىسىلىرى :</b>"
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:486
 msgid "Main settings"
-msgstr "مەسئۇل ئادەم"
+msgstr "ئاساسىي تەڭشەكلەر"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:492
 msgid "Timezone"
 msgstr "ۋاقىت رايونى"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:507
 msgid "You should always define your local timezone."
 msgstr "يەرلىك ۋاقىت رايونىنى بەلگىلىمىسىڭىز بولمايدۇ."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:515
 msgid "Archive threshold (months)"
 msgstr "ئارخىپ بوسۇغىسى (ئايلار)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:525
 msgid "(0 = no archiving)"
 msgstr "(0 = ئارخىپلانمايدۇ)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:528
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"ئارخىپلاش،  ھادىسىلەرنى بىر تەرەپ قىلغاندا، ۋاقىت ۋە دىسكا بوشلۇقىنى تەجەيدۇ."
+msgstr "ئارخىپلاش،  ھادىسىلەرنى بىر تەرەپ قىلغاندا، ۋاقىت ۋە دىسكا بوشلۇقىنى تېجەيدۇ."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:536
 msgid "Sound command"
 msgstr "ئۈن بۇيرۇقى"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:551
 msgid "This command is given to shell to make sound in alarms."
 msgstr ""
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "كۆرسەت"
+#: ../src/parameters.c:590
+msgid "Calendar window"
+msgstr ""
 
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "يىلنامە ئاساس كۆزنىكى"
+#: ../src/parameters.c:597
+msgid "Calendar visual details"
+msgstr ""
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:603
 msgid "Show borders"
 msgstr "گىرۋەكلەرنى كۆرسەت"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:608
 msgid "Show menu"
 msgstr "تىزىملىكنى كۆرسىتىش"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "ئاي ۋە يىلنى كۆرسەت"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:616
 msgid "Show day names"
 msgstr "كۈن ناملىرىنى كۆرسەت"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:621
 msgid "Show week numbers"
 msgstr "ھەپتە نومۇرىنى كۆرسىتىدۇ"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:629
+msgid "Show month and year"
+msgstr "ئاي ۋە يىلنى كۆرسەت"
+
+#: ../src/parameters.c:649
+msgid "Calendar info boxes"
+msgstr ""
+
+#: ../src/parameters.c:654
 msgid "Show todo list"
 msgstr "ئىشلار تىزىملىكىنى كۆرسىتىدۇ"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:661
 msgid "Number of days to show in event window"
 msgstr "ھادىسە كۆزنىكىدە كۆرسىتىدىغان كۈننىڭ سانى"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:667
 msgid "0 = do not show event list at all"
 msgstr "0 = ھادىسە تىزىملىكىنى زادىلا كۆرسەتمەيدۇ"
 
-#: ../src/parameters.c:676
-msgid "Show on all desktops"
+#: ../src/parameters.c:680
+msgid "Calendar visibility"
 msgstr ""
 
-#: ../src/parameters.c:683
-#, fuzzy
-msgid "Keep on top"
-msgstr "ئۈستىدە تۇرسۇن"
+#: ../src/parameters.c:685
+msgid "Show on all desktops"
+msgstr "بارلىق ئۈستەلئۈستىلىرىدە كۆرسەتسۇن"
 
 #: ../src/parameters.c:690
+msgid "Keep on top"
+msgstr "كۆزنەك ھەمىشە ئەڭ ئۈستىدە تۇرسۇن"
+
+#: ../src/parameters.c:698
 msgid "Show in taskbar"
-msgstr "ۋەزىپە تاياقچىسىنى كۆرسەت"
+msgstr "ۋەزىپە بالدىقىنى كۆرسەتسۇن"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:703
 msgid "Show in pager"
 msgstr ""
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:711
 msgid "Show in systray"
 msgstr "قونداقتا كۆرسەت"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:732
 msgid "Calendar start"
 msgstr "يىلنامە باشلاش"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:737
 msgid "Show"
 msgstr "كۆرسەت"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:749
 msgid "Hide"
 msgstr "يوشۇر"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:761
 msgid "Minimized"
 msgstr "كىچىكلىتىش"
 
-#: ../src/parameters.c:793
-#, fuzzy
-msgid "Extra settings"
-msgstr "باشقا تەڭشەكلەر"
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "يىلنامە ئاساس كۆزنىكى"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "بۈگۈننى تاللا(_T)"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:781
+msgid "On calendar window open"
 msgstr ""
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "ھەرىكەتچان قوندۇرما سىنبەلگىسى ئىشلەت"
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "ھەرىكەتچان سىنبەلگىسى ئىشلەت"
+#: ../src/parameters.c:786
+msgid "Select today's date"
+msgstr ""
 
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "ھەرىكەتچان سىنبەلگىدە ئاي ۋە كۈن كۆرسىتىلسۇن."
+#: ../src/parameters.c:799
+msgid "Select previously selected date"
+msgstr ""
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
+#: ../src/parameters.c:817
+msgid "Calendar day double click shows"
 msgstr ""
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:822
 msgid "Days view"
 msgstr ""
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:834
 msgid "Event list"
 msgstr "ھادىسە تىزىملىكى"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr "Eventlist كۆزنىكى"
+#: ../src/parameters.c:856
+msgid "Extra settings"
+msgstr "باشقا تەڭشەكلەر"
+
+#: ../src/parameters.c:863
+msgid "Event list window extra days"
+msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:868
 msgid "Number of extra days to show in event list"
 msgstr "ھادىسە تىزىملىكىدە كۆرسىتىدىغان باشقا كۈنلەر"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:876
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
+msgstr "بۇ پەقەتلا كۆڭۈلدىكى قىممىتى، بۇنى eventlist كۆزنىكىدە ئۆزگەرتكىلى بولىدۇ."
+
+#: ../src/parameters.c:886
+msgid "Day view window default first day"
 msgstr ""
-"بۇ پەقەتلا كۆڭۈلدىكى قىممىتى، بۇنى eventlist كۆزنىكىدە ئۆزگەرتكىلى بولىدۇ."
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:891
+msgid "First day of week"
+msgstr ""
+
+#: ../src/parameters.c:904
+msgid "Selected day"
+msgstr ""
+
+#: ../src/parameters.c:922
+msgid "Use dynamic tray icon"
+msgstr "ھەرىكەتچان قوندۇرما سىنبەلگىسى ئىشلەت"
+
+#: ../src/parameters.c:927
+msgid "Use dynamic icon"
+msgstr "ھەرىكەتچان سىنبەلگىسى ئىشلەت"
+
+#: ../src/parameters.c:933
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "ھەرىكەتچان سىنبەلگىدە ئاي ۋە كۈن كۆرسىتىلسۇن."
+
+#: ../src/parameters.c:941 ../src/parameters.c:946
 msgid "Use wakeup timer"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:952
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:961
+msgid "Foreign file default visual alarm"
+msgstr ""
+
+#: ../src/parameters.c:966
+msgid "Orage window"
+msgstr ""
+
+#: ../src/parameters.c:979
+msgid "Notify notification"
+msgstr ""
+
+#: ../src/parameters.c:997
+msgid "Always quit when asked to close"
+msgstr ""
+
+#: ../src/parameters.c:1002
+msgid "Always quit"
+msgstr ""
+
+#: ../src/parameters.c:1008
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr ""
+
+#: ../src/parameters.c:1024
 msgid "Orage Preferences"
 msgstr "Orage خاسلىقى"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1136
 msgid "First Orage start. Searching default timezone."
 msgstr "Orage تۇنجى قوزغالدى. كۆڭۈلدىكى ۋاقىت رايونىنى ئىزدەۋاتىدۇ."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1155
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "كۆڭۈلدىكى ۋاقىت رايونى  %s غا توغرىلا."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1158
 msgid "Default timezone not found, please, set it manually."
 msgstr "كۆڭۈلدىكى ۋاقىت رايونى تېپىلمىدى، ئۆزىڭىز بېكىتىڭ."
 
@@ -1971,40 +2066,35 @@
 msgid "Open"
 msgstr "ئاچ"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "ئەسلەتكۈ - Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr ""
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "بەلگىلىك ۋاقىتتىن  كېيىن ئەسكەرتمە بەرگىن"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr "بەلگىلىك ۋاقىتتىن  كېيىن ئەسكەرتمە بېرىش ئۈچۈن <Execute>  نى چەك:"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "كېيىنكى ئاكتىپ گۈدۈكلەر:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d d %02d h %02d min to: %s"
+msgstr "\n%02d d %02d h %02d min to: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"ئاكتىپ گۈدۈك تېپىلمىدى"
+msgstr "\nئاكتىپ گۈدۈك تېپىلمىدى"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2756,7 +2846,7 @@
 
 #: ../src/timezone_names.c:223
 msgid "Arctic/Longyearbyen"
-msgstr "شىمالىي قۇتۇپ/لوڭيەاربيەن"
+msgstr "شىمالىي قۇتۇپ/لوڭيىئېربىن"
 
 #: ../src/timezone_names.c:224
 msgid "Asia"
@@ -3052,7 +3142,7 @@
 
 #: ../src/timezone_names.c:297
 msgid "Atlantic"
-msgstr ""
+msgstr "ئاتلانتىك ئوكيان"
 
 #: ../src/timezone_names.c:298
 msgid "Atlantic/Azores"
@@ -3568,72 +3658,33 @@
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
 msgid "Orage Panel Clock"
-msgstr "Orage Panel سائىتى"
+msgstr "Orage كۆزنەك سائىتى"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
 msgid "Show time and date?"
 msgstr "ۋاقىت ۋە چېسلانى كۆرسەتسۇنمۇ؟"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "يىلنامە"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Orage يىلنامە تەڭشىكى"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Orage تەڭشىكى"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Xfce 4 يىلنامە پروگراممىسى (Orage) نىڭ تەڭشەكلىرى"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "ئۈستەليۈزى يىلنامىسى"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Orage يىلنامە تەڭشىكى"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "يىلنامە"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Orage يىلنامە"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "ماۋزۇ: %s\n"
-#~ " باشلانغان:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " تامام:\t%s\n"
-#~ "ئىزاھات:\n"
-#~ "%s"
-
-#~ msgid "Orage clock"
-#~ msgstr "Orage سائەت"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "ئەسلى قۇرغۇچى، پېنسىيىگە چىققان مەسئۇل ئادەم"
-
-#~ msgid "Contributor"
-#~ msgstr "تۆھپىكار"
-
-#~ msgid "Info"
-#~ msgstr "ئۇچۇر"
-
-#~ msgid "Warning"
-#~ msgstr "دىققەت"
-
-#~ msgid "Error"
-#~ msgstr "خاتالىق"
-
-#~ msgid "Set sticked"
-#~ msgstr "چاپلىشىپ تۇرسۇن"
-
-#~ msgid "Select always today"
-#~ msgstr "داۋاملىق بۈگۈن تاللانسۇن"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "ئۈستەلئۈستى يىلنامىسى"
diff -Nru orage-4.8.3/po/uk.po orage-4.12.1/po/uk.po
--- orage-4.8.3/po/uk.po	2012-01-03 12:01:10.000000000 +0000
+++ orage-4.12.1/po/uk.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,22 +1,39 @@
-# Ukrainian translations to xfcalendar package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Maxim V. Dziumanenko <mvd@mylinux.com.ua>.
-#
-# Dmitry Nikitin <luckas_fb@mail.ru>, 2008.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Dmitry Nikitin <luckas_fb@mail.ru>, 2008
+# Yarema aka Knedlyk <yupadmin@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
-"Project-Id-Version: xfcalendar\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2008-11-17 11:35+0200\n"
-"Last-Translator: Dmitry Nikitin <luckas_fb@mail.ru>\n"
-"Language-Team: Ukrainian <xfce4-dev@xfce.org>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2014-10-01 21:57+0000\n"
+"Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/xfce-apps/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "без підкреслення"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "одинарно"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "подвійно"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "низько"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -32,9 +49,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"клацніть для зміни часу"
+msgstr "%s\nклацніть для зміни часу"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -44,9 +59,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"кнопка 1 для вибору властивостей\n"
-"кнопка 2 для зміни часу годинників"
+msgstr "кнопка 1 для вибору властивостей\nкнопка 2 для зміни часу годинників"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -55,9 +68,11 @@
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"уточнити на одну хвилину. Натисніть кнопку зі стрілкою 2 щоб змінити тільки "
-"на 1 хвилину."
+msgstr "уточнити на одну хвилину. Натисніть кнопку зі стрілкою 2 щоб змінити тільки на 1 хвилину."
+
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Глобальний час"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -206,8 +221,7 @@
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
-"Перейшовши сюди використовуєте типовий системний колір замість вибраного"
+msgstr "Перейшовши сюди використовуєте типовий системний колір замість вибраного"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
@@ -219,8 +233,7 @@
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"Перейшовши сюди використовуєте типовий системний шрифт замість вибраного"
+msgstr "Перейшовши сюди використовуєте типовий системний шрифт замість вибраного"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -261,6 +274,10 @@
 msgid "Use normal decorations"
 msgstr "Використовувати основні прикраси"
 
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "Немає"
+
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
 msgstr "Не показувати прикраси вікон (рамки)"
@@ -336,7 +353,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Місце"
@@ -397,97 +414,108 @@
 msgid "floating"
 msgstr "плаваюче"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "Світовий час"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Світовий час Orage"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "Відображати годинники з різних країн"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Світовий час"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "Без повертання"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "Повернути вліво"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "Повернути вправо"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "Зовнішній вигляд"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
 msgstr "Показувати _фрейм"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
 msgstr "встановити основний _колір:"
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
 msgstr "встановити колір _тла:"
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
 msgstr "встановити _висоту:"
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
 msgstr "Зверніть увагу, Ви не можете змінити висоту горизонтальних панелей"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
 msgstr "встановити _ширину:"
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
 msgstr "Зверніть увагу, Ви не можете змінити ширину вертикальних панелей"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "Показати лінії _вертикально"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "Опції годинника"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
 msgstr "встановити часовий пояс в:"
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "Стрічка %d:"
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
 msgstr "Введіть будь-який правильний параметр функції strftime."
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
 msgstr "Спливаючі:"
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
 msgstr "скоригувати час після призупинення/сплячки"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"Вам це потрібно якщо це відбувається в короткому проміжку часу (менше  5 "
-"годин) призупинення чи сплячки і Ваш видимий час не включає секунд. В цих "
-"випадках можливо, Orageclock відображатиме неточний час ніж вибраний  Вами. "
-"(Виберіть цю опцію для правильної роботи повідомлень з допомогою    "
-"процесора і системного переривання)"
+msgstr "Вам це потрібно якщо це відбувається в короткому проміжку часу (менше  5 годин) призупинення чи сплячки і Ваш видимий час не включає секунд. В цих випадках можливо, Orageclock відображатиме неточний час ніж вибраний  Вами. (Виберіть цю опцію для правильної роботи повідомлень з допомогою    процесора і системного переривання)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -497,22 +525,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"Ця програма використовує strftime для одержання часу.\n"
-"Використовуйте будь-який правильний код щоб отримати час в потрібному "
-"форматі\n"
-"Деякі з основних кодів:\n"
-"\t%A = день тижня\t\t\t%B = місяць\n"
-"\t%c = дата і час\t\t%R = години і хвилини\n"
-"\t%V = номер тижня\t\t%Z = використовуваний часовий пояс\n"
-"\t%H = година \t\t\t\t%M = хвилина\n"
-"\t%X = місцевий час\t\t\t%x = місцева дата"
+msgstr "Ця програма використовує strftime для одержання часу.\nВикористовуйте будь-який правильний код щоб отримати час в потрібному форматі\nДеякі з основних кодів:\n\t%A = день тижня\t\t\t%B = місяць\n\t%c = дата і час\t\t%R = години і хвилини\n\t%V = номер тижня\t\t%Z = використовуваний часовий пояс\n\t%H = година \t\t\t\t%M = хвилина\n\t%X = місцевий час\t\t\t%x = місцева дата"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
 msgstr "Налаштування Orage"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -521,8 +539,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
 
@@ -537,7 +554,7 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Кінець"
 
@@ -545,13 +562,13 @@
 msgid "Due"
 msgstr "Точно"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Менеджер Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Вибрати файл..."
 
@@ -559,227 +576,281 @@
 msgid "Sound Files"
 msgstr "Звукові файли"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Всі файли"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Призначення інформації було змінено."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "Хочете продовжити?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "Ні, не виходити"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "Так, незважати на зміни і вийти"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "Кінець цієї події заплановано раніше ніж її початок."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "Не встановлено"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "Додати нову зустріч до цього файлу."
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Типовий файл Orage"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "Додати зустріч не вдалося."
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "Сталася помилка при додаванні зустрічі. Перегляньте файл запису журналу для інформації."
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "Оновлення зустрічі не вдалося."
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "Перегляньте файл журналу для більшої інформації. (Можливо файл був оновлено ззовні з Orage?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
 msgstr "Ця подія буде повністю видалена."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "Ні, скасувати вилучення"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "Так, вилучити це"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Виберіть дату"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Сьогодні"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "Цієї події не існує."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
 msgstr "Це можливо видалено, оновіть вікно програми."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "Поточні категорії"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "Додати нову категорію з кольором"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "Категорія:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "Кольори категорій - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr " *** КОПІЮВАТИ ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "Нова подія - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Файл"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "Зб_ерегти і закрити"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "Д_ублювати"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Зберегти"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Зберегти і закрити"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Повернути"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Дублювати"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Видалити"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Вільний"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Зайнятий"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Загальне"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "Тип"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "Подія"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"Разова подія. Наприклад:\n"
-"Зустріч чи день народження або ТВ-шоу."
+msgstr "Разова подія. Наприклад:\nЗустріч чи день народження або ТВ-шоу."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "Зробити"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"Те, що вам потрібно зробити в призначений час. Наприклад:\n"
-"Помити машину або тестувати нову версію Orage."
+msgstr "Те, що вам потрібно зробити в призначений час. Наприклад:\nПомити машину або тестувати нову версію Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "Журнал"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"Створіть записку що має відбутися. Наприклад:\n"
-"Не забути подзвонити матері, або випав перший сніг."
+msgstr "Створіть записку що має відбутися. Наприклад:\nНе забути подзвонити матері, або випав перший сніг."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Назва "
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "На весь день"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Початок"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "Встановити"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Тривалість"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "днів"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "годин"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "хвилин"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Готовність"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "Завершені"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "Готово"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "Категорії"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"Це спеціальні категорії, котрі можуть бути використані в кольорі подій в "
-"списку перегляду."
+msgstr "Це спеціальні категорії, котрі можуть бути використані в кольорі подій в списку перегляду."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "оновити кольори для категорій."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "Пріоритет"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "Якщо Ви встановите 8 або більше, тоді зустріч НЕ появиться у вікні списку.\nВи можете використовувати цю можливість для побудови Вашого списку, але це утруднить знаходження цієї зустрічі.\n(Будильники працюють все ще нормально.)\n(Існує недокументований параметр, що можна встановити типову границю як 8.)"
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Примітка"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -788,140 +859,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"Ці скорочення команд застосовуються негайно:\n"
-"    <D> вставити поточну дату в локальному форматі\n"
-"    <T> вставити час і \n"
-"    <DT> вставити дату і час.\n"
-"\n"
-"Ці появляються пізніше під час перегляду:\n"
-"    <&Ynnnn> це конвертований поточний рік мінус nnnn.\n"
-"(Може бути використано в нагадуваннях про дні народження для показу віку.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "Ці скорочення команд застосовуються негайно:\n    <D> вставити поточну дату в локальному форматі\n    <T> вставити час і \n    <DT> вставити дату і час.\n\nЦі появляються пізніше під час перегляду:\n    <&Ynnnn> це конвертований поточний рік мінус nnnn.\n(Може бути використано в нагадуваннях про дні народження для показу віку.)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "Перед початком"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "Перед завершенням"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "Після початку"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "Після завершення"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Дзвінок"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "Час дзвінка"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"Частота отримання дзвінка:\n"
-" 1) перед початком Події\n"
-" 2) перед завершенням Зробити\n"
-" 3) після початку Зробити"
+msgstr "Частота отримання дзвінка:\n 1) перед початком Події\n 2) перед завершенням Зробити\n 3) після початку Зробити"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr "Стійкий дзвінок"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"Виберіть це щоб Orage нагадував про подію, при його неактивності коли подія "
-"вже відбулася."
+msgstr "Виберіть це щоб Orage нагадував про подію, при його неактивності коли подія вже відбулася."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Звук"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "Використовувати"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
 msgstr "Виберіть це, якщо хочете чути дзвінок"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "Повторювати мелодію дзвінка"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "години"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "інтервал в сек"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "Візуальний"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "Використовувати вікно Orage"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
 msgstr "Виберіть це, якщо хочете отримувати вікно з дзвінком"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "Використовувати повідомлення"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
 msgstr "Виберіть це, якщо хочете отримувати повідомлення дзвінка"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "Встановити затримку"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
-msgstr ""
-"Виберіть це, якщо хочете отримувати автоматичні повідомлення про прострочення"
+msgstr "Виберіть це, якщо хочете отримувати автоматичні повідомлення про прострочення"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 = типовий системний прострочення часу"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "секунд"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "Процедура"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
 msgstr "Виберіть це, якщо хочете отримувати процедуру або скрипт дзвінка"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -931,164 +986,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
-"Ви повинні додати всі символи самі.\n"
-"Ця стрічка подана тільки для запуску шелу.\n"
-"Наступні спеціальні команди заміняться під час запуску\n"
-"\t<&T> назва події\n"
-"\t<&D> опис події\n"
-"\t<&AT> час будильника\n"
-"\t<&ST> час початку події\n"
-"\t<&ET> час закінчення події"
+msgstr "Ви повинні додати всі символи самі.\nЦя стрічка подана тільки для запуску шелу.\nНаступні спеціальні команди заміняться під час запуску\n\t<&T> назва події\n\t<&D> опис події\n\t<&AT> час будильника\n\t<&ST> час початку події\n\t<&ET> час закінчення події"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
 msgstr "Протестуйте будильник, збільшивши зараз звук"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "<b>Типовий дзвінок</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
 msgstr "Запам'ятати поточні параметри як типові для дзвінка"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
 msgstr "Встановити поточні параметри з типового дзвінка"
 
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "Немає"
-
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Щоденно"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Щотижня"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Щомісяця"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Щорічно"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
 msgstr "Щогодини"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "Пнд"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "Втр"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "Срд"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "Чтв"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "Пнт"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "Суб"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "Ндл"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Повторюваність"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "Складність"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "Основне"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "Додатково"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr "Використовуйте це щоб призначити постійно повторювані події"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"Використовуйте це щоб об'єднати умови, як такі:\n"
-" Кожної суботи та понеділка, або \n"
-" Перший четвер кожного місяця"
+msgstr "Використовуйте це щоб об'єднати умови, як такі:\n Кожної суботи та понеділка, або \n Перший четвер кожного місяця"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "Частота"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "Кожний"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "випадок"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"Обмеження частоти визначеним інтервалом.\n"
-" Наприклад: Кожний третій день:\n"
-" Частота = щоденно а інтервал = 3"
+msgstr "Обмеження частоти визначеним інтервалом.\n Наприклад: Кожний третій день:\n Частота = щоденно а інтервал = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "Обмеження"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Завжди повторювати"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Повторюваність"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Повторювати доти "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "Дні тижня"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr "Кожний день"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1096,293 +1133,297 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"Зазначте день тижня для щомісячної і щорічної події.\n"
-" Наприклад:\n"
-" Друга Середа кожного місяця:\n"
-"\tЧастота = Щомісяця,\n"
-"\tДні тижня = перевіряти тільки Середу,\n"
-"\tКотрий день = вибрати 2 з числа Середи"
+msgstr "Зазначте день тижня для щомісячної і щорічної події.\n Наприклад:\n Друга Середа кожного місяця:\n\tЧастота = Щомісяця,\n\tДні тижня = перевіряти тільки Середу,\n\tКотрий день = вибрати 2 з числа Середи"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr "Що ще зробити"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"ЩоЗробити (TODO) регулярно появляється при завантаженні і повторюється після "
-"кожного інтервалу події, без значення коли він був востаннє завершений"
+msgstr "ЩоЗробити (TODO) регулярно появляється при завантаженні і повторюється після кожного інтервалу події, без значення коли він був востаннє завершений"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"Поява ЩоЗробити (TODO) залежить від часу завершення події і повторюється "
-"після кожного інтервалу, починаючи від останнього завершеного.\n"
-"(Зауважте, що Ви не зможете нічого сказати про історію ЩоЗробити (TODO), "
-"тому що поява змінюється після кожного завершення події.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "Поява ЩоЗробити (TODO) залежить від часу завершення події і повторюється після кожного інтервалу, починаючи від останнього завершеного.\n(Зауважте, що Ви не зможете нічого сказати про історію ЩоЗробити (TODO), тому що поява змінюється після кожного завершення події.)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "Винятки"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"Додати більше днів-винятків, клацаючи на дні календаря нижче.\n"
-"Винятки це або виключення (-), або включення (+) в залежності від вибору.\n"
-"Видалення через клацання на даних."
+msgstr "Додати більше днів-винятків, клацаючи на дні календаря нижче.\nВинятки це або виключення (-), або включення (+) в залежності від вибору.\nВидалення через клацання на даних."
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr "Додати виключену дату (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr "Виключені дати є повними днями, коли ці події не трапляються"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
 msgstr "Додати включений час (+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
-"Включені часи мають ту саму часову зону що й час початку, але але вони "
-"можуть мати різний час"
+msgstr "Включені часи мають ту саму часову зону що й час початку, але але вони можуть мати різний час"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
 msgstr "Дати дії"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Перегляд"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "Пе_рейти"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Нова"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Назад"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Сьогодні"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Вперед"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "Назад на тиждень"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "Назад на день"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "Вперед на день"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "Вперед на тиждень"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Оновити"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Закрити"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "Невідомий"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "Кількість днів для показу"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - перегляд дня"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Всі дні"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Час"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "Не було вибрано рядка."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
-msgstr ""
-"Клацніть на рядку для його вибору і після цього Ви зможете його скопіювати."
+msgstr "Клацніть на рядку для його вибору і після цього Ви зможете його скопіювати."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"Ви видалите повністю всі\n"
-"виділені події."
+msgstr "Ви видалите повністю всі\nвиділені події."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "Так, вилучити їх"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Назад"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Вперед"
+
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "Знайти"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "Перегляд дня"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "Додаткові дні для показу"
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "Більше днів для показу:"
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "тільки перше повторення"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "Позначте це, якщо Ви бажаєте бачити тільки першу повторювану подію. Типово показуються всі події.\nЗауважте, що ця опція покаже теж всі негайні події.\nПовторювані події можуть появлятися як перші в списку і раніше тільки тоді, коли вони є."
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "також старі"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "Позначте це, якщо Ви також бажаєте бачити старші події. Це можна зробити, якщо включено опцію 'тільки перша повторювана', щоб уникнути дуже довгого списку.\nЗауважте, що вибір більше днів все ще визначає, якщо показуються новіші зустрічі."
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "Входження до журналу починати з:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "Пошук"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "Шукати текст"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Відмітки"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Назва"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"Подвійне клацання на лінії перехід в редагування.\n"
-"\n"
-"Замовлені відмітки:\n"
-"\t 1. Дзвінок: n=без дзвінка\n"
-"\t\t A=візуальний дзвінок S=інакше звуковий дзвінок\n"
-"\t 2. Повторюваність: n=без повторення\n"
-"\t\t D=Щоденно W=Щотижня M=Щомісяця Y=Щороку\n"
-"\t 3. Тип: f=вільний B=Зайнятий\n"
-"\t 4. Знаходиться в файлі:\n"
-"\t\tO=Orage A=Архіві F=Зовнішній\n"
-"\t 5. Призначення типу:\n"
-"\t\tE=Подія T=Зробити J=Журнал"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Виберіть дату"
+msgstr "Клацніть два рази для правки.\n\nПозначки в порядку:\n\t 1. Будильник: n=немає будильника\n\t\t A=будильник налаштовано P=налаштовано постійний будильник\n\t 2. Повторення: n=немає повторення\n\t\t H=щогодини D=щодня W=щотижня M=щомісяця Y=щороку\n\t 3. Тип: f=вільний B=зайнятий\n\t 4. Розміщено у файлі:\n\t\tO=Orage A=архів F=інший\n\t 5. Тип призначення:\n\t\tE=подія T=що зробити J=журнал"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tПовторюваність завершилась, переміщена в архівний файл."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "Архівування не завершено. Вихід"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Поріг архівування: %d місяць(ів)"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\tПодії для архівування старіші за: %04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "Додання до архіву з uid: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tVTODO неповний; не підлягає архівації"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tПовторюваність. Кінцевий рік: %04d, місяць: %02d, день: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "Архівування завершено\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "Починається видалення архіву."
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tФАЗА 1: скидання повторюваних подій"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tФАЗА 2: повернення архівованих подій"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "Видалення архіву завершено\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Звичайний сигнал Orage"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "Створений список будильників для основного файлу Orage:"
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "Список створених подій для зовнішнього файлу: %s (%s)"
+
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "Побудова списку дзвінків: Додано %d сигналів. Опрацьовано %d подій."
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\tДодано %d будильників. Опрацьовано %d подій."
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tЗнайдено %d дзвінків і з них %d є активними. (Знайдено %d повторюваних "
-"дзвінків.)"
+msgstr "\tЗнайдено %d дзвінків і з них %d є активними. (Знайдено %d повторюваних дзвінків.)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1400,7 +1441,16 @@
 msgid "Import file preprocessing done"
 msgstr "Попередній імпорт файлу завершено"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "Знайдено зовнішнє оновлення файлу %s."
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "Оновлення будильників і календаря із-за оновлення зовнішнього файлу."
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Файли календаря"
 
@@ -1408,621 +1458,672 @@
 msgid "Current foreign files"
 msgstr "Поточні зовнішні файли"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "ТІЛЬКИ ЧИТАННЯ"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "ЧИТАННЯ ЗАПИС"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** Немає зовнішніх файлів *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "Додавання зовнішнього файлу не вдалося"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage може оперувати тільки 10 зовнішніми файлами."
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "Немає назви файлу."
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "Назва порожня."
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "Файл не існує."
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Деякі назви файлів вже існують в Orage."
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Такі самі назви вже існують в Orage."
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "Імпорт/експорт"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "Імпорт"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "Прочитати з файлу:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"Назви файлів розділені комами(,).\n"
-" ПРИМІТКА: кома не є правильним символом в іменах файлів для Orage."
+msgstr "Назви файлів розділені комами(,).\n ПРИМІТКА: кома не є правильним символом в іменах файлів для Orage."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "Експорт"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "Записати в файл:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "Вибрати"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "Всі події"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "Іменовані події: "
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"Запам'ятайте, що тільки основний файл подій буде прочитано.\n"
-"Архівовані і зовнішні події не експортуються."
+msgstr "Запам'ятайте, що тільки основний файл подій буде прочитано.\nАрхівовані і зовнішні події не експортуються."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"Запам'ятайте, що тільки основний файл подій буде прочитано.\n"
-"Зовнішні події не експортуються."
+msgstr "Запам'ятайте, що тільки основний файл подій буде прочитано.\nЗовнішні події не експортуються."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "Ви можете обережно перенести це зі списку подій у вікно."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "UID права доступу подій Orage розділені комами."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "Архів"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "Новий архів (поріг: %d місяців)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "Ви можете вибрати поріг архівування в параметрах"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "Повернути новий архів"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"Повернути всі архівовані події в основний файл orage і видалити файл "
-"архіву.\n"
-"Це буває корисним у випадку коли робиться експорт і перенесення\n"
-"подій orage на іншу систему."
+msgstr "Повернути всі архівовані події в основний файл orage і видалити файл архіву.\nЦе буває корисним у випадку коли робиться експорт і перенесення\nподій orage на іншу систему."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Файли Orage"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Основний файл календаря Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "Поточний файл"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "Новий файл"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "Опції дій"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "Поточний файл:"
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "Новий файл:"
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "Параметри дії:"
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "Перейменувати"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"Внутрішній файл Orage можна тільки перейменувати.\n"
-"Взагалі не стосується зовнішньої файлової системи.\n"
-"Новий файл мусить бути."
+msgstr "Внутрішній файл Orage можна тільки перейменувати.\nВзагалі не стосується зовнішньої файлової системи.\nНовий файл мусить бути."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "Копіювати"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr "Поточний файл скопійований і перебуває незмінним на старому місці."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "Переміщення"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "Поточний файл перенесений і видалений зі старого місця."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Архівний файл"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "Зовнішні файли"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "Додати новий зовнішній файл"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "Зовнішній файл:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "Опції"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "Видима назва:"
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "Тільки читання"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"Встановіть таке, якщо впевнені в тому, що цей файл Orage ніколи не змінює.\n"
-"Запам'ятайте, що зміна зовнішніх файлів може зробити їх несумісними з "
-"оригінальною утилітою, після модифікації!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "Встановіть таке, якщо впевнені в тому, що цей файл Orage ніколи не змінює.\nЗапам'ятайте, що зміна зовнішніх файлів може зробити їх несумісними з оригінальною утилітою, після модифікації!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "Ця внутрішня назва буде висвітлюватися користувачу замість назви файлу."
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "Обмін даними - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\tЦе є %s версія %s\n"
-"\n"
+msgstr "\tЦе є %s версія %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tВипущено під ліцензією GNU General Public License.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tСкомпільовано з GTK+-%d.%d.%d, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "Використовує GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tДля імпорту використовується DBUS.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tНе використовувати DBUS. Імпорт працюватиме тільки частково.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tВикористовувати libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tНе використовувати libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tВикористовувати автоматичне архівування.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tНе використовувати архівування.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\tВикористовуючи системний пакунок libical.\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr "\tВикористовуючи локальну версію Orage libical.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Використання: orage [опції] [файли]\n"
-"\n"
+msgstr "Використання: orage [опції] [файли]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "Опції:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tпоказати версію orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tнадрукувати цей текст\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \tпоказати форму уподобань\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\tзробити orage видимим/невидимим\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) file [RW] \tдодати зовнішній файл\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) файл [RW] [назва] \tдоlавання зовнішнього файлу\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) file \tвидалити зовнішній файл\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
 msgstr "--export (-e) файл [подія...] \texport подія з Orage до файлу\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "files=ical файли для завантаження в orage\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tdbus не включено в orage. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tбез dbus [файли] і опцій (-a & -r) зовнішнього файлу можна використовувати "
-"тільки коли стартує orage \n"
+msgstr "\tбез dbus [файли] і опцій (-a & -r) зовнішнього файлу можна використовувати тільки коли стартує orage \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"Невідома опція %s\n"
-"\n"
+msgstr "\nНевідома опція %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_Обмін даними"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_Редагування"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Показати виділену _дату"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "Показати виділений _тиждень"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Виділити _Сьогодні"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
 msgstr "_Показати Світовий час"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Довідка"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "Не визначено назви"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr " Місце: %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n Примітка:\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "Ніколи"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Назва: %s\n"
-" Початок:\t%s\n"
-" кінець:\t%s\n"
-" Примітка:\n"
-"%s"
+" Done:\t%s%s"
+msgstr "Назва: %s\n%s Початок:\t%s\n Тривалість:\t%s\n Кінець:\t%s%s"
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"Назва: %s\n"
-" Початок:\t%s\n"
-" кінець:\t%s\n"
-" Примітка:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "Назва: %s\n%s Початок:\t%s\n Кінець:\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>Зробити:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>Події для %s:</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>Події для %s - %s:</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "Головні налаштування"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Часовий пояс"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "Вам завжди варто визначати ваш часовий пояс."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "Поріг архівації (місяців)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = не архівувати)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Архівація використовується для збереження часу і місця при обробці подій."
+msgstr "Архівація використовується для збереження часу і місця при обробці подій."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "Команда для програвання звуку"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-"Ця команда передається командній оболонці для створення звукових попереджень."
+msgstr "Ця команда передається командній оболонці для створення звукових попереджень."
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "Налаштування відображення"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "Вікно календаря"
 
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "Головне вікно календаря"
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "Видимі деталі календаря"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "Показувати рамки"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "Показувати меню"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "Показувати місяць і рік"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
 msgstr "Показувати назви днів"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
 msgstr "Показувати номери тижнів"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Показувати місяць і рік"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "Інформаційні блоки календаря"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "Показувати список Зробити"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
 msgstr "Кількість днів для показу у вікні подій"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
 msgstr "0 = не показувати список подій взагалі"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "Видимість календаря"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
 msgstr "Показувати на всіх стільницях"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
 msgstr "Утримувати на передньому плані"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "Показувати в панелі задач"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "Показувати в пейджері"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "Показувати в системному лотку"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "Старт календаря"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Показати"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Прихований"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Мінімізований"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr "Додаткові налаштування"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "На відкриття вікна календаря"
+
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "Вибрати сьогоднішній день"
 
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr "Відкрити вікно календаря"
-
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "Вибрати сьогоднішню дату"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
 msgstr "Вибрати попередньо вибрану дату"
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "Використовувати динамічний значок пейджера"
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "Використовувати динамічний значок"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "Динамічний значок показує поточний місяць і день місяця."
-
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "Основне вікно календаря відображається за подвійним клацанням"
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "Показ дня календаря на подвійне клацання"
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
 msgstr "Перегляд по дням"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
 msgstr "Список подій"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Додаткові налаштування"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
 msgstr "Вікно списку подій"
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
 msgstr "Кількість додаткових днів для показу в списку подій"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
-msgstr ""
-"Це тільки типове значення, Ви можете змінити його в актуальному вікні списку "
-"подій."
+msgstr "Це тільки типове значення, Ви можете змінити його в актуальному вікні списку подій."
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "Показати тільки першу повторювану подію"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "Типовий перший день у вікні показу днів"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "Перший день тижня"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "Вибраний день"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Використовувати динамічний значок пейджера"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Використовувати динамічний значок"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Динамічний значок показує поточний місяць і день місяця."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
 msgstr "Використовувати таймер пробудження"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-"Використовуйте цей таймер, якщо Orage має проблеми з правильним виходом зі "
-"сну або сплячки. (Напиклад коли іконка трею не відновлюється або будильник "
-"не дзвонить.)"
+msgstr "Використовуйте цей таймер, якщо Orage має проблеми з правильним виходом зі сну або сплячки. (Напиклад коли іконка трею не відновлюється або будильник не дзвонить.)"
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "Типовий видимий будильник в зовнішньому файлі"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Вікно Orage"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "Показати сповіщення"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "Завжди виходити при закритті"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "Завжди виходити"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Типово Orage залишається в тлі при закритті. Цей параметр змінює поведінку Orage, Orage закривається і не залишається в тлі."
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Уподобання Orage"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
 msgstr "Перший запуск Orage. Пошук типового часового поясу."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "Встановлено типовий часовий пояс в %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
-msgstr ""
-"Не знайдено типового часового поясу, будь ласка встановіть його вручну."
+msgstr "Не знайдено типового часового поясу, будь ласка встановіть його вручну."
 
 #: ../src/reminder.c:562
 msgid "Reminder "
@@ -2032,41 +2133,35 @@
 msgid "Open"
 msgstr "Відкрити"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "Нагадування - Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "Перенесення"
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "Нагадати мені знову після визначеного часу"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-"Натисніть <Виконати> для нагадування мені знову після визначеного часу:"
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "Наступні активні дзвінки:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d д %02d г %02d хв. до: %s"
+msgstr "\n%02d д %02d г %02d хв. до: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"Не знайдено активних дзвінків"
+msgstr "\nНе знайдено активних дзвінків"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2089,1537 +2184,2229 @@
 msgstr "Африка/Алжир"
 
 #: ../src/timezone_names.c:41
+msgid "Africa/Asmara"
+msgstr "Африка/Асмара"
+
+#: ../src/timezone_names.c:42
 msgid "Africa/Asmera"
 msgstr "Африка/Асмера"
 
-#: ../src/timezone_names.c:42
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "Африка/Бамако"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "Африка/Бангі"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "Африка/Банджул"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "Африка/Біссау"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "Африка/Блантір"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "Африка/Браззавілль"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "Африка/Буджумбура"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "Африка/Каїр"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "Африка/Касабланка"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "Африка/Кеута"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "Африка/Конакрі"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "Африка/Дакар"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "Африка/Дар_ес_Салаам"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "Африка/Джибутті"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "Африка/Доуала"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "Африка/Ель_Ауйн"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "Африка/Фрітаун"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "Африка/Габороне"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "Африка/Хараре"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "Африка/Джуба"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "Африка/Йоганнесбург"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "Африка/Кампала"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "Африка/Хартум"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "Африка/Кігалі"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "Африка/Кіншаса"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "Африка/Лагос"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "Африка/Лібревілль"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "Африка/Ломе"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "Африка/Луанда"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "Африка/Лимумбаши"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "Африка/Лусака"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "Африка/Малабо"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "Африка/Мапуту"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "Африка/Масеру"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "Африка/Мбабане"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "Африка/Могадішу"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "Африка/Монровія"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "Африка/Найробі"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "Африка/Нджамена"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "Африка/Н'ямей"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "Африка/Ноуакшотт"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "Африка/Оуагадоугоу"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "Африка/Порто-Ново"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "Африка/Сао_Томе"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "Африка/Тімбукту"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "Африка/Тріполі"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "Африка/Туніс"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "Африка/Віндхук"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "Америка"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "Америка/Адак"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "Америка/Анкоридж"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "Америка/Ангулла"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "Америка/Антікуа"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "Америка/Арагвайна"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "Америка/Аргентина/Буенос_Айрес"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "Америка/Аргентина/Катамарка"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "Америка/Аргентина/КомодРівадавія"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "Америка/Аргентина/Кордоба"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "Америка/Аргентина/Жужуй"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "Америка/Аргентина/Ла_Ріоха"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "Америка/Аргентина/Мендоза"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "Америка/Аргентина/Ріо_Галлегос"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "Америка/Аргентина/Сальта"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "Америка/Аргентина/Сан_Хуан"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "Америка/Аргентина/Сан_Луїс"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "Америка/Аргентина/Тукуман"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "Америка/Аргентина/Ушуая"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "Америка/Аруба"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "Америка/Асунсьйон"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "Америка/Атікокан"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "Америка/Атка"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "Америка/Бахія"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "Америка/Бахія_Бандерас"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "Америка/Барбадос"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "Америка/Белем"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "Америка/Беліз"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "Америка/Бланк_Саблон"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "Америка/Боа_Віста"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "Америка/Богота"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "Америка/Бойсе"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "Америка/Буенос_Айрес"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "Америка/Кембридж_Бей"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "Америка/Кампо_Гранде"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "Америка/Канкун"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "Америка/Каракас"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "Америка/Катамарка"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "Америка/Кайєнн"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "Америка/Кайман"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "Америка/Чикаго"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "Америка/Чіахуахуа"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "Америка/Корал_Харбор"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "Америка/Кордоба"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "Америка/Коста_Ріка"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "Америка/Крестон"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "Америка/Куяба"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "Америка/Куракао"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "Америка/Данмаркшавн"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "Америка/Деусон"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "Америка/Бухта_Деусона"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "Америка/Денвер"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "Америка/Детройт"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "Америка/Домініка"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "Америка/Едмонтон"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "Америка/Енсенада"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "Америка/Ейрунепе"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "Америка/Ель_Сальвадор"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "Америка/Форталеза"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "Америка/Форт_Вейн"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "Америка/Глейс_Бей"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "Америка/Годзаб"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "Америка/Гуз_Бей"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "Америка/Ґранд_Тюрк"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "Америка/Гренада"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "Америка/Гваделупа"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "Америка/Гватемала"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "Америка/Ґуаякіль"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "Америка/Гаяна"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "Америка/Ґаліфакс"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "Америка/Гавана"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "Америка/Ермосільйо"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "Америка/Індіана/Індіанаполіс"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "Америка/Індіана/Нокс"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "Америка/Індіана/Маренго"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "Америка/Індіана/Петерсбург"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "Америка/Тел_Ситі"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "Америка/Індіана/Вевай"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "Америка/Індіана/Вінсеннес"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "Америка/Індіана/Вінамак"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "Америка/Індіанаполіс"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "Америка/Інувік"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "Америка/Іквалуйт"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "Америка/Ямайка"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "Америка/Жужуй"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "Америка/Джуно"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "Америка/Кентуккі/Луісвілль"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "Америка/Кентуккі/Монтічелло"
 
-#: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr "Америка/Ла_Пас"
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "Америка/Кнокс_ІН"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "Америка/Краледійк"
+
+#: ../src/timezone_names.c:181
+msgid "America/La_Paz"
+msgstr "Америка/Ла_Пас"
+
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "Америка/Ліма"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "Америка/Лос_Анжелес"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "Америка/Луісвілль"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "Америка/Нижні_Принцеси"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "Америка/Масейо"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "Америка/Манагуа"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "Америка/Манаус"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "Америка/Марігот"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "Америка/Мартініка"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "Америка/Матаморос"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "Америка/Мазатлан"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "Америка/Мендоза"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "Америка/Меномініі"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "Америка/Меріда"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "Америка/Метлакатла"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "Америка/Мехіко_Сіті"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "Америка/Міґелон"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "Америка/Монктон"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "Америка/Монтеррей"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "Америка/Монтевідео"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "Америка/Монреаль"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "Америка/Монсерат"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "Америка/Насау"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "Америка/Н'ю_Йорк"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "Америка/Ніпігон"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "Америка/Ном"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "Америка/Північна_Дакота/Бойла"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "Америка/Північна_Дакота/Центр"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "Америка/Північна_Дакота/Нью_Салем"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "Америка/Норона"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "Америка/Оджінага"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "Америка/Панама"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "Америка/Пангріртанг"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "Америка/Парамарібо"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "Америка/Фенікс"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "Америка/Порто-о-Пренс"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "Америка/Порт_оф_Спейн"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "Америка/Порто_Акре"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "Америка/Порто_Вел'ю"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "Америка/Пуерто_Ріко"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "Америка/Райні_Рівер"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "Америка/Ранкіт_Інлет"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "Америка/Ресіф"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "Америка/Реджайна"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "Америка/Резолют"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "Америка/Ріо_Бранко"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "Америка/Розаріо"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "Америка/Санта_Ізабель"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "Америка/Сантарем"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "Америка/Сант'яго"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "Америка/Санто_Домінго"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "Америка/Сан_Пауло"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "Америка/Скорсбісунд"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "Америка/Шипрок"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "Америка/Сітка"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "Америка/Св_Бартелемі"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "Америка/Св_Джона"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "Америка/Св_Кітт"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "Америка/Св_Лусії"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "Америка/Св_Томаса"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "Америка/Св_Вінсента"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "Америка/Свіфт_Карент"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "Америка/Тегусіґальпа"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "Америка/Туле"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "Америка/Зандер_Бей"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "Америка/Тіхуана"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "Америка/Торонто"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "Америка/Тортола"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "Америка/Ванкувер"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "Америка/Вірджін"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "Америка/Вайтхорс"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "Америка/Вінніпег"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "Америка/Якутат"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "Америка/Єллоунайф"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "Антарктика"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "Антарктика/Кейсі"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "Антарктика/Девіс"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "Антарктика/Дюмонтд'Юрвілль"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "Антарктика/Маскварі"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "Антарктика/Моусон"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "Антарктика/МакМордо"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "Антарктика/Палмер"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "Антарктика/Розера"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "Антарктика/Південний_Полюс"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "Антарктика/Сєва"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "Антарктика/Восток"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "Арктика"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "Арктика/Лонгербюйн"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "Азія"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "Азія/Аден"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "Азія/Алмати"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "Азія/Амман"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "Азія/Анадир"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "Азія/Актау"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "Азія/Актюбінськ"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "Азія/Ашґабад"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "Азія/Ашхабад"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "Азія/Багдад"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "Азія/Бахрейн"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "Азія/Баку"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "Азія/Бангкок"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "Азія/Бейрут"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "Азія/Бішкек"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "Азія/Бруней"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "Азія/Калькутта"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "Азія/Чоібальсан"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "Азія/Чонгкінг"
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "Азія/Чунцин"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "Азія/Коломбо"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "Азія/Дакка"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "Азія/Дамаск"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "Азія/Дакка"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "Азія/Ділі"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "Азія/Дубаї"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "Азія/Душанбе"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "Азія/Газа"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "Азія/Харбін"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "Азія/Хеброн"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "Азія/Гонг_Конг"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "Азія/Хо_Ші_Мін"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "Азія/Ховд"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "Азія/Іркутськ"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "Азія/Стамбул"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "Азія/Джакарта"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "Азія/Джайпур"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "Азія/Ієрусалим"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "Азія/Кабул"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "Азія/Камчатка"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "Азія/Карачі"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "Азія/Кашгар"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "Азія/Катманду"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "Азія/Катманду"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "Азія/Хандига"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "Азія/Кольката"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "Азія/Красноярськ"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "Азія/Куала_Лумпур"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "Азія/Кучінг"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "Азія/Кувейт"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "Азія/Макао"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "Азія/Макау"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "Азія/Магадан"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "Азія/Макассар"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "Азія/Маніла"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "Азія/Маскат"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "Азія/Нікосія"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "Азія/Новокузнецьк"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "Азія/Новосибірськ"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "Азія/Омськ"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "Азія/Орал"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "Азія/Пном_Пень"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "Азія/Понтіанак"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "Азія/Пхеньян"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "Азія/Катар"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "Азія/Кизилорда"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "Азія/Рангуун"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "Азія/ЕльРіяд"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "Азія/Ріядх87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "Азія/Ріядх88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "Азія/Ріядх89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Азія/Сайгон"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "Азія/Сахалін"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "Азія/Самарканд"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Азія/Сеул"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Азія/Шанхай"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Азія/Сінгапур"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "Азія/Тайвань"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "Азія/Ташкент"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "Азія/Тбілісі"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "Азія/Тегеран"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "Азія/Тель_Авів"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "Азія/Тімбу"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "Азія/Тхімпху"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Азія/Токіо"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "Азія/Унджун_Панданг"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "Азія/Улан-Батор"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "Азія/Улан_Батор"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "Азія/Урумчі"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "Азія/Усть-Нера"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Азія/В'єнт'ян"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Азія/Владивосток"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Азія/Якутськ"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Азія/Єкатеринбург"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "Азія/Єреван"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Атлантика"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "Атлантика/Азорські о-ви"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "Атлантика/Бермуди"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "Атлантика/Канарські о-ви"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "Атлантика/Кабо_Верде"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "Атлантика/Фарерські о-ви"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "Атлантика/Фаро"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "Атлантика/Ян_Маєн"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "Атлантика/Мадейра"
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
 msgstr "Атлантика/Рейк'явік"
 
-#: ../src/timezone_names.c:306
+#: ../src/timezone_names.c:375
 msgid "Atlantic/South_Georgia"
 msgstr "Атлантика/Південна_Георгія"
 
-#: ../src/timezone_names.c:307
+#: ../src/timezone_names.c:376
 msgid "Atlantic/St_Helena"
 msgstr "Атлантика/Св_Олена"
 
-#: ../src/timezone_names.c:308
+#: ../src/timezone_names.c:377
 msgid "Atlantic/Stanley"
 msgstr "Атлантика/Стенлі"
 
-#: ../src/timezone_names.c:309
+#: ../src/timezone_names.c:378
 msgid "Australia"
 msgstr "Австралія"
 
-#: ../src/timezone_names.c:310
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "Австралія/ACT"
+
+#: ../src/timezone_names.c:380
 msgid "Australia/Adelaide"
 msgstr "Австралія/Аделаїд"
 
-#: ../src/timezone_names.c:311
+#: ../src/timezone_names.c:381
 msgid "Australia/Brisbane"
 msgstr "Австралія/Брісбейн"
 
-#: ../src/timezone_names.c:312
+#: ../src/timezone_names.c:382
 msgid "Australia/Broken_Hill"
 msgstr "Австралія/Брокен_Хілл"
 
-#: ../src/timezone_names.c:313
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "Австралія/Каррі"
+
+#: ../src/timezone_names.c:384
 msgid "Australia/Darwin"
 msgstr "Австралія/Дарвін"
 
-#: ../src/timezone_names.c:314
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "Австралія/Еукла"
+
+#: ../src/timezone_names.c:386
 msgid "Australia/Hobart"
 msgstr "Австралія/Хобарт"
 
-#: ../src/timezone_names.c:315
+#: ../src/timezone_names.c:387
 msgid "Australia/Lindeman"
 msgstr "Австралія/Ліндемен"
 
-#: ../src/timezone_names.c:316
+#: ../src/timezone_names.c:388
 msgid "Australia/Lord_Howe"
 msgstr "Австралія/Лорд_Хау"
 
-#: ../src/timezone_names.c:317
+#: ../src/timezone_names.c:389
 msgid "Australia/Melbourne"
 msgstr "Австралія/Мельбурн"
 
-#: ../src/timezone_names.c:318
+#: ../src/timezone_names.c:390
 msgid "Australia/Perth"
 msgstr "Австралія/Перт"
 
-#: ../src/timezone_names.c:319
+#: ../src/timezone_names.c:391
 msgid "Australia/Sydney"
 msgstr "Австралія/Сідней"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "Бразилія"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "Бразилія/Акре"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "Бразилія/ДеНорона"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "Бразилія/Схід"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "Бразилія/Захід"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "Канада"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "Канада/Атлантик"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "Канада/Центр"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "Канада/Схід-Саскатчеван"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "Канада/Схід"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "Канада/Гори"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "Канада/Ньюфаундленд"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "Канада/ТихийОкеан"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "Канада/Саскатчеван"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "Канада/Юкон"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "Чилі"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "Чилі/Материк"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "Чилі/СхідніЗемлі"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "Etc"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "Etc/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "Etc/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "Etc/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "Etc/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "Etc/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "Etc/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "Etc/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "Etc/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "Etc/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "Etc/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "Etc/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "Etc/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "Etc/GMT+8"
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "Etc/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "Etc/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "Etc/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "Etc/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "Etc/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "Etc/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "Etc/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "Etc/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "Etc/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "Etc/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "Etc/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "Etc/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "Etc/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "Etc/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "Etc/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "Etc/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "Etc/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "Etc/Ґрінвіч"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "Etc/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "Etc/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "Etc/Універсальний"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "Etc/Зулу"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Європа"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "Європа/Амстердам"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Європа/Андорра"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Європа/Афіни"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "Європа/Белфаст"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "Європа/Белград"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Європа/Берлін"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "Європа/Братислава"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Європа/Брюссель"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "Європа/Бухарест"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Європа/Будапешт"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "Європа/Бусінген"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "Європа/Кишинів"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Європа/Копенгаген"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "Європа/Дублін"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "Європа/Гібралтар"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "Європа/Гернсі"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "Європа/Гельсінкі"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "Європа/Острів_Мен"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "Європа/Стамбул"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "Європа/Джерсі"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Європа/Калінінград"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Європа/Київ"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Європа/Лісабон"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "Європа/Любляна"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Європа/Лондон"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Європа/Люксембург"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Європа/Мадрид"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "Європа/Мальта"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "Європа/Марієхамн"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Європа/Мінськ"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Європа/Монако"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Європа/Москва"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "Європа/Нікосія"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "Європа/Осло"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Європа/Париж"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "Європа/Подґоріца"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "Європа/Прага"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Європа/Рига"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Європа/Рим"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Європа/Самара"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "Європа/Сан_Марино"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "Європа/Сараєво"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "Європа/Сімферополь"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "Європа/Скоп'є"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "Європа/Софія"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Європа/Стокгольм"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "Європа/Таллін"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "Європа/Тірана"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "Європа/Тирасполь"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "Європа/Ужгород"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "Європа/Вадуц"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Європа/Ватикан"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Європа/Відень"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "Європа/Вільнюс"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "Європа/Волгоград"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "Європа/Варшава"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "Європа/Загреб"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "Європа/Запоріжжя"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "Європа/Цюріх"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Індія"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "Індія/Антананаріву"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "Індія/Чагос"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "Індія/Крістмас"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "Індія/Кокос"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "Індія/Коморо"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "Індія/Кергуелен"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "Індія/Махе"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "Індія/Мальдіви"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "Індія/Мавританія"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "Індія/Майотте"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "Індія/Реуньйон"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Мексика"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "Мексика/БахаНорте"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "Мексика/Бахасур"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "Мексика/Вся"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "Середній Схід"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "СереднійСхід/Ріядх87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "СереднійСхід/Ріядх88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "СереднійСхід/Ріядх89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Тихоокеанський"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "Тихоокеанський/Апія"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "Тихоокеанський/Окленд"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "Тихоокеанський/Чатем"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "Тихий океан/Чуук"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "Тихоокеанський/Пасхи"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "Тихоокеанський/Ефат"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "Тихоокеанський/Енденбері"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "Тихоокеанський/Факаофо"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "Тихоокеанський/Фіджі"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "Тихоокеанський/Фунафуті"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "Тихоокеанський/Галапагоси"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "Тихоокеанський/Ґамб'є"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "Тихоокеанський/Ґуадалканал"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Тихоокеанський/Гуам"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "Тихоокеанський/Гонолулу"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "Тихоокеанський/Джонстон"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "Тихоокеанський/Кірітімакі"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "Тихоокеанський/Косрає"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "Тихоокеанський/Кваджелейн"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "Тихоокеанський/Маджуро"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "Тихоокеанський/Маркізи"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "Тихоокеанський/Мідвей"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "Тихоокеанський/Науру"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "Тихоокеанський/Ніує"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "Тихоокеанський/Норфолк"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "Тихоокеанський/Ноумеа"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "Тихоокеанський/Паго_Паго"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "Тихоокеанський/Палау"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "Тихоокеанський/Піткерн"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "Тихий океан/Похнпеі"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "Тихоокеанський/Понапе"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "Тихоокеанський/Порт_Моресбі"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "Тихоокеанський/Ракотонга"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "Тихоокеанський/Сайпан"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "Тихий океан/Самоа"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "Тихоокеанський/Таїті"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "Тихоокеанський/Тарава"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "Тихоокеанський/Тонгатапу"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "Тихоокеанський/Трук"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "Тихоокеанський/Вейк"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "Тихоокеанський/Уолліс"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "Тихоокеанський/Яп"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "США"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "США/Аляска"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "США/Алеутіан"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "США/Арізона"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "США/Центр"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "США/Схід"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "США/Схід-Індіана"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "США/Гаваї"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "США/Індіана-Старк"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "США/Мічіган"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "США/Гори"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "США/Тихий океан"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "США/ТихийОкеан-Нове"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "США/Самоа"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "Нова подія"
@@ -3637,164 +4424,26 @@
 msgstr "Показати дату і годину?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Календар"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Уподобання годинника Orage"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Уподобання Orage"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "Налаштування для програми Календар (Orage) з Xfce 4 "
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Календар стільниці"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Уподобання годинника Orage"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Календар"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Календар Orage"
 
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Назва: %s\n"
-#~ " Початок:\t%s\n"
-#~ " Діє:\t%s\n"
-#~ " Завершення:\t%s\n"
-#~ "Примітка:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "Ви мусите ввести всі керуючі символи самостійно.\n"
-#~ " Ця стрічка буде передана оболонці для виконання"
-
-#~ msgid "Orage clock"
-#~ msgstr "Годинник Orage"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "Автор ідеї, попередній супроводжувач"
-
-#~ msgid "Contributor"
-#~ msgstr "Помічник"
-
-#~ msgid "Info"
-#~ msgstr "Інформація"
-
-#~ msgid "Warning"
-#~ msgstr "Попередження"
-
-#~ msgid "Error"
-#~ msgstr "Помилка"
-
-#~ msgid "Set sticked"
-#~ msgstr "Зробити липучим"
-
-#~ msgid "Select always today"
-#~ msgstr "Завжди вибирати Сьогодні"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Коли відображається основне вікно календаря, вказівник встановлюється на "
-#~ "раніше вибраний день або завжди на поточний день."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "Завершення режиму налаштування часу"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "Розпочати режим налаштування часу"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "змінити хвилини"
-
-#~ msgid "Vary"
-#~ msgstr "Змінний"
-
-#~ msgid "Select timezone"
-#~ msgstr "Вибрати часовий пояс"
-
-#~ msgid "Modify Clock "
-#~ msgstr "Змінити годинник "
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "введіть часовий пояс(ЧП)\n"
-#~ "(=будь-яке правильне значення ЧП)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Змінити уподобання"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Введіть місцевий ЧП. (це для показу часу попередньої (-) або наступної "
-#~ "(+)  дати з додаванням +/- після годин)     "
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr ""
-#~ "Ввести будь-яке правильне значення часового поясу (=ЧП) або вибрати одне "
-#~ "зі списку."
-
-#~ msgid "show line _1:"
-#~ msgstr "показувати стрічку _1:"
-
-#~ msgid "show line _2:"
-#~ msgstr "показувати стрічку _2:"
-
-#~ msgid "show line _3:"
-#~ msgstr "показувати стрічку _3:"
-
-#~ msgid "Properties"
-#~ msgstr "Властивості"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "Невдача запуску 'orage -p'"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> вставити поточну дату в форматі місцевої дати.\n"
-#~ "<T> вставити час і\n"
-#~ "<DT> вставити дату та час."
-
-#~ msgid "Show event list"
-#~ msgstr "Показувати список подій"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = використовувати статичний значок)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Динамічний значок показує поточний день і місяць. Це видно тільки в "
-#~ "системному лотку. Якщо системний лоток не вміщає динамічний розмір "
-#~ "значка, Orage автоматично перемикається до статичного значка."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "Параметри календаря"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Параметри календаря Xfce 4"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Календар стільниці"
diff -Nru orage-4.8.3/po/ur_PK.po orage-4.12.1/po/ur_PK.po
--- orage-4.8.3/po/ur_PK.po	2012-01-03 12:01:11.000000000 +0000
+++ orage-4.12.1/po/ur_PK.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,25 +1,22 @@
-# translation of orage.po to urdu
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Muhammad Ali Makki <makki.ma@gmail.com>, 2007.
+# 
+# Translators:
+# Muhammad Ali Makki <makki.ma@gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: orage\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2009-05-14 02:25+0500\n"
-"Last-Translator: Muhammad Ali Makki <makki.ma@gmail.com>\n"
-"Language-Team: urdu <makki.ma@gmail.com>\n"
+"POT-Creation-Date: 2013-11-18 18:30+0100\n"
+"PO-Revision-Date: 2013-11-19 15:56+0000\n"
+"Last-Translator: Xfce <transifex@xfce.org>\n"
+"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/xfce/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Poedit-Language: Urdu\n"
-"X-Poedit-Country: PAKISTAN\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: ur_PK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -35,9 +32,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"گھڑی میں تبدیلی کے لیے کلک کریں"
+msgstr "%s\nگھڑی میں تبدیلی کے لیے کلک کریں"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -47,9 +42,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"ترجیحات کی تبدیلی کے لیے بٹن 1\n"
-"گھڑیوں کا وقت مرتب کرنے کے لیے بٹن 2"
+msgstr "ترجیحات کی تبدیلی کے لیے بٹن 1\nگھڑیوں کا وقت مرتب کرنے کے لیے بٹن 2"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -113,9 +106,8 @@
 msgstr "ونڈو بند کرکے برخاست کریں"
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "ترجیحات تازہ کریں"
+msgstr ""
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -241,9 +233,8 @@
 msgstr "ترجیحات تازہ کریں"
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "عام ترجیحات"
+msgstr ""
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
@@ -303,15 +294,15 @@
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
-msgstr "گھنٹے"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "%d mins"
-msgstr "منٹ"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
@@ -320,9 +311,8 @@
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-#, fuzzy
 msgid "forward"
-msgstr "آگے"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
@@ -338,7 +328,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2771
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "مقام"
@@ -399,20 +389,18 @@
 msgid "floating"
 msgstr "فلوٹنگ"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "لوکل وقت"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "Orage - کیلینڈر"
+msgstr ""
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr ""
 
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr ""
+
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
 msgstr "مظہر"
@@ -484,11 +472,7 @@
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"آپ کو اس کی صرف اس وقت ضرورت ہے اگر آپ مختصر (5 گھنٹے سے کم) سسپینڈ یا "
-"ہائبرنیٹ کرتے ہیں اور آپ کا ظاہری وقت سیکنڈ پر مشتمل نہیں ہے. اس صورت میں یہ "
-"ممکن ہے کہ آرگ گھڑی غلط وقت دکھائے جب تک کہ آپ یہ منتخب نہ کریں.(اسے منتخب "
-"کرنا سی پی یو کو روکتا ہے اور کام سے خواص محفوظ کرنے سے منع کرتا ہے.)"
+msgstr "آپ کو اس کی صرف اس وقت ضرورت ہے اگر آپ مختصر (5 گھنٹے سے کم) سسپینڈ یا ہائبرنیٹ کرتے ہیں اور آپ کا ظاہری وقت سیکنڈ پر مشتمل نہیں ہے. اس صورت میں یہ ممکن ہے کہ آرگ گھڑی غلط وقت دکھائے جب تک کہ آپ یہ منتخب نہ کریں.(اسے منتخب کرنا سی پی یو کو روکتا ہے اور کام سے خواص محفوظ کرنے سے منع کرتا ہے.)"
 
 #: ../panel-plugin/oc_config.c:432
 msgid ""
@@ -500,19 +484,11 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"یہ پروگرام وقت کے حصول کے لیے  strftime فنگشن کا استعمال ہے.\n"
-"اپنے پسندیدہ فارمیٹ میں وقت کے حصول کے لیے کوئی بھی موزوں کوڈ استعمال کریں.\n"
-"کچھ عام کوڈ یہ ہیں:\t%A = weekday\t\t\t%B = month\n"
-"\t%c = date & time\t\t%R = hour & minute\n"
-"\t%V = week number\t\t%Z = timezone in use\n"
-"\t%H = hours \t\t\t\t%M = minute\n"
-"\t%X = local time\t\t\t%x = local date"
+msgstr "یہ پروگرام وقت کے حصول کے لیے  strftime فنگشن کا استعمال ہے.\nاپنے پسندیدہ فارمیٹ میں وقت کے حصول کے لیے کوئی بھی موزوں کوڈ استعمال کریں.\nکچھ عام کوڈ یہ ہیں:\t%A = weekday\t\t\t%B = month\n\t%c = date & time\t\t%R = hour & minute\n\t%V = week number\t\t%Z = timezone in use\n\t%H = hours \t\t\t\t%M = minute\n\t%X = local time\t\t\t%x = local date"
 
 #: ../panel-plugin/oc_config.c:457
-#, fuzzy
 msgid "Orage clock Preferences"
-msgstr "Orage کی ترجیحات"
+msgstr ""
 
 #. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
@@ -523,7 +499,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
@@ -533,14 +509,13 @@
 msgstr "منتظم"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "اپنے ایکسفس 4 کے وقت کی ادارت کیجیے"
+msgstr ""
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2800
 msgid "End"
 msgstr "آخر"
 
@@ -548,13 +523,13 @@
 msgid "Due"
 msgstr "واجب الادا"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "کیلینڈر"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "فائل منتخب کریں..."
 
@@ -562,227 +537,273 @@
 msgid "Sound Files"
 msgstr "صوتی فائل"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "تمام فائلیں"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "اپائنٹمنٹ معلومات تبدیل ہوگئی ہیں."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1282 ../src/event-list.c:921
 msgid "Do you want to continue?"
 msgstr "کیا آپ آگے بڑھنا چاہتے ہیں؟"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr ""
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr ""
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "اس اپائنٹمنٹ کا اختتام شروع ہونے سے پہلے ہے."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1918
 msgid "Not set"
 msgstr "مرتب نہیں"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1220
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1221
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1231
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1232
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1281
 msgid "This appointment will be permanently removed."
 msgstr "یہ اپائنٹمنٹ ہمیشہ کے لیے حذف کردی جائے گی."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1283 ../src/event-list.c:922
+msgid "No, cancel the removal"
+msgstr ""
+
+#: ../src/appointment.c:1284
+msgid "Yes, remove it"
+msgstr ""
+
+#: ../src/appointment.c:1373 ../src/appointment.c:1388 ../src/day-view.c:457
+#: ../src/event-list.c:980
+msgid "Pick the date"
+msgstr "تاریخ اٹھائیں"
+
+#: ../src/appointment.c:1375 ../src/appointment.c:1390 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:982 ../src/event-list.c:1132
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "آج"
+
+#: ../src/appointment.c:1798
 msgid "This appointment does not exist."
 msgstr "یہ اپائنٹمنٹ وجود نہیں رکھتی."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1799
 msgid "It was probably removed, please refresh your screen."
 msgstr "ممکنہ طور پر حذف کردیا گیا ہوگا، براہ مہربانی اپنی سکرین تازہ کریں."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2100
 msgid "Current categories"
 msgstr "حالیہ زمرہ جات"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2115
 msgid "Add new category with color"
 msgstr "رنگ کے ساتھ نیا زمرہ شامل کریں"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2119
 msgid "Category:"
 msgstr "زمرہ:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2150
 msgid "Colors of categories - Orage"
 msgstr "زمرہ جات کے رنگ - آرگ"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2196
 msgid " *** COPY ***"
 msgstr "*** کاپی ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2461
 msgid "New appointment - Orage"
 msgstr "نئی اپائنٹمنٹ - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2491 ../src/day-view.c:279 ../src/event-list.c:1033
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_فائل"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2497
 msgid "Sav_e and close"
 msgstr "محفو_ظ اور برخاست"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2510 ../src/event-list.c:1039
 msgid "D_uplicate"
 msgstr "ن_قل"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2697
 msgid "Save"
 msgstr "محفوظ کریں"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2699
 msgid "Save and close"
 msgstr "محفوظ اور برخاست"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2704
 msgid "Revert"
 msgstr "منعکس"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2706 ../src/event-list.c:1123
 msgid "Duplicate"
 msgstr "نقل"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2711 ../src/event-list.c:1125
 msgid "Delete"
 msgstr "حذف"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Free"
 msgstr "فارغ"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Busy"
 msgstr "مصروف"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2733
 msgid "General"
 msgstr "عام"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2739
 msgid "Type "
 msgstr "قسم"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2741 ../src/event-list.c:1176
 msgid "Event"
 msgstr "واقعہ"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2744
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"واقعات جو کبھی کبھی وقوع پذیر ہوتے ہیں جیس:\n"
-"میٹنگ یا سالگرہ یا کوئی ٹی وی پروگرام."
+msgstr "واقعات جو کبھی کبھی وقوع پذیر ہوتے ہیں جیس:\nمیٹنگ یا سالگرہ یا کوئی ٹی وی پروگرام."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2747 ../src/event-list.c:1196
 msgid "Todo"
 msgstr "برائے ادا"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2750
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"کوئی کام جو آپ نے کبھی کرنا ہو مثال کے طور پر:\n"
-"اپنی گاڑی دھونی ہو یا آرگ کا نیا ورژن چیک کرنا ہو."
+msgstr "کوئی کام جو آپ نے کبھی کرنا ہو مثال کے طور پر:\nاپنی گاڑی دھونی ہو یا آرگ کا نیا ورژن چیک کرنا ہو."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2753 ../src/event-list.c:1209
 msgid "Journal"
 msgstr "روزنامہ"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2757
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"کسی چیز کے بارے میں نوٹ بنائیں مثلا:\n"
-"مکی نے ایکسفس 4 کا ترجمہ کیا، یا پہلی بارش کب ہوئی."
+msgstr "کسی چیز کے بارے میں نوٹ بنائیں مثلا:\nمکی نے ایکسفس 4 کا ترجمہ کیا، یا پہلی بارش کب ہوئی."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2764
 msgid "Title "
 msgstr "عنوان"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2779
 msgid "All day event"
 msgstr "تمام دنوں کے واقعات"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2785 ../src/appointment.c:3446 ../src/day-view.c:801
 msgid "Start"
 msgstr "شروع"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2805
 msgid "Set      "
 msgstr "سیٹ"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2826
 msgid "Duration"
 msgstr "مدت"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2830 ../src/appointment.c:3020 ../src/reminder.c:758
 msgid "days"
 msgstr "دن"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2832 ../src/appointment.c:3022 ../src/reminder.c:760
 msgid "hours"
 msgstr "گھنٹے"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2834 ../src/appointment.c:3024 ../src/reminder.c:762
 msgid "mins"
 msgstr "منٹ"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2846
 msgid "Availability"
 msgstr "دستیابی"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2854 ../src/appointment.c:3452
 msgid "Completed"
 msgstr "مکمل شدہ"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2857
 msgid "Done"
 msgstr "ہوگيا"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2878
 msgid "Categories"
 msgstr "زمرہ جات"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2890
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"یہ ایک خاص زمرہ ہے، جسے فہرست میں اس اپائنٹمنٹ کو رنگ کرنے کے لیے استعمال "
-"کیا جاسکتا ہے."
+msgstr "یہ ایک خاص زمرہ ہے، جسے فہرست میں اس اپائنٹمنٹ کو رنگ کرنے کے لیے استعمال کیا جاسکتا ہے."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2895
 msgid "update colors for categories."
 msgstr "زمرہ جات کے رنگ اپڈیٹ کریں."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2901
 msgid "Priority"
 msgstr ""
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2911
 msgid "Note"
 msgstr "نوٹ"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2932
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -791,133 +812,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before Start"
 msgstr "شروعات سے پہلے"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before End"
 msgstr "انتہا سے پہلے"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After Start"
 msgstr "شروعات کے بعد"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After End"
 msgstr "انتہا کے بعد"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3011
 msgid "Alarm"
 msgstr "الارم"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3017
 msgid "Alarm time"
 msgstr "الارم کا وقت"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3041
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"زیادہ تر آپ الارم کب چاہتے ہیں:\n"
-"1) واقعہ شروع ہونے سے پہلے\n"
-"2) برائے ادا ختم ہونے سے پہلے\n"
-"3) برائے ادا شروع ہونے کے بعد"
+msgstr "زیادہ تر آپ الارم کب چاہتے ہیں:\n1) واقعہ شروع ہونے سے پہلے\n2) برائے ادا ختم ہونے سے پہلے\n3) برائے ادا شروع ہونے کے بعد"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3046
 msgid "Persistent alarm"
 msgstr "استمراری الارم"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3048
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"اگر آپ چاہتے ہیں کہ آرگ آپ کو متنبہ کرے چاہے وہ الارم کے وقت فعال ہی نہ ہو "
-"تو اسے منتخب کریں."
+msgstr "اگر آپ چاہتے ہیں کہ آرگ آپ کو متنبہ کرے چاہے وہ الارم کے وقت فعال ہی نہ ہو تو اسے منتخب کریں."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3057
 msgid "Sound"
 msgstr "آواز"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3061 ../src/appointment.c:3181
 msgid "Use"
 msgstr "استعمال"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3063
 msgid "Select this if you want audible alarm"
 msgstr "اگر آپ صوتی الارم چاہتے ہیں تو اسے منتخب کریں"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3080
 msgid "Repeat alarm sound"
 msgstr "الارم کی آواز دہرائیں"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3096 ../src/appointment.c:3395
 msgid "times"
 msgstr "اوقات"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3112
 msgid "sec interval"
 msgstr "سیکنڈوں کا وقفہ"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3122
 msgid "Visual"
 msgstr "بصری"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3126
 msgid "Use Orage window"
 msgstr "آرگ ونڈو استعمال کریں"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3128
 msgid "Select this if you want Orage window alarm"
 msgstr "اگر آپ آرگ ونڈو الارم چاہتے ہیں تو اسے منتخب کریں"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3140
 msgid "Use notification"
 msgstr "اطلاع استعمال کریں"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3142
 msgid "Select this if you want notification alarm"
 msgstr "اگر آپ تنبیہی الارم چاہتے ہیں تو اسے منتخب کریں"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3148
 msgid "Set timeout"
 msgstr "انتہائی وقت مرتب کریں"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3150
 msgid "Select this if you want notification to expire automatically"
-msgstr ""
-"اگر آپ چاہتے ہیں کہ تنبیہی الارم خودکار طور پر ایکسپائر ہوجائے تو اسے منتخب "
-"کریں"
+msgstr "اگر آپ چاہتے ہیں کہ تنبیہی الارم خودکار طور پر ایکسپائر ہوجائے تو اسے منتخب کریں"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3161
 msgid "0 = system default expiration time"
 msgstr "0 = نظام کا طے شدہ ایسکپائریشن وقت"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3166
 msgid "seconds"
 msgstr "سیکنڈ"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3177
 msgid "Procedure"
 msgstr "طرقہ کار"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3183
 msgid "Select this if you want procedure or script alarm"
 msgstr "اگر آپ پروسیجر یا سکرپٹ الارم چاہتے ہیں تو اسے منتخب کریں"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3189
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -929,155 +941,148 @@
 "\t<&ET> appointment end time"
 msgstr ""
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3201
 msgid "Test this alarm by raising it now"
 msgstr ""
 
-#: ../src/appointment.c:3101
-#, fuzzy
+#: ../src/appointment.c:3208
 msgid "<b>Default alarm</b>"
-msgstr "طے شدہ الارم"
+msgstr ""
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3216
 msgid "Store current settings as default alarm"
 msgstr "حالیہ ترتیبات کو بطور طے شدہ الارم محفوظ کریں"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3221
 msgid "Set current settings from default alarm"
 msgstr "حالیہ ترتیبات کو طے شدہ الارم سے مرتب کریں"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "None"
 msgstr "کچھ نہیں"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Daily"
 msgstr "روزانہ"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Weekly"
 msgstr "ہفتہ وار"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Monthly"
 msgstr "ماہنامہ"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Yearly"
 msgstr "سالنامہ"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Hourly"
 msgstr ""
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Mon"
 msgstr "پیر"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Tue"
 msgstr "منگل"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Wed"
 msgstr "بدھ"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Thu"
 msgstr "جمعرات"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Fri"
 msgstr "جمعہ"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sat"
 msgstr "ہفتہ"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sun"
 msgstr "اتوار"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3290
 msgid "Recurrence"
 msgstr "تکرار"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3296
 msgid "Complexity"
 msgstr "پیچیدگی"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3299
 msgid "Basic"
 msgstr "بنیادی"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3305
 msgid "Advanced"
 msgstr "اعلی"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3309
 msgid "Use this if you want regular repeating event"
 msgstr "اگر آپ سادہ تکراری واقعہ چاہتے ہیں تو اسے منتخب کریں"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3311
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"اگر آپ پیچیدہ اوقات چاہتے تو اسے استعمال کریں جیسے:\n"
-"ہر ہفتہ اور اتوار یا \n"
-"مہینے کا پہلا منگل"
+msgstr "اگر آپ پیچیدہ اوقات چاہتے تو اسے استعمال کریں جیسے:\nہر ہفتہ اور اتوار یا \nمہینے کا پہلا منگل"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3317
 msgid "Frequency"
 msgstr "فریکوینسی"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3323
 msgid "Each"
 msgstr "ہر ایک"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3330
 msgid "occurrence"
 msgstr "ہونا"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3334
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"چند وقفوں میں فریکوینسی کو محدود کریں.\n"
-"مثال کے طور پر: ہر تیسرے دن:\n"
-"فریکوینسی = روزانہ اور وقفہ = 3"
+msgstr "چند وقفوں میں فریکوینسی کو محدود کریں.\nمثال کے طور پر: ہر تیسرے دن:\nفریکوینسی = روزانہ اور وقفہ = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3379
 msgid "Limit"
 msgstr "حد"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3381
 msgid "Repeat forever"
 msgstr "ہمیشہ کے لیے دہرائیں"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3387
 msgid "Repeat "
 msgstr "دہرائیں"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3403
 msgid "Repeat until "
 msgstr "دہرائیں جب تک"
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3416
 msgid "Weekdays"
 msgstr "ہفتہ کے دن"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3428
 msgid "Which day"
 msgstr "کس دن"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3436
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1085,116 +1090,108 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"ماہانہ اور سالانہ واقعات کے لیے ہفتے کے دن متعین کریں.\n"
-"مثال کے طور پر:\n"
-"ہر ماہ کا دوسرا بدھ:\n"
-"\tفریکوینسی = ماہانہ،\n"
-"\tہفتے کے دن = صرف بدھ کا دن چیک کریں،\n"
-"\tکون سا دن = ذیل کے نمبروں سے 2 منتخب کریں بدھ"
+msgstr "ماہانہ اور سالانہ واقعات کے لیے ہفتے کے دن متعین کریں.\nمثال کے طور پر:\nہر ماہ کا دوسرا بدھ:\n\tفریکوینسی = ماہانہ،\n\tہفتے کے دن = صرف بدھ کا دن چیک کریں،\n\tکون سا دن = ذیل کے نمبروں سے 2 منتخب کریں بدھ"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3443
 msgid "TODO base"
 msgstr ""
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3456
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
 msgstr ""
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3458
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 
 #. exceptions
-#: ../src/appointment.c:3361
-#, fuzzy
+#: ../src/appointment.c:3464
 msgid "Exceptions"
-msgstr "اختیارات"
+msgstr ""
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3477
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
 msgstr ""
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3482
 msgid "Add excluded date (-)"
 msgstr ""
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3484
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr ""
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3490
 msgid "Add included time (+)"
 msgstr ""
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3492
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
 msgstr ""
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
-#, fuzzy
+#: ../src/appointment.c:3509
 msgid "Action dates"
-msgstr "حرکت اختیارات"
+msgstr ""
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1056 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_منظر"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1075
 msgid "_Go"
 msgstr "_جائیں"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1121
 msgid "New"
 msgstr "نیو"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "پیچھے"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr ""
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "آج"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "آگے"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1139
 msgid "Refresh"
 msgstr "پھر تازہ"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1146 ../src/interface.c:834
 msgid "Close"
 msgstr "بند کریں"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "نامعلوم"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr ""
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "آرگ - دن منظر"
 
@@ -1203,165 +1200,166 @@
 msgid "All day"
 msgstr "تمام دن"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:583 ../src/event-list.c:1292
 msgid "Time"
 msgstr "وقت"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:751
 msgid "No rows have been selected."
 msgstr "کوئی رو منتخب نہیں کی گئی ہے."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:752
 msgid "Click a row to select it and after that you can copy it."
 msgstr "منتخب کرنے کے لیے رو پر کلک کریں اس کے بعد آپ اسے کاپی کر سکیں گے."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:920
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
+msgstr "آپ تمام اپائنٹمنٹ ہمیشہ کے لیے\nحذف کردیں گے."
+
+#: ../src/event-list.c:923
+msgid "Yes, remove them"
 msgstr ""
-"آپ تمام اپائنٹمنٹ ہمیشہ کے لیے\n"
-"حذف کردیں گے."
 
 #: ../src/event-list.c:1130
+msgid "Back"
+msgstr "پیچھے"
+
+#: ../src/event-list.c:1134
+msgid "Forward"
+msgstr "آگے"
+
+#: ../src/event-list.c:1141
 msgid "Find"
 msgstr "تلاش"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1148
 msgid "Dayview"
 msgstr "دن منظر"
 
-#: ../src/event-list.c:1170
+#: ../src/event-list.c:1181
 msgid "Extra days to show "
 msgstr "دکھانے کے لیے اضافی دن"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1212
 msgid "Journal entries starting from:"
 msgstr "روزنامہ کے انٹریاں شروع ہوں از:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1232
 msgid "Search"
 msgstr "تلاش"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1235
 msgid "Search text "
 msgstr "تلاش متن"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1300
 msgid "Flags"
 msgstr "جھنڈیاں"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1308
 msgid "Title"
 msgstr "عنوان"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1334
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
-"لائن مدون کرنے کے لیے اس پر ڈبل کلک کریں.\n"
-"\n"
-"Flags in order:\n"
-"\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
-"\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
-"\t 3. Type: f=free B=Busy\n"
-"\t 4. Located in file:\n"
-"\t\tO=Orage A=Archive F=Foreign\n"
-"\t 5. Appointment type:\n"
-"\t\tE=Event T=Todo J=Journal"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "تاریخ اٹھائیں"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tRecur ختم، محفوظہ فائل میں منتقل کیا جارہا ہے."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "محفوظہ فعال نہیں ہے. بند کیا جارہا ہے"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Archiving threshold: %d مہینہ/مہینے"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\t%04d-%02d-%02d سے پرانے واقعات محفوظہ میں محفوظ کیے جارہے ہیں"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "محفوظہ میں محفوظ کیے جارہے ہیں uid: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tبرائے ادا مکمل نہیں، محفوظہ میں محفوظ نہیں کیے جائیں گے"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tRecurring اختتام سال: %04d، مہینہ: %02d، دن: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "محفوظہ میں محفوظگی مکمل\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "محفوظہ حذف کرنا شروع کیا جارہا ہے"
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tPHASE 1: reset recurring appointments"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tPHASE 2: return archived appointments"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "محفوظہ کی حذف کاری مکمل\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Orage کا طے شدہ الارم"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr ""
+
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "الارم فہرست بنائیں: %d الارم شامل کیے گئے %d واقعات کی عمل کاری ہوئی."
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr ""
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tالارم تلاش کیے گئے %d جن میں سے %d فعال ہیں. (%d recurring الارم تلاش کیے "
-"گئے)"
+msgstr "\tالارم تلاش کیے گئے %d جن میں سے %d فعال ہیں. (%d recurring الارم تلاش کیے گئے)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1379,7 +1377,16 @@
 msgid "Import file preprocessing done"
 msgstr "فائل درآمد کی عمل کاری تمام ہوئی"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "کیلینڈر کی فائلیں"
 
@@ -1387,623 +1394,667 @@
 msgid "Current foreign files"
 msgstr "حالیہ اجنبی فائلیں"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "صرف پڑھنے کے لیے"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "پڑھنا لکھنا"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** اجنبی فائلیں نہیں *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr ""
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "درآمد/برآمد"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "درآمد"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "فائل سے پڑھیں:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"فائلوں کے نام کوما (,) سے الگ کریں.\n"
-"نوٹ: Orage کی فائل کے ناموں میں کوما غیر کارآمد کیرکٹر ہے."
+msgstr "فائلوں کے نام کوما (,) سے الگ کریں.\nنوٹ: Orage کی فائل کے ناموں میں کوما غیر کارآمد کیرکٹر ہے."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "برآمد"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "لکھیں تا فائل:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "منتخب کریں"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "تمام اپائنٹمنٹ:"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "مسمی اپائنٹمنٹس:"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"نوٹ کریں کہ اپائنٹمنٹس کی صرف مین فائل پڑھی گئی ہے.\n"
-"محفوظ شدہ اور خارجی واقعات برآمد نہیں کیے گئے."
+msgstr "نوٹ کریں کہ اپائنٹمنٹس کی صرف مین فائل پڑھی گئی ہے.\nمحفوظ شدہ اور خارجی واقعات برآمد نہیں کیے گئے."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"اپائنٹمنٹس کی صرف مین فائل پڑھی گئی ہے.\n"
-"خارجی واقعات برآمد نہیں کیے گئے."
+msgstr "اپائنٹمنٹس کی صرف مین فائل پڑھی گئی ہے.\nخارجی واقعات برآمد نہیں کیے گئے."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "آپ انہیں آسانی سے واقعات فہرست ونڈو سے گھسیٹ سکتے ہیں."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "آرگ اپائنٹمنٹ UIDs کوما سے فاصلے دیے ہوئے."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "محفوظہ"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "ابھی محفوظہ بنائیں (threshold: %d مہینے)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "آپ محفوظہ کی threshold پیرامیٹرز میں تبدیل کرسکتے ہیں"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "محفوظگی ابھی واپس لیں"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"محفوظہ کے تمام واقعات آرگ کی میں فائل میں واپس کرکے محفوظہ حذف کردیں.\n"
-"یہ اس وقت کارآمد ہوتا ہے جب آپ آرگ اور اس کے تمام اپائنٹمنٹس برآمد یا نئے\n"
-"خدمتگار نظام میں منتقل کر رہے ہوں."
+msgstr "محفوظہ کے تمام واقعات آرگ کی میں فائل میں واپس کرکے محفوظہ حذف کردیں.\nیہ اس وقت کارآمد ہوتا ہے جب آپ آرگ اور اس کے تمام اپائنٹمنٹس برآمد یا نئے\nخدمتگار نظام میں منتقل کر رہے ہوں."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Orage کی فائلیں"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Orage کی مین کیلینڈر فائل"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "حالیہ فائل"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "نئی فائل"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "حرکت اختیارات"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "پھرنام دیں"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"صرف Orage کی داخلی فائلوں کے نام کی تبدیلی.\n"
-"خارجی فائل سسٹم کو کچھ مت کہیں.\n"
-"نئی فائل لازمی ہونی چاہیے."
+msgstr "صرف Orage کی داخلی فائلوں کے نام کی تبدیلی.\nخارجی فائل سسٹم کو کچھ مت کہیں.\nنئی فائل لازمی ہونی چاہیے."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "کاپی"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr "حالیہ فائل پرانی جگہ میں کاپی کردی گئی ہے اور اس میں تبدیلی نہیں ہوگی."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "منتقل کریں"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "حالیہ فائل پرانی جگہ سے منتقل کرکے چھپا دی گئی ہے."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "محفوظہ فائل"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "اجنبی فائل"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "نئی خارجی فائل شامل کریں"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "خارجی فائل:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "اختیارات"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "صرف پڑھنے کے لیے"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"اگر آپ چاہتے ہیں کہ یہ فائل آرگ کی طرف سے کبھی تبدیل نہ کی جائے تو اسے مرتب "
-"کریں.\n"
-"نوٹ کریں کہ خارجی فائلوں میں تبدیلی انہیں اصل اوزار سے ناموافق بنا دے گی "
-"جہاں سے یہ بن کر آئی تھی!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "اگر آپ چاہتے ہیں کہ یہ فائل آرگ کی طرف سے کبھی تبدیل نہ کی جائے تو اسے مرتب کریں.\nنوٹ کریں کہ خارجی فائلوں میں تبدیلی انہیں اصل اوزار سے ناموافق بنا دے گی جہاں سے یہ بن کر آئی تھی!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "ڈیٹا کا تبادلہ - آرگ"
 
-#: ../src/main.c:268
-#, fuzzy, c-format
+#: ../src/main.c:275
+#, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
 msgstr ""
-"\tیہ ہے %s ورژن %s برائے ایکسفس %s\n"
-"\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tGNU کے جنرل پبلک لائسنس کے تحت جاری کیا گیا\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tکمپائل ہوا بمقابل GTK+-%d.%d.%d،"
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "GTK+-%d.%d.%d کو استعمال کرتے ہوئے \n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tUsing DBUS for import.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tNot using DBUS. Import works only partially.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tlibnotify کے استعمال سے.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tlibnotify استعمال نہیں کیا جارہا.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tخودکار محفوظگی کے استعمال سے.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tمحفوظگی استعمال نہیں کی جارہی ہے.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr ""
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr ""
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Usage: orage [options] [files]\n"
-"\n"
+msgstr "Usage: orage [options] [files]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "اختیارات:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tshow version of orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tprint this text\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \tshow preferences form\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\tmake orage visible/unvisible\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) file [RW] \tadd a foreign file\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--اجنبی-فائل (-r) حذف کریں \tاجنبی فائل حذف کریں\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
 msgstr ""
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "فائلیں=ical فائلیں orage میں لوڈ کرنے کے لیے\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tڈی بس orage میں شامل نہیں. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tبغیر dbus [فائلیں] اور اجنبی فائل اختیارات(-a اور -r) صرف orage کو چلانے "
-"پر استعمال کی جاسکتی ہیں \n"
+msgstr "\tبغیر dbus [فائلیں] اور اجنبی فائل اختیارات(-a اور -r) صرف orage کو چلانے پر استعمال کی جاسکتی ہیں \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"نا معلوم آپشن %s\n"
-"\n"
+msgstr "\nنا معلوم آپشن %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_تبادلہ ڈیٹا"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_تدوین"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "منت_خب تاریخ دیکھیں"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "منتخب کردہ _ہفتہ دکھائیں"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "_آج منتخب کریں"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "لوکل وقت"
+msgstr ""
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_ہدایات"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr ""
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr ""
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr ""
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "کبھی نہیں"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
-"عنوان: %s\n"
-" ابتداء:\t%s\n"
-" انتہاء:\t%s\n"
-" نوٹ:\n"
-"%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
-"عنوان: %s\n"
-" ابتداء:\t%s\n"
-" انتہاء:\t%s\n"
-" نوٹ:\n"
-"%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>ٹو ڈو:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>واقعات برائے %s:</b>"
 
-#: ../src/mainbox.c:593
-#, fuzzy, c-format
+#: ../src/mainbox.c:660
+#, c-format
 msgid "<b>Events for %s - %s:</b>"
-msgstr "<b>واقعات برائے %s:</b>"
+msgstr ""
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:486
 msgid "Main settings"
-msgstr "مین سیٹ اپ"
+msgstr ""
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:492
 msgid "Timezone"
 msgstr "ٹائم زون"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:507
 msgid "You should always define your local timezone."
 msgstr "آپ کو ہمیشہ اپنا لوکل ٹائم زون متعین کرنا چاہیے."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:515
 msgid "Archive threshold (months)"
 msgstr "محفوظہ threshold (مہینے)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:525
 msgid "(0 = no archiving)"
 msgstr "(0 = محفوظگی نہیں)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:528
 msgid "Archiving is used to save time and space when handling events."
 msgstr "محفوظگی واقعات کو ہینڈل کرتے ہوئے وقت اور جگہ کی بچت کرتی ہے."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:536
 msgid "Sound command"
 msgstr "صوتی کمانڈ"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:551
 msgid "This command is given to shell to make sound in alarms."
 msgstr "یہ کمانڈ شیل کو دی گئی تھی تاکہ الارموں میں آواز بنائی جاسکے."
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "ڈسپلے"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "کیلینڈر کی مین ونڈو"
+#: ../src/parameters.c:590
+msgid "Calendar window"
+msgstr ""
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:597
+msgid "Calendar visual details"
+msgstr ""
+
+#: ../src/parameters.c:603
 msgid "Show borders"
 msgstr "بارڈر دکھائیں"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:608
 msgid "Show menu"
 msgstr "مینیو دکھائیں"
 
-#: ../src/parameters.c:632
-#, fuzzy
-msgid "Show month and year"
-msgstr "پیجر میں دکھائیں"
-
-#: ../src/parameters.c:639
-#, fuzzy
+#: ../src/parameters.c:616
 msgid "Show day names"
-msgstr "_فریم دکھائیں"
+msgstr ""
 
-#: ../src/parameters.c:646
-#, fuzzy
+#: ../src/parameters.c:621
 msgid "Show week numbers"
-msgstr "بارڈر دکھائیں"
+msgstr ""
+
+#: ../src/parameters.c:629
+msgid "Show month and year"
+msgstr ""
+
+#: ../src/parameters.c:649
+msgid "Calendar info boxes"
+msgstr ""
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:654
 msgid "Show todo list"
 msgstr "ٹو ڈو فہرست دکھائیں"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:661
 msgid "Number of days to show in event window"
 msgstr ""
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:667
 msgid "0 = do not show event list at all"
 msgstr ""
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:680
+msgid "Calendar visibility"
+msgstr ""
+
+#: ../src/parameters.c:685
 msgid "Show on all desktops"
 msgstr ""
 
-#: ../src/parameters.c:683
-#, fuzzy
+#: ../src/parameters.c:690
 msgid "Keep on top"
-msgstr "ٹاپ پر سیٹ کریں"
+msgstr ""
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:698
 msgid "Show in taskbar"
 msgstr "ٹاسک بار میں دکھائیں"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:703
 msgid "Show in pager"
 msgstr "پیجر میں دکھائیں"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:711
 msgid "Show in systray"
 msgstr "نظام کی ٹرے میں دکھائیں"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:732
 msgid "Calendar start"
 msgstr "کیلنڈر شروعات"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:737
 msgid "Show"
 msgstr "ظاہر کریں"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:749
 msgid "Hide"
 msgstr "چھپائیں"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:761
 msgid "Minimized"
 msgstr "چھوٹا کریں"
 
-#: ../src/parameters.c:793
-#, fuzzy
-msgid "Extra settings"
-msgstr "اضافی ترتیبات"
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "کیلینڈر کی مین ونڈو"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "_آج منتخب کریں"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:781
+msgid "On calendar window open"
 msgstr ""
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
+#: ../src/parameters.c:786
+msgid "Select today's date"
 msgstr ""
 
-#: ../src/parameters.c:841
-#, fuzzy
-msgid "Use dynamic icon"
-msgstr "متحرک آئکن حجم"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
+#: ../src/parameters.c:799
+msgid "Select previously selected date"
 msgstr ""
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "مین کیلنڈر دیکھنے کے لیے ڈبل کلک کریں"
+#: ../src/parameters.c:817
+msgid "Calendar day double click shows"
+msgstr ""
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:822
 msgid "Days view"
 msgstr "دنوں کا منظر"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:834
 msgid "Event list"
 msgstr "واقعہ فہرست"
 
-#: ../src/parameters.c:890
-#, fuzzy
-msgid "Eventlist window"
-msgstr "واقعہ فہرست"
+#: ../src/parameters.c:856
+msgid "Extra settings"
+msgstr ""
+
+#: ../src/parameters.c:863
+msgid "Event list window extra days"
+msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:868
 msgid "Number of extra days to show in event list"
 msgstr ""
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:876
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
 msgstr ""
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:886
+msgid "Day view window default first day"
+msgstr ""
+
+#: ../src/parameters.c:891
+msgid "First day of week"
+msgstr ""
+
+#: ../src/parameters.c:904
+msgid "Selected day"
+msgstr ""
+
+#: ../src/parameters.c:922
+msgid "Use dynamic tray icon"
+msgstr ""
+
+#: ../src/parameters.c:927
+msgid "Use dynamic icon"
+msgstr ""
+
+#: ../src/parameters.c:933
+msgid "Dynamic icon shows current month and day of the month."
+msgstr ""
+
+#: ../src/parameters.c:941 ../src/parameters.c:946
 msgid "Use wakeup timer"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:952
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:961
+msgid "Foreign file default visual alarm"
+msgstr ""
+
+#: ../src/parameters.c:966
+msgid "Orage window"
+msgstr ""
+
+#: ../src/parameters.c:979
+msgid "Notify notification"
+msgstr ""
+
+#: ../src/parameters.c:997
+msgid "Always quit when asked to close"
+msgstr ""
+
+#: ../src/parameters.c:1002
+msgid "Always quit"
+msgstr ""
+
+#: ../src/parameters.c:1008
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr ""
+
+#: ../src/parameters.c:1024
 msgid "Orage Preferences"
 msgstr "Orage کی ترجیحات"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1136
 msgid "First Orage start. Searching default timezone."
 msgstr "آرگ پہلی دفعہ چلا ہے. طے شدہ ٹائم زون تلاش کیا جارہا ہے."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1155
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "طے شدہ ٹائم زون %s پر سیٹ ہے."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1158
 msgid "Default timezone not found, please, set it manually."
 msgstr "طے شدہ ٹائم زون نہیں پایا گیا، براہ مہربانی اسے خود مرتب کریں."
 
@@ -2015,40 +2066,35 @@
 msgid "Open"
 msgstr "کھولیں"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "ریمائنڈر - آرگ"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
+#: ../src/reminder.c:803
+msgid "Postpone"
 msgstr ""
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
 msgstr ""
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "نیا فعال الارم:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d د %02d گ %02d منٹ تا: %s"
+msgstr "\n%02d د %02d گ %02d منٹ تا: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"کوئی فعال الارم دریاف نہیں ہوا"
+msgstr "\nکوئی فعال الارم دریاف نہیں ہوا"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -3611,207 +3657,34 @@
 msgstr "آرگ کی بابت"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Orage Panel Clock"
-msgstr "آرگ گھڑی"
+msgstr ""
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
 msgid "Show time and date?"
-msgstr "وقت اور تاریخ کیا ہے؟"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "کیلینڈر"
+msgid "Orage preferences"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Orage کی ترجیحات"
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Orage کی ترجیحات"
+msgid "Orage Calendar Preferences"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "ترتیبات برائے ایکسفس 4 کیلنڈر اطلاقیہ"
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "کیلینڈر"
+
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr ""
 
 #: ../xfcalendar.desktop.in.h:2
 msgid "Desktop calendar"
 msgstr "ڈیسک ٹاپ کیلینڈر"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "Orage - کیلینڈر"
-
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "عنوان: %s\n"
-#~ " ابتداء:\t%s\n"
-#~ " باقی:\t%s\n"
-#~ " مکمل:\t%s\n"
-#~ "نوٹ:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "لازم ہے کہ آپ خود اسکیپ وغیرہ کیریکٹر خود ڈالیں.\n"
-#~ "یہ سٹرنگ صرف شیل کو عمل کاری کے لیے دی جائے گی"
-
-#~ msgid "Orage clock"
-#~ msgstr "Orage گھڑی"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "اصل مصنف، ریٹائر منتظم"
-
-#~ msgid "Contributor"
-#~ msgstr "حصہ دار"
-
-#~ msgid "Info"
-#~ msgstr "معلومات"
-
-#~ msgid "Warning"
-#~ msgstr "انتباہ"
-
-#~ msgid "Error"
-#~ msgstr "غلطی"
-
-#~ msgid "Set sticked"
-#~ msgstr "چپکا ہوا سیٹ کریں"
-
-#~ msgid "Select always today"
-#~ msgstr "ہمیشہ آج منتخب کریں"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "مین کیلنڈر دکھاتے وقت، پوائنٹر کو سابقہ منتخب دن یا ہمیشہ حالیہ دن پر "
-#~ "مرتب کریں."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "وقت ترتیب موڈ ختم کیا جارہا ہے"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "وقت ترتیب موڈ شروع کیا جارہا ہے"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "ترتیب برائے  تبدیلی منٹ"
-
-#~ msgid "Vary"
-#~ msgstr "مختلف"
-
-#~ msgid "Select timezone"
-#~ msgstr "ٹائم زون منتخب کریں"
-
-#~ msgid "Modify Clock "
-#~ msgstr "گھڑی میں تبدیلی کرں"
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "گھڑی کا ٹائم زون لکھیں\n"
-#~ "(=کوئی درست TZ ویلیو)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "ترجیحات تبدیل کریں"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "لوکل ٹائم زون لکھیں. (یہ دیکھنے کے لیے استعمال ہوتا ہے کہ کیا وقت سابقہ "
-#~ "(-) یا اگلی تاریخ (+) پر ہے، اس کے لیے وقت کے بعد +/- لکھیں)"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr ""
-#~ "کوئی بھی ٹائم زون ویلیو (=TZ) مرتب کریں یا فہرست میں سے ایک منتخب کریں."
-
-#~ msgid "show line _1:"
-#~ msgstr "لائن _1 ظاہر کریں:"
-
-#~ msgid "show line _2:"
-#~ msgstr "لائن _2 ظاہر کریں:"
-
-#~ msgid "show line _3:"
-#~ msgstr "لائن _3 ظاہر کریں:"
-
-#~ msgid "Properties"
-#~ msgstr "خصوصیات"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "چلانے میں ناکامی 'orage -p'"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> حالیہ تاریخ لوکل فارمیٹ میں مندرج کریں.\n"
-#~ "<T> مندرج کریں وقت اور\n"
-#~ "<DT> وقت اور تاریخ مندرج کریں."
-
-#~ msgid "Show event list"
-#~ msgstr "واقعات کی فہرست دکھائیں"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = ثابت آئکن استعمال کریں)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "متحرک آئکن حالیہ دن اور مہینہ دکھاتی ہے. یہ صرف نظام کی ٹرے میں نظر آتی "
-#~ "ہے. اگر ٹرے متحرک آئکن کے حجم کے لیے بہت چھوٹی ہو تو آرگ خودکار طور پر "
-#~ "اسے ساکن آئکن میں بدل دے گا."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "کیلینڈر ترتیبات"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "ایکسفس 4 کیلینڈر ترتیبات"
-
-#~ msgid ""
-#~ "Set this if you want to make sure that this file is never modified by "
-#~ "Orage."
-#~ msgstr ""
-#~ "اگر آپ چاہتے کہ Orage اس فائل کو کبھی تبدیل نہ کرے تو اسے منتخب کریں."
-
-#~ msgid "Monday"
-#~ msgstr "پیر"
-
-#~ msgid "Tuesday"
-#~ msgstr "منگل"
-
-#~ msgid "Wednesday"
-#~ msgstr "بدھ"
-
-#~ msgid "Thursday"
-#~ msgstr "جمعرات"
-
-#~ msgid "Friday"
-#~ msgstr "جمعہ"
-
-#~ msgid "Saturday"
-#~ msgstr "ہفتہ"
-
-#~ msgid "Sunday"
-#~ msgstr "اتوار"
-
-#~ msgid "Ical week start day"
-#~ msgstr "Ical ہفتہ شروع دن"
diff -Nru orage-4.8.3/po/ur.po orage-4.12.1/po/ur.po
--- orage-4.8.3/po/ur.po	2012-01-03 12:01:11.000000000 +0000
+++ orage-4.12.1/po/ur.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,25 +1,22 @@
-# translation of orage.po to urdu
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Muhammad Ali Makki <makki.ma@gmail.com>, 2007.
+# 
+# Translators:
+# Muhammad Ali Makki <makki.ma@gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: orage\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2009-05-14 02:25+0500\n"
-"Last-Translator: Muhammad Ali Makki <makki.ma@gmail.com>\n"
-"Language-Team: urdu <makki.ma@gmail.com>\n"
+"POT-Creation-Date: 2013-11-18 18:30+0100\n"
+"PO-Revision-Date: 2013-11-19 15:56+0000\n"
+"Last-Translator: Xfce <transifex@xfce.org>\n"
+"Language-Team: Urdu (http://www.transifex.com/projects/p/xfce/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Poedit-Language: Urdu\n"
-"X-Poedit-Country: PAKISTAN\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -35,9 +32,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"گھڑی میں تبدیلی کے لیے کلک کریں"
+msgstr "%s\nگھڑی میں تبدیلی کے لیے کلک کریں"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -47,9 +42,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"ترجیحات کی تبدیلی کے لیے بٹن 1\n"
-"گھڑیوں کا وقت مرتب کرنے کے لیے بٹن 2"
+msgstr "ترجیحات کی تبدیلی کے لیے بٹن 1\nگھڑیوں کا وقت مرتب کرنے کے لیے بٹن 2"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -113,9 +106,8 @@
 msgstr "ونڈو بند کرکے برخاست کریں"
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "ترجیحات تازہ کریں"
+msgstr ""
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -241,9 +233,8 @@
 msgstr "ترجیحات تازہ کریں"
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "عام ترجیحات"
+msgstr ""
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
@@ -303,15 +294,15 @@
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
-msgstr "گھنٹے"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "%d mins"
-msgstr "منٹ"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
@@ -320,9 +311,8 @@
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-#, fuzzy
 msgid "forward"
-msgstr "آگے"
+msgstr ""
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
@@ -338,7 +328,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2771
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "مقام"
@@ -399,20 +389,18 @@
 msgid "floating"
 msgstr "فلوٹنگ"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "لوکل وقت"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "Orage - کیلینڈر"
+msgstr ""
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr ""
 
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr ""
+
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
 msgstr "مظہر"
@@ -484,11 +472,7 @@
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"آپ کو اس کی صرف اس وقت ضرورت ہے اگر آپ مختصر (5 گھنٹے سے کم) سسپینڈ یا "
-"ہائبرنیٹ کرتے ہیں اور آپ کا ظاہری وقت سیکنڈ پر مشتمل نہیں ہے. اس صورت میں یہ "
-"ممکن ہے کہ آرگ گھڑی غلط وقت دکھائے جب تک کہ آپ یہ منتخب نہ کریں.(اسے منتخب "
-"کرنا سی پی یو کو روکتا ہے اور کام سے خواص محفوظ کرنے سے منع کرتا ہے.)"
+msgstr "آپ کو اس کی صرف اس وقت ضرورت ہے اگر آپ مختصر (5 گھنٹے سے کم) سسپینڈ یا ہائبرنیٹ کرتے ہیں اور آپ کا ظاہری وقت سیکنڈ پر مشتمل نہیں ہے. اس صورت میں یہ ممکن ہے کہ آرگ گھڑی غلط وقت دکھائے جب تک کہ آپ یہ منتخب نہ کریں.(اسے منتخب کرنا سی پی یو کو روکتا ہے اور کام سے خواص محفوظ کرنے سے منع کرتا ہے.)"
 
 #: ../panel-plugin/oc_config.c:432
 msgid ""
@@ -500,19 +484,11 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"یہ پروگرام وقت کے حصول کے لیے  strftime فنگشن کا استعمال ہے.\n"
-"اپنے پسندیدہ فارمیٹ میں وقت کے حصول کے لیے کوئی بھی موزوں کوڈ استعمال کریں.\n"
-"کچھ عام کوڈ یہ ہیں:\t%A = weekday\t\t\t%B = month\n"
-"\t%c = date & time\t\t%R = hour & minute\n"
-"\t%V = week number\t\t%Z = timezone in use\n"
-"\t%H = hours \t\t\t\t%M = minute\n"
-"\t%X = local time\t\t\t%x = local date"
+msgstr "یہ پروگرام وقت کے حصول کے لیے  strftime فنگشن کا استعمال ہے.\nاپنے پسندیدہ فارمیٹ میں وقت کے حصول کے لیے کوئی بھی موزوں کوڈ استعمال کریں.\nکچھ عام کوڈ یہ ہیں:\t%A = weekday\t\t\t%B = month\n\t%c = date & time\t\t%R = hour & minute\n\t%V = week number\t\t%Z = timezone in use\n\t%H = hours \t\t\t\t%M = minute\n\t%X = local time\t\t\t%x = local date"
 
 #: ../panel-plugin/oc_config.c:457
-#, fuzzy
 msgid "Orage clock Preferences"
-msgstr "Orage کی ترجیحات"
+msgstr ""
 
 #. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
@@ -523,7 +499,7 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
 msgstr "%A %d %B %Y/%V"
@@ -533,14 +509,13 @@
 msgstr "منتظم"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "اپنے ایکسفس 4 کے وقت کی ادارت کیجیے"
+msgstr ""
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2800
 msgid "End"
 msgstr "آخر"
 
@@ -548,13 +523,13 @@
 msgid "Due"
 msgstr "واجب الادا"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "کیلینڈر"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "فائل منتخب کریں..."
 
@@ -562,227 +537,273 @@
 msgid "Sound Files"
 msgstr "صوتی فائل"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "تمام فائلیں"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "اپائنٹمنٹ معلومات تبدیل ہوگئی ہیں."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1282 ../src/event-list.c:921
 msgid "Do you want to continue?"
 msgstr "کیا آپ آگے بڑھنا چاہتے ہیں؟"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr ""
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr ""
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "اس اپائنٹمنٹ کا اختتام شروع ہونے سے پہلے ہے."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1918
 msgid "Not set"
 msgstr "مرتب نہیں"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1220
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1221
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1231
+msgid "Appointment update failed."
+msgstr ""
+
+#: ../src/appointment.c:1232
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1281
 msgid "This appointment will be permanently removed."
 msgstr "یہ اپائنٹمنٹ ہمیشہ کے لیے حذف کردی جائے گی."
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1283 ../src/event-list.c:922
+msgid "No, cancel the removal"
+msgstr ""
+
+#: ../src/appointment.c:1284
+msgid "Yes, remove it"
+msgstr ""
+
+#: ../src/appointment.c:1373 ../src/appointment.c:1388 ../src/day-view.c:457
+#: ../src/event-list.c:980
+msgid "Pick the date"
+msgstr "تاریخ اٹھائیں"
+
+#: ../src/appointment.c:1375 ../src/appointment.c:1390 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:982 ../src/event-list.c:1132
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "آج"
+
+#: ../src/appointment.c:1798
 msgid "This appointment does not exist."
 msgstr "یہ اپائنٹمنٹ وجود نہیں رکھتی."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1799
 msgid "It was probably removed, please refresh your screen."
 msgstr "ممکنہ طور پر حذف کردیا گیا ہوگا، براہ مہربانی اپنی سکرین تازہ کریں."
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2100
 msgid "Current categories"
 msgstr "حالیہ زمرہ جات"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2115
 msgid "Add new category with color"
 msgstr "رنگ کے ساتھ نیا زمرہ شامل کریں"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2119
 msgid "Category:"
 msgstr "زمرہ:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2150
 msgid "Colors of categories - Orage"
 msgstr "زمرہ جات کے رنگ - آرگ"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2196
 msgid " *** COPY ***"
 msgstr "*** کاپی ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2461
 msgid "New appointment - Orage"
 msgstr "نئی اپائنٹمنٹ - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2491 ../src/day-view.c:279 ../src/event-list.c:1033
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_فائل"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2497
 msgid "Sav_e and close"
 msgstr "محفو_ظ اور برخاست"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2510 ../src/event-list.c:1039
 msgid "D_uplicate"
 msgstr "ن_قل"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2697
 msgid "Save"
 msgstr "محفوظ کریں"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2699
 msgid "Save and close"
 msgstr "محفوظ اور برخاست"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2704
 msgid "Revert"
 msgstr "منعکس"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2706 ../src/event-list.c:1123
 msgid "Duplicate"
 msgstr "نقل"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2711 ../src/event-list.c:1125
 msgid "Delete"
 msgstr "حذف"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Free"
 msgstr "فارغ"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2729
 msgid "Busy"
 msgstr "مصروف"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2733
 msgid "General"
 msgstr "عام"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2739
 msgid "Type "
 msgstr "قسم"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2741 ../src/event-list.c:1176
 msgid "Event"
 msgstr "واقعہ"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2744
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"واقعات جو کبھی کبھی وقوع پذیر ہوتے ہیں جیس:\n"
-"میٹنگ یا سالگرہ یا کوئی ٹی وی پروگرام."
+msgstr "واقعات جو کبھی کبھی وقوع پذیر ہوتے ہیں جیس:\nمیٹنگ یا سالگرہ یا کوئی ٹی وی پروگرام."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2747 ../src/event-list.c:1196
 msgid "Todo"
 msgstr "برائے ادا"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2750
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"کوئی کام جو آپ نے کبھی کرنا ہو مثال کے طور پر:\n"
-"اپنی گاڑی دھونی ہو یا آرگ کا نیا ورژن چیک کرنا ہو."
+msgstr "کوئی کام جو آپ نے کبھی کرنا ہو مثال کے طور پر:\nاپنی گاڑی دھونی ہو یا آرگ کا نیا ورژن چیک کرنا ہو."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2753 ../src/event-list.c:1209
 msgid "Journal"
 msgstr "روزنامہ"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2757
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"کسی چیز کے بارے میں نوٹ بنائیں مثلا:\n"
-"مکی نے ایکسفس 4 کا ترجمہ کیا، یا پہلی بارش کب ہوئی."
+msgstr "کسی چیز کے بارے میں نوٹ بنائیں مثلا:\nمکی نے ایکسفس 4 کا ترجمہ کیا، یا پہلی بارش کب ہوئی."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2764
 msgid "Title "
 msgstr "عنوان"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2779
 msgid "All day event"
 msgstr "تمام دنوں کے واقعات"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2785 ../src/appointment.c:3446 ../src/day-view.c:801
 msgid "Start"
 msgstr "شروع"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2805
 msgid "Set      "
 msgstr "سیٹ"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2826
 msgid "Duration"
 msgstr "مدت"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2830 ../src/appointment.c:3020 ../src/reminder.c:758
 msgid "days"
 msgstr "دن"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2832 ../src/appointment.c:3022 ../src/reminder.c:760
 msgid "hours"
 msgstr "گھنٹے"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2834 ../src/appointment.c:3024 ../src/reminder.c:762
 msgid "mins"
 msgstr "منٹ"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2846
 msgid "Availability"
 msgstr "دستیابی"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2854 ../src/appointment.c:3452
 msgid "Completed"
 msgstr "مکمل شدہ"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2857
 msgid "Done"
 msgstr "ہوگيا"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2878
 msgid "Categories"
 msgstr "زمرہ جات"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2890
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
-"یہ ایک خاص زمرہ ہے، جسے فہرست میں اس اپائنٹمنٹ کو رنگ کرنے کے لیے استعمال "
-"کیا جاسکتا ہے."
+msgstr "یہ ایک خاص زمرہ ہے، جسے فہرست میں اس اپائنٹمنٹ کو رنگ کرنے کے لیے استعمال کیا جاسکتا ہے."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2895
 msgid "update colors for categories."
 msgstr "زمرہ جات کے رنگ اپڈیٹ کریں."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2901
 msgid "Priority"
 msgstr ""
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2911
 msgid "Note"
 msgstr "نوٹ"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2932
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -791,133 +812,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before Start"
 msgstr "شروعات سے پہلے"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3003
 msgid "Before End"
 msgstr "انتہا سے پہلے"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After Start"
 msgstr "شروعات کے بعد"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3004
 msgid "After End"
 msgstr "انتہا کے بعد"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3011
 msgid "Alarm"
 msgstr "الارم"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3017
 msgid "Alarm time"
 msgstr "الارم کا وقت"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3041
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"زیادہ تر آپ الارم کب چاہتے ہیں:\n"
-"1) واقعہ شروع ہونے سے پہلے\n"
-"2) برائے ادا ختم ہونے سے پہلے\n"
-"3) برائے ادا شروع ہونے کے بعد"
+msgstr "زیادہ تر آپ الارم کب چاہتے ہیں:\n1) واقعہ شروع ہونے سے پہلے\n2) برائے ادا ختم ہونے سے پہلے\n3) برائے ادا شروع ہونے کے بعد"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3046
 msgid "Persistent alarm"
 msgstr "استمراری الارم"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3048
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
-"اگر آپ چاہتے ہیں کہ آرگ آپ کو متنبہ کرے چاہے وہ الارم کے وقت فعال ہی نہ ہو "
-"تو اسے منتخب کریں."
+msgstr "اگر آپ چاہتے ہیں کہ آرگ آپ کو متنبہ کرے چاہے وہ الارم کے وقت فعال ہی نہ ہو تو اسے منتخب کریں."
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3057
 msgid "Sound"
 msgstr "آواز"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3061 ../src/appointment.c:3181
 msgid "Use"
 msgstr "استعمال"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3063
 msgid "Select this if you want audible alarm"
 msgstr "اگر آپ صوتی الارم چاہتے ہیں تو اسے منتخب کریں"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3080
 msgid "Repeat alarm sound"
 msgstr "الارم کی آواز دہرائیں"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3096 ../src/appointment.c:3395
 msgid "times"
 msgstr "اوقات"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3112
 msgid "sec interval"
 msgstr "سیکنڈوں کا وقفہ"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3122
 msgid "Visual"
 msgstr "بصری"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3126
 msgid "Use Orage window"
 msgstr "آرگ ونڈو استعمال کریں"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3128
 msgid "Select this if you want Orage window alarm"
 msgstr "اگر آپ آرگ ونڈو الارم چاہتے ہیں تو اسے منتخب کریں"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3140
 msgid "Use notification"
 msgstr "اطلاع استعمال کریں"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3142
 msgid "Select this if you want notification alarm"
 msgstr "اگر آپ تنبیہی الارم چاہتے ہیں تو اسے منتخب کریں"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3148
 msgid "Set timeout"
 msgstr "انتہائی وقت مرتب کریں"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3150
 msgid "Select this if you want notification to expire automatically"
-msgstr ""
-"اگر آپ چاہتے ہیں کہ تنبیہی الارم خودکار طور پر ایکسپائر ہوجائے تو اسے منتخب "
-"کریں"
+msgstr "اگر آپ چاہتے ہیں کہ تنبیہی الارم خودکار طور پر ایکسپائر ہوجائے تو اسے منتخب کریں"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3161
 msgid "0 = system default expiration time"
 msgstr "0 = نظام کا طے شدہ ایسکپائریشن وقت"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3166
 msgid "seconds"
 msgstr "سیکنڈ"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3177
 msgid "Procedure"
 msgstr "طرقہ کار"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3183
 msgid "Select this if you want procedure or script alarm"
 msgstr "اگر آپ پروسیجر یا سکرپٹ الارم چاہتے ہیں تو اسے منتخب کریں"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3189
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -929,155 +941,148 @@
 "\t<&ET> appointment end time"
 msgstr ""
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3201
 msgid "Test this alarm by raising it now"
 msgstr ""
 
-#: ../src/appointment.c:3101
-#, fuzzy
+#: ../src/appointment.c:3208
 msgid "<b>Default alarm</b>"
-msgstr "طے شدہ الارم"
+msgstr ""
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3216
 msgid "Store current settings as default alarm"
 msgstr "حالیہ ترتیبات کو بطور طے شدہ الارم محفوظ کریں"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3221
 msgid "Set current settings from default alarm"
 msgstr "حالیہ ترتیبات کو طے شدہ الارم سے مرتب کریں"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "None"
 msgstr "کچھ نہیں"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Daily"
 msgstr "روزانہ"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Weekly"
 msgstr "ہفتہ وار"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Monthly"
 msgstr "ماہنامہ"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Yearly"
 msgstr "سالنامہ"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3283
 msgid "Hourly"
 msgstr ""
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Mon"
 msgstr "پیر"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Tue"
 msgstr "منگل"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Wed"
 msgstr "بدھ"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Thu"
 msgstr "جمعرات"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Fri"
 msgstr "جمعہ"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sat"
 msgstr "ہفتہ"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3285
 msgid "Sun"
 msgstr "اتوار"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3290
 msgid "Recurrence"
 msgstr "تکرار"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3296
 msgid "Complexity"
 msgstr "پیچیدگی"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3299
 msgid "Basic"
 msgstr "بنیادی"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3305
 msgid "Advanced"
 msgstr "اعلی"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3309
 msgid "Use this if you want regular repeating event"
 msgstr "اگر آپ سادہ تکراری واقعہ چاہتے ہیں تو اسے منتخب کریں"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3311
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"اگر آپ پیچیدہ اوقات چاہتے تو اسے استعمال کریں جیسے:\n"
-"ہر ہفتہ اور اتوار یا \n"
-"مہینے کا پہلا منگل"
+msgstr "اگر آپ پیچیدہ اوقات چاہتے تو اسے استعمال کریں جیسے:\nہر ہفتہ اور اتوار یا \nمہینے کا پہلا منگل"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3317
 msgid "Frequency"
 msgstr "فریکوینسی"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3323
 msgid "Each"
 msgstr "ہر ایک"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3330
 msgid "occurrence"
 msgstr "ہونا"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3334
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"چند وقفوں میں فریکوینسی کو محدود کریں.\n"
-"مثال کے طور پر: ہر تیسرے دن:\n"
-"فریکوینسی = روزانہ اور وقفہ = 3"
+msgstr "چند وقفوں میں فریکوینسی کو محدود کریں.\nمثال کے طور پر: ہر تیسرے دن:\nفریکوینسی = روزانہ اور وقفہ = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3379
 msgid "Limit"
 msgstr "حد"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3381
 msgid "Repeat forever"
 msgstr "ہمیشہ کے لیے دہرائیں"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3387
 msgid "Repeat "
 msgstr "دہرائیں"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3403
 msgid "Repeat until "
 msgstr "دہرائیں جب تک"
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3416
 msgid "Weekdays"
 msgstr "ہفتہ کے دن"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3428
 msgid "Which day"
 msgstr "کس دن"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3436
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1085,116 +1090,108 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"ماہانہ اور سالانہ واقعات کے لیے ہفتے کے دن متعین کریں.\n"
-"مثال کے طور پر:\n"
-"ہر ماہ کا دوسرا بدھ:\n"
-"\tفریکوینسی = ماہانہ،\n"
-"\tہفتے کے دن = صرف بدھ کا دن چیک کریں،\n"
-"\tکون سا دن = ذیل کے نمبروں سے 2 منتخب کریں بدھ"
+msgstr "ماہانہ اور سالانہ واقعات کے لیے ہفتے کے دن متعین کریں.\nمثال کے طور پر:\nہر ماہ کا دوسرا بدھ:\n\tفریکوینسی = ماہانہ،\n\tہفتے کے دن = صرف بدھ کا دن چیک کریں،\n\tکون سا دن = ذیل کے نمبروں سے 2 منتخب کریں بدھ"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3443
 msgid "TODO base"
 msgstr ""
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3456
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
 msgstr ""
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3458
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 
 #. exceptions
-#: ../src/appointment.c:3361
-#, fuzzy
+#: ../src/appointment.c:3464
 msgid "Exceptions"
-msgstr "اختیارات"
+msgstr ""
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3477
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
 msgstr ""
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3482
 msgid "Add excluded date (-)"
 msgstr ""
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3484
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr ""
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3490
 msgid "Add included time (+)"
 msgstr ""
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3492
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
 msgstr ""
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
-#, fuzzy
+#: ../src/appointment.c:3509
 msgid "Action dates"
-msgstr "حرکت اختیارات"
+msgstr ""
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1056 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_منظر"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1075
 msgid "_Go"
 msgstr "_جائیں"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1121
 msgid "New"
 msgstr "نیو"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "پیچھے"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr ""
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "آج"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "آگے"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1139
 msgid "Refresh"
 msgstr "پھر تازہ"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1146 ../src/interface.c:834
 msgid "Close"
 msgstr "بند کریں"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "نامعلوم"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr ""
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "آرگ - دن منظر"
 
@@ -1203,165 +1200,166 @@
 msgid "All day"
 msgstr "تمام دن"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:583 ../src/event-list.c:1292
 msgid "Time"
 msgstr "وقت"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:751
 msgid "No rows have been selected."
 msgstr "کوئی رو منتخب نہیں کی گئی ہے."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:752
 msgid "Click a row to select it and after that you can copy it."
 msgstr "منتخب کرنے کے لیے رو پر کلک کریں اس کے بعد آپ اسے کاپی کر سکیں گے."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:920
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
+msgstr "آپ تمام اپائنٹمنٹ ہمیشہ کے لیے\nحذف کردیں گے."
+
+#: ../src/event-list.c:923
+msgid "Yes, remove them"
 msgstr ""
-"آپ تمام اپائنٹمنٹ ہمیشہ کے لیے\n"
-"حذف کردیں گے."
 
 #: ../src/event-list.c:1130
+msgid "Back"
+msgstr "پیچھے"
+
+#: ../src/event-list.c:1134
+msgid "Forward"
+msgstr "آگے"
+
+#: ../src/event-list.c:1141
 msgid "Find"
 msgstr "تلاش"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1148
 msgid "Dayview"
 msgstr "دن منظر"
 
-#: ../src/event-list.c:1170
+#: ../src/event-list.c:1181
 msgid "Extra days to show "
 msgstr "دکھانے کے لیے اضافی دن"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1212
 msgid "Journal entries starting from:"
 msgstr "روزنامہ کے انٹریاں شروع ہوں از:"
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1232
 msgid "Search"
 msgstr "تلاش"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1235
 msgid "Search text "
 msgstr "تلاش متن"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1300
 msgid "Flags"
 msgstr "جھنڈیاں"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1308
 msgid "Title"
 msgstr "عنوان"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1334
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
-"لائن مدون کرنے کے لیے اس پر ڈبل کلک کریں.\n"
-"\n"
-"Flags in order:\n"
-"\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
-"\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
-"\t 3. Type: f=free B=Busy\n"
-"\t 4. Located in file:\n"
-"\t\tO=Orage A=Archive F=Foreign\n"
-"\t 5. Appointment type:\n"
-"\t\tE=Event T=Todo J=Journal"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "تاریخ اٹھائیں"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\tRecur ختم، محفوظہ فائل میں منتقل کیا جارہا ہے."
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr "محفوظہ فعال نہیں ہے. بند کیا جارہا ہے"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "Archiving threshold: %d مہینہ/مہینے"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr "\t%04d-%02d-%02d سے پرانے واقعات محفوظہ میں محفوظ کیے جارہے ہیں"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "محفوظہ میں محفوظ کیے جارہے ہیں uid: %s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\tبرائے ادا مکمل نہیں، محفوظہ میں محفوظ نہیں کیے جائیں گے"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\tRecurring اختتام سال: %04d، مہینہ: %02d، دن: %02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "محفوظہ میں محفوظگی مکمل\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "محفوظہ حذف کرنا شروع کیا جارہا ہے"
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\tPHASE 1: reset recurring appointments"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\tPHASE 2: return archived appointments"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "محفوظہ کی حذف کاری مکمل\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Orage کا طے شدہ الارم"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr ""
+
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "الارم فہرست بنائیں: %d الارم شامل کیے گئے %d واقعات کی عمل کاری ہوئی."
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr ""
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tالارم تلاش کیے گئے %d جن میں سے %d فعال ہیں. (%d recurring الارم تلاش کیے "
-"گئے)"
+msgstr "\tالارم تلاش کیے گئے %d جن میں سے %d فعال ہیں. (%d recurring الارم تلاش کیے گئے)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
@@ -1379,7 +1377,16 @@
 msgid "Import file preprocessing done"
 msgstr "فائل درآمد کی عمل کاری تمام ہوئی"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "کیلینڈر کی فائلیں"
 
@@ -1387,623 +1394,667 @@
 msgid "Current foreign files"
 msgstr "حالیہ اجنبی فائلیں"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "صرف پڑھنے کے لیے"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "پڑھنا لکھنا"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
 msgstr "***** اجنبی فائلیں نہیں *****"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr ""
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr ""
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr ""
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr ""
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "درآمد/برآمد"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "درآمد"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "فائل سے پڑھیں:"
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"فائلوں کے نام کوما (,) سے الگ کریں.\n"
-"نوٹ: Orage کی فائل کے ناموں میں کوما غیر کارآمد کیرکٹر ہے."
+msgstr "فائلوں کے نام کوما (,) سے الگ کریں.\nنوٹ: Orage کی فائل کے ناموں میں کوما غیر کارآمد کیرکٹر ہے."
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "برآمد"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "لکھیں تا فائل:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "منتخب کریں"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "تمام اپائنٹمنٹ:"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "مسمی اپائنٹمنٹس:"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"نوٹ کریں کہ اپائنٹمنٹس کی صرف مین فائل پڑھی گئی ہے.\n"
-"محفوظ شدہ اور خارجی واقعات برآمد نہیں کیے گئے."
+msgstr "نوٹ کریں کہ اپائنٹمنٹس کی صرف مین فائل پڑھی گئی ہے.\nمحفوظ شدہ اور خارجی واقعات برآمد نہیں کیے گئے."
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"اپائنٹمنٹس کی صرف مین فائل پڑھی گئی ہے.\n"
-"خارجی واقعات برآمد نہیں کیے گئے."
+msgstr "اپائنٹمنٹس کی صرف مین فائل پڑھی گئی ہے.\nخارجی واقعات برآمد نہیں کیے گئے."
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "آپ انہیں آسانی سے واقعات فہرست ونڈو سے گھسیٹ سکتے ہیں."
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr "آرگ اپائنٹمنٹ UIDs کوما سے فاصلے دیے ہوئے."
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "محفوظہ"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "ابھی محفوظہ بنائیں (threshold: %d مہینے)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "آپ محفوظہ کی threshold پیرامیٹرز میں تبدیل کرسکتے ہیں"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "محفوظگی ابھی واپس لیں"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"محفوظہ کے تمام واقعات آرگ کی میں فائل میں واپس کرکے محفوظہ حذف کردیں.\n"
-"یہ اس وقت کارآمد ہوتا ہے جب آپ آرگ اور اس کے تمام اپائنٹمنٹس برآمد یا نئے\n"
-"خدمتگار نظام میں منتقل کر رہے ہوں."
+msgstr "محفوظہ کے تمام واقعات آرگ کی میں فائل میں واپس کرکے محفوظہ حذف کردیں.\nیہ اس وقت کارآمد ہوتا ہے جب آپ آرگ اور اس کے تمام اپائنٹمنٹس برآمد یا نئے\nخدمتگار نظام میں منتقل کر رہے ہوں."
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Orage کی فائلیں"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Orage کی مین کیلینڈر فائل"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "حالیہ فائل"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "نئی فائل"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "حرکت اختیارات"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "پھرنام دیں"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"صرف Orage کی داخلی فائلوں کے نام کی تبدیلی.\n"
-"خارجی فائل سسٹم کو کچھ مت کہیں.\n"
-"نئی فائل لازمی ہونی چاہیے."
+msgstr "صرف Orage کی داخلی فائلوں کے نام کی تبدیلی.\nخارجی فائل سسٹم کو کچھ مت کہیں.\nنئی فائل لازمی ہونی چاہیے."
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "کاپی"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr "حالیہ فائل پرانی جگہ میں کاپی کردی گئی ہے اور اس میں تبدیلی نہیں ہوگی."
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "منتقل کریں"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "حالیہ فائل پرانی جگہ سے منتقل کرکے چھپا دی گئی ہے."
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "محفوظہ فائل"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "اجنبی فائل"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "نئی خارجی فائل شامل کریں"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "خارجی فائل:"
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "اختیارات"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#. 
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "صرف پڑھنے کے لیے"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"اگر آپ چاہتے ہیں کہ یہ فائل آرگ کی طرف سے کبھی تبدیل نہ کی جائے تو اسے مرتب "
-"کریں.\n"
-"نوٹ کریں کہ خارجی فائلوں میں تبدیلی انہیں اصل اوزار سے ناموافق بنا دے گی "
-"جہاں سے یہ بن کر آئی تھی!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "اگر آپ چاہتے ہیں کہ یہ فائل آرگ کی طرف سے کبھی تبدیل نہ کی جائے تو اسے مرتب کریں.\nنوٹ کریں کہ خارجی فائلوں میں تبدیلی انہیں اصل اوزار سے ناموافق بنا دے گی جہاں سے یہ بن کر آئی تھی!"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "ڈیٹا کا تبادلہ - آرگ"
 
-#: ../src/main.c:268
-#, fuzzy, c-format
+#: ../src/main.c:275
+#, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
 msgstr ""
-"\tیہ ہے %s ورژن %s برائے ایکسفس %s\n"
-"\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
 msgstr "\tGNU کے جنرل پبلک لائسنس کے تحت جاری کیا گیا\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
 msgstr "\tکمپائل ہوا بمقابل GTK+-%d.%d.%d،"
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "GTK+-%d.%d.%d کو استعمال کرتے ہوئے \n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\tUsing DBUS for import.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
 msgstr "\tNot using DBUS. Import works only partially.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\tlibnotify کے استعمال سے.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\tlibnotify استعمال نہیں کیا جارہا.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\tخودکار محفوظگی کے استعمال سے.\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\tمحفوظگی استعمال نہیں کی جارہی ہے.\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr ""
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
 msgstr ""
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"Usage: orage [options] [files]\n"
-"\n"
+msgstr "Usage: orage [options] [files]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "اختیارات:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr "--version (-v) \t\tshow version of orage\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr "--help (-h) \t\tprint this text\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \tshow preferences form\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr "--toggle (-t) \t\tmake orage visible/unvisible\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) file [RW] \tadd a foreign file\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--اجنبی-فائل (-r) حذف کریں \tاجنبی فائل حذف کریں\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
 msgstr ""
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr "فائلیں=ical فائلیں orage میں لوڈ کرنے کے لیے\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr "\tڈی بس orage میں شامل نہیں. \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\tبغیر dbus [فائلیں] اور اجنبی فائل اختیارات(-a اور -r) صرف orage کو چلانے "
-"پر استعمال کی جاسکتی ہیں \n"
+msgstr "\tبغیر dbus [فائلیں] اور اجنبی فائل اختیارات(-a اور -r) صرف orage کو چلانے پر استعمال کی جاسکتی ہیں \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"نا معلوم آپشن %s\n"
-"\n"
+msgstr "\nنا معلوم آپشن %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "_تبادلہ ڈیٹا"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "_تدوین"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "منت_خب تاریخ دیکھیں"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "منتخب کردہ _ہفتہ دکھائیں"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "_آج منتخب کریں"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "لوکل وقت"
+msgstr ""
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_ہدایات"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr ""
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr ""
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr ""
+
+#: ../src/mainbox.c:489
 msgid "Never"
 msgstr "کبھی نہیں"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:495
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
-"عنوان: %s\n"
-" ابتداء:\t%s\n"
-" انتہاء:\t%s\n"
-" نوٹ:\n"
-"%s"
 
-#: ../src/mainbox.c:460
-#, fuzzy, c-format
+#: ../src/mainbox.c:503
+#, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
-"عنوان: %s\n"
-" ابتداء:\t%s\n"
-" انتہاء:\t%s\n"
-" نوٹ:\n"
-"%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>ٹو ڈو:</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>واقعات برائے %s:</b>"
 
-#: ../src/mainbox.c:593
-#, fuzzy, c-format
+#: ../src/mainbox.c:660
+#, c-format
 msgid "<b>Events for %s - %s:</b>"
-msgstr "<b>واقعات برائے %s:</b>"
+msgstr ""
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:486
 msgid "Main settings"
-msgstr "مین سیٹ اپ"
+msgstr ""
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:492
 msgid "Timezone"
 msgstr "ٹائم زون"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:507
 msgid "You should always define your local timezone."
 msgstr "آپ کو ہمیشہ اپنا لوکل ٹائم زون متعین کرنا چاہیے."
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:515
 msgid "Archive threshold (months)"
 msgstr "محفوظہ threshold (مہینے)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:525
 msgid "(0 = no archiving)"
 msgstr "(0 = محفوظگی نہیں)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:528
 msgid "Archiving is used to save time and space when handling events."
 msgstr "محفوظگی واقعات کو ہینڈل کرتے ہوئے وقت اور جگہ کی بچت کرتی ہے."
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:536
 msgid "Sound command"
 msgstr "صوتی کمانڈ"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:551
 msgid "This command is given to shell to make sound in alarms."
 msgstr "یہ کمانڈ شیل کو دی گئی تھی تاکہ الارموں میں آواز بنائی جاسکے."
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "ڈسپلے"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "کیلینڈر کی مین ونڈو"
+#: ../src/parameters.c:590
+msgid "Calendar window"
+msgstr ""
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:597
+msgid "Calendar visual details"
+msgstr ""
+
+#: ../src/parameters.c:603
 msgid "Show borders"
 msgstr "بارڈر دکھائیں"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:608
 msgid "Show menu"
 msgstr "مینیو دکھائیں"
 
-#: ../src/parameters.c:632
-#, fuzzy
-msgid "Show month and year"
-msgstr "پیجر میں دکھائیں"
-
-#: ../src/parameters.c:639
-#, fuzzy
+#: ../src/parameters.c:616
 msgid "Show day names"
-msgstr "_فریم دکھائیں"
+msgstr ""
 
-#: ../src/parameters.c:646
-#, fuzzy
+#: ../src/parameters.c:621
 msgid "Show week numbers"
-msgstr "بارڈر دکھائیں"
+msgstr ""
+
+#: ../src/parameters.c:629
+msgid "Show month and year"
+msgstr ""
+
+#: ../src/parameters.c:649
+msgid "Calendar info boxes"
+msgstr ""
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:654
 msgid "Show todo list"
 msgstr "ٹو ڈو فہرست دکھائیں"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:661
 msgid "Number of days to show in event window"
 msgstr ""
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:667
 msgid "0 = do not show event list at all"
 msgstr ""
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:680
+msgid "Calendar visibility"
+msgstr ""
+
+#: ../src/parameters.c:685
 msgid "Show on all desktops"
 msgstr ""
 
-#: ../src/parameters.c:683
-#, fuzzy
+#: ../src/parameters.c:690
 msgid "Keep on top"
-msgstr "ٹاپ پر سیٹ کریں"
+msgstr ""
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:698
 msgid "Show in taskbar"
 msgstr "ٹاسک بار میں دکھائیں"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:703
 msgid "Show in pager"
 msgstr "پیجر میں دکھائیں"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:711
 msgid "Show in systray"
 msgstr "نظام کی ٹرے میں دکھائیں"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:732
 msgid "Calendar start"
 msgstr "کیلنڈر شروعات"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:737
 msgid "Show"
 msgstr "ظاہر کریں"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:749
 msgid "Hide"
 msgstr "چھپائیں"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:761
 msgid "Minimized"
 msgstr "چھوٹا کریں"
 
-#: ../src/parameters.c:793
-#, fuzzy
-msgid "Extra settings"
-msgstr "اضافی ترتیبات"
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "کیلینڈر کی مین ونڈو"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "_آج منتخب کریں"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
+#: ../src/parameters.c:781
+msgid "On calendar window open"
 msgstr ""
 
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
+#: ../src/parameters.c:786
+msgid "Select today's date"
 msgstr ""
 
-#: ../src/parameters.c:841
-#, fuzzy
-msgid "Use dynamic icon"
-msgstr "متحرک آئکن حجم"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
+#: ../src/parameters.c:799
+msgid "Select previously selected date"
 msgstr ""
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "مین کیلنڈر دیکھنے کے لیے ڈبل کلک کریں"
+#: ../src/parameters.c:817
+msgid "Calendar day double click shows"
+msgstr ""
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:822
 msgid "Days view"
 msgstr "دنوں کا منظر"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:834
 msgid "Event list"
 msgstr "واقعہ فہرست"
 
-#: ../src/parameters.c:890
-#, fuzzy
-msgid "Eventlist window"
-msgstr "واقعہ فہرست"
+#: ../src/parameters.c:856
+msgid "Extra settings"
+msgstr ""
+
+#: ../src/parameters.c:863
+msgid "Event list window extra days"
+msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:868
 msgid "Number of extra days to show in event list"
 msgstr ""
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:876
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
 msgstr ""
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:886
+msgid "Day view window default first day"
+msgstr ""
+
+#: ../src/parameters.c:891
+msgid "First day of week"
+msgstr ""
+
+#: ../src/parameters.c:904
+msgid "Selected day"
+msgstr ""
+
+#: ../src/parameters.c:922
+msgid "Use dynamic tray icon"
+msgstr ""
+
+#: ../src/parameters.c:927
+msgid "Use dynamic icon"
+msgstr ""
+
+#: ../src/parameters.c:933
+msgid "Dynamic icon shows current month and day of the month."
+msgstr ""
+
+#: ../src/parameters.c:941 ../src/parameters.c:946
 msgid "Use wakeup timer"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:952
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:961
+msgid "Foreign file default visual alarm"
+msgstr ""
+
+#: ../src/parameters.c:966
+msgid "Orage window"
+msgstr ""
+
+#: ../src/parameters.c:979
+msgid "Notify notification"
+msgstr ""
+
+#: ../src/parameters.c:997
+msgid "Always quit when asked to close"
+msgstr ""
+
+#: ../src/parameters.c:1002
+msgid "Always quit"
+msgstr ""
+
+#: ../src/parameters.c:1008
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr ""
+
+#: ../src/parameters.c:1024
 msgid "Orage Preferences"
 msgstr "Orage کی ترجیحات"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1136
 msgid "First Orage start. Searching default timezone."
 msgstr "آرگ پہلی دفعہ چلا ہے. طے شدہ ٹائم زون تلاش کیا جارہا ہے."
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1155
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "طے شدہ ٹائم زون %s پر سیٹ ہے."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1158
 msgid "Default timezone not found, please, set it manually."
 msgstr "طے شدہ ٹائم زون نہیں پایا گیا، براہ مہربانی اسے خود مرتب کریں."
 
@@ -2015,40 +2066,35 @@
 msgid "Open"
 msgstr "کھولیں"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "ریمائنڈر - آرگ"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
+#: ../src/reminder.c:803
+msgid "Postpone"
 msgstr ""
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
 msgstr ""
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "نیا فعال الارم:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d د %02d گ %02d منٹ تا: %s"
+msgstr "\n%02d د %02d گ %02d منٹ تا: %s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"کوئی فعال الارم دریاف نہیں ہوا"
+msgstr "\nکوئی فعال الارم دریاف نہیں ہوا"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -3611,207 +3657,34 @@
 msgstr "آرگ کی بابت"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Orage Panel Clock"
-msgstr "آرگ گھڑی"
+msgstr ""
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
 msgid "Show time and date?"
-msgstr "وقت اور تاریخ کیا ہے؟"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "کیلینڈر"
+msgid "Orage preferences"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Orage کی ترجیحات"
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Orage کی ترجیحات"
+msgid "Orage Calendar Preferences"
+msgstr ""
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "ترتیبات برائے ایکسفس 4 کیلنڈر اطلاقیہ"
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "کیلینڈر"
+
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr ""
 
 #: ../xfcalendar.desktop.in.h:2
 msgid "Desktop calendar"
 msgstr "ڈیسک ٹاپ کیلینڈر"
-
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "Orage - کیلینڈر"
-
-#~ msgid ""
-#~ "Title: %s\n"
-#~ " Start:\t%s\n"
-#~ " Due:\t%s\n"
-#~ " Done:\t%s\n"
-#~ "Note:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "عنوان: %s\n"
-#~ " ابتداء:\t%s\n"
-#~ " باقی:\t%s\n"
-#~ " مکمل:\t%s\n"
-#~ "نوٹ:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You must enter all escape etc characters yourself.\n"
-#~ " This string is just given to shell to process"
-#~ msgstr ""
-#~ "لازم ہے کہ آپ خود اسکیپ وغیرہ کیریکٹر خود ڈالیں.\n"
-#~ "یہ سٹرنگ صرف شیل کو عمل کاری کے لیے دی جائے گی"
-
-#~ msgid "Orage clock"
-#~ msgstr "Orage گھڑی"
-
-#~ msgid "Original creator, retired maintainer"
-#~ msgstr "اصل مصنف، ریٹائر منتظم"
-
-#~ msgid "Contributor"
-#~ msgstr "حصہ دار"
-
-#~ msgid "Info"
-#~ msgstr "معلومات"
-
-#~ msgid "Warning"
-#~ msgstr "انتباہ"
-
-#~ msgid "Error"
-#~ msgstr "غلطی"
-
-#~ msgid "Set sticked"
-#~ msgstr "چپکا ہوا سیٹ کریں"
-
-#~ msgid "Select always today"
-#~ msgstr "ہمیشہ آج منتخب کریں"
-
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "مین کیلنڈر دکھاتے وقت، پوائنٹر کو سابقہ منتخب دن یا ہمیشہ حالیہ دن پر "
-#~ "مرتب کریں."
-
-#~ msgid "Ending time adjustment mode"
-#~ msgstr "وقت ترتیب موڈ ختم کیا جارہا ہے"
-
-#~ msgid "Starting time adjustment mode"
-#~ msgstr "وقت ترتیب موڈ شروع کیا جارہا ہے"
-
-#~ msgid "adjust to change minute"
-#~ msgstr "ترتیب برائے  تبدیلی منٹ"
-
-#~ msgid "Vary"
-#~ msgstr "مختلف"
-
-#~ msgid "Select timezone"
-#~ msgstr "ٹائم زون منتخب کریں"
-
-#~ msgid "Modify Clock "
-#~ msgstr "گھڑی میں تبدیلی کرں"
-
-#~ msgid ""
-#~ "enter timezone of clock,\n"
-#~ "(=any valid TZ value)"
-#~ msgstr ""
-#~ "گھڑی کا ٹائم زون لکھیں\n"
-#~ "(=کوئی درست TZ ویلیو)"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "ترجیحات تبدیل کریں"
-
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "لوکل ٹائم زون لکھیں. (یہ دیکھنے کے لیے استعمال ہوتا ہے کہ کیا وقت سابقہ "
-#~ "(-) یا اگلی تاریخ (+) پر ہے، اس کے لیے وقت کے بعد +/- لکھیں)"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr ""
-#~ "کوئی بھی ٹائم زون ویلیو (=TZ) مرتب کریں یا فہرست میں سے ایک منتخب کریں."
-
-#~ msgid "show line _1:"
-#~ msgstr "لائن _1 ظاہر کریں:"
-
-#~ msgid "show line _2:"
-#~ msgstr "لائن _2 ظاہر کریں:"
-
-#~ msgid "show line _3:"
-#~ msgstr "لائن _3 ظاہر کریں:"
-
-#~ msgid "Properties"
-#~ msgstr "خصوصیات"
-
-#~ msgid "Failed to launch 'orage -p'"
-#~ msgstr "چلانے میں ناکامی 'orage -p'"
-
-#~ msgid ""
-#~ "<D> inserts current date in local date format.\n"
-#~ "<T> inserts time and\n"
-#~ "<DT> inserts date and time."
-#~ msgstr ""
-#~ "<D> حالیہ تاریخ لوکل فارمیٹ میں مندرج کریں.\n"
-#~ "<T> مندرج کریں وقت اور\n"
-#~ "<DT> وقت اور تاریخ مندرج کریں."
-
-#~ msgid "Show event list"
-#~ msgstr "واقعات کی فہرست دکھائیں"
-
-#~ msgid "(0 = use static icon)"
-#~ msgstr "(0 = ثابت آئکن استعمال کریں)"
-
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "متحرک آئکن حالیہ دن اور مہینہ دکھاتی ہے. یہ صرف نظام کی ٹرے میں نظر آتی "
-#~ "ہے. اگر ٹرے متحرک آئکن کے حجم کے لیے بہت چھوٹی ہو تو آرگ خودکار طور پر "
-#~ "اسے ساکن آئکن میں بدل دے گا."
-
-#~ msgid "Calendar Settings"
-#~ msgstr "کیلینڈر ترتیبات"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "ایکسفس 4 کیلینڈر ترتیبات"
-
-#~ msgid ""
-#~ "Set this if you want to make sure that this file is never modified by "
-#~ "Orage."
-#~ msgstr ""
-#~ "اگر آپ چاہتے کہ Orage اس فائل کو کبھی تبدیل نہ کرے تو اسے منتخب کریں."
-
-#~ msgid "Monday"
-#~ msgstr "پیر"
-
-#~ msgid "Tuesday"
-#~ msgstr "منگل"
-
-#~ msgid "Wednesday"
-#~ msgstr "بدھ"
-
-#~ msgid "Thursday"
-#~ msgstr "جمعرات"
-
-#~ msgid "Friday"
-#~ msgstr "جمعہ"
-
-#~ msgid "Saturday"
-#~ msgstr "ہفتہ"
-
-#~ msgid "Sunday"
-#~ msgstr "اتوار"
-
-#~ msgid "Ical week start day"
-#~ msgstr "Ical ہفتہ شروع دن"
diff -Nru orage-4.8.3/po/vi.po orage-4.12.1/po/vi.po
--- orage-4.8.3/po/vi.po	2012-01-03 12:01:11.000000000 +0000
+++ orage-4.12.1/po/vi.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,31 +1,32 @@
-# Vietnamese translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# Lâm Vĩnh Niên <nienvl@yahoo.ca>, 2004.
-# Phan Vĩnh Thịnh <teppi@vnlinux.org>, 2006.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# truongap <truongap.ars@gmail.com>, 2014
+# Lâm Vĩnh Niên <nienvl@yahoo.ca>, 2004
+# Phan Vĩnh Thịnh <teppi@vnlinux.org>, 2006
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2006-04-26 22:40+0400\n"
-"Last-Translator: Phan Vĩnh Thịnh <teppi@vnlinux.org>\n"
-"Language-Team: Vietnamese <vi_VN@googlegroups.com>\n"
+"POT-Creation-Date: 2013-12-02 18:30+0100\n"
+"PO-Revision-Date: 2014-04-08 10:17+0000\n"
+"Last-Translator: truongap <truongap.ars@gmail.com>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/xfce/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: vi\n"
-"X-Generator: KBabel 1.10\n"
-"Plural-Forms: nplurals=1; nplural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr ""
+msgstr "Mở rộng cửa sổ GlobalTime"
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
-msgstr ""
+msgstr "Mở rộng cửa sổ GlobalTime thất bại"
 
 #. ********** timezone tooltip **********
 #: ../globaltime/globaltime.c:277
@@ -33,31 +34,30 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
+msgstr "%s\nnhấn để chỉnh sửa đồng hồ"
 
 #: ../globaltime/globaltime.c:386
-#, fuzzy
 msgid "Localtime"
-msgstr "Vị trí"
+msgstr "Giờ địa phương"
 
 #: ../globaltime/globaltime.c:464
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
+msgstr "nút 1 để thay đổi các tùy chọn\nnút 2 để điều chỉnh thời gian của đồng hồ"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
-msgstr ""
+msgstr "điều chỉnh giờ"
 
 #: ../globaltime/globaltime.c:496
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
+msgstr "điều chỉnh phút. Nhấn vào 2 nút lên hoặc xuống để sẽ thay đổi 1 phút"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
-msgstr ""
+msgstr "MỚI"
 
 #: ../globaltime/gt_prefs.c:289
 msgid "NEW COPY"
@@ -69,48 +69,47 @@
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
-msgstr ""
+msgstr "cập nhật đồng hồ này"
 
 #: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
 msgid "add new empty clock"
-msgstr ""
+msgstr "thêm đồng hồ trống mới"
 
 #: ../globaltime/gt_prefs.c:526
 msgid "add new clock using this clock as model"
-msgstr ""
+msgstr "thêm đồng hồ trống mới với cùng mẫu"
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
-msgstr ""
+msgstr "xóa đồng hồ này"
 
 #: ../globaltime/gt_prefs.c:539
 msgid "move this clock first"
-msgstr ""
+msgstr "di chuyển đồng hồ này lên trước"
 
 #: ../globaltime/gt_prefs.c:544
 msgid "move this clock left"
-msgstr ""
+msgstr "di chuyển đồng hồ này sang trái"
 
 #: ../globaltime/gt_prefs.c:549
 msgid "move this clock right"
-msgstr ""
+msgstr "di chuyển đồng hồ này sang phải"
 
 #: ../globaltime/gt_prefs.c:554
 msgid "move this clock last"
-msgstr ""
+msgstr "di chuyển đồng hồ này xuống cuối"
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
-msgstr ""
+msgstr "đặt múi giờ địa phương giống với múi giờ của đồng hồ này"
 
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
-msgstr ""
+msgstr "đóng cửa sổ và thoát"
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "Tuỳ thích"
+msgstr "Tùy thích Globaltime"
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -119,38 +118,36 @@
 
 #: ../globaltime/gt_prefs.c:607
 msgid "Name of the clock:"
-msgstr ""
+msgstr "Tên đồng hồ"
 
 #: ../globaltime/gt_prefs.c:613
-#, fuzzy
 msgid "enter name of clock"
-msgstr "Orage"
+msgstr "nhập tên đồng hồ"
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
-msgstr ""
+msgstr "Múi giờ của đồng hồ"
 
 #: ../globaltime/gt_prefs.c:643
 msgid "Text Formatting"
-msgstr ""
+msgstr "Định dạnh văn bản"
 
 #. ------------------------background-------------------------
 #: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
 msgid "Background color:"
-msgstr ""
+msgstr "Màu nền:"
 
 #: ../globaltime/gt_prefs.c:656
 msgid "Click to change background colour for clock"
-msgstr ""
+msgstr "Nhấn để thay đổi màu nền của đồng hồ"
 
 #: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
 #: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
 #: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
 #: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
 #: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
-#, fuzzy
 msgid "Use default"
-msgstr "Báo thức mặc định của Orage"
+msgstr "Sử dụng mặc định"
 
 #: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
@@ -170,38 +167,38 @@
 #. ------------------------name font-------------------------
 #: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
 msgid "Font for name of clock:"
-msgstr ""
+msgstr "Phông cho tên đồng hồ"
 
 #: ../globaltime/gt_prefs.c:720
 msgid "Click to change font for clock name"
-msgstr ""
+msgstr "Nhấn để thay đổi phông cho tên đồn hồ"
 
 #. ------------------------time font-------------------------
 #: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
 msgid "Font for time of clock:"
-msgstr ""
+msgstr "Phông cho thời gian của đồng hồ"
 
 #: ../globaltime/gt_prefs.c:753
 msgid "Click to change font for clock time"
-msgstr ""
+msgstr "Nhấn để thay đổi phông cho thời gian của đồng hồ"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:780
 msgid "Underline name of clock:"
-msgstr ""
+msgstr "Gạch chân tên đồng hồ"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:810
 msgid "Underline time of clock:"
-msgstr ""
+msgstr "Gạch chân thời gian của đồng hồ"
 
 #: ../globaltime/gt_prefs.c:850
 msgid "Text Default Formatting"
-msgstr ""
+msgstr "Định dạng chữ mặc định"
 
 #: ../globaltime/gt_prefs.c:863
 msgid "Click to change default background colour for clocks"
-msgstr ""
+msgstr "Nhấn để thay đổi màu nền mặc định của đồng hồ"
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
@@ -209,11 +206,11 @@
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
-msgstr ""
+msgstr "Nhấn để thay đổi màu chữ mặc định của đồng hồ"
 
 #: ../globaltime/gt_prefs.c:929
 msgid "Click to change default font for clock name"
-msgstr ""
+msgstr "Nhấn để thay đổi phông mặc định của tên đồng hồ"
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
@@ -221,43 +218,38 @@
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
-msgstr ""
+msgstr "Nhấn để thay đổi phông mặc định cho thời gian của đồng hồ"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:990
 msgid "Underline for name of clock:"
-msgstr ""
+msgstr "Gạch chân tên đồng hồ"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:1004
 msgid "Underline for time of clock:"
-msgstr ""
+msgstr "Gạch chân thời gian của đồng hồ"
 
 #: ../globaltime/gt_prefs.c:1027
-#, fuzzy
 msgid "update preferences"
-msgstr "Tuỳ thích"
+msgstr "Cập nhật các tùy chỉnh"
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "Tuỳ thích"
+msgstr "Tùy chỉnh Globaltime"
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
-#, fuzzy
 msgid "General Preferences"
-msgstr "Tuỳ thích"
+msgstr "Tùy chỉnh chung"
 
 #: ../globaltime/gt_prefs.c:1077
-#, fuzzy
 msgid "Decorations:"
-msgstr "Khoảng thời gian"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1078
-#, fuzzy
 msgid "Standard"
-msgstr "Lịch"
+msgstr "Chuẩn"
 
 #: ../globaltime/gt_prefs.c:1083
 msgid "Use normal decorations"
@@ -268,9 +260,8 @@
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:1100
-#, fuzzy
 msgid "Clock size:"
-msgstr "Đóng"
+msgstr "Kích cỡ đồng hồ"
 
 #: ../globaltime/gt_prefs.c:1101
 msgid "Equal"
@@ -278,71 +269,68 @@
 
 #: ../globaltime/gt_prefs.c:1106
 msgid "All clocks have same size"
-msgstr ""
+msgstr "Mọi đồng hồ đều có chung kích cỡ"
 
 #: ../globaltime/gt_prefs.c:1111
-#, fuzzy
 msgid "Varying"
-msgstr "Cảnh báo"
+msgstr ""
 
 #: ../globaltime/gt_prefs.c:1116
 msgid "Clock sizes vary"
 msgstr ""
 
 #: ../globaltime/gt_prefs.c:1122
-#, fuzzy
 msgid "Local timezone:"
-msgstr "Chọn múi giờ"
+msgstr "Múi giờ địa phương"
 
 #: ../globaltime/timezone_selection.c:101
 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
 msgid " Other"
-msgstr ""
+msgstr "Khác"
 
 #: ../globaltime/timezone_selection.c:156
 #: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
 #, c-format
 msgid "%d hour %d mins"
-msgstr ""
+msgstr "%d giờ %d phút"
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
-msgstr "giờ"
+msgstr "%d giờ"
 
 #: ../globaltime/timezone_selection.c:161
 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "%d mins"
-msgstr "phút"
+msgstr "%d phút"
 
 #: ../globaltime/timezone_selection.c:167
 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
 msgid "backward"
-msgstr ""
+msgstr "lui lại"
 
 #: ../globaltime/timezone_selection.c:170
 #: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-#, fuzzy
 msgid "forward"
-msgstr "Đi tới"
+msgstr "tiến lên"
 
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
 msgid "not changed"
-msgstr ""
+msgstr "đã không thay đổi"
 
 #: ../globaltime/timezone_selection.c:195
 #: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
 msgid "not changing"
-msgstr ""
+msgstr "không thay đổi"
 
 #. location
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "Vị trí"
@@ -355,12 +343,12 @@
 #: ../globaltime/timezone_selection.c:264
 #: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
 msgid "Previous/Next Change"
-msgstr ""
+msgstr "Thay đổi trước/kế tiếp"
 
 #: ../globaltime/timezone_selection.c:269
 #: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
 msgid "Country"
-msgstr ""
+msgstr "Quốc gia"
 
 #. We are actually setting the g_par parameter. In other words
 #. we are setting the global default timezone for Orage. This is
@@ -381,7 +369,7 @@
 #: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:319
 #: ../src/timezone_selection.c:328 ../src/timezone_selection.c:339
 msgid "Change mode"
-msgstr ""
+msgstr "Thay đổi chế độ"
 
 #: ../globaltime/timezone_selection.c:303
 #: ../globaltime/timezone_selection.c:313
@@ -403,28 +391,26 @@
 msgid "floating"
 msgstr "không cố định"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-#, fuzzy
-msgid "Globaltime"
-msgstr "Vị trí"
-
-#: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
-msgstr "Lịch"
+msgstr "Orage Globaltime"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
-msgstr ""
+msgstr "Hiển thị đồng hồ từ những quốc gia khác nhau"
+
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "Globaltime"
 
 #: ../panel-plugin/oc_config.c:224
 msgid "Appearance"
-msgstr ""
+msgstr "Diện mạo"
 
 #. show frame
 #: ../panel-plugin/oc_config.c:229
 msgid "Show _frame"
-msgstr ""
+msgstr "Hiện _khung"
 
 #. foreground color
 #: ../panel-plugin/oc_config.c:239
@@ -455,13 +441,12 @@
 
 #: ../panel-plugin/oc_config.c:316
 msgid "Clock Options"
-msgstr ""
+msgstr "Tùy chọn đồng hồ"
 
 #. timezone
 #: ../panel-plugin/oc_config.c:326
-#, fuzzy
 msgid "set timezone to:"
-msgstr "Chọn múi giờ"
+msgstr "đặt múi giờ về:"
 
 #: ../panel-plugin/oc_config.c:347
 #, c-format
@@ -475,12 +460,12 @@
 #. Tooltip hint
 #: ../panel-plugin/oc_config.c:401
 msgid "Tooltip:"
-msgstr ""
+msgstr "Chú thích:"
 
 #. special timing for SUSPEND/HIBERNATE
 #: ../panel-plugin/oc_config.c:411
 msgid "fix time after suspend/hibernate"
-msgstr ""
+msgstr "sửa thời gian sau khi tạm dừng / ngủ đông"
 
 #: ../panel-plugin/oc_config.c:415
 msgid ""
@@ -504,9 +489,8 @@
 msgstr ""
 
 #: ../panel-plugin/oc_config.c:457
-#, fuzzy
 msgid "Orage clock Preferences"
-msgstr "Tuỳ thích"
+msgstr "Tùy chỉnh đồng hồ Orage"
 
 #. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
@@ -517,24 +501,22 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid "%A %d %B %Y/%V"
-msgstr ""
+msgstr "%A %d %B %Y/%V"
 
 #: ../src/about-xfcalendar.c:40
 msgid "Maintainer"
-msgstr ""
+msgstr "Người bảo trì"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "Quản lí thời gian với Xfce4"
+msgstr "Quản lý thời gian với Orage"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "Kết thúc"
 
@@ -542,13 +524,13 @@
 msgid "Due"
 msgstr ""
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "Chọn một tập tin..."
 
@@ -556,224 +538,281 @@
 msgid "Sound Files"
 msgstr "Tập tin Âm thanh"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "Tất cả"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "Đã thay đổi thông tin về cuộc hẹn."
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "Tiếp tục?"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr ""
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr ""
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "Thời gian kết thúc cuộc hẹn sớm hơn thời gian bắt đầu."
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
-#, fuzzy
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
-msgstr "Ghi chú"
+msgstr "Không đặt"
+
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr ""
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr ""
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr ""
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr ""
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr ""
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr ""
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
 msgstr "Sẽ xóa cuộc hẹn này."
 
-#: ../src/appointment.c:1692
-#, fuzzy
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr ""
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr ""
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "Chọn ngày"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "Hôm nay"
+
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
-msgstr "Sẽ xóa cuộc hẹn này."
+msgstr "Cuộc hẹn này không tồn tại."
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
 msgstr ""
 
-#: ../src/appointment.c:1995
-#, fuzzy
+#: ../src/appointment.c:2105
 msgid "Current categories"
-msgstr "Tập tin lưu"
+msgstr ""
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr ""
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
-msgstr ""
+msgstr "Mục:"
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
-msgstr ""
+msgstr "Màu của các mục - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr ""
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "Cuộc hẹn mới - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "_Tập tin"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "Ghi _và đóng"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "_Sao chép"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "Ghi"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "Ghi và đóng"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "Quay lại"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "Sao"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "Xóa"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "Rảnh"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "Bận"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "Chung"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
-msgstr ""
+msgstr "Kiểu"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
-msgstr ""
+msgstr "Sự kiện"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
+msgstr "Sự kiện xảy ra vào lúc nào đó. Ví dụ:\nCuộc họp hay ngày sinh nhật hay chương trình TV."
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
-#, fuzzy
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
-msgstr "Hôm nay"
+msgstr "Làm"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
+msgstr "Một vài việc mà bạn làm vào lúc nào đó. Ví dụ:\nRửa xe hay thử phiên bản mới của Orage."
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
-msgstr ""
+msgstr "Nhật ký"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
+msgstr "Tạo ghi chú những thứ đã xảy ra. Ví dụ:\nĐánh dấu lại cuộc gọi của mẹ hay ngày đầu tiên tuyết rơi."
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "Tên"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "Tất cả sự kiện"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "Bắt đầu"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
-msgstr ""
+msgstr "Đặt"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "Khoảng thời gian"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "ngày"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "giờ"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "phút"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "Khả năng"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
-msgstr ""
+msgstr "Đã hoàn thành"
 
-#: ../src/appointment.c:2749
-#, fuzzy
+#: ../src/appointment.c:2862
 msgid "Done"
-msgstr "Không"
+msgstr "Xong"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
-msgstr ""
+msgstr "Các mục"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
+msgstr "Đây là mục đặc biệt, bạn có thể sử dụng để tô màu cuộc hẹn ở chế độ xem danh sách."
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
-msgstr ""
+msgstr "cập nhật màu cho các mục."
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
+msgstr "Ưu tiên"
+
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
 msgstr ""
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "Ghi chú"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -782,38 +821,35 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
 msgstr ""
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
-msgstr ""
+msgstr "Sau khi bắt đầu"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
-msgstr ""
+msgstr "Sau khi kết thúc"
 
-#: ../src/appointment.c:2896
-#, fuzzy
+#: ../src/appointment.c:3011
 msgid "After Start"
-msgstr "Bắt đầu"
+msgstr "Trước khi bắt đầu"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
-msgstr ""
+msgstr "Trước khi kết thúc"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "Báo thức"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
-#, fuzzy
+#: ../src/appointment.c:3024
 msgid "Alarm time"
-msgstr "Báo thức"
+msgstr "Thời gian báo thức"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
@@ -821,91 +857,88 @@
 " 3) after Todo start"
 msgstr ""
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr ""
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
 msgstr ""
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "Âm thanh"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
-msgstr ""
+msgstr "Dùng"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
-msgstr ""
+msgstr "Chọn nếu bạn muốn có báo thức bằng âm thanh"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "Lặp lại âm thanh báo thức"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "thời gian"
 
-#: ../src/appointment.c:3004
-#, fuzzy
+#: ../src/appointment.c:3119
 msgid "sec interval"
-msgstr "Chung"
+msgstr ""
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr ""
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
-msgstr ""
+msgstr "Sử dụng cửa sổ Orage"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
-msgstr ""
+msgstr "Chọn nếu bạn muốn báo thức bằng cửa sổ Orage"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
-msgstr ""
+msgstr "Sử dụng thông báo"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
-msgstr ""
+msgstr "Chọn nếu bạn muốn báo thức bằng thông báo"
 
-#: ../src/appointment.c:3040
-#, fuzzy
+#: ../src/appointment.c:3155
 msgid "Set timeout"
-msgstr "Chọn múi giờ"
+msgstr ""
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
 msgstr ""
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr ""
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
-msgstr ""
+msgstr "giây"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
-#, fuzzy
+#: ../src/appointment.c:3184
 msgid "Procedure"
-msgstr "Châu Âu/Pa-ri"
+msgstr ""
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
 msgstr ""
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -917,101 +950,96 @@
 "\t<&ET> appointment end time"
 msgstr ""
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
 msgstr ""
 
-#: ../src/appointment.c:3101
-#, fuzzy
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
-msgstr "Báo thức mặc định của Orage"
+msgstr "<b>Báo thức mặc định</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
-msgstr ""
+msgstr "Lưu cài đặt hiện tại thành báo thức mặc định"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
-msgstr ""
+msgstr "Đặt cài đặt hiện tại từ bao thức mặc định"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "None"
 msgstr "Không"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "Hàng ngày"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "Hàng tuần"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "Hàng tháng"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "Hàng năm"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
 msgstr ""
 
-#: ../src/appointment.c:3178
-#, fuzzy
+#: ../src/appointment.c:3292
 msgid "Mon"
-msgstr "Hàng tháng"
+msgstr "Thứ 2"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
-msgstr ""
+msgstr "Thứ 3"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
-msgstr ""
+msgstr "Thứ 4"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
-msgstr ""
+msgstr "Thứ 5"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
-msgstr ""
+msgstr "Thứ 6"
 
-#: ../src/appointment.c:3178
-#, fuzzy
+#: ../src/appointment.c:3292
 msgid "Sat"
-msgstr "Bắt đầu"
+msgstr "Thứ 7"
 
-#: ../src/appointment.c:3178
-#, fuzzy
+#: ../src/appointment.c:3292
 msgid "Sun"
-msgstr "Âm thanh"
+msgstr "CN"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "Lặp lại"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr ""
 
-#: ../src/appointment.c:3192
-#, fuzzy
+#: ../src/appointment.c:3306
 msgid "Basic"
-msgstr "Quay lại"
+msgstr "Cơ bản"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
-msgstr ""
+msgstr "Nâng cao"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
 msgstr ""
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
@@ -1019,54 +1047,51 @@
 msgstr ""
 
 #. frequency
-#: ../src/appointment.c:3211
-#, fuzzy
+#: ../src/appointment.c:3324
 msgid "Frequency"
-msgstr "Rảnh"
+msgstr "Độ thường xuyên"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr ""
 
-#: ../src/appointment.c:3224
-#, fuzzy
+#: ../src/appointment.c:3337
 msgid "occurrence"
-msgstr "Lặp lại"
+msgstr ""
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
 msgstr ""
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
-msgstr ""
+msgstr "Giới hạn"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "Lặp lại mãi"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "Lặp lại"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "Lặp lại cho đến "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
-#, fuzzy
+#: ../src/appointment.c:3423
 msgid "Weekdays"
-msgstr "Hàng tuần"
+msgstr ""
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
 msgstr ""
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1077,265 +1102,290 @@
 msgstr ""
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr ""
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
 msgstr ""
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
-msgstr ""
+msgstr "Ngoại lệ"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
 msgstr ""
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
-msgstr ""
+msgstr "Thêm vào ngày ngoại lệ (-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
 msgstr ""
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
 msgstr ""
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
 msgstr ""
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
-msgstr ""
+msgstr "Ngày làm việc"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "_Xem"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "_Chuyển tới"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "Mới"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "Quay lại"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr ""
 
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "Hôm nay"
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr ""
 
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "Đi tới"
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr ""
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr ""
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "Cập nhật"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "Đóng"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
-msgstr ""
+msgstr "Không rõ"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
-msgstr ""
+msgstr "Số ngày để hiển thị"
 
-#: ../src/day-view.c:935
-#, fuzzy
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
-msgstr "Lịch"
+msgstr "Orage - hiển thị theo ngày"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "Mọi ngày"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "Thời gian"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
-msgstr ""
+msgstr "Không có hàng nào được chọn."
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
-msgstr ""
+msgstr "Nhấn vào một hàng để chọn sau đó bạn có thể sao chép nó."
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
+msgstr "Bạn sẽ xóa bỏ tất cả vĩnh viễn\ncác cuộc hẹn được chọn."
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
 msgstr ""
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "Quay lại"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "Đi tới"
+
+#: ../src/event-list.c:1189
 msgid "Find"
-msgstr ""
+msgstr "Tìm"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
+msgstr "Hiển thị ngày"
+
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr ""
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr ""
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr ""
+
+#: ../src/event-list.c:1250
+msgid "also old"
 msgstr ""
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
 msgstr ""
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr ""
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
-msgstr ""
+msgstr "Tìm kiếm"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
-msgstr ""
+msgstr "Tìm kiếm văn bản"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "Đánh dấu"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "Tiêu đề"
 
-#: ../src/event-list.c:1323
-#, fuzzy
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
 msgstr ""
-"Nhấn kép lên dòng để sửa nó.\n"
-"\n"
-"Cờ theo thứ tự:\n"
-"\t 1. Chuông: n=không chuông\n"
-"\t\tA=chuông thấy được S=và cả tiếng chuông\n"
-"\t 2. Lặp lại: n=không lặp lại\n"
-"\t\t D=Hàng ngày W=Hàng tuần M=Hàng tháng Y=Hàng năm\n"
-"\t 3. Kiểu: f=rỗi B=Bận"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "Chọn ngày"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr ""
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
 msgstr ""
 
-#: ../src/ical-archive.c:347
-#, fuzzy, c-format
+#: ../src/ical-archive.c:349
+#, c-format
 msgid "Archiving threshold: %d month(s)"
-msgstr "Giới hạn"
+msgstr ""
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
 msgstr ""
 
-#: ../src/ical-archive.c:377
-#, fuzzy, c-format
+#: ../src/ical-archive.c:379
+#, c-format
 msgid "Archiving uid: %s"
-msgstr "Lưu trữ"
+msgstr ""
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr ""
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr ""
 
-#: ../src/ical-archive.c:405
-#, fuzzy
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
-msgstr "Lưu trữ"
+msgstr ""
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
-#, fuzzy
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
-msgstr "Giới hạn"
+msgstr ""
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr ""
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr ""
 
-#: ../src/ical-archive.c:470
-#, fuzzy
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
-msgstr "Giới hạn"
+msgstr ""
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Báo thức mặc định của Orage"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr ""
+
+#: ../src/ical-code.c:3181
+#, c-format
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr ""
+
+#: ../src/ical-code.c:3183
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
+msgid "\tAdded %d alarms. Processed %d events."
 msgstr ""
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
@@ -1357,330 +1407,361 @@
 msgid "Import file preprocessing done"
 msgstr ""
 
-#: ../src/interface.c:284
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr ""
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr ""
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "Tập tin lịch"
 
 #: ../src/interface.c:631
 msgid "Current foreign files"
-msgstr ""
+msgstr "Các tệp tin ngoại lai hiện tại"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
-msgstr ""
+msgstr "CHỈ ĐỌC"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
-msgstr ""
+msgstr "CHỈ GHI"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
+msgstr "***** Không có tệp tin ngoại lai *****"
+
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
 msgstr ""
 
-#: ../src/interface.c:974
-msgid "Import/export"
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
 msgstr ""
 
-#: ../src/interface.c:981
-msgid "Import"
+#: ../src/interface.c:697
+msgid "Filename is empty."
 msgstr ""
 
-#: ../src/interface.c:986
-#, fuzzy
-msgid "Read from file:"
-msgstr "Tập tin lưu"
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr ""
 
-#: ../src/interface.c:1003
-msgid ""
-"Separate filenames with comma(,).\n"
-" NOTE: comma is not valid character in filenames for Orage."
+#: ../src/interface.c:713
+msgid "File does not exist."
 msgstr ""
 
-#: ../src/interface.c:1008
-msgid "Export"
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
 msgstr ""
 
-#: ../src/interface.c:1013
-#, fuzzy
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr ""
+
+#: ../src/interface.c:965
+msgid "Import/export"
+msgstr "Nhập/xuất"
+
+#: ../src/interface.c:972
+msgid "Import"
+msgstr "Nhập"
+
+#: ../src/interface.c:977
+msgid "Read from file:"
+msgstr "Đọc tệp tin:"
+
+#: ../src/interface.c:994
+msgid ""
+"Separate filenames with comma(,).\n"
+" NOTE: comma is not valid character in filenames for Orage."
+msgstr "Tách tên tệp tin với dấu phẩy(,).\nChú ý: dấu phẩy không phải là kí tự phù hợp cho tên tệp tin trong Orage."
+
+#: ../src/interface.c:999
+msgid "Export"
+msgstr "Xuất"
+
+#: ../src/interface.c:1004
 msgid "Write to file:"
-msgstr "Tập tin lưu"
+msgstr "Ghi vào tệp:"
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
-#, fuzzy
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
-msgstr "Xóa"
+msgstr "Chọn"
 
-#: ../src/interface.c:1037
-#, fuzzy
+#: ../src/interface.c:1028
 msgid "All appointments"
-msgstr "Cuộc hẹn mới"
+msgstr "Mọi cuộc hẹn"
 
-#: ../src/interface.c:1050
-#, fuzzy
+#: ../src/interface.c:1041
 msgid "Named appointments: "
-msgstr "Cuộc hẹn mới"
+msgstr "Cuộc hẹn được đặt tên:"
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
 msgstr ""
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr ""
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
 msgstr ""
 
-#: ../src/interface.c:1076
-#, fuzzy
+#: ../src/interface.c:1067
 msgid "Archive"
-msgstr "Lưu trữ"
+msgstr ""
 
-#: ../src/interface.c:1084
-#, fuzzy, c-format
+#: ../src/interface.c:1075
+#, c-format
 msgid "Archive now (threshold: %d months)"
-msgstr "Giới hạn"
+msgstr ""
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr ""
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr ""
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
 msgstr ""
 
-#: ../src/interface.c:1118
-#, fuzzy
+#: ../src/interface.c:1109
 msgid "Orage files"
-msgstr "Tuỳ thích"
+msgstr "Tệp tin Orage"
 
-#: ../src/interface.c:1125
-#, fuzzy
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
-msgstr "Lịch"
+msgstr "Tệp tin lịch chính Orage"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-#, fuzzy
-msgid "Current file"
-msgstr "Tập tin lưu"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr ""
 
-#: ../src/interface.c:1137 ../src/interface.c:1202
-#, fuzzy
-msgid "New file"
-msgstr "Tập tin lưu"
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr ""
 
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
 msgstr ""
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
-msgstr ""
+msgstr "Sửa tên"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
 msgstr ""
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
-msgstr ""
+msgstr "Sao chép"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
 msgstr ""
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
-msgstr ""
+msgstr "Di chuyển"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr ""
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "Tập tin lưu"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
-msgstr ""
+msgstr "Tệp tin ngoại lai"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
-msgstr ""
+msgstr "Thêm tệp tin ngoại lai"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
-msgstr ""
+msgstr "Tệp tin ngoại lai:"
 
-#: ../src/interface.c:1284
-msgid "Options"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
 msgstr ""
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
+msgstr "Chỉ đọc"
+
+#: ../src/interface.c:1292
+msgid ""
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
 msgstr ""
 
 #: ../src/interface.c:1294
-msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
+msgid "This internal name is displayed to user instead of file name."
 msgstr ""
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr ""
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
 msgstr ""
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
+msgstr "Phát hành dưới những điều khoản của Giấy phép công cộng phổ biến GNU.\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
+msgstr "Biên dịch bằng GTK+-%d.%d.%d,"
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
+msgstr "sử dụng GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
-msgstr ""
+msgstr "Sử dụng DBUS để nhập.\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
+msgstr "Không sử dụng DBUS. Nhập chỉ làm việc một phần.\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
-msgstr ""
+msgstr "Sử dụng libnotify.\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
-msgstr ""
+msgstr "Không sử dụng libnotify.\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr ""
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr ""
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr ""
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
+msgstr "Sử dụng phiên bản cục bộ của libical.\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
+msgstr "Cách sử dụng: orage [options] [files]\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
-msgstr ""
+msgstr "Tùy chọn:\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
 msgstr ""
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
 msgstr ""
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr ""
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
 msgstr ""
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
 msgstr ""
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr ""
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
 msgstr ""
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
 msgstr ""
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
 msgstr ""
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
 msgstr ""
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
@@ -1688,279 +1769,327 @@
 "\n"
 msgstr ""
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr ""
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "Th_ay đổi"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "Xem _ngày đã chọn"
 
-#: ../src/mainbox.c:311
-#, fuzzy
+#: ../src/mainbox.c:329
 msgid "View selected _week"
-msgstr "Xem _ngày đã chọn"
+msgstr "Hiển thị t_uần được chọn"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "Chọn hôm na_y"
 
-#: ../src/mainbox.c:323
-#, fuzzy
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
-msgstr "Vị trí"
+msgstr "Hiện _Globaltime"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "_Giúp đỡ"
 
-#: ../src/mainbox.c:448
-#, fuzzy
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr ""
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr ""
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr ""
+
+#: ../src/mainbox.c:489
 msgid "Never"
-msgstr "không bao giờ"
+msgstr "Không bao giờ"
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:495
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
+" Done:\t%s%s"
 msgstr ""
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
 msgstr ""
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr ""
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr ""
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr ""
 
-#: ../src/parameters.c:522
-#, fuzzy
+#: ../src/parameters.c:492
 msgid "Main settings"
-msgstr "Thiết lập Lịch"
+msgstr "Cài đặt chính"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "Múi giờ"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
-msgstr ""
+msgstr "Bạn nên thường xuyên xác định múi giờ địa phương."
 
-#: ../src/parameters.c:552
-#, fuzzy
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
-msgstr "Giới hạn"
+msgstr ""
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr ""
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
 msgstr ""
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
-msgstr ""
+msgstr "Lệnh âm thanh"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
 msgstr ""
 
-#: ../src/parameters.c:605
-#, fuzzy
-msgid "Display settings"
-msgstr "Hiện"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr ""
 
-#: ../src/parameters.c:613
-#, fuzzy
-msgid "Calendar main window"
-msgstr "Cửa sổ lịch"
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr ""
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr ""
 
-#: ../src/parameters.c:625
-#, fuzzy
+#: ../src/parameters.c:614
 msgid "Show menu"
-msgstr "Hiện"
-
-#: ../src/parameters.c:632
-#, fuzzy
-msgid "Show month and year"
-msgstr "Hiện trong chuyển trang"
+msgstr "Hiện thực đơn"
 
-#: ../src/parameters.c:639
-#, fuzzy
+#: ../src/parameters.c:622
 msgid "Show day names"
-msgstr "Hiện"
+msgstr "Hiện tên ngày"
 
-#: ../src/parameters.c:646
-#, fuzzy
+#: ../src/parameters.c:627
 msgid "Show week numbers"
-msgstr "Hiện"
+msgstr "Đáng số tuần"
 
-#: ../src/parameters.c:653
-msgid "Show todo list"
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "Hiện tháng và năm"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
 msgstr ""
 
 #: ../src/parameters.c:660
+msgid "Show todo list"
+msgstr "Hiện danh sách việc để làm"
+
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
-msgstr ""
+msgstr "Số ngày để hiện trên cửa sổ  sự kiện"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
 msgstr ""
 
-#: ../src/parameters.c:676
-msgid "Show on all desktops"
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
 msgstr ""
 
-#: ../src/parameters.c:683
-#, fuzzy
+#: ../src/parameters.c:691
+msgid "Show on all desktops"
+msgstr "Hiện trên tất cả bàn làm việc"
+
+#: ../src/parameters.c:696
 msgid "Keep on top"
-msgstr "Chọn múi giờ"
+msgstr "Giữ ở trên"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "Hiện thị trên thanh công cụ"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "Hiện trong chuyển trang"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "Hiện thị trong khay"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "Khởi động lịch"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "Hiện"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "Ẩn"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "Thu nhỏ"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr ""
-
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "Cửa sổ lịch"
-
-#: ../src/parameters.c:806
-#, fuzzy
-msgid "Select Today's Date"
-msgstr "Chọn hôm na_y"
-
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
 msgstr ""
 
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
+#: ../src/parameters.c:792
+msgid "Select today's date"
 msgstr ""
 
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
 msgstr ""
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
 msgstr ""
 
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
-msgstr ""
+msgstr "Hiện theo ngày"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
-msgstr ""
+msgstr "Danh sách sự kiện"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "Cài đặt thêm"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
 msgstr ""
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
 msgstr ""
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
 msgstr ""
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr ""
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr ""
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr ""
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr ""
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "Sử dụng biểu tượng thực trên khay hệ thống"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "Sử dụng biểu tượng thực"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "Biểu tượng thực sẽ hiển thị ngày và tháng hiện tại."
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
 msgstr ""
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
 msgstr ""
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr ""
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr ""
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr ""
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr ""
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr ""
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr ""
+
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Tuỳ thích"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
 msgstr ""
 
-#: ../src/parameters.c:1069
-#, fuzzy, c-format
+#: ../src/parameters.c:1176
+#, c-format
 msgid "Default timezone set to %s."
-msgstr "Chọn múi giờ"
+msgstr "Múi giờ mặc định đặt về %s."
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
-msgstr ""
+msgstr "Không tìm thấy múi giờ mặc định, hãy đặt nó bằng tay."
 
 #: ../src/reminder.c:562
 msgid "Reminder "
@@ -1968,39 +2097,37 @@
 
 #: ../src/reminder.c:591
 msgid "Open"
-msgstr ""
+msgstr "Mở"
 
-#: ../src/reminder.c:722
-#, fuzzy
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
-msgstr "Nhắc "
+msgstr "Nhắc nhở - Orage"
 
-#: ../src/reminder.c:808
-msgid "Remind me again after the specified time"
+#: ../src/reminder.c:803
+msgid "Postpone"
 msgstr ""
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
+#: ../src/reminder.c:805
+msgid "Remind me again after the specified time"
 msgstr ""
 
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
-msgstr ""
+msgstr "Báo thức đang hoạt động tiếp theo:"
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
 msgstr ""
 
-#: ../src/reminder.c:1166
-#, fuzzy, c-format
+#: ../src/reminder.c:1154
+#, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr "Lặp lại âm thanh báo thức"
+msgstr ""
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2023,1712 +2150,2266 @@
 msgstr "Châu Phi/Angêri"
 
 #: ../src/timezone_names.c:41
+msgid "Africa/Asmara"
+msgstr ""
+
+#: ../src/timezone_names.c:42
 msgid "Africa/Asmera"
 msgstr "Châu Phi/Asmera"
 
-#: ../src/timezone_names.c:42
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "Châu Phi/Bamako"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "Châu Phi/Bangui"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "Châu Phi/Banjul"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "Châu Phi/Bissau"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "Châu Phi/Blantyre"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "Châu Phi/Brazzaville"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "Châu Phi/Bujumbura"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "Châu Phi/Cairo"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "Châu Phi/Casablanca"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "Châu Phi/Ceuta"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "Châu Phi/Conakry"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "Châu Phi/Dakar"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "Châu Phi/Dar_es_Salaam"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "Châu Phi/Djibouti"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "Châu Phi/Douala"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "Châu Phi/El_Aaiun"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "Châu Phi/Freetown"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "Châu Phi/Gaborone"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "Châu Phi/Harare"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr ""
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "Châu Phi/Johannesburg"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "Châu Phi/Kampala"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "Châu Phi/Khartoum"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "Châu Phi/Kigali"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "Châu Phi/Kinshasa"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "Châu Phi/Lagos"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "Châu Phi/Libreville"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "Châu Phi/Lome"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "Châu Phi/Luanda"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "Châu Phi/Lubumbashi"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "Châu Phi/Lusaka"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "Châu Phi/Malabo"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "Châu Phi/Maputo"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "Châu Phi/Maseru"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "Châu Phi/Mbabane"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "Châu Phi/Mogadishu"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "Châu Phi/Monrovia"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "Châu Phi/Nairobi"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "Châu Phi/Ndjamena"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "Châu Phi/Niamey"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "Châu Phi/Nouakchott"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "Châu Phi/Ouagadougou"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "Châu Phi/Porto-Novo"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "Châu Phi/Sao Tôm"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "Châu Phi/Timbuktu"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "Châu Phi/Tripoli"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "Châu Phi/Tunis"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "Châu Phi/Windhoek"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "Châu Mỹ"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "Châu Mỹ/A đắc"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "Châu Mỹ/Anchôrết"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "Châu Mỹ/Ăngôla"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "Châu Mỹ/Antigua"
 
-#: ../src/timezone_names.c:94
-msgid "America/Araguaina"
-msgstr ""
-
-#: ../src/timezone_names.c:95
-msgid "America/Argentina/Buenos_Aires"
-msgstr ""
-
 #: ../src/timezone_names.c:96
-#, fuzzy
-msgid "America/Argentina/Catamarca"
-msgstr "Châu Mỹ/Antigua"
+msgid "America/Araguaina"
+msgstr "Châu Mĩ / Araguaina"
 
 #: ../src/timezone_names.c:97
-#, fuzzy
-msgid "America/Argentina/Cordoba"
-msgstr "Châu Mỹ/Antigua"
+msgid "America/Argentina/Buenos_Aires"
+msgstr "Châu Mĩ / Argentina / Buenos_Aires"
 
 #: ../src/timezone_names.c:98
-#, fuzzy
-msgid "America/Argentina/Jujuy"
-msgstr "Châu Mỹ/Antigua"
+msgid "America/Argentina/Catamarca"
+msgstr "Châu Mĩ / Argentina / Catamarca"
 
 #: ../src/timezone_names.c:99
-#, fuzzy
-msgid "America/Argentina/Mendoza"
-msgstr "Châu Mỹ/Antigua"
+msgid "America/Argentina/ComodRivadavia"
+msgstr ""
 
 #: ../src/timezone_names.c:100
-msgid "America/Aruba"
-msgstr ""
+msgid "America/Argentina/Cordoba"
+msgstr "Châu Mĩ / Argentina / Cordoba"
 
 #: ../src/timezone_names.c:101
-msgid "America/Asuncion"
-msgstr ""
+msgid "America/Argentina/Jujuy"
+msgstr "Châu Mĩ / Argentina / Jujuy"
 
 #: ../src/timezone_names.c:102
-msgid "America/Barbados"
+msgid "America/Argentina/La_Rioja"
 msgstr ""
 
 #: ../src/timezone_names.c:103
-msgid "America/Belem"
-msgstr ""
+msgid "America/Argentina/Mendoza"
+msgstr "Châu Mĩ / Argentina / Mendoza"
 
 #: ../src/timezone_names.c:104
-msgid "America/Belize"
+msgid "America/Argentina/Rio_Gallegos"
 msgstr ""
 
 #: ../src/timezone_names.c:105
-msgid "America/Boa_Vista"
+msgid "America/Argentina/Salta"
 msgstr ""
 
 #: ../src/timezone_names.c:106
-msgid "America/Bogota"
+msgid "America/Argentina/San_Juan"
 msgstr ""
 
 #: ../src/timezone_names.c:107
-msgid "America/Boise"
+msgid "America/Argentina/San_Luis"
 msgstr ""
 
 #: ../src/timezone_names.c:108
-msgid "America/Buenos_Aires"
+msgid "America/Argentina/Tucuman"
 msgstr ""
 
 #: ../src/timezone_names.c:109
-msgid "America/Cambridge_Bay"
+msgid "America/Argentina/Ushuaia"
 msgstr ""
 
 #: ../src/timezone_names.c:110
-msgid "America/Cancun"
-msgstr ""
+msgid "America/Aruba"
+msgstr "Châu Mĩ / Aruba"
 
 #: ../src/timezone_names.c:111
-msgid "America/Caracas"
-msgstr ""
+msgid "America/Asuncion"
+msgstr "Châu Mĩ / Asuncion"
 
 #: ../src/timezone_names.c:112
-msgid "America/Catamarca"
+msgid "America/Atikokan"
 msgstr ""
 
 #: ../src/timezone_names.c:113
-msgid "America/Cayenne"
+msgid "America/Atka"
 msgstr ""
 
 #: ../src/timezone_names.c:114
-msgid "America/Cayman"
+msgid "America/Bahia"
 msgstr ""
 
 #: ../src/timezone_names.c:115
-msgid "America/Chicago"
+msgid "America/Bahia_Banderas"
 msgstr ""
 
 #: ../src/timezone_names.c:116
-msgid "America/Chihuahua"
-msgstr ""
+msgid "America/Barbados"
+msgstr "Châu Mĩ / Barbados"
 
 #: ../src/timezone_names.c:117
-msgid "America/Cordoba"
-msgstr ""
+msgid "America/Belem"
+msgstr "Châu Mĩ / Belem"
 
 #: ../src/timezone_names.c:118
-msgid "America/Costa_Rica"
-msgstr ""
+msgid "America/Belize"
+msgstr "Châu Mĩ / Belize"
 
 #: ../src/timezone_names.c:119
-msgid "America/Cuiaba"
+msgid "America/Blanc-Sablon"
 msgstr ""
 
 #: ../src/timezone_names.c:120
-msgid "America/Curacao"
-msgstr ""
+msgid "America/Boa_Vista"
+msgstr "Châu Mĩ / Boa_Vista"
 
 #: ../src/timezone_names.c:121
-msgid "America/Dawson"
-msgstr ""
+msgid "America/Bogota"
+msgstr "Châu Mĩ / Bogota"
 
 #: ../src/timezone_names.c:122
-msgid "America/Dawson_Creek"
-msgstr ""
+msgid "America/Boise"
+msgstr "Châu Mĩ / Boise"
 
 #: ../src/timezone_names.c:123
-msgid "America/Denver"
-msgstr ""
+msgid "America/Buenos_Aires"
+msgstr "Châu Mĩ / Buenos_Aires"
 
 #: ../src/timezone_names.c:124
-msgid "America/Detroit"
-msgstr ""
+msgid "America/Cambridge_Bay"
+msgstr "Châu Mĩ / Cambridge_Bay"
 
 #: ../src/timezone_names.c:125
-msgid "America/Dominica"
+msgid "America/Campo_Grande"
 msgstr ""
 
 #: ../src/timezone_names.c:126
-msgid "America/Edmonton"
-msgstr ""
+msgid "America/Cancun"
+msgstr "Châu Mĩ / Cancun"
 
 #: ../src/timezone_names.c:127
-msgid "America/Eirunepe"
-msgstr ""
+msgid "America/Caracas"
+msgstr "Châu Mĩ / Caracas"
 
 #: ../src/timezone_names.c:128
-msgid "America/El_Salvador"
-msgstr ""
+msgid "America/Catamarca"
+msgstr "Châu Mĩ / Catamarca"
 
 #: ../src/timezone_names.c:129
-msgid "America/Fortaleza"
-msgstr ""
+msgid "America/Cayenne"
+msgstr "Châu Mĩ / Cayenne"
 
 #: ../src/timezone_names.c:130
-msgid "America/Glace_Bay"
-msgstr ""
+msgid "America/Cayman"
+msgstr "Châu Mĩ / Cayman"
 
 #: ../src/timezone_names.c:131
-msgid "America/Godthab"
-msgstr ""
+msgid "America/Chicago"
+msgstr "Châu Mĩ / Chicago"
 
 #: ../src/timezone_names.c:132
-msgid "America/Goose_Bay"
-msgstr ""
+msgid "America/Chihuahua"
+msgstr "Châu Mĩ / Chihuahua"
 
 #: ../src/timezone_names.c:133
-msgid "America/Grand_Turk"
+msgid "America/Coral_Harbour"
 msgstr ""
 
 #: ../src/timezone_names.c:134
-msgid "America/Grenada"
-msgstr ""
+msgid "America/Cordoba"
+msgstr "Châu Mĩ / Cordoba"
 
 #: ../src/timezone_names.c:135
-msgid "America/Guadeloupe"
-msgstr ""
+msgid "America/Costa_Rica"
+msgstr "Châu Mĩ / Costa_Rica"
 
 #: ../src/timezone_names.c:136
-msgid "America/Guatemala"
+msgid "America/Creston"
 msgstr ""
 
 #: ../src/timezone_names.c:137
-msgid "America/Guayaquil"
-msgstr ""
+msgid "America/Cuiaba"
+msgstr "Châu Mĩ / Cuiaba"
 
 #: ../src/timezone_names.c:138
-msgid "America/Guyana"
-msgstr ""
+msgid "America/Curacao"
+msgstr "Châu Mĩ / Curacao"
 
 #: ../src/timezone_names.c:139
-msgid "America/Halifax"
+msgid "America/Danmarkshavn"
 msgstr ""
 
 #: ../src/timezone_names.c:140
-msgid "America/Havana"
-msgstr ""
+msgid "America/Dawson"
+msgstr "Châu Mĩ / Dawson"
 
 #: ../src/timezone_names.c:141
-msgid "America/Hermosillo"
-msgstr ""
+msgid "America/Dawson_Creek"
+msgstr "Châu Mĩ / Dawson_Creek"
 
 #: ../src/timezone_names.c:142
-msgid "America/Indiana/Indianapolis"
-msgstr ""
+msgid "America/Denver"
+msgstr "Châu Mĩ / Denver"
 
 #: ../src/timezone_names.c:143
-msgid "America/Indiana/Knox"
-msgstr ""
+msgid "America/Detroit"
+msgstr "Châu Mĩ / Detroit"
 
 #: ../src/timezone_names.c:144
-msgid "America/Indiana/Marengo"
-msgstr ""
+msgid "America/Dominica"
+msgstr "Châu Mĩ / Dominica"
 
 #: ../src/timezone_names.c:145
-msgid "America/Indiana/Vevay"
-msgstr ""
+msgid "America/Edmonton"
+msgstr "Châu Mĩ / Edmonton"
 
 #: ../src/timezone_names.c:146
-msgid "America/Indianapolis"
+msgid "America/Ensenada"
 msgstr ""
 
 #: ../src/timezone_names.c:147
-msgid "America/Inuvik"
-msgstr ""
+msgid "America/Eirunepe"
+msgstr "Châu Mĩ / Eirunepe"
 
 #: ../src/timezone_names.c:148
-msgid "America/Iqaluit"
-msgstr ""
+msgid "America/El_Salvador"
+msgstr "Châu Mĩ / El_Salvador"
 
 #: ../src/timezone_names.c:149
-msgid "America/Jamaica"
-msgstr ""
+msgid "America/Fortaleza"
+msgstr "Châu Mĩ / Fortaleza"
 
 #: ../src/timezone_names.c:150
-msgid "America/Jujuy"
+msgid "America/Fort_Wayne"
 msgstr ""
 
 #: ../src/timezone_names.c:151
-msgid "America/Juneau"
-msgstr ""
+msgid "America/Glace_Bay"
+msgstr "Châu Mĩ / Glace_Bay"
 
 #: ../src/timezone_names.c:152
-msgid "America/Kentucky/Louisville"
-msgstr ""
+msgid "America/Godthab"
+msgstr "Châu Mĩ / Godthab"
 
 #: ../src/timezone_names.c:153
-msgid "America/Kentucky/Monticello"
-msgstr ""
+msgid "America/Goose_Bay"
+msgstr "Châu Mĩ / Goose_Bay"
 
 #: ../src/timezone_names.c:154
-msgid "America/La_Paz"
-msgstr ""
+msgid "America/Grand_Turk"
+msgstr "Châu Mĩ / Grand_Turk"
 
 #: ../src/timezone_names.c:155
-msgid "America/Lima"
-msgstr "Châu Mỹ/Li-ma"
+msgid "America/Grenada"
+msgstr "Châu Mĩ / Grenada"
 
 #: ../src/timezone_names.c:156
-msgid "America/Los_Angeles"
-msgstr "Châu Mỹ/Lốxt Andơlét"
+msgid "America/Guadeloupe"
+msgstr "Châu Mĩ / Guedeloupe"
 
 #: ../src/timezone_names.c:157
-msgid "America/Louisville"
-msgstr ""
+msgid "America/Guatemala"
+msgstr "Châu Mĩ / Guatemala"
 
 #: ../src/timezone_names.c:158
-msgid "America/Maceio"
-msgstr "Châu Mỹ/Ma-sêyô"
+msgid "America/Guayaquil"
+msgstr "Châu Mĩ / Guayaquil"
 
 #: ../src/timezone_names.c:159
-msgid "America/Managua"
-msgstr ""
+msgid "America/Guyana"
+msgstr "Châu Mĩ / Guyana"
 
 #: ../src/timezone_names.c:160
-msgid "America/Manaus"
-msgstr ""
+msgid "America/Halifax"
+msgstr "Châu Mĩ / Halifax"
 
 #: ../src/timezone_names.c:161
-msgid "America/Martinique"
-msgstr ""
+msgid "America/Havana"
+msgstr "Châu Mĩ / Havana"
 
 #: ../src/timezone_names.c:162
-msgid "America/Mazatlan"
-msgstr ""
+msgid "America/Hermosillo"
+msgstr "Châu Mĩ / Hermosillo"
 
 #: ../src/timezone_names.c:163
-msgid "America/Mendoza"
-msgstr ""
+msgid "America/Indiana/Indianapolis"
+msgstr "Châu Mĩ / Indiana / Indianapolis"
 
 #: ../src/timezone_names.c:164
-msgid "America/Menominee"
-msgstr ""
+msgid "America/Indiana/Knox"
+msgstr "Châu Mĩ / Indiana / Knox"
 
 #: ../src/timezone_names.c:165
-msgid "America/Merida"
-msgstr ""
+msgid "America/Indiana/Marengo"
+msgstr "Châu Mĩ / Indiana / Marengo"
 
 #: ../src/timezone_names.c:166
-msgid "America/Mexico_City"
-msgstr "Châu Mỹ/Mehicô Siti"
+msgid "America/Indiana/Petersburg"
+msgstr ""
 
 #: ../src/timezone_names.c:167
-msgid "America/Miquelon"
+msgid "America/Indiana/Tell_City"
 msgstr ""
 
 #: ../src/timezone_names.c:168
-msgid "America/Monterrey"
-msgstr ""
+msgid "America/Indiana/Vevay"
+msgstr "Châu Mĩ / Indiana / Vevay"
 
 #: ../src/timezone_names.c:169
-msgid "America/Montevideo"
-msgstr "Châu Mỹ/Môntêviđêô"
+msgid "America/Indiana/Vincennes"
+msgstr ""
 
 #: ../src/timezone_names.c:170
-msgid "America/Montreal"
-msgstr "Châu Mỹ/Môntrêan"
+msgid "America/Indiana/Winamac"
+msgstr ""
 
 #: ../src/timezone_names.c:171
-msgid "America/Montserrat"
-msgstr ""
+msgid "America/Indianapolis"
+msgstr "Châu Mĩ / Indianapolis"
 
 #: ../src/timezone_names.c:172
-msgid "America/Nassau"
-msgstr ""
+msgid "America/Inuvik"
+msgstr "Châu Mĩ / Inuvik"
 
 #: ../src/timezone_names.c:173
-msgid "America/New_York"
-msgstr "Châu Mỹ/Nữu Ước"
+msgid "America/Iqaluit"
+msgstr "Châu Mĩ / Iqaluit"
 
 #: ../src/timezone_names.c:174
-msgid "America/Nipigon"
-msgstr ""
+msgid "America/Jamaica"
+msgstr "Châu Mĩ / Jamaica"
 
 #: ../src/timezone_names.c:175
-msgid "America/Nome"
-msgstr "Châu Mỹ/Nômê"
+msgid "America/Jujuy"
+msgstr "Châu Mĩ / Jujuy"
 
 #: ../src/timezone_names.c:176
-msgid "America/Noronha"
-msgstr ""
+msgid "America/Juneau"
+msgstr "Châu Mĩ / Juneau"
 
 #: ../src/timezone_names.c:177
-msgid "America/Panama"
-msgstr "Châu Mỹ/Panama"
+msgid "America/Kentucky/Louisville"
+msgstr "Châu Mĩ / Kentucky / Louisville"
 
 #: ../src/timezone_names.c:178
-msgid "America/Pangnirtung"
-msgstr ""
+msgid "America/Kentucky/Monticello"
+msgstr "Châu Mĩ / Kentucky / Monticello"
 
 #: ../src/timezone_names.c:179
-msgid "America/Paramaribo"
+msgid "America/Knox_IN"
 msgstr ""
 
 #: ../src/timezone_names.c:180
-msgid "America/Phoenix"
+msgid "America/Kralendijk"
 msgstr ""
 
 #: ../src/timezone_names.c:181
-msgid "America/Port-au-Prince"
-msgstr ""
+msgid "America/La_Paz"
+msgstr "Châu Mĩ / La_Paz"
 
 #: ../src/timezone_names.c:182
-msgid "America/Port_of_Spain"
-msgstr ""
+msgid "America/Lima"
+msgstr "Châu Mỹ/Li-ma"
 
 #: ../src/timezone_names.c:183
-msgid "America/Porto_Velho"
-msgstr ""
+msgid "America/Los_Angeles"
+msgstr "Châu Mỹ/Lốxt Andơlét"
 
 #: ../src/timezone_names.c:184
-msgid "America/Puerto_Rico"
-msgstr ""
+msgid "America/Louisville"
+msgstr "Châu Mĩ / Louisville"
 
 #: ../src/timezone_names.c:185
-msgid "America/Rainy_River"
+msgid "America/Lower_Princes"
 msgstr ""
 
 #: ../src/timezone_names.c:186
-msgid "America/Rankin_Inlet"
-msgstr ""
+msgid "America/Maceio"
+msgstr "Châu Mỹ/Ma-sêyô"
 
 #: ../src/timezone_names.c:187
-msgid "America/Recife"
-msgstr ""
+msgid "America/Managua"
+msgstr "Châu Mĩ / Managua"
 
 #: ../src/timezone_names.c:188
-msgid "America/Regina"
-msgstr ""
+msgid "America/Manaus"
+msgstr "Châu Mĩ / Maunaus"
 
 #: ../src/timezone_names.c:189
-msgid "America/Rio_Branco"
+msgid "America/Marigot"
 msgstr ""
 
 #: ../src/timezone_names.c:190
-msgid "America/Rosario"
-msgstr ""
+msgid "America/Martinique"
+msgstr "Châu Mĩ / Martinique"
 
 #: ../src/timezone_names.c:191
-msgid "America/Santiago"
+msgid "America/Matamoros"
 msgstr ""
 
 #: ../src/timezone_names.c:192
-msgid "America/Santo_Domingo"
-msgstr ""
+msgid "America/Mazatlan"
+msgstr "Châu Mĩ / Mazatlan"
 
 #: ../src/timezone_names.c:193
-msgid "America/Sao_Paulo"
-msgstr "Châu Mỹ/San Paolô"
+msgid "America/Mendoza"
+msgstr "Châu Mĩ / Mendoza"
 
 #: ../src/timezone_names.c:194
-msgid "America/Scoresbysund"
-msgstr ""
+msgid "America/Menominee"
+msgstr "Châu Mĩ / Menominee"
 
 #: ../src/timezone_names.c:195
-msgid "America/Shiprock"
-msgstr ""
+msgid "America/Merida"
+msgstr "Châu Mĩ / Merida"
 
 #: ../src/timezone_names.c:196
-msgid "America/St_Johns"
+msgid "America/Metlakatla"
 msgstr ""
 
 #: ../src/timezone_names.c:197
-msgid "America/St_Kitts"
-msgstr ""
+msgid "America/Mexico_City"
+msgstr "Châu Mỹ/Mehicô Siti"
 
 #: ../src/timezone_names.c:198
-msgid "America/St_Lucia"
-msgstr ""
+msgid "America/Miquelon"
+msgstr "Châu Mĩ / Miquelon"
 
 #: ../src/timezone_names.c:199
-msgid "America/St_Thomas"
+msgid "America/Moncton"
 msgstr ""
 
 #: ../src/timezone_names.c:200
-msgid "America/St_Vincent"
-msgstr ""
+msgid "America/Monterrey"
+msgstr "Châu Mĩ / Monterrey"
 
 #: ../src/timezone_names.c:201
-msgid "America/Swift_Current"
-msgstr ""
+msgid "America/Montevideo"
+msgstr "Châu Mỹ/Môntêviđêô"
 
 #: ../src/timezone_names.c:202
-msgid "America/Tegucigalpa"
-msgstr ""
+msgid "America/Montreal"
+msgstr "Châu Mỹ/Môntrêan"
 
 #: ../src/timezone_names.c:203
-msgid "America/Thule"
-msgstr ""
+msgid "America/Montserrat"
+msgstr "Châu Mĩ / Montserrat"
 
 #: ../src/timezone_names.c:204
-msgid "America/Thunder_Bay"
-msgstr ""
+msgid "America/Nassau"
+msgstr "Châu Mĩ / Nassau"
 
 #: ../src/timezone_names.c:205
-msgid "America/Tijuana"
-msgstr ""
+msgid "America/New_York"
+msgstr "Châu Mỹ/Nữu Ước"
 
 #: ../src/timezone_names.c:206
-msgid "America/Tortola"
-msgstr ""
+msgid "America/Nipigon"
+msgstr "Châu Mĩ / Nipigon"
 
 #: ../src/timezone_names.c:207
-msgid "America/Vancouver"
-msgstr ""
+msgid "America/Nome"
+msgstr "Châu Mỹ/Nômê"
 
 #: ../src/timezone_names.c:208
-msgid "America/Whitehorse"
+msgid "America/North_Dakota/Beulah"
 msgstr ""
 
 #: ../src/timezone_names.c:209
-msgid "America/Winnipeg"
+msgid "America/North_Dakota/Center"
 msgstr ""
 
 #: ../src/timezone_names.c:210
-msgid "America/Yakutat"
+msgid "America/North_Dakota/New_Salem"
 msgstr ""
 
 #: ../src/timezone_names.c:211
-msgid "America/Yellowknife"
-msgstr ""
+msgid "America/Noronha"
+msgstr "Châu Mĩ / Noronha"
 
 #: ../src/timezone_names.c:212
-msgid "Antarctica"
-msgstr "Nam Cực"
+msgid "America/Ojinaga"
+msgstr ""
 
 #: ../src/timezone_names.c:213
-msgid "Antarctica/Casey"
-msgstr "Châu Mỹ/Câysi"
+msgid "America/Panama"
+msgstr "Châu Mỹ/Panama"
 
 #: ../src/timezone_names.c:214
-msgid "Antarctica/Davis"
-msgstr "Châu Mỹ/Davíxt"
+msgid "America/Pangnirtung"
+msgstr "Châu Mĩ / Pangnirtung"
 
 #: ../src/timezone_names.c:215
-msgid "Antarctica/DumontDUrville"
-msgstr ""
+msgid "America/Paramaribo"
+msgstr "Châu Mĩ / Paramaribo"
 
 #: ../src/timezone_names.c:216
-msgid "Antarctica/Mawson"
-msgstr ""
+msgid "America/Phoenix"
+msgstr "Châu Mĩ / Phoenix"
 
 #: ../src/timezone_names.c:217
-msgid "Antarctica/McMurdo"
-msgstr ""
+msgid "America/Port-au-Prince"
+msgstr "Châu Mĩ / Port-au-Prince"
 
 #: ../src/timezone_names.c:218
-msgid "Antarctica/Palmer"
-msgstr ""
+msgid "America/Port_of_Spain"
+msgstr "Châu Mĩ / Port_of_Spain"
 
 #: ../src/timezone_names.c:219
-msgid "Antarctica/South_Pole"
+msgid "America/Porto_Acre"
 msgstr ""
 
 #: ../src/timezone_names.c:220
-msgid "Antarctica/Syowa"
-msgstr ""
+msgid "America/Porto_Velho"
+msgstr "Châu Mĩ / Porto_Velho"
 
 #: ../src/timezone_names.c:221
-msgid "Antarctica/Vostok"
-msgstr "Châu Mỹ/Vátxtốc"
+msgid "America/Puerto_Rico"
+msgstr "Châu Mĩ / Puerto_Rico"
 
 #: ../src/timezone_names.c:222
-msgid "Arctic"
-msgstr "Bắc Cực"
+msgid "America/Rainy_River"
+msgstr "Châu Mĩ / Rainy_River"
 
 #: ../src/timezone_names.c:223
-msgid "Arctic/Longyearbyen"
-msgstr ""
+msgid "America/Rankin_Inlet"
+msgstr "Châu Mĩ / Rankin_Inlet"
 
 #: ../src/timezone_names.c:224
-msgid "Asia"
-msgstr "Châu Á"
+msgid "America/Recife"
+msgstr "Châu Mĩ / Recife"
 
 #: ../src/timezone_names.c:225
-msgid "Asia/Aden"
-msgstr "Châu Á/Ađen"
+msgid "America/Regina"
+msgstr "Châu Mĩ / Regina"
 
 #: ../src/timezone_names.c:226
-msgid "Asia/Almaty"
-msgstr "Châu Á/An-ma-ti"
+msgid "America/Resolute"
+msgstr ""
 
 #: ../src/timezone_names.c:227
-msgid "Asia/Amman"
-msgstr "Châu Á/Amman"
+msgid "America/Rio_Branco"
+msgstr "Châu Mĩ / Rio_Branco"
 
 #: ../src/timezone_names.c:228
-msgid "Asia/Anadyr"
-msgstr "Châu Á/Anađir"
+msgid "America/Rosario"
+msgstr "Châu Mĩ / Rosario"
 
 #: ../src/timezone_names.c:229
-msgid "Asia/Aqtau"
-msgstr "Châu Á/Áctâu"
+msgid "America/Santa_Isabel"
+msgstr ""
 
 #: ../src/timezone_names.c:230
-msgid "Asia/Aqtobe"
-msgstr "Châu Á/Ác-tốp"
+msgid "America/Santarem"
+msgstr ""
 
 #: ../src/timezone_names.c:231
-msgid "Asia/Ashgabat"
-msgstr "Châu Á/Ashgabat"
+msgid "America/Santiago"
+msgstr "Châu Mĩ / Santiago"
 
 #: ../src/timezone_names.c:232
-msgid "Asia/Baghdad"
-msgstr "Châu Á/Bát Đa"
+msgid "America/Santo_Domingo"
+msgstr "Châu Mĩ / Santo_Domingo"
 
 #: ../src/timezone_names.c:233
-msgid "Asia/Bahrain"
-msgstr "Châu Á/Bahrain"
+msgid "America/Sao_Paulo"
+msgstr "Châu Mỹ/San Paolô"
 
 #: ../src/timezone_names.c:234
-msgid "Asia/Baku"
-msgstr "Châu Á/Ba cu"
+msgid "America/Scoresbysund"
+msgstr "Châu Mĩ / Scoresbysund"
 
 #: ../src/timezone_names.c:235
-msgid "Asia/Bangkok"
-msgstr "Châu Á/Băng Cốc"
+msgid "America/Shiprock"
+msgstr "Châu Mĩ / Shiprock"
 
 #: ../src/timezone_names.c:236
-msgid "Asia/Beirut"
-msgstr "Châu Á/Beirut"
+msgid "America/Sitka"
+msgstr ""
 
 #: ../src/timezone_names.c:237
-msgid "Asia/Bishkek"
-msgstr "Châu Á/Bishkek"
+msgid "America/St_Barthelemy"
+msgstr ""
 
 #: ../src/timezone_names.c:238
-msgid "Asia/Brunei"
-msgstr "Châu Á/Brunêi"
+msgid "America/St_Johns"
+msgstr "Châu Mĩ / St_Johns"
 
 #: ../src/timezone_names.c:239
-msgid "Asia/Calcutta"
-msgstr "Châu Á/Can-cút-ta"
+msgid "America/St_Kitts"
+msgstr "Châu Mĩ / S_Kitts"
 
 #: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
-msgstr "Châu Á/Chung Kinh"
+msgid "America/St_Lucia"
+msgstr "Châu Mĩ / St_Lucia"
 
 #: ../src/timezone_names.c:241
-msgid "Asia/Colombo"
-msgstr "Châu Á/Cô lôm bô"
+msgid "America/St_Thomas"
+msgstr "Châu Mĩ / St_Thomas"
 
 #: ../src/timezone_names.c:242
-msgid "Asia/Damascus"
-msgstr "Châu Á/Đa-mác"
+msgid "America/St_Vincent"
+msgstr "Châu Mĩ / St_Vincent"
 
 #: ../src/timezone_names.c:243
-msgid "Asia/Dhaka"
-msgstr "Châu Á/Dhaka"
+msgid "America/Swift_Current"
+msgstr "Châu Mĩ / Swift_Current"
 
 #: ../src/timezone_names.c:244
-msgid "Asia/Dili"
-msgstr "Châu Á/Đi-li"
+msgid "America/Tegucigalpa"
+msgstr ""
 
 #: ../src/timezone_names.c:245
-msgid "Asia/Dubai"
-msgstr "Châu Á/Đu-bai"
+msgid "America/Thule"
+msgstr ""
 
 #: ../src/timezone_names.c:246
-msgid "Asia/Dushanbe"
-msgstr "Châu Á/Đu-xan-bê"
+msgid "America/Thunder_Bay"
+msgstr ""
 
 #: ../src/timezone_names.c:247
-msgid "Asia/Gaza"
-msgstr "Châu Á/Ga-z"
+msgid "America/Tijuana"
+msgstr ""
 
 #: ../src/timezone_names.c:248
-msgid "Asia/Harbin"
+msgid "America/Toronto"
 msgstr ""
 
 #: ../src/timezone_names.c:249
-msgid "Asia/Hong_Kong"
-msgstr "Châu Á/Hồng Kông"
+msgid "America/Tortola"
+msgstr ""
 
 #: ../src/timezone_names.c:250
-msgid "Asia/Hovd"
+msgid "America/Vancouver"
 msgstr ""
 
 #: ../src/timezone_names.c:251
-msgid "Asia/Irkutsk"
-msgstr "Châu Á/Ir-kútx"
+msgid "America/Virgin"
+msgstr ""
 
 #: ../src/timezone_names.c:252
-msgid "Asia/Istanbul"
-msgstr "Châu Á/Ix-tan-bun"
+msgid "America/Whitehorse"
+msgstr ""
 
 #: ../src/timezone_names.c:253
-msgid "Asia/Jakarta"
-msgstr "Châu Á/Ja-cát-ta"
+msgid "America/Winnipeg"
+msgstr ""
 
 #: ../src/timezone_names.c:254
-msgid "Asia/Jayapura"
+msgid "America/Yakutat"
 msgstr ""
 
 #: ../src/timezone_names.c:255
-msgid "Asia/Jerusalem"
-msgstr "Châu Á/Je-ru-sa-len"
+msgid "America/Yellowknife"
+msgstr ""
 
 #: ../src/timezone_names.c:256
-msgid "Asia/Kabul"
-msgstr ""
+msgid "Antarctica"
+msgstr "Nam Cực"
 
 #: ../src/timezone_names.c:257
-msgid "Asia/Kamchatka"
-msgstr "Châu Á/Camtrátca"
+msgid "Antarctica/Casey"
+msgstr "Châu Mỹ/Câysi"
 
 #: ../src/timezone_names.c:258
-msgid "Asia/Karachi"
-msgstr ""
+msgid "Antarctica/Davis"
+msgstr "Châu Mỹ/Davíxt"
 
 #: ../src/timezone_names.c:259
-msgid "Asia/Kashgar"
+msgid "Antarctica/DumontDUrville"
 msgstr ""
 
 #: ../src/timezone_names.c:260
-msgid "Asia/Katmandu"
+msgid "Antarctica/Macquarie"
 msgstr ""
 
 #: ../src/timezone_names.c:261
-msgid "Asia/Krasnoyarsk"
+msgid "Antarctica/Mawson"
 msgstr ""
 
 #: ../src/timezone_names.c:262
-msgid "Asia/Kuala_Lumpur"
-msgstr "Châu Á/Kuala Lămpơ"
+msgid "Antarctica/McMurdo"
+msgstr ""
 
 #: ../src/timezone_names.c:263
-msgid "Asia/Kuching"
+msgid "Antarctica/Palmer"
 msgstr ""
 
 #: ../src/timezone_names.c:264
-msgid "Asia/Kuwait"
+msgid "Antarctica/Rothera"
 msgstr ""
 
 #: ../src/timezone_names.c:265
-msgid "Asia/Macao"
-msgstr "Châu Á/Ma-cao"
+msgid "Antarctica/South_Pole"
+msgstr ""
 
 #: ../src/timezone_names.c:266
-msgid "Asia/Magadan"
+msgid "Antarctica/Syowa"
 msgstr ""
 
 #: ../src/timezone_names.c:267
-msgid "Asia/Manila"
-msgstr "Châu Á/Ma-ni-la"
+msgid "Antarctica/Vostok"
+msgstr "Châu Mỹ/Vátxtốc"
 
 #: ../src/timezone_names.c:268
-msgid "Asia/Muscat"
-msgstr ""
+msgid "Arctic"
+msgstr "Bắc Cực"
 
 #: ../src/timezone_names.c:269
-msgid "Asia/Nicosia"
+msgid "Arctic/Longyearbyen"
 msgstr ""
 
 #: ../src/timezone_names.c:270
-msgid "Asia/Novosibirsk"
-msgstr ""
+msgid "Asia"
+msgstr "Châu Á"
 
 #: ../src/timezone_names.c:271
-msgid "Asia/Omsk"
-msgstr "Châu Á/Ôm-xkờ"
+msgid "Asia/Aden"
+msgstr "Châu Á/Ađen"
 
 #: ../src/timezone_names.c:272
-msgid "Asia/Phnom_Penh"
-msgstr "Châu Á/Phnôm Pênh"
+msgid "Asia/Almaty"
+msgstr "Châu Á/An-ma-ti"
 
 #: ../src/timezone_names.c:273
-msgid "Asia/Pontianak"
-msgstr ""
+msgid "Asia/Amman"
+msgstr "Châu Á/Amman"
 
 #: ../src/timezone_names.c:274
+msgid "Asia/Anadyr"
+msgstr "Châu Á/Anađir"
+
+#: ../src/timezone_names.c:275
+msgid "Asia/Aqtau"
+msgstr "Châu Á/Áctâu"
+
+#: ../src/timezone_names.c:276
+msgid "Asia/Aqtobe"
+msgstr "Châu Á/Ác-tốp"
+
+#: ../src/timezone_names.c:277
+msgid "Asia/Ashgabat"
+msgstr "Châu Á/Ashgabat"
+
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr ""
+
+#: ../src/timezone_names.c:279
+msgid "Asia/Baghdad"
+msgstr "Châu Á/Bát Đa"
+
+#: ../src/timezone_names.c:280
+msgid "Asia/Bahrain"
+msgstr "Châu Á/Bahrain"
+
+#: ../src/timezone_names.c:281
+msgid "Asia/Baku"
+msgstr "Châu Á/Ba cu"
+
+#: ../src/timezone_names.c:282
+msgid "Asia/Bangkok"
+msgstr "Châu Á/Băng Cốc"
+
+#: ../src/timezone_names.c:283
+msgid "Asia/Beirut"
+msgstr "Châu Á/Beirut"
+
+#: ../src/timezone_names.c:284
+msgid "Asia/Bishkek"
+msgstr "Châu Á/Bishkek"
+
+#: ../src/timezone_names.c:285
+msgid "Asia/Brunei"
+msgstr "Châu Á/Brunêi"
+
+#: ../src/timezone_names.c:286
+msgid "Asia/Calcutta"
+msgstr "Châu Á/Can-cút-ta"
+
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr ""
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr ""
+
+#: ../src/timezone_names.c:289
+msgid "Asia/Chungking"
+msgstr "Châu Á/Chung Kinh"
+
+#: ../src/timezone_names.c:290
+msgid "Asia/Colombo"
+msgstr "Châu Á/Cô lôm bô"
+
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr ""
+
+#: ../src/timezone_names.c:292
+msgid "Asia/Damascus"
+msgstr "Châu Á/Đa-mác"
+
+#: ../src/timezone_names.c:293
+msgid "Asia/Dhaka"
+msgstr "Châu Á/Dhaka"
+
+#: ../src/timezone_names.c:294
+msgid "Asia/Dili"
+msgstr "Châu Á/Đi-li"
+
+#: ../src/timezone_names.c:295
+msgid "Asia/Dubai"
+msgstr "Châu Á/Đu-bai"
+
+#: ../src/timezone_names.c:296
+msgid "Asia/Dushanbe"
+msgstr "Châu Á/Đu-xan-bê"
+
+#: ../src/timezone_names.c:297
+msgid "Asia/Gaza"
+msgstr "Châu Á/Ga-z"
+
+#: ../src/timezone_names.c:298
+msgid "Asia/Harbin"
+msgstr ""
+
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr ""
+
+#: ../src/timezone_names.c:300
+msgid "Asia/Hong_Kong"
+msgstr "Châu Á/Hồng Kông"
+
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr ""
+
+#: ../src/timezone_names.c:302
+msgid "Asia/Hovd"
+msgstr ""
+
+#: ../src/timezone_names.c:303
+msgid "Asia/Irkutsk"
+msgstr "Châu Á/Ir-kútx"
+
+#: ../src/timezone_names.c:304
+msgid "Asia/Istanbul"
+msgstr "Châu Á/Ix-tan-bun"
+
+#: ../src/timezone_names.c:305
+msgid "Asia/Jakarta"
+msgstr "Châu Á/Ja-cát-ta"
+
+#: ../src/timezone_names.c:306
+msgid "Asia/Jayapura"
+msgstr ""
+
+#: ../src/timezone_names.c:307
+msgid "Asia/Jerusalem"
+msgstr "Châu Á/Je-ru-sa-len"
+
+#: ../src/timezone_names.c:308
+msgid "Asia/Kabul"
+msgstr ""
+
+#: ../src/timezone_names.c:309
+msgid "Asia/Kamchatka"
+msgstr "Châu Á/Camtrátca"
+
+#: ../src/timezone_names.c:310
+msgid "Asia/Karachi"
+msgstr ""
+
+#: ../src/timezone_names.c:311
+msgid "Asia/Kashgar"
+msgstr ""
+
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr ""
+
+#: ../src/timezone_names.c:313
+msgid "Asia/Katmandu"
+msgstr ""
+
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr ""
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr ""
+
+#: ../src/timezone_names.c:316
+msgid "Asia/Krasnoyarsk"
+msgstr ""
+
+#: ../src/timezone_names.c:317
+msgid "Asia/Kuala_Lumpur"
+msgstr "Châu Á/Kuala Lămpơ"
+
+#: ../src/timezone_names.c:318
+msgid "Asia/Kuching"
+msgstr ""
+
+#: ../src/timezone_names.c:319
+msgid "Asia/Kuwait"
+msgstr ""
+
+#: ../src/timezone_names.c:320
+msgid "Asia/Macao"
+msgstr "Châu Á/Ma-cao"
+
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr ""
+
+#: ../src/timezone_names.c:322
+msgid "Asia/Magadan"
+msgstr ""
+
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr ""
+
+#: ../src/timezone_names.c:324
+msgid "Asia/Manila"
+msgstr "Châu Á/Ma-ni-la"
+
+#: ../src/timezone_names.c:325
+msgid "Asia/Muscat"
+msgstr ""
+
+#: ../src/timezone_names.c:326
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr ""
+
+#: ../src/timezone_names.c:328
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+#: ../src/timezone_names.c:329
+msgid "Asia/Omsk"
+msgstr "Châu Á/Ôm-xkờ"
+
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr ""
+
+#: ../src/timezone_names.c:331
+msgid "Asia/Phnom_Penh"
+msgstr "Châu Á/Phnôm Pênh"
+
+#: ../src/timezone_names.c:332
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr ""
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr ""
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr ""
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr ""
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "Châu Á/Sài Gòn"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr ""
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "Châu Á/Sê-ul"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "Châu Á/Thượng Hải"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "Châu Á/Singapore"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr ""
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr ""
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr ""
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr ""
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr ""
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr ""
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "Châu Á/Tô-ki-o"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr ""
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr ""
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr ""
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "Châu Á/Viên Chăn"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "Châu Á/Vla-đi-vátx-tốc"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "Châu Á/Ia-kútx-kơ"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "Châu Á/E-ka-che-rin-buốc"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr ""
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "Đại Tây Dương"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr ""
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr ""
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr ""
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr ""
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
 msgstr ""
 
-#: ../src/timezone_names.c:306
+#: ../src/timezone_names.c:375
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: ../src/timezone_names.c:307
+#: ../src/timezone_names.c:376
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: ../src/timezone_names.c:308
+#: ../src/timezone_names.c:377
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: ../src/timezone_names.c:309
+#: ../src/timezone_names.c:378
 msgid "Australia"
 msgstr "Châu Úc"
 
-#: ../src/timezone_names.c:310
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr ""
+
+#: ../src/timezone_names.c:380
 msgid "Australia/Adelaide"
 msgstr ""
 
-#: ../src/timezone_names.c:311
+#: ../src/timezone_names.c:381
 msgid "Australia/Brisbane"
 msgstr ""
 
-#: ../src/timezone_names.c:312
+#: ../src/timezone_names.c:382
 msgid "Australia/Broken_Hill"
 msgstr ""
 
-#: ../src/timezone_names.c:313
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr ""
+
+#: ../src/timezone_names.c:384
 msgid "Australia/Darwin"
 msgstr ""
 
-#: ../src/timezone_names.c:314
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr ""
+
+#: ../src/timezone_names.c:386
 msgid "Australia/Hobart"
 msgstr ""
 
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr ""
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr ""
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "Châu Úc/Men-bơn"
+
+#: ../src/timezone_names.c:390
+msgid "Australia/Perth"
+msgstr "Châu Úc/Perth"
+
+#: ../src/timezone_names.c:391
+msgid "Australia/Sydney"
+msgstr "Châu Úc/Sít-Nêi"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr ""
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr ""
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr ""
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr ""
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr ""
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr ""
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr ""
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr ""
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr ""
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr ""
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr ""
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr ""
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr ""
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr ""
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr ""
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr ""
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr ""
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr ""
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr ""
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr ""
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr ""
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr ""
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr ""
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr ""
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr ""
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr ""
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr ""
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr ""
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr ""
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr ""
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr ""
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr ""
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr ""
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr ""
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr ""
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr ""
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr ""
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr ""
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr ""
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr ""
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr ""
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr ""
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr ""
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr ""
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr ""
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr ""
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr ""
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr ""
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr ""
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
 msgstr ""
 
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
 msgstr ""
 
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr "Châu Úc/Men-bơn"
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr ""
 
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr "Châu Úc/Perth"
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr ""
 
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr "Châu Úc/Sít-Nêi"
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr ""
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "Châu Âu"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "Châu Âu/Amx-téc-đam"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "Châu Âu/An-đô-ra"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "Châu Âu/A-ten"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr ""
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr ""
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "Châu Âu/Béc-lin"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr ""
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "Châu Âu/Brút-xen"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr ""
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "Châu Âu/Bu-đa-péxt"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr ""
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "Châu Âu/Cô-pen-ga-gen"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr ""
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr ""
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr ""
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr ""
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr ""
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr ""
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr ""
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "Châu Âu/Ka-li-nhin-grát"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "Châu Âu/Ki-ev"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "Châu Âu/Líx-bon"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr ""
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "Châu Âu/Luân Đôn"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "Châu Âu/Lúc-xem-bua"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "Châu Âu/Man-drít"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr ""
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr ""
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "Châu Âu/Minx-kơ"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "Châu Âu/Mô-na-cô"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "Châu Âu/Matx-cơ-va"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr ""
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr ""
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "Châu Âu/Pa-ri"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr ""
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr ""
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "Châu Âu/Ri-ga"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "Châu Âu/Rôm"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "Châu Âu/Sa-ma-ra"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr ""
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr ""
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr ""
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr ""
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr ""
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "Châu Âu/Stốc-khôm"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr ""
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr ""
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr ""
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr ""
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "Châu Âu/Va-ti-căng"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "Châu Âu/Viên"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr ""
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr ""
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr ""
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr ""
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr ""
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr ""
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "Ấn Độ Dương"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr ""
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr ""
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr ""
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr ""
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr ""
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr ""
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr ""
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr ""
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr ""
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr ""
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr ""
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr ""
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr ""
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr ""
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr ""
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr ""
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr ""
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "Thái Bình Dương"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr ""
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr ""
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr ""
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr ""
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "Thái bình dương/Gu-am"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr ""
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr ""
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr ""
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr ""
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr ""
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr ""
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr ""
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr ""
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr ""
 
-#: ../src/tray_icon.c:469
-msgid "New appointment"
-msgstr "Cuộc hẹn mới"
-
-#: ../src/tray_icon.c:485
-msgid "About Orage"
-msgstr "Về Orage"
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
-msgid "Orage Panel Clock"
-msgstr "Orage"
-
-#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
-msgid "Show time and date?"
-msgstr "Hiện trong chuyển trang"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "Lịch"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
-msgid "Orage Calendar Preferences"
-msgstr "Tuỳ thích"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
-msgid "Orage preferences"
-msgstr "Tuỳ thích"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Thiết lập cho Ứng dụng Lịch của Xfce 4"
-
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "Lịch màn hình"
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr ""
 
-#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
-msgid "Orage Calendar"
-msgstr "Lịch"
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Orage clock"
-#~ msgstr "Orage"
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr ""
 
-#~ msgid "Contributor"
-#~ msgstr "Người đóng góp"
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr ""
 
-#~ msgid "Warning"
-#~ msgstr "Cảnh báo"
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr ""
 
-#~ msgid "Display"
-#~ msgstr "Hiển thị"
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Select always today"
-#~ msgstr "Chọn hôm na_y"
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Vary"
-#~ msgstr "Hàng năm"
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Select timezone"
-#~ msgstr "Chọn múi giờ"
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Modify Preferences"
-#~ msgstr "Tuỳ thích"
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Properties"
-#~ msgstr "Châu Âu/Pa-ri"
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Show event list"
-#~ msgstr "Hiện thị trong khay"
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr ""
 
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Thiết lập Lịch Xfce 4"
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Monday"
-#~ msgstr "Hôm nay"
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Tuesday"
-#~ msgstr "Hôm nay"
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Wednesday"
-#~ msgstr "Hàng tuần"
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Thursday"
-#~ msgstr "Hôm nay"
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Friday"
-#~ msgstr "ngày"
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Sunday"
-#~ msgstr "Âm thanh"
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Days"
-#~ msgstr "ngày"
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr ""
 
-#, fuzzy
-#~ msgid "normal"
-#~ msgstr "Chung"
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr ""
 
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%m/%d/%Y"
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Calendar Files"
-#~ msgstr "Tập tin lịch"
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr ""
 
-#~ msgid "Calendar borders"
-#~ msgstr "Đường viền"
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr ""
 
-#~ msgid "Hidden"
-#~ msgstr "Ẩn"
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr ""
 
-#~ msgid "3 months"
-#~ msgstr "3 tháng"
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr ""
 
-#~ msgid "6 months"
-#~ msgstr "6 tháng"
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr ""
 
-#~ msgid "1 year"
-#~ msgstr "1 năm"
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr ""
 
-#~ msgid "Application"
-#~ msgstr "Ứng dụng"
+#: ../src/tray_icon.c:469
+msgid "New appointment"
+msgstr "Cuộc hẹn mới"
 
-#~ msgid "Button Label|Orage"
-#~ msgstr "Orage"
+#: ../src/tray_icon.c:485
+msgid "About Orage"
+msgstr "Về Orage"
 
-#~ msgid "Core developer"
-#~ msgstr "Người phát triển chính"
+#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
+msgid "Orage Panel Clock"
+msgstr ""
 
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr ""
-#~ "Bạn sẽ bỏ tất cả thông tin \n"
-#~ "liên hệ với ngày này."
+#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
+msgid "Show time and date?"
+msgstr ""
 
-#~ msgid "Clear"
-#~ msgstr "Xoá"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
+msgid "Orage preferences"
+msgstr ""
 
-#~ msgid "uid"
-#~ msgstr "uid"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr ""
 
-#~ msgid "This should not happen"
-#~ msgstr "Điều này không nên xảy ra"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr ""
 
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "Không thể tạo kênh khách MCS"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "Lịch"
 
-#~ msgid "Open archive file..."
-#~ msgstr "Mở tập tin lưu trữ..."
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr ""
 
-#~ msgid "Close archive file"
-#~ msgstr "Đóng tập tin lưu trữ"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Lịch màn hình"
diff -Nru orage-4.8.3/po/zh_CN.po orage-4.12.1/po/zh_CN.po
--- orage-4.8.3/po/zh_CN.po	2012-01-04 08:11:25.000000000 +0000
+++ orage-4.12.1/po/zh_CN.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,26 +1,46 @@
-# Simplified Chinese translations for
-# the orage package.
-# This file is distributed under the same license as
-# the orage package.
-# Yongtao Yang <yongtao.yang@telia.com>, 2004.
-# Huang Huan <unicon221@gmail.com>, 2006.
-# Chris K. Zhang <plutino@gmail.com>, 2009.
-# Aron Xu <aronmalache@163.com>, 2009.
-# Hunt Xu <huntxu@live.cn>, 2009, 2011.
-# Chipong Luo <chipong_l@yahoo.com>, 2011.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Aron Xu <aronmalache@163.com>, 2009
+# Chipong Luo <chipong.luo@yahoo.com>, 2011-2013
+# Chris K. Zhang <plutino@gmail.com>, 2009
+# Huang Huan <unicon221@gmail.com>, 2006
+# Hunt Xu <huntxu@live.cn>, 2009,2011
+# 玉堂白鹤 <yjwork@qq.com>, 2013-2014
+# Yongtao Yang <yongtao.yang@telia.com>, 2004
+# 周潇波 <zhouxiaobo.500@gmail.com>, 2013-2014
+# 玉堂白鹤 <yjwork@qq.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: orage\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2011-02-15 21:29+0800\n"
-"Last-Translator: Chipong Luo <chipong_l@yahoo.com>\n"
-"Language-Team: Chinese (Simplified) <xfce-i18n@xfce.org>\n"
-"Language: zh_CN\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2014-11-18 04:38+0000\n"
+"Last-Translator: 玉堂白鹤 <yjwork@qq.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/xfce-apps/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "无下划线"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "单一"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "两倍"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "低"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -36,9 +56,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"点击修改时钟"
+msgstr "%s\n点击修改时钟"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -48,9 +66,7 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
-"按钮 1 更改首选项\n"
-"按钮 2 调整时钟时间"
+msgstr "按钮 1 更改首选项\n按钮 2 调整时钟时间"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
@@ -61,6 +77,10 @@
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
 msgstr "调整以更改分钟。点击带按钮 2 的箭头只更改 1 分钟。"
 
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Global Time"
+
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
 msgstr "新建"
@@ -71,7 +91,7 @@
 
 #: ../globaltime/gt_prefs.c:310
 msgid "Not possible to delete the last clock."
-msgstr "不可能删除上个时钟"
+msgstr "不可能删除上个时钟。"
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
@@ -115,7 +135,7 @@
 
 #: ../globaltime/gt_prefs.c:590
 msgid "Globaltime preferences "
-msgstr "全球时间首选项"
+msgstr "全球时间首选项 "
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -136,7 +156,7 @@
 
 #: ../globaltime/gt_prefs.c:643
 msgid "Text Formatting"
-msgstr "文本格式"
+msgstr "文字格式"
 
 #. ------------------------background-------------------------
 #: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
@@ -153,18 +173,18 @@
 #: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
 #: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
 msgid "Use default"
-msgstr "使用默认值"
+msgstr "使用默认色"
 
 #: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
 #: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
 msgid "Cross this to use default instead of selected value"
-msgstr "划掉它使用默认值而不是选中的值"
+msgstr "勾掉它以便使用默认色而不是选中的值"
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
 msgid "Foreground (=text) color:"
-msgstr "前景(为文本)色："
+msgstr "前景(为文字)色："
 
 #: ../globaltime/gt_prefs.c:688
 msgid "Click to change foreground colour for clock"
@@ -200,19 +220,19 @@
 
 #: ../globaltime/gt_prefs.c:850
 msgid "Text Default Formatting"
-msgstr "文本默认格式"
+msgstr "文字默认格式"
 
 #: ../globaltime/gt_prefs.c:863
 msgid "Click to change default background colour for clocks"
-msgstr "点击更改时钟的默认背景色"
+msgstr "点击更改时钟的默认背景颜色"
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr "划掉它使用系统默认值而不是选中的颜色"
+msgstr "勾掉它以便使用系统默认色而不是选中的颜色"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
-msgstr "点击更改时钟的默认文本颜色"
+msgstr "点击更改时钟的默认文字颜色"
 
 #: ../globaltime/gt_prefs.c:929
 msgid "Click to change default font for clock name"
@@ -220,7 +240,7 @@
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr "划去本项取消所选字体而用系统默认值"
+msgstr "勾掉它以便使用系统默认字体而不是选中的字体"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -261,6 +281,10 @@
 msgid "Use normal decorations"
 msgstr "使用普通修饰"
 
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "无"
+
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
 msgstr "不显示窗口修饰(边框)"
@@ -336,7 +360,7 @@
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "位置"
@@ -397,95 +421,108 @@
 msgid "floating"
 msgstr "浮动"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "全球时间"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Orage 全球时间"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "显示不同国家的时钟"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "全球时间"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "不旋转"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "逆时针旋转"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "顺时针旋转"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "外观"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
 msgstr "显示外框(_F)"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
 msgstr "设置前景色(_C)："
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
 msgstr "设置背景色(_B)："
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
 msgstr "设置高度(_H)："
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
 msgstr "注意您不能更改水平面板的高度"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
 msgstr "设置宽度(_W)："
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
 msgstr "注意您不能更改竖直面板的宽度"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "显示垂直线(_V)"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "时钟选项"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
 msgstr "将时区设置为："
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "行 %d："
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
-msgstr "输入任何有效 strftime 函数参数。"
+msgstr "输入任何有效的 strftime 函数参数。"
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
 msgstr "工具提示："
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
-msgstr "待机/休眠之后修正时间"
+msgstr "挂起/休眠之后修正时间"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
-"短期(少于 5 小时)待机或休眠而且您可见的时间不包含秒时才需要此选项。这些情况"
-"下，除非您选了此项，Orage 时钟显示的时间可能不准确。(选中此项将使 cpu 和中断"
-"保留功能失效。)"
+msgstr "短期(少于 5 小时)挂起或休眠而且在您可见的时间不包含秒时才需要此选项。在这些情况下，除非您选了此项，Orage 时钟显示的时间可能不准确。(选中此项会防止使 cpu 和中断保留功能起作用。)"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -495,20 +532,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"此程序使用 strftime 函数获取时间。使用任何有效的\n"
-"代码获取您喜欢格式的时间。一些常用代码是：\n"
-"\t%A 为工作日\t\t\t%B 为月\n"
-"\t%c 为日期和时间\t\t%R 为小时和分钟\n"
-"\t%V 为周\t\t%Z为使用的时区\n"
-"\t%H 为小时 \t\t\t\t%M 为分钟\n"
-"\t%X 为本地时间\t\t\t%x 为本地日期"
+msgstr "此程序使用 strftime 函数获取时间。使用\n任何有效的代码获取您偏爱格式的时间。一些\n常用代码是：\n\t%A 为工作日\t\t\t%B 为月\n\t%c 为日期和时间\t\t%R 为小时和分钟\n\t%V 为周数\t\t%Z 为使用的时区\n\t%H 为小时\t\t\t\t%M 为分钟\n\t%X 为本地时间\t\t\t%x 为本地日期"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
 msgstr "Orage 时钟首选项"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -517,10 +546,9 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
-msgstr "%A %d %B %Y/%V"
+msgstr "%Y-%B-%d %A/%V"
 
 #: ../src/about-xfcalendar.c:40
 msgid "Maintainer"
@@ -533,7 +561,7 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "结束"
 
@@ -541,13 +569,13 @@
 msgid "Due"
 msgstr "到期"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
-msgstr "Orage 日历"
+msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
 msgstr "选择文件..."
 
@@ -555,225 +583,281 @@
 msgid "Sound Files"
 msgstr "声音文件"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "所有文件"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
-msgstr "约会信息已修改"
+msgstr "已修改约会信息。"
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "你要继续吗？"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "不，不要离开"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "是的，忽略修改并离开"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "约会结束时间早于开始时间。"
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "没有设置"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "添加新的约会到这个文件。"
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Orage 默认文件"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "添加新的约会失败。"
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "添加约会时发生错误。更多详情请参考日志文件。"
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "约会更新失败。"
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "从日志文件中查看更多详情。（也许文件被 Orage 从外部更新了?)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
-msgstr "此约会会永久移除。"
+msgstr "会永久移除此约会。"
+
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "不，取消移除"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "是，移除"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "选取日期"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "今天"
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "此约会不存在。"
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
-msgstr "它可能已移除，请刷新屏幕。"
+msgstr "它可能已被移除，请刷新屏幕。"
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "当前类别"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
 msgstr "添加新的颜色类别"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "类别："
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
-msgstr "类别的颜色-Orage 日历"
+msgstr "类别的颜色-Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr "*** 复制 ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
-msgstr "新建约会-Orage 日历"
+msgstr "新建约会-Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "保存并关闭(_E)"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
 msgstr "重复(_U)"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "保存"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "保存并关闭"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "重置"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
 msgstr "重复"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "删除"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "空闲"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "繁忙"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "一般"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "类型 "
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "事件"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"某时要发生的事件，比如：\n"
-"会议、生日或电视节目。"
+msgstr "某时要发生的事件，比如：\n会议、生日或电视节目。"
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "待办"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
-"某时您应该做的事情，比如：\n"
-"洗车或测试新版 Orage 日历。"
+msgstr "某时您应该做的事情，比如：\n洗车或测试新版 Orage。"
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
 msgstr "日志"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
-"记录发生的事情，比如：\n"
-"备注妈妈的电话或初雪到来。"
+msgstr "记录发生的事情，比如：\n记录妈妈的电话或初雪到来。"
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "标题 "
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "全天事件"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "开始"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
 msgstr "设置      "
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
 msgstr "持续时间"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "天"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "小时"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "分钟"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "有效性"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
 msgstr "完成"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "做完"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "类别"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr "这个特殊类别可用来在列表视图中将本约会显示为彩色。"
+msgstr "这个特殊类别可用来在列表视图中将本约会彩色显示。"
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
-msgstr "更新类别的颜色"
+msgstr "更新类别的颜色。"
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
-msgstr "优先"
+msgstr "优先级"
+
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "如果您将该值设为 8 或更大，该约会将\"不会\"显示在列表窗口。\n您可以使用该功能来整理您的列表窗口，但可能导致它更难找到该约会。\n(闹钟功能将会正常运行。)\n(该功能未正式记录，所以你可以更改此默认为8的限制。)"
 
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "备注"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -782,137 +866,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
-"这些简略命令立即生效：\n"
-"    <D> 以本地日期格式插入当前日期\n"
-"    <T> 插入时间和\n"
-"    <DT> 插入日期和时间。\n"
-"\n"
-"这些只有在后来看见它们时才会转换：\n"
-"    <&Ynnnn> 转换为当前的年减去 nnnn。\n"
-"(此用来比如在生日提醒中告诉这个人的年龄。)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "这些简略命令立即生效：\n    <D> 以本地日期格式插入当前日期\n    <T> 插入时间和\n    <DT> 插入日期和时间。\n\n这些只有在后来看见它们时才会转换：\n    <&Ynnnn> 转换为当前的年减去 nnnn。\n(此用来如在生日提醒中显示这个人的年龄。)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
 msgstr "开始前"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
 msgstr "结束前"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
 msgstr "开始后"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
 msgstr "结束后"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "闹铃"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "闹铃时间"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
-"通常您要闹铃：\n"
-" 1) 事件发生前\n"
-" 2) 待办结束前\n"
-" 3) 待办开始后"
+msgstr "通常您要有闹铃：\n 1) 事件发生前\n 2) 待办结束前\n 3) 待办开始后"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
 msgstr "持续闹铃"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr "闹铃响时，如果您要 Orage 日历即使还没被激活时也提醒您，选择此项。"
+msgstr "闹铃响时，如果您要即使还没激活 Orage 时也提醒您，选择此项。"
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "声音"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "使用"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
 msgstr "如果您要可听的闹铃则选择此项"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "重复闹铃声音"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
 msgstr "时间"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
 msgstr "秒间隔"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
-msgstr "视觉"
+msgstr "可见"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
-msgstr "使用 Orage 日历窗口"
+msgstr "使用 Orage 窗口"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
-msgstr "如果您要 Orage 日历窗口闹铃则选择此项"
+msgstr "如果您要 Orage 窗口闹铃则选择此项"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "使用通知"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
 msgstr "如果您要通知闹铃则选择此项"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "设置超时"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
 msgstr "如果您要通知自动终止则选择此项"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
 msgstr "0 为系统默认终止时间"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "秒"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
+#: ../src/appointment.c:3184
 msgid "Procedure"
 msgstr "步骤"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
 msgstr "如果您要步骤或脚本闹铃则选择此项"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -922,164 +993,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
-"您必须自己输入所有退格键等字符。\n"
-"此字符串仅用于进程 shell。\n"
-"在运行时会替换以下特殊命令：\n"
-"\t<&T>  约会标题\n"
-"\t<&D>  约会描述\n"
-"\t<&AT> 闹铃时间\n"
-"\t<&ST> 约会开始时间\n"
-"\t<&ET> 约会结束时间"
+msgstr "您必须自己输入所有退格键等字符。\n此字符串仅用于进程 shell。\n在运行时会替换以下特殊命令：\n\t<&T>  约会标题\n\t<&D>  约会描述\n\t<&AT> 闹铃时间\n\t<&ST> 约会开始时间\n\t<&ET> 约会结束时间"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
-msgstr "现在设置闹铃来测试"
+msgstr "现在触发闹铃来测试"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "<b>默认闹铃</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
 msgstr "把当前设置存为默认闹铃"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
 msgstr "从默认闹铃设置当前设置"
 
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "无"
-
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "每天"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "每周"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "每月"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "每年"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
 msgstr "每小时"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "星期一"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "星期二"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "星期三"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "星期四"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "星期五"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "星期六"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "星期日"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "重复发生"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
 msgstr "复杂度"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "基本"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "高级"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
-msgstr "如果您要规则的重复事件则使用该项"
+msgstr "如果您要规则的重复事件则使用它"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
-"使用这个，如果您需要复杂的时间如：\n"
-"  每星期六和星期日，或\n"
-"  每月的第一个星期二"
+msgstr "使用它，如果您需要复杂的时间如：\n  每星期六和星期日，或\n  每月的第一个星期二"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "频率"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
 msgstr "每个"
 
-#: ../src/appointment.c:3224
+#: ../src/appointment.c:3337
 msgid "occurrence"
 msgstr "发生"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
-"限定重复频率为特定间隔。\n"
-" 比如：每三天：\n"
-" 频率为每天，间隔为 3"
+msgstr "限定频率为特定间隔。\n 比如：每三天：\n 频率为每天且间隔为 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "限定"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "一直重复"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "重复 "
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "重复直到 "
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "工作日"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
-msgstr "哪天"
+msgstr "哪一天"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1087,282 +1140,293 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
-"指定月事件和年事件的哪个工作日。\n"
-" 比如：\n"
-" 每月的第二个星期三：\n"
-"\t频率为每月，\n"
-"\t工作日为只检查星期三，\n"
-"\t哪一天为从星期三下的数字中选择 2"
+msgstr "指定月事件和年事件的哪个工作日。\n 比如：\n 每月的第二个星期三：\n\t频率为每月，\n\t工作日为只检查星期三，\n\t哪一天为从星期三下的数字中选择 2"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
 msgstr "待办基本"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
-"待办有规律地在开始时间启动并在每个间隔后重复，它会重复发生而不管上次是何时完"
-"成的。"
+msgstr "待办有规律地在开始时间启动并在每个间隔后重复，它会重复发生而不管上次是何时完成的"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
-"待办基于完成时间在从上次完成时间计时的间隔后重复发生。\n"
-"(注意重复发生基本在每次完成后改变，所以您不能知道待办的任何相关历史。)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "待办基于完成时间在从上次完成时间计时的间隔后重复发生。\n(注意重复发生基本在每次完成后改变，所以您不能知道待办的任何相关历史。)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "例外"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
-"在下面点击日历天数添加更多例外日期。\n"
-"例外取决于选择要么排除(-)要么包括(+)。\n"
-"点击数据移除。"
+msgstr "在下面点击日历天数添加更多例外日期。\n例外取决于选择要么排除(-)要么包括(+)。\n点击数据移除。"
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr "添加排除日期(-)"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr "排除天数是约会不会发生的全天。"
+msgstr "排除天数是约会不会发生的全天"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
 msgstr "添加包括时间(+)"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
 msgstr "包括时间与开始时间的时区相同，但可能时间不同"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
 msgstr "动作日期"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "视图(_V)"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "转到(_G)"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "新建"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "后退"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "今天"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "前进"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "后退一星期"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "后退一天"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "前进一天"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "前进一星期"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "刷新"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "关闭"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "       要显示的天数"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
-msgstr "Orage 日历-日视图"
+msgstr "Orage-日视图"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "所有天"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "时间"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
-msgstr "没有选择任何行"
+msgstr "没有选择任何行。"
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
 msgstr "点击一行选择，之后您可以复制它。"
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"所有选中的约会\n"
-"将永久移除。"
+msgstr "将永久移除所有\n选中的约会。"
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "是，移除"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "后退"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "前进"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "查找"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "日视图"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "要显示的额外天数"
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "要显示的额外天数："
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "只有第一个重复"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "如果您只想查看第一个重复的事件，请勾选此项。默认为全部显示。\n注意，这将显示所有紧急事件。\n注意，重复的事件将只会在列表中第一次出现的地方出现。"
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "也是旧的"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "如果您也想查看旧的时间，请勾选此项。该功能只能在勾选“只有第一个重复”时启用，以避免列表过长。\n请注意，额外的天数选择仍有限制，如果有较新的约会将被列出。"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
 msgstr "日志条目开始于："
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "搜索"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
-msgstr "搜索文本 "
+msgstr "搜索文字 "
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "标签"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "标题"
 
-#: ../src/event-list.c:1323
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"双击编辑本行。\n"
-"\n"
-"标签顺序：\n"
-"\t 1. 闹铃： n 为无闹铃\n"
-"\t\t A 为视觉闹铃，S 也为声音闹铃\n"
-"\t 2. 重复发生： n 为不重复\n"
-"\t\t D 为每天，W 为每周，M 为每月，Y 为每年\n"
-"\t 3. 类型： f 为空闲，B 为忙\n"
-"\t 4. 定位于该文件中：\n"
-"\t\tO 为 Orage 日历，A 为归档，F 为外部\n"
-"\t 5. 约会类型：\n"
-"\t\tE 为事件，T 为待办，J 为日志"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "选择日期"
+msgstr "双击行编辑。\n\n标签顺序：\n\t 1. 闹钟： n=无闹钟\n\t\t A=已设置闹钟 P=已设置持续闹钟\n\t 2. 重复发生： n=不重复\n\t\t H=每小时 D=每天 W=每星期 M=每月 Y=每年\n\t 3. 类型： f=空闲 B=繁忙\n\t 4. 文件中位置：\n\t\tO=日历文件 A=归档文件 F=外部文件\n\t 5. 约会类型：\n\t\tE=事件 T=待办 J=日志"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
 msgstr "\t重复结束，正在移入归档文件。"
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
-msgstr "没有启用归档功能。正在退出"
+msgstr "没有启用归档。正在退出"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
 msgstr "归档阈值：%d 月"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr "\t归档 %04d-%02d-%02d 之前的事件。"
+msgstr "\t在 %04d-%02d-%02d 之前的归档事件。"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
-msgstr "归档统一标志符：%s"
+msgstr "归档 uid：%s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
 msgstr "\t待办未完成；没有归档"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
 msgstr "\t重复发生。结束：%04d 年 %02d 月 %02d 日"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
-msgstr "归档完成\n"
+msgstr "归档已完成\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "开始归档移除。"
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
 msgstr "\t第一步：重置重复发生约会"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
 msgstr "\t第二步：返回已归档的约会"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
-msgstr "移除归档完成\n"
+msgstr "归档移除已完成\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
-msgstr "Orage 日历默认闹铃"
+msgstr "Orage 默认闹铃"
+
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "创建主 Orage 文件告警列表："
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr "生成闹铃列表：添加 %d 个闹铃。处理 %d 个事件。"
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "为外部文件创建告警列表: %s (%s)"
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\t添加 %d 个闹铃。处理 %d 个事件。"
+
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
@@ -1374,17 +1438,26 @@
 
 #: ../src/ical-expimp.c:158
 msgid "... Patched DCREATED to be CREATED."
-msgstr "...将 DCREATED 修正为 CREATED"
+msgstr "...将 DCREATED 修正为 CREATED。"
 
 #: ../src/ical-expimp.c:197
 msgid "... Patched timezone to Orage format."
-msgstr "...将时区修正为 Orage 日历格式"
+msgstr "...将时区修正为 Orage 格式。"
 
 #: ../src/ical-expimp.c:206
 msgid "Import file preprocessing done"
-msgstr "导入文件预处理完成"
+msgstr "导入文件预处理已完成"
+
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "在文件 %s 发现外部更新。"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "由于外部文件更新刷新告警和日历。"
+
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "日历文件"
 
@@ -1392,612 +1465,670 @@
 msgid "Current foreign files"
 msgstr "当前外部文件"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "只读"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "读写"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
-msgstr "***** 没有外部文件 *****"
+msgstr "***** 无外部文件 *****"
+
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "外部文件添加失败。"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage 仅能处理10个外部文件。已达上限。"
+
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "文件名为空。"
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "名称为空。"
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "文件不存在。"
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "相同文件名已存在于 Orage。"
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "相同名称已存在于 Orage。"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "导入/导出"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "导入"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "从文件读取："
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
-"用逗号(，)隔开文件名。\n"
-" 注意：对 Orage 日历来说在文件名中逗号不是有效的字符。"
+msgstr "用逗号(，)隔开文件名。\n 注意：对 Orage 来说在文件名中逗号不是\n 有效的字符。"
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "导出"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "写入文件："
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "选择"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "所有约会"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "已命名的约会："
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
-"注意只读取了主文件约会。\n"
-"没有导入已归档和外部事件。"
+msgstr "注意只读取了主文件约会。\n没有导入已归档和外部事件。"
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
-"注意只读取了主文件约会。\n"
-"没有导入外部事件。"
+msgstr "注意只读取了主文件约会。\n没有导入外部事件。"
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
 msgstr "您可以很容易地从事件列表窗口中拖动这些。"
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
-msgstr "Orage 日历约会统一标志符用逗号隔开。"
+msgstr "Orage UID 用逗号隔开。"
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "归档"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
 msgstr "现在归档(阈值：%d 月)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
 msgstr "您可以在参数中改变归档阈值"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
-msgstr "现在恢复归档"
+msgstr "现在重置归档"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
-"导入所有已归档事件至 orage 日历文件并移除归档文件。\n"
-"这在如导出并移动 Orage 日历约会至另一系统时有用。"
+msgstr "导入所有已归档事件至 orage 文件并移除归档\n文件。这在如导出并移动 Orage 约会至另一\n系统时有用。"
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
-msgstr "Orage 日历文件"
+msgstr "Orage 文件"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Orage 主日历文件"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "当前文件"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "新建文件"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "动作选项"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "当前文件："
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "新建文件："
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "动作选项："
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "重命名"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
-"只重命名 Orage 日历内部文件。\n"
-"一点也不涉及外部文件系统。\n"
-"新文件必须存在。"
+msgstr "只重命名 Orage 内部文件。\n一点也不涉及外部文件系统。\n新文件必须存在。"
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "复制"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr "当前文件被复制并在原位置保持原态。"
+msgstr "复制当前文件并在原位置保持原样。"
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "移动"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
 msgstr "当前文件被移走并从原位置消失。"
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "归档文件"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
 msgstr "外部文件"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
 msgstr "添加新的外部文件"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
 msgstr "外部文件："
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "选项"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "可见名称："
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "只读"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
-"如果您确定 Orage 日历将永不修改此文件则设置此项。\n"
-"注意修改外部文件将使与其来源的源工具不兼容。"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "如果您确定 Orage 将永不修改此文件则设置\n此项。注意修改外部文件将使与其来源的源工具\n不兼容。"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "向用户显示内在名称而非文件名。"
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
-msgstr "交换数据-Orage 日历"
+msgstr "交换数据-Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
-"\t这是 %s 版本 %s\n"
-"\n"
+msgstr "\t这是 %s 版 %s\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr "\t按 GNU 通用公共许可协议方式发布。\n"
+msgstr "\t以 GNU 通用公共许可协议方式发布。\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr "\t相对 GTK+-%d.%d.%d 编译，"
+msgstr "\t对 GTK+-%d.%d.%d 编译，"
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
 msgstr "使用 GTK+-%d.%d.%d。\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
 msgstr "\t使用 DBUS 导入。\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr "\t不使用 DBUS 。导入只部分可用。\n"
+msgstr "\t不使用 DBUS。导入只部分可用。\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
 msgstr "\t使用 libnotify。\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
 msgstr "\t不使用 libnotify。\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
 msgstr "\t使用自动归档。\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
 msgstr "\t不使用归档。\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
 msgstr "\t使用操作系统软件包 libical。\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
-msgstr "\t使用 Orage 日历本地版本 libical。\n"
+msgstr "\t使用 Orage 本地版本 libical。\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
-"用法：orage [选项] [文件]\n"
-"\n"
+msgstr "用法：orage [选项] [文件]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "选项：\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
-msgstr "--version (-v) \t\t显示 orage 日历版本\n"
+msgstr "--version (-v) \t\t显示 orage 版本\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
-msgstr "--help (-h) \t\t列印本文本\n"
+msgstr "--help (-h) \t\t列印此文本\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
 msgstr "--preferences (-p) \t显示首选项表格\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr "--toggle (-t) \t\t显示/隐藏 orage 日历\n"
+msgstr "--toggle (-t) \t\t显示/隐藏 orage\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr "--add-foreign (-a) 文件 [RW] \t添加外部文件\n"
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) file [RW] [name] \t添加外部文件\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
 msgstr "--remove-foreign (-r) 文件 \t移除外部文件\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr "--export (-e) 文件 [约会...] \t从 Orage 日历导出约会至文件\n"
+msgstr "--export (-e) 文件 [约会...] \t从 Orage 导出约会至文件\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
-msgstr "文件为要载入进 orage 日历的 ical 文件\n"
+msgstr "文件为要载入进 orage 的 ical 文件\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
-msgstr "\torage 日历中不包括 dbus 。\n"
+msgstr "\torage 中不包括 dbus。\n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
-"\t没有 dbus [文件] 和外部文件选项(-a 和 -r)只能在 orage 日历启动时使用\n"
+msgstr "\t没有 dbus [文件] 和外部文件选项(-a 和 -r)只能在 orage 启动时使用\n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
-"\n"
-"未知选项 %s\n"
-"\n"
+msgstr "\n未知选项 %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "交换数据(_E)"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "查看选中的日期(_D)"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "查看选中的星期(_W)"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "选择今天(_T)"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
 msgstr "显示全球时间(_G)"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../src/mainbox.c:448
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "未定义标题"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr " 位置： %s\n"
+
+#: ../src/mainbox.c:481
+#, c-format
+msgid ""
+"\n"
+" Note:\n"
+"%s"
+msgstr "\n 备注：\n%s"
+
+#: ../src/mainbox.c:489
 msgid "Never"
-msgstr "永不"
+msgstr "从不"
 
-#: ../src/mainbox.c:453
+#: ../src/mainbox.c:495
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
+"%s Start:\t%s\n"
 " Due:\t%s\n"
-" Done:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"标题： %s\n"
-" 位置：%s\n"
-" 开始：\t%s\n"
-" 到期：\t%s\n"
-" 做完：\t%s\n"
-" 注意：\n"
-"%s"
+" Done:\t%s%s"
+msgstr "标题： %s\n%s 开始：\t%s\n 到期：\t%s\n 做完：\t%s%s"
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:503
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"标题： %s\n"
-" 位置：%s\n"
-" 开始：\t%s\n"
-" 结束：\t%s\n"
-" 注意：\n"
-"%s"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "标题： %s\n%s 开始：\t%s\n 结束：\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>待办：</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
 msgstr "<b>%s 的事件：</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>%s-%s 的事件：</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "主设置"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "时区"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "您应该总是定义您的本地时区。"
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "归档阈值(月)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 为不归档)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
 msgstr "处理事件时归档用于节省时间和空间。"
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "声音命令"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
 msgstr "此命令传递给 shell 用来放闹铃声音。"
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "显示设置"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "日历主窗口"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "日历窗口"
+
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "日历视觉详情"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "显示边框"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "显示菜单"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "显示年月"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
 msgstr "显示天名称"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
 msgstr "显示周数"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "显示月和年"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "日历信息窗口"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "显示待办列表"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
-msgstr "在事件窗口中显示的天数"
+msgstr "在事件窗口中要显示的天数"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
 msgstr "0 为绝不显示事件列表"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "日历视觉效果"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
 msgstr "在所有桌面显示"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
 msgstr "置顶"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "在任务栏中显示"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "在页面中显示"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
-msgstr "在系统托盘显示"
+msgstr "在系统托盘中显示"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "日历开始"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "显示"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "隐藏"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "最小化"
 
-#: ../src/parameters.c:793
-msgid "Extra settings"
-msgstr "额外设置"
-
-#: ../src/parameters.c:801
-msgid "On Calendar Window Open"
-msgstr "在日历窗口打开"
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "在日历窗口中打开"
 
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
+#: ../src/parameters.c:792
+msgid "Select today's date"
 msgstr "选择今天的日期"
 
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr "选择先前选中的日期"
-
-#: ../src/parameters.c:836
-msgid "Use dynamic tray icon"
-msgstr "使用动态托盘图标"
-
-#: ../src/parameters.c:841
-msgid "Use dynamic icon"
-msgstr "使用动态图标"
-
-#: ../src/parameters.c:847
-msgid "Dynamic icon shows current month and day of the month."
-msgstr "动态图标显示此月的当前月份和天"
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "选择以前选中的日期"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "在日历的天上双击时显示"
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr "主日历双击显示"
-
-#: ../src/parameters.c:861
+#: ../src/parameters.c:828
 msgid "Days view"
 msgstr "日视图"
 
-#: ../src/parameters.c:873
+#: ../src/parameters.c:840
 msgid "Event list"
 msgstr "事件列表"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
+#: ../src/parameters.c:862
+msgid "Extra settings"
+msgstr "额外设置"
+
+#: ../src/parameters.c:869
+msgid "Event list window"
 msgstr "事件列表窗口"
 
-#: ../src/parameters.c:894
+#: ../src/parameters.c:874
 msgid "Number of extra days to show in event list"
 msgstr "在事件列表中显示的额外天数"
 
-#: ../src/parameters.c:902
+#: ../src/parameters.c:883
 msgid ""
 "This is just the default value, you can change it in the actual eventlist "
 "window."
 msgstr "这只是默认值，您可以在实际的事件列表窗口中更改它。"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "仅显示第一个重复事件"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "日视图窗口默认第一天"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "每周第一天"
+
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "选中的天"
+
+#: ../src/parameters.c:943
+msgid "Use dynamic tray icon"
+msgstr "使用动态托盘图标"
+
+#: ../src/parameters.c:948
+msgid "Use dynamic icon"
+msgstr "使用动态图标"
+
+#: ../src/parameters.c:954
+msgid "Dynamic icon shows current month and day of the month."
+msgstr "动态图标显示此月的当前月份和天"
+
+#: ../src/parameters.c:962 ../src/parameters.c:967
 msgid "Use wakeup timer"
 msgstr "使用唤醒定时器"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:973
 msgid ""
 "Use this timer if Orage has problems waking up properly after suspend or "
 "hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-"如果 Orage 日历在待机或休眠后正常唤醒时有问题则使用此定时器(比如托盘图标没有"
-"刷新或闹铃没有启动。)。"
+msgstr "如果 Orage 在挂起或休眠后正常唤醒时有问题则使用此定时器(比如托盘图标没有刷新或闹铃没有启动。)。"
+
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "外部文件默认可见闹钟"
+
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Orage 窗口"
+
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "注意通知"
+
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "要求关闭时总是退出"
+
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "总是退出。"
+
+#: ../src/parameters.c:1029
+msgid ""
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "Orage在默认条件下保持在后台打开时要求关闭。该选项使得Orage在要求关闭时退出且不在后台运行。"
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
-msgstr "Orage 日历首选项"
+msgstr "Orage 首选项"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
-msgstr "Orage 日历第一次启动。正在搜寻默认时区。"
+msgstr "Orage 第一次启动。正在搜索默认时区。"
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
-msgstr "默认时区设为 %s。"
+msgstr "默认时区设置为 %s。"
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
 msgstr "未找到默认时区，请手动设置。"
 
@@ -2009,40 +2140,35 @@
 msgid "Open"
 msgstr "打开"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
-msgstr "提醒-Orage 日历"
+msgstr "提醒-Orage"
+
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "延期"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "在指定时间后再次提醒我"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr "按 <Execute> 在指定的时间后再次提醒我："
-
-#: ../src/reminder.c:1099
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
 msgstr "下一个活动闹铃："
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
-"\n"
-"%02d 天 %02d 小时 %02d 分钟到：%s"
+msgstr "\n%02d 天 %02d 小时 %02d 分钟到：%s"
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"未找到活动闹铃"
+msgstr "\n未找到活动闹铃"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2065,1574 +2191,2266 @@
 msgstr "非洲/阿尔及尔"
 
 #: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
+msgid "Africa/Asmara"
 msgstr "非洲/阿斯马拉"
 
 #: ../src/timezone_names.c:42
+msgid "Africa/Asmera"
+msgstr "非洲/阿斯马拉"
+
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "非洲/巴马科"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "非洲/班吉"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "非洲/班珠尔"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "非洲/比绍"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "非洲/布兰太尔"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "非洲/布拉柴维尔"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "非洲/布琼布拉"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "非洲/开罗"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "非洲/卡萨布兰卡"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "非洲/休达"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "非洲/科纳克里"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "非洲/达喀尔"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "非洲/达累斯萨拉姆"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "非洲/吉布提"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "非洲/杜阿拉"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "非洲/阿尤恩"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "非洲/弗里敦"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "非洲/哈博罗内"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "非洲/哈拉雷"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "非洲/朱巴"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "非洲/约翰内斯堡"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "非洲/坎帕拉"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "非洲/喀士穆"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "非洲/基加利"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "非洲/金沙萨"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "非洲/拉各斯"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "非洲/利伯维尔"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "非洲/洛美"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "非洲/罗安达"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "非洲/卢本巴希"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "非洲/卢萨卡"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "非洲/马拉博"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "非洲/马普托"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "非洲/马塞卢"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "非洲/姆巴巴纳"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "非洲/摩加迪沙"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "非洲/蒙罗维亚"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "非洲/内罗毕"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "非洲/恩贾梅纳"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "非洲/尼亚美"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "非洲/努瓦克肖特"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "非洲/瓦加杜古"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "非洲/波多诺伏"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "非洲/圣多美"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "非洲/廷巴克图"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "非洲/的黎波里"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "非洲/突尼斯"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "非洲/温得和克"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "美洲"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "美洲/阿达克"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "美洲/安克雷奇"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "美洲/安圭拉岛"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "美洲/安提瓜岛"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "美洲/阿拉瓜伊纳"
 
-#: ../src/timezone_names.c:95
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
 msgstr "美洲/阿根廷/布宜诺斯艾利斯"
 
-#: ../src/timezone_names.c:96
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
 msgstr "美洲/阿根廷/卡塔马卡"
 
-#: ../src/timezone_names.c:97
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "美洲/阿根廷/里瓦达维亚海军准将城"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
 msgstr "美洲/阿根廷/科尔多瓦"
 
-#: ../src/timezone_names.c:98
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
 msgstr "美洲/阿根廷/胡胡伊"
 
-#: ../src/timezone_names.c:99
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "美洲/阿根廷/拉里奥哈"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
 msgstr "美洲/阿根廷/门多萨"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "美洲/阿根廷/里奥加耶戈斯"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "美洲/阿根廷/萨尔塔"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "美洲/阿根廷/圣胡安"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "美洲/阿根廷/圣路易斯"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "美洲/阿根廷/图库曼"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "美洲/阿根廷/乌斯怀亚"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "美洲/阿鲁巴岛"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "美洲/亚松森"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "美洲/阿蒂科肯"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "美洲/阿特卡"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "美洲/巴伊亚"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "美洲/巴伊亚班德拉斯"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "美洲/巴巴多斯"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "美洲/贝伦"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "美洲/伯利兹"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "美洲/相思"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "美洲/博阿维斯塔"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "美洲/波哥大"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "美洲/博伊西"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "美洲/布宜诺斯艾利斯"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "美洲/剑桥湾"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "美洲/大坎普"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "美洲/坎昆"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "美洲/加拉加斯"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "美洲/卡塔马卡"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "美洲/卡宴"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "美洲/开曼"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "美洲/芝加哥"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "美洲/奇瓦瓦"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "美洲/珊瑚港"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "美洲/科尔多瓦"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "美洲/哥斯达黎加"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "美洲/克雷斯顿"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "美洲/库亚巴"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "美洲/库拉索"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "美洲/丹马沙"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "美洲/道森"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "美洲/道森河"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "美洲/丹佛"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "美洲/底特律"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "美洲/多米尼加"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "美洲/埃德蒙顿"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "美洲/恩塞纳达"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "美洲/艾鲁内佩"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "美洲/萨尔瓦多"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "美洲/福塔雷萨"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "美洲/韦恩堡"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "美洲/格莱斯湾"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "美洲/戈特霍布"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "美洲/鹅湾"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "美洲/大特克"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "美洲/格林纳达"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "美洲/瓜德罗普岛"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "美洲/危地马拉"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "美洲/瓜亚基尔"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "美洲/圭亚那"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "美洲/哈利法克斯"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "美洲/哈瓦那"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "美洲/埃莫西约"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "美洲/印第安纳/印第安纳波利斯"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "美洲/印第安纳/诺克斯"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "美洲/印第安纳/马伦戈"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "美洲/印第安纳州/圣彼得堡"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "美洲/印第安纳州/告诉市"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "美洲/印第安纳/韦韦"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "美洲/印第安纳州/文森斯"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "美洲/印第安纳州/威纳马克"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "美洲/印第安纳波利斯"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "美洲/伊努维克"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "美洲/伊卡卢伊特"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "美洲/牙买加"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "美洲/胡胡伊"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "美洲/朱诺"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "美洲/肯塔基/路易斯维尔"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "美洲/肯塔基/蒙蒂塞洛"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "美洲/Knox_IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "美洲/博内尔"
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "美洲/拉巴斯"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "美洲/利马"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "美洲/洛杉矶"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "美洲/路易斯维尔"
 
-#: ../src/timezone_names.c:158
-msgid "America/Maceio"
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "美洲/下王子"
+
+#: ../src/timezone_names.c:186
+msgid "America/Maceio"
 msgstr "美洲/马塞约"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "美洲/马那瓜"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "美洲/马瑙斯"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "美洲/马里戈特"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "美洲/马提尼克岛"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "美洲/马塔莫罗斯"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "美洲/马萨特兰"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "美洲/门多萨"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "美洲/梅诺米尼"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "美洲/梅里达"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "美洲/梅特拉卡特拉"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "美洲/墨西哥城"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "美洲/密克隆岛"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "美洲/蒙克顿"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "美洲/蒙特雷"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "美洲/蒙得维的亚"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "美洲/蒙特利尔"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "美洲/蒙特塞拉特岛"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "美洲/拿骚"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "美洲/纽约"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "美洲/尼皮贡"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "美洲/诺姆"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "美洲/北达科他州/Beulah"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "美洲/北达科他州/中心"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "美洲/北达科他州/新塞勒姆"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "美洲/诺罗尼亚"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "美洲/奥希纳加"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "美洲/巴拿马"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "美洲/庞纳唐"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "美洲/帕拉马里博"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "美洲/菲尼克斯"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "美洲/太子港"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "美洲/西班牙港"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "美洲/阿克里港"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "美洲/波多韦柳"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "美洲/波多黎各"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "美洲/雨河"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "美洲/兰金湾"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "美洲/累西腓"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "美洲/里贾纳"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "美洲/雷索卢特"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "美洲/里奥布朗库"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "美洲/罗萨里奥"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "美洲/圣伊莎贝尔"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "美洲/桑特莱"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "美洲/圣地亚哥"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "美洲/圣多明哥"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "美洲/圣保罗"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "美洲/斯科斯比松"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "美洲/希普罗克"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "美洲/锡特卡"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "美洲/圣巴托洛缪"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "美洲/圣约翰"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "美洲/圣基茨"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "美洲/圣卢西亚"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "美洲/圣托马斯"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "美洲/圣文森特"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "美洲/斯威夫特卡伦特"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "美洲/特古西加尔巴"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "美洲/图勒"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "美洲/雷湾"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "美洲/提华纳"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "美洲/加拿大多伦多"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "美洲/托托拉岛"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "美洲/温哥华"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "美洲/维尔京"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "美洲/怀特霍斯"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "美洲/温尼伯"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "美洲/亚库塔特"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "美洲/耶洛奈夫"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "南极洲"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "南极洲/凯西站"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "南极洲/戴维斯站"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "南极洲/迪蒙迪尔维尔站"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "南极洲/Macquarie"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "南极洲/莫森站"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "南极洲/麦克莫多站"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "南极洲/帕默站"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "南极洲/罗瑟拉站"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "南极洲/南极点"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "南极洲/昭和站"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "南极洲/东方站"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "北冰洋"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "北冰洋/朗伊尔城"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "亚洲"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "亚洲/亚丁"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "亚洲/阿拉木图"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "亚洲/安曼"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "亚洲/阿纳德尔"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "亚洲/阿克图"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "亚洲/阿克托别"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "亚洲/阿什哈巴德"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "亚洲/阿什喀巴德"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "亚洲/巴格达"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "亚洲/巴林"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "亚洲/巴库"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "亚洲/曼谷"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "亚洲/贝鲁特"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "亚洲/比什凯克"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "亚洲/文莱"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "亚洲/加尔各答"
 
-#: ../src/timezone_names.c:240
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "亚洲/乔巴山"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
+msgstr "亚洲/重庆"
+
+#: ../src/timezone_names.c:289
 msgid "Asia/Chungking"
 msgstr "亚洲/重庆"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "亚洲/科伦坡"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "亚洲/达卡"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "亚洲/大马士革"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "亚洲/达卡"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "亚洲/帝力"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "亚洲/迪拜"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "亚洲/杜尚别"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "亚洲/加沙"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "亚洲/哈尔滨"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "亚洲/希伯伦"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "亚洲/香港"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "亚洲/胡志明"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "亚洲/科布多"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "亚洲/伊尔库斯克"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "亚洲/伊斯坦布尔"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "亚洲/雅加达"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "亚洲/查亚普拉"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "亚洲/耶路撒冷"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "亚洲/喀布尔"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "亚洲/勘察加半岛"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "亚洲/卡拉奇"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "亚洲/喀什葛尔"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "亚洲/加德满都"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "亚洲/加德满都"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "亚洲/汉德加"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "亚洲/加尔各答"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "亚洲/克拉斯诺雅斯克"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "亚洲/吉隆坡"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "亚洲/古晋"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "亚洲/科威特"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
 msgstr "亚洲/澳门"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
+msgstr "亚洲/澳门"
+
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "亚洲/马加丹"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "亚洲/望加锡"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "亚洲/马尼拉"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "亚洲/马斯喀特"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "亚洲/尼科希亚"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "亚洲/新库兹涅茨克"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "亚洲/新西伯利亚"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "亚洲/鄂木斯克"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "亚洲/乌拉尔"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "亚洲/金边"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "亚洲/坤甸"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "亚洲/平壤"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "亚洲/卡塔尔"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "亚洲/克孜勒奥尔达"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "亚洲/仰光"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "亚洲/利雅得"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "亚洲/利雅得87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "亚洲/利雅得88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "亚洲/利雅得89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "亚洲/西贡"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "亚洲/萨哈林岛"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "亚洲/撒马尔罕"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "亚洲/首尔"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "亚洲/上海"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "亚洲/新加坡"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "亚洲/台北"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "亚洲/塔什干"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "亚洲/第比利斯"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "亚洲/德黑兰"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "亚洲/特拉维夫"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "亚洲/廷布"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "亚洲/廷布"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "亚洲/东京"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "亚洲/乌戎潘当"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "亚洲/乌兰巴托"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "亚洲/乌兰巴托"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "亚洲/乌鲁木齐"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "亚洲/乌斯内拉"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "亚洲/万象"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "亚洲/海参崴"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "亚洲/雅库斯克"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "亚洲/叶卡特琳堡"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "亚洲/耶烈万"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "大西洋"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "大西洋/亚速尔群岛"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "大西洋/百慕大群岛"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "大西洋/加那利群岛"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "大西洋/佛得角"
 
-#: ../src/timezone_names.c:302
+#: ../src/timezone_names.c:370
 msgid "Atlantic/Faeroe"
 msgstr "大西洋/法罗群岛"
 
-#: ../src/timezone_names.c:303
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "大西洋/法罗群岛"
+
+#: ../src/timezone_names.c:372
 msgid "Atlantic/Jan_Mayen"
 msgstr "大西洋/扬马延岛"
 
-#: ../src/timezone_names.c:304
+#: ../src/timezone_names.c:373
 msgid "Atlantic/Madeira"
 msgstr "大西洋/马德拉群岛"
 
-#: ../src/timezone_names.c:305
+#: ../src/timezone_names.c:374
 msgid "Atlantic/Reykjavik"
 msgstr "大西洋/雷克雅末克"
 
-#: ../src/timezone_names.c:306
+#: ../src/timezone_names.c:375
 msgid "Atlantic/South_Georgia"
 msgstr "大西洋/南佐治亚"
 
-#: ../src/timezone_names.c:307
+#: ../src/timezone_names.c:376
 msgid "Atlantic/St_Helena"
 msgstr "大西洋/圣赫勒拿岛"
 
-#: ../src/timezone_names.c:308
+#: ../src/timezone_names.c:377
 msgid "Atlantic/Stanley"
 msgstr "大西洋/斯坦利群岛"
 
-#: ../src/timezone_names.c:309
+#: ../src/timezone_names.c:378
 msgid "Australia"
 msgstr "澳洲"
 
-#: ../src/timezone_names.c:310
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "澳洲/ACT"
+
+#: ../src/timezone_names.c:380
 msgid "Australia/Adelaide"
 msgstr "澳洲/阿德莱德"
 
-#: ../src/timezone_names.c:311
+#: ../src/timezone_names.c:381
 msgid "Australia/Brisbane"
 msgstr "澳洲/布里斯班"
 
-#: ../src/timezone_names.c:312
+#: ../src/timezone_names.c:382
 msgid "Australia/Broken_Hill"
 msgstr "澳洲/布罗肯山"
 
-#: ../src/timezone_names.c:313
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "澳洲//柯里"
+
+#: ../src/timezone_names.c:384
 msgid "Australia/Darwin"
 msgstr "澳洲/达尔文"
 
-#: ../src/timezone_names.c:314
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "澳洲//尤克拉"
+
+#: ../src/timezone_names.c:386
 msgid "Australia/Hobart"
 msgstr "澳洲/霍巴特"
 
-#: ../src/timezone_names.c:315
+#: ../src/timezone_names.c:387
 msgid "Australia/Lindeman"
 msgstr "澳洲/林德曼"
 
-#: ../src/timezone_names.c:316
+#: ../src/timezone_names.c:388
 msgid "Australia/Lord_Howe"
 msgstr "澳洲/豪勋爵岛"
 
-#: ../src/timezone_names.c:317
+#: ../src/timezone_names.c:389
 msgid "Australia/Melbourne"
 msgstr "澳洲/墨尔本"
 
-#: ../src/timezone_names.c:318
+#: ../src/timezone_names.c:390
 msgid "Australia/Perth"
 msgstr "澳洲/佩思"
 
-#: ../src/timezone_names.c:319
+#: ../src/timezone_names.c:391
 msgid "Australia/Sydney"
 msgstr "澳洲/悉尼"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "巴西"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "巴西/阿克里州"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "巴西/迪诺罗尼亚"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "巴西/东部"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "巴西/西部"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "加拿大"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "加拿大/大西洋"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "加拿大中部"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "加拿大/东萨斯喀彻温"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "加拿大东部"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "加拿大/山区"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "加拿大/纽芬兰"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "加拿大/太平洋"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "加拿大/萨斯喀彻温"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "加拿大/育空地区"
+
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "智利"
+
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "智利/大陆"
+
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "智利/复活节岛"
+
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "其他"
+
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "其他/GMT"
+
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "其他/GMT+0"
+
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "其他/GMT+1"
+
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "其他/GMT+10"
+
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "其他/GMT+11"
+
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "其他/GMT+12"
+
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "其他/GMT+2"
+
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "其他/GMT+3"
+
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "其他/GMT+4"
+
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "其他/GMT+5"
+
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "其他/GMT+6"
+
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "其他/GMT+7"
+
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "其他/GMT+8"
+
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "其他/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "其他/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "其他/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "其他/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "其他/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "其他/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "其他/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "其他/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "其他/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "其他/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "其他/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "其他/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "其他/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "其他/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "其他/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "其他/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "其他/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "其他/格林威治"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "其他/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "其他/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "其他/通用"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "其他/祖鲁"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "欧洲"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "欧洲/阿姆斯特丹"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "欧洲/安道尔"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "欧洲/雅典"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "欧洲/贝尔法斯特"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "欧洲/贝尔格莱德"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "欧洲/柏林"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "欧洲/布拉迪斯拉发"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "欧洲/布鲁塞尔"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "欧洲/布加勒斯特"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "欧洲/布达佩斯"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "欧洲/布辛根"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "欧洲/基希讷乌"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "欧洲/哥本哈根"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "欧洲/都柏林"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "欧洲/直布罗陀"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "欧洲/格恩西岛"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "欧洲/赫尔辛基"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "欧洲/马恩岛"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "欧洲/伊斯坦布尔"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "欧洲/泽西"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "欧洲/加里宁格勒"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "欧洲/基辅"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "欧洲/里斯本"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "欧洲/卢布尔雅那"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "欧洲/伦敦"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "欧洲/卢森堡"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "欧洲/马德里"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "欧洲/马耳他"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "欧洲/玛丽港"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "欧洲/明斯克"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "欧洲/摩纳哥"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "欧洲/莫斯科"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "欧洲/尼科西亚"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "欧洲/奥斯陆"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "欧洲/巴黎"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "欧洲/波德戈里察"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "欧洲/布拉格"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "欧洲/里加"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "欧洲/罗马"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "欧洲/萨马拉"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "欧洲/圣马力诺"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "欧洲/萨拉热窝"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "欧洲/辛菲罗波尔"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "欧洲/斯科普里"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "欧洲/索菲亚"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "欧洲/斯德哥尔摩"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "欧洲/塔林"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "欧洲/地拉那"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "欧洲/蒂拉斯波尔"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "欧洲/乌兹格罗"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "欧洲/瓦杜兹"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "欧洲/梵蒂冈"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "欧洲/维也纳"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "欧洲/维尔纽斯"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "欧洲/伏尔加格勒"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "欧洲/华沙"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "欧洲/萨格勒布"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "欧洲/扎波罗热"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "欧洲/苏黎士"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "印度洋"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "印度洋/安塔那利佛"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "印度洋/查戈斯群岛"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "印度洋/圣诞岛"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "印度洋/考克斯群岛"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "印度洋/科摩罗群岛"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "印度洋/凯尔盖朗岛"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "印度洋/马埃岛"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "印度洋/马尔代夫"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "印度洋/毛里求斯"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "印度洋/马约特岛"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "印度洋/留尼旺岛"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "墨西哥"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "墨西哥/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "墨西哥/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "墨西哥/General"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "中东"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "中东/利雅得87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "中东/利雅得88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "中东/利雅得89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "太平洋"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "太平洋/阿皮亚"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "太平洋/奥克兰"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "太平洋/查塔姆群岛"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "太平洋/特鲁克"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "太平洋/复活节岛"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "太平洋/埃法特岛"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "太平洋/恩德伯里岛"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "太平洋/法考福环礁"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "太平洋/斐济"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "太平洋/富纳富提"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "太平洋/加拉帕哥斯群岛"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "太平洋/甘比儿群岛"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "太平洋/瓜达康纳尔岛"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "太平洋/关岛"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "太平洋/檀香山"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "太平洋/约翰斯顿岛"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "太平洋/圣诞岛"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "太平洋/科斯雷岛"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "太平洋/夸贾林环礁"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "太平洋/马朱罗环礁"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "太平洋/马克萨斯群岛"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "太平洋/中途岛"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "太平洋/瑙鲁"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "太平洋/纽埃岛"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "太平洋/诺福克"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "太平洋/努美阿"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "太平洋/帕果帕果"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "太平洋/帕劳"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "太平洋/皮特克恩岛"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "太平洋/波纳佩"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "太平洋/波纳佩岛"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "太平洋/莫尔兹比港"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "太平洋/拉罗汤加岛"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "太平洋/塞班岛"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "太平洋/萨摩亚"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "太平洋/塔希提岛"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "太平洋/塔拉瓦岛"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "太平洋/汤加塔布岛"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "太平洋/特鲁克群岛"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "太平洋/威克岛"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "太平洋/沃利斯岛"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "太平洋/雅浦岛"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "美国"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "美国/阿拉斯加"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "美国/阿留申"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "美国/亚利桑那州"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "美国/中部"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "美国/东部"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "美国/东印第安那"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "美国/夏威夷"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "美国/印第安纳斯塔克"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "美国/密歇根"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "美国/山区"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "美国/太平洋"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "美国/太平洋(新)"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "美国/萨摩亚"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "新建约会"
 
 #: ../src/tray_icon.c:485
 msgid "About Orage"
-msgstr "关于 Orage 日历"
+msgstr "关于 Orage"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
 msgid "Orage Panel Clock"
-msgstr "Orage 日历面板时钟"
+msgstr "Orage 面板时钟"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
 msgid "Show time and date?"
 msgstr "显示时间和日期？"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "日历"
+msgid "Orage preferences"
+msgstr "Orage 首选项"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Orage 日历首选项"
+msgid "Settings for the Xfce 4 Calendar Application (Orage)"
+msgstr "Xfce 4 日历应用程序(Orage)设置"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-msgid "Orage preferences"
+msgid "Orage Calendar Preferences"
 msgstr "Orage 日历首选项"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Xfce 4 日历应用程序(Orage 日历)设置"
+#: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "日历"
+
+#: ../xfcalendar.desktop.in.h:1
+msgid "Orage Calendar"
+msgstr "Orage 日历"
 
 #: ../xfcalendar.desktop.in.h:2
 msgid "Desktop calendar"
 msgstr "桌面日历"
-
-#: ../xfcalendar.desktop.in.h:3
-msgid "Orage Calendar"
-msgstr "Orage 日历"
\ No newline at end of file
diff -Nru orage-4.8.3/po/zh_TW.po orage-4.12.1/po/zh_TW.po
--- orage-4.8.3/po/zh_TW.po	2012-01-03 12:01:11.000000000 +0000
+++ orage-4.12.1/po/zh_TW.po	2015-04-10 10:26:26.000000000 +0000
@@ -1,23 +1,44 @@
-# Traditional Chinese translations for orage package.
-# Copyright (C) 2003-2006 The Xfce development team.
-# This file is distributed under the same license as the orage package.
-# umm <umm@pchome.com.tw>, 2003.
-# Ambrose Li <acli@ada.dhs.org>, 2004.
-# Hydonsingore Cia <hydonsingore@educities.edu.tw>, 2005.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Ambrose Li <acli@ada.dhs.org>, 2004
 # Cosmo Chene <cosmolax@gmail.com>, 2006
-#
+# Hydonsingore Cia <hydonsingore@educities.edu.tw>, 2005
+# Jeff Huang <s8321414@gmail.com>, 2014
+# umm <umm@pchome.com.tw>, 2003
+# Walter Cheuk <wwycheuk@gmail.com>, 2013
+# Jeff Huang <s8321414@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: orage 4.3.90.2\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:00+0200\n"
-"PO-Revision-Date: 2011-12-09 18:40+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
-"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
+"POT-Creation-Date: 2014-09-23 12:30+0200\n"
+"PO-Revision-Date: 2014-09-24 05:15+0000\n"
+"Last-Translator: Jeff Huang <s8321414@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/xfce-apps/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../globaltime/globaltime.c:58
+msgid "no underline"
+msgstr "無底線"
+
+#: ../globaltime/globaltime.c:58
+msgid "single"
+msgstr "單一"
+
+#: ../globaltime/globaltime.c:58
+msgid "double"
+msgstr "兩倍"
+
+#: ../globaltime/globaltime.c:58
+msgid "low"
+msgstr "低"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
@@ -33,9 +54,7 @@
 msgid ""
 "%s\n"
 "click to modify clock"
-msgstr ""
-"%s\n"
-"點擊以修改時鐘"
+msgstr "%s\n點擊以修改時鐘"
 
 #: ../globaltime/globaltime.c:386
 msgid "Localtime"
@@ -45,18 +64,21 @@
 msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
-msgstr ""
+msgstr "按鈕 1 變更偏好設定\n按鈕 2 調整時鐘時間"
 
 #: ../globaltime/globaltime.c:480
 msgid "adjust to change hour"
 msgstr "調整以變更小時"
 
 #: ../globaltime/globaltime.c:496
-#, fuzzy
 msgid ""
 "adjust to change minute. Click arrows with button 2 to change only 1 minute."
 msgstr "調整以變更分鐘。點擊按鈕 2 的箭頭來以 1 分鐘為單位更動。"
 
+#: ../globaltime/globaltime.c:548
+msgid "Global Time"
+msgstr "Global Time"
+
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
 msgstr "新時鐘"
@@ -67,7 +89,7 @@
 
 #: ../globaltime/gt_prefs.c:310
 msgid "Not possible to delete the last clock."
-msgstr ""
+msgstr "不能刪除最後一個時鐘"
 
 #: ../globaltime/gt_prefs.c:516
 msgid "update this clock"
@@ -79,7 +101,7 @@
 
 #: ../globaltime/gt_prefs.c:526
 msgid "add new clock using this clock as model"
-msgstr ""
+msgstr "以此時鐘為模範加入新時鐘"
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
@@ -87,23 +109,23 @@
 
 #: ../globaltime/gt_prefs.c:539
 msgid "move this clock first"
-msgstr ""
+msgstr "將此時鐘移為第一個"
 
 #: ../globaltime/gt_prefs.c:544
 msgid "move this clock left"
-msgstr ""
+msgstr "將此時鐘左移"
 
 #: ../globaltime/gt_prefs.c:549
 msgid "move this clock right"
-msgstr ""
+msgstr "將此時鐘右移"
 
 #: ../globaltime/gt_prefs.c:554
 msgid "move this clock last"
-msgstr ""
+msgstr "將此時鐘移為最後一個"
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
-msgstr ""
+msgstr "將此時鐘的時區設為本地時區"
 
 #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
 msgid "close window and exit"
@@ -120,7 +142,7 @@
 
 #: ../globaltime/gt_prefs.c:607
 msgid "Name of the clock:"
-msgstr "時鐘的名稱:"
+msgstr "時鐘的名稱："
 
 #: ../globaltime/gt_prefs.c:613
 msgid "enter name of clock"
@@ -128,7 +150,7 @@
 
 #: ../globaltime/gt_prefs.c:616
 msgid "Timezone of the clock:"
-msgstr "時鐘的時區"
+msgstr "時鐘的時區："
 
 #: ../globaltime/gt_prefs.c:643
 msgid "Text Formatting"
@@ -155,7 +177,7 @@
 #: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
 #: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
 msgid "Cross this to use default instead of selected value"
-msgstr ""
+msgstr "勾選此項以使用預設值而非所選值"
 
 #. ------------------------foreground-------------------------
 #: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
@@ -169,30 +191,30 @@
 #. ------------------------name font-------------------------
 #: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
 msgid "Font for name of clock:"
-msgstr ""
+msgstr "名稱的字型："
 
 #: ../globaltime/gt_prefs.c:720
 msgid "Click to change font for clock name"
-msgstr ""
+msgstr "點此變更時鐘名稱的字型"
 
 #. ------------------------time font-------------------------
 #: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
 msgid "Font for time of clock:"
-msgstr ""
+msgstr "時間的字型："
 
 #: ../globaltime/gt_prefs.c:753
 msgid "Click to change font for clock time"
-msgstr ""
+msgstr "點此變更時鐘時間的字型"
 
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:780
 msgid "Underline name of clock:"
-msgstr ""
+msgstr "名稱加底線："
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:810
 msgid "Underline time of clock:"
-msgstr ""
+msgstr "時間加底線："
 
 #: ../globaltime/gt_prefs.c:850
 msgid "Text Default Formatting"
@@ -200,23 +222,23 @@
 
 #: ../globaltime/gt_prefs.c:863
 msgid "Click to change default background colour for clocks"
-msgstr ""
+msgstr "點一下以變更時鐘的背景顏色"
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
+msgstr "勾選此項以使用系統預設顏色而非所選顏色"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
-msgstr ""
+msgstr "點此變更時鐘的預設文字字型"
 
 #: ../globaltime/gt_prefs.c:929
 msgid "Click to change default font for clock name"
-msgstr ""
+msgstr "點此變更時鐘名稱的預設字型"
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
+msgstr "勾選此項以使用系統預設字型而非所選字型"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -225,12 +247,12 @@
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:990
 msgid "Underline for name of clock:"
-msgstr ""
+msgstr "名稱底線："
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:1004
 msgid "Underline for time of clock:"
-msgstr ""
+msgstr "時間底線："
 
 #: ../globaltime/gt_prefs.c:1027
 msgid "update preferences"
@@ -255,11 +277,15 @@
 
 #: ../globaltime/gt_prefs.c:1083
 msgid "Use normal decorations"
-msgstr ""
+msgstr "使用正常裝飾"
+
+#: ../globaltime/gt_prefs.c:1089 ../src/appointment.c:3290
+msgid "None"
+msgstr "無"
 
 #: ../globaltime/gt_prefs.c:1094
 msgid "Do not show window decorations (borders)"
-msgstr ""
+msgstr "不要顯示視窗裝飾（邊框）"
 
 #: ../globaltime/gt_prefs.c:1100
 msgid "Clock size:"
@@ -267,20 +293,19 @@
 
 #: ../globaltime/gt_prefs.c:1101
 msgid "Equal"
-msgstr "等於"
+msgstr "相等"
 
 #: ../globaltime/gt_prefs.c:1106
 msgid "All clocks have same size"
-msgstr ""
+msgstr "所有時鐘使用相同大小"
 
 #: ../globaltime/gt_prefs.c:1111
-#, fuzzy
 msgid "Varying"
-msgstr "警告"
+msgstr "不同"
 
 #: ../globaltime/gt_prefs.c:1116
 msgid "Clock sizes vary"
-msgstr ""
+msgstr "時鐘大小各有不同"
 
 #: ../globaltime/gt_prefs.c:1122
 msgid "Local timezone:"
@@ -295,7 +320,7 @@
 #: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
 #, c-format
 msgid "%d hour %d mins"
-msgstr ""
+msgstr "%d 時 %d 分"
 
 #: ../globaltime/timezone_selection.c:159
 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
@@ -322,18 +347,18 @@
 #: ../globaltime/timezone_selection.c:194
 #: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
 msgid "not changed"
-msgstr ""
+msgstr "未變"
 
 #: ../globaltime/timezone_selection.c:195
 #: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
 msgid "not changing"
-msgstr ""
+msgstr "不變"
 
 #. location
 #: ../globaltime/timezone_selection.c:247
 #: ../globaltime/timezone_selection.c:252
 #: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2663
+#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2776
 #: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
 msgid "Location"
 msgstr "區域"
@@ -341,12 +366,12 @@
 #: ../globaltime/timezone_selection.c:258
 #: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
 msgid "GMT Offset"
-msgstr "GMT 位移"
+msgstr "GMT 時差"
 
 #: ../globaltime/timezone_selection.c:264
 #: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
 msgid "Previous/Next Change"
-msgstr ""
+msgstr "上個/下個變更"
 
 #: ../globaltime/timezone_selection.c:269
 #: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
@@ -394,92 +419,108 @@
 msgid "floating"
 msgstr "浮動"
 
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:500
-msgid "Globaltime"
-msgstr "全球時間"
-
-#: ../globaltime/globaltime.desktop.in.h:2
+#: ../globaltime/globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Orage 國際時間"
 
-#: ../globaltime/globaltime.desktop.in.h:3
+#: ../globaltime/globaltime.desktop.in.h:2
 msgid "Show clocks from different countries"
 msgstr "顯示不同國家的時鐘"
 
-#: ../panel-plugin/oc_config.c:224
+#: ../globaltime/globaltime.desktop.in.h:3 ../src/tray_icon.c:500
+msgid "Globaltime"
+msgstr "全球時間"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "No rotation"
+msgstr "不旋轉"
+
+#: ../panel-plugin/oc_config.c:239
+msgid "Rotate left"
+msgstr "向左旋轉"
+
+#: ../panel-plugin/oc_config.c:240
+msgid "Rotate right"
+msgstr "向右旋轉"
+
+#: ../panel-plugin/oc_config.c:248
 msgid "Appearance"
 msgstr "外觀"
 
 #. show frame
-#: ../panel-plugin/oc_config.c:229
+#: ../panel-plugin/oc_config.c:257
 msgid "Show _frame"
 msgstr "顯示框格(_F)"
 
 #. foreground color
-#: ../panel-plugin/oc_config.c:239
+#: ../panel-plugin/oc_config.c:263
 msgid "set foreground _color:"
 msgstr "設定前景顏色(_C)："
 
 #. background color
-#: ../panel-plugin/oc_config.c:253
+#: ../panel-plugin/oc_config.c:277
 msgid "set _background color:"
 msgstr "設定背景顏色(_B)："
 
-#. clock size (=vbox size): height and width
-#: ../panel-plugin/oc_config.c:267
+#. clock size (=mbox size): height and width
+#: ../panel-plugin/oc_config.c:291
 msgid "set _height:"
 msgstr "設定高度(_H)："
 
-#: ../panel-plugin/oc_config.c:277
+#: ../panel-plugin/oc_config.c:301
 msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
+msgstr "注意：水平面板高度不能變更"
 
-#: ../panel-plugin/oc_config.c:282
+#: ../panel-plugin/oc_config.c:306
 msgid "set _width:"
 msgstr "設定寬度(_W)："
 
-#: ../panel-plugin/oc_config.c:293
+#: ../panel-plugin/oc_config.c:316
 msgid "Note that you can not change the width of vertical panels"
-msgstr ""
+msgstr "注意：垂直面板寬度不能變更"
 
-#: ../panel-plugin/oc_config.c:316
+#: ../panel-plugin/oc_config.c:327
+msgid "Show lines _vertically"
+msgstr "垂直顯示列(_V)"
+
+#: ../panel-plugin/oc_config.c:350
 msgid "Clock Options"
 msgstr "時鐘選項"
 
 #. timezone
-#: ../panel-plugin/oc_config.c:326
+#: ../panel-plugin/oc_config.c:360
 msgid "set timezone to:"
 msgstr "設定時區為："
 
-#: ../panel-plugin/oc_config.c:347
+#: ../panel-plugin/oc_config.c:381
 #, c-format
 msgid "Line %d:"
 msgstr "第 %d 行："
 
-#: ../panel-plugin/oc_config.c:357
+#: ../panel-plugin/oc_config.c:391
 msgid "Enter any valid strftime function parameter."
 msgstr "請輸入任一可用的·strftime·函數參數"
 
 #. Tooltip hint
-#: ../panel-plugin/oc_config.c:401
+#: ../panel-plugin/oc_config.c:435
 msgid "Tooltip:"
 msgstr "工具提示："
 
 #. special timing for SUSPEND/HIBERNATE
-#: ../panel-plugin/oc_config.c:411
+#: ../panel-plugin/oc_config.c:445
 msgid "fix time after suspend/hibernate"
 msgstr "在暫停/休眠後修正時間"
 
-#: ../panel-plugin/oc_config.c:415
+#: ../panel-plugin/oc_config.c:449
 msgid ""
 "You only need this if you do short term (less than 5 hours) suspend or "
 "hibernate and your visible time does not include seconds. Under these "
 "circumstances it is possible that Orageclock shows time inaccurately unless "
 "you have this selected. (Selecting this prevents cpu and interrupt saving "
 "features from working.)"
-msgstr ""
+msgstr "只有在作短時間 (少於 5 小時) 的暫停或休眠，而顯示的時間不包括秒數時才需要選用此項。在此情況如不選取此項，Orage 時鐘顯示的時間有可能不準確 (選取此項會令 CPU 和中斷省電功能無法運作)。"
 
-#: ../panel-plugin/oc_config.c:432
+#: ../panel-plugin/oc_config.c:466
 msgid ""
 "This program uses strftime function to get time.\n"
 "Use any valid code to get time in the format you prefer.\n"
@@ -489,21 +530,12 @@
 "\t%V = week number\t\t%Z = timezone in use\n"
 "\t%H = hours \t\t\t\t%M = minute\n"
 "\t%X = local time\t\t\t%x = local date"
-msgstr ""
-"本程式使用 strftime 函數來獲知時間。\n"
-"您可以使用可用的取數來調整成您習慣的時間格式。\n"
-"底下是一般常用的取數:\n"
-"\t%A = 星期幾\t\t\t%B = 月份\n"
-"\t%c = 日期與時間\t\t%R = 小時及分鐘\n"
-"\t%V = 第幾週\t\t%Z = 使用的時區\n"
-"\t%H = 小時 \t\t\t\t%M = 分鐘\n"
-"\t%X = 本地時間\t\t\t%x = 本地日期"
+msgstr "本程式使用 strftime 函數來獲知時間。\n您可以使用可用的取數來調整成您習慣的時間格式。\n底下是一般常用的取數:\n\t%A = 星期幾\t\t\t%B = 月份\n\t%c = 日期與時間\t\t%R = 小時及分鐘\n\t%V = 第幾週\t\t%Z = 使用的時區\n\t%H = 小時 \t\t\t\t%M = 分鐘\n\t%X = 本地時間\t\t\t%x = 本地日期"
 
-#: ../panel-plugin/oc_config.c:457
+#: ../panel-plugin/oc_config.c:491
 msgid "Orage clock Preferences"
 msgstr "Orage 時鐘偏好設定"
 
-#. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
 #. * to get the proper string for your locale.
 #. * I used these:
@@ -512,10 +544,9 @@
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
-#: ../panel-plugin/xfce4-orageclock-plugin.c:627
+#: ../panel-plugin/xfce4-orageclock-plugin.c:700
 msgid "%A %d %B %Y/%V"
-msgstr "%Y %B %d %A/%V"
+msgstr "%Y年%-m月%-d日 %A/%V"
 
 #: ../src/about-xfcalendar.c:40
 msgid "Maintainer"
@@ -528,7 +559,7 @@
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
 #. end time
-#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2692
+#: ../src/appointment.c:313 ../src/appointment.c:353 ../src/appointment.c:2805
 msgid "End"
 msgstr "結束"
 
@@ -536,235 +567,295 @@
 msgid "Due"
 msgstr "到期"
 
-#: ../src/appointment.c:493 ../src/mainbox.c:783
+#: ../src/appointment.c:493 ../src/mainbox.c:862
 msgid "Orage"
 msgstr "Orage"
 
 #. to avoid timing problems when updating entry
 #. Create file chooser
-#: ../src/appointment.c:672 ../src/interface.c:277 ../src/parameters.c:416
+#: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374
 msgid "Select a file..."
-msgstr "選擇一個檔案..."
+msgstr "選擇檔案..."
 
 #: ../src/appointment.c:680
 msgid "Sound Files"
 msgstr "音效檔"
 
-#: ../src/appointment.c:687 ../src/interface.c:290
+#: ../src/appointment.c:687 ../src/interface.c:277
 msgid "All Files"
 msgstr "所有檔案"
 
-#: ../src/appointment.c:739
+#: ../src/appointment.c:738
 msgid "The appointment information has been modified."
 msgstr "本約會資訊已經被修改"
 
-#: ../src/appointment.c:740 ../src/appointment.c:1194 ../src/event-list.c:919
+#: ../src/appointment.c:739 ../src/appointment.c:1287 ../src/event-list.c:969
 msgid "Do you want to continue?"
 msgstr "請問您要繼續嗎？"
 
-#: ../src/appointment.c:767
+#: ../src/appointment.c:740
+msgid "No, do not leave"
+msgstr "不，不要離開"
+
+#: ../src/appointment.c:741
+msgid "Yes, ignore modifications and leave"
+msgstr "是，不理會修改並離開"
+
+#: ../src/appointment.c:768
 msgid "The end of this appointment is earlier than the beginning."
 msgstr "本次約會的結束時間早於開始時間。"
 
-#: ../src/appointment.c:1034 ../src/appointment.c:1812
+#: ../src/appointment.c:1035 ../src/appointment.c:1923
 msgid "Not set"
 msgstr "尚未設定"
 
-#: ../src/appointment.c:1193
+#: ../src/appointment.c:1138
+msgid "Add new appointment to this file."
+msgstr "為此檔案加入新約會。"
+
+#: ../src/appointment.c:1139 ../src/appointment.c:1188
+msgid "Orage default file"
+msgstr "Orage 預設檔案"
+
+#: ../src/appointment.c:1225
+msgid "Appointment addition failed."
+msgstr "未能加入約會。"
+
+#: ../src/appointment.c:1226
+msgid ""
+"Error happened when adding appointment. Look more details from the log file."
+msgstr "加入約會時發生錯誤。詳情見記錄檔。"
+
+#: ../src/appointment.c:1236
+msgid "Appointment update failed."
+msgstr "未能更新約會。"
+
+#: ../src/appointment.c:1237
+msgid ""
+"Look more details from the log file. (Perhaps file was updated external from"
+" Orage?)"
+msgstr "在記錄檔中觀看更多細節。(也許檔案已經被 Orage 從外部升級了？)"
+
+#: ../src/appointment.c:1286
 msgid "This appointment will be permanently removed."
-msgstr "這個約會將被永遠移除。"
+msgstr "這個約會將永久移除。"
+
+#: ../src/appointment.c:1288 ../src/event-list.c:970
+msgid "No, cancel the removal"
+msgstr "不，取消移除"
+
+#: ../src/appointment.c:1289
+msgid "Yes, remove it"
+msgstr "是，移除之"
+
+#: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457
+#: ../src/event-list.c:1028
+msgid "Pick the date"
+msgstr "挑選日期"
+
+#: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386
+#: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180
+#: ../src/tray_icon.c:460
+msgid "Today"
+msgstr "今天"
 
-#: ../src/appointment.c:1692
+#: ../src/appointment.c:1803
 msgid "This appointment does not exist."
 msgstr "這個約會不存在。"
 
-#: ../src/appointment.c:1693
+#: ../src/appointment.c:1804
 msgid "It was probably removed, please refresh your screen."
-msgstr ""
+msgstr "可能已移除，請刷新畫面。"
 
-#: ../src/appointment.c:1995
+#: ../src/appointment.c:2105
 msgid "Current categories"
 msgstr "目前分類"
 
-#: ../src/appointment.c:2010
+#: ../src/appointment.c:2120
 msgid "Add new category with color"
-msgstr "加入新分類與色彩"
+msgstr "加入新分類及其色彩"
 
-#: ../src/appointment.c:2014
+#: ../src/appointment.c:2124
 msgid "Category:"
 msgstr "分類："
 
-#: ../src/appointment.c:2045
+#: ../src/appointment.c:2155
 msgid "Colors of categories - Orage"
 msgstr "分類的色彩 - Orage"
 
-#: ../src/appointment.c:2092
+#: ../src/appointment.c:2201
 msgid " *** COPY ***"
 msgstr " *** 複製 ***"
 
-#: ../src/appointment.c:2353
+#: ../src/appointment.c:2466
 msgid "New appointment - Orage"
 msgstr "新約會 - Orage"
 
 #. File menu stuff
 #. ********* File menu *********
 #. File menu
-#: ../src/appointment.c:2382 ../src/day-view.c:254 ../src/event-list.c:1021
-#: ../src/interface.c:767 ../src/mainbox.c:279
+#: ../src/appointment.c:2496 ../src/day-view.c:279 ../src/event-list.c:1081
+#: ../src/interface.c:813 ../src/mainbox.c:297
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../src/appointment.c:2388
+#: ../src/appointment.c:2502
 msgid "Sav_e and close"
 msgstr "儲存並關閉(_E)"
 
-#: ../src/appointment.c:2401 ../src/event-list.c:1027
+#: ../src/appointment.c:2515 ../src/event-list.c:1087
 msgid "D_uplicate"
-msgstr "複製(_U)"
+msgstr "製作複本(_U)"
 
-#: ../src/appointment.c:2589
+#: ../src/appointment.c:2702
 msgid "Save"
 msgstr "儲存"
 
-#: ../src/appointment.c:2591
+#: ../src/appointment.c:2704
 msgid "Save and close"
 msgstr "儲存並關閉"
 
-#: ../src/appointment.c:2596
+#: ../src/appointment.c:2709
 msgid "Revert"
 msgstr "還原"
 
-#: ../src/appointment.c:2598 ../src/event-list.c:1112
+#: ../src/appointment.c:2711 ../src/event-list.c:1171
 msgid "Duplicate"
-msgstr "複製"
+msgstr "製作複本"
 
-#: ../src/appointment.c:2603 ../src/event-list.c:1114
+#: ../src/appointment.c:2716 ../src/event-list.c:1173
 msgid "Delete"
 msgstr "刪除"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Free"
 msgstr "有閒"
 
-#: ../src/appointment.c:2621
+#: ../src/appointment.c:2734
 msgid "Busy"
 msgstr "無閒"
 
-#: ../src/appointment.c:2625
+#: ../src/appointment.c:2738
 msgid "General"
 msgstr "一般"
 
 #. type
-#: ../src/appointment.c:2631
+#: ../src/appointment.c:2744
 msgid "Type "
 msgstr "類型"
 
-#: ../src/appointment.c:2633 ../src/event-list.c:1165
+#: ../src/appointment.c:2746 ../src/event-list.c:1226
 msgid "Event"
 msgstr "事件"
 
-#: ../src/appointment.c:2636
+#: ../src/appointment.c:2749
 msgid ""
 "Event that will happen sometime. For example:\n"
 "Meeting or birthday or TV show."
-msgstr ""
-"有時候某個事件會發生。舉例來說：\n"
-"開會、生日或者電視節目等。"
+msgstr "會在某個時間發生的事件。例如：\n開會、生日或者電視節目等。"
 
-#: ../src/appointment.c:2639 ../src/event-list.c:1185
+#: ../src/appointment.c:2752 ../src/event-list.c:1274
 msgid "Todo"
 msgstr "待辦"
 
-#: ../src/appointment.c:2642
+#: ../src/appointment.c:2755
 msgid ""
 "Something that you should do sometime. For example:\n"
 "Wash your car or test new version of Orage."
-msgstr ""
+msgstr "要在某個時間進行的事情。例如：\n洗車、又或者測試新版的 Orage 等。"
 
-#: ../src/appointment.c:2645 ../src/event-list.c:1198
+#: ../src/appointment.c:2758 ../src/event-list.c:1287
 msgid "Journal"
-msgstr ""
+msgstr "日誌"
 
-#: ../src/appointment.c:2649
+#: ../src/appointment.c:2762
 msgid ""
 "Make a note that something happened. For example:\n"
 "Remark that your mother called or first snow came."
-msgstr ""
+msgstr "記下某件發生的事情。例如：\n媽媽打電話來、又或者何時下雪等。"
 
 #. title
-#: ../src/appointment.c:2656
+#: ../src/appointment.c:2769
 msgid "Title "
 msgstr "標題"
 
-#: ../src/appointment.c:2671
+#: ../src/appointment.c:2784
 msgid "All day event"
 msgstr "整天的事件"
 
 #. start time
-#: ../src/appointment.c:2677 ../src/appointment.c:3342 ../src/day-view.c:697
+#: ../src/appointment.c:2790 ../src/appointment.c:3453 ../src/day-view.c:801
 msgid "Start"
 msgstr "開始"
 
-#: ../src/appointment.c:2697
+#: ../src/appointment.c:2810
 msgid "Set      "
-msgstr ""
+msgstr "設定"
 
-#: ../src/appointment.c:2718
+#: ../src/appointment.c:2831
 msgid "Duration"
-msgstr "時間長短"
+msgstr "為期"
 
-#: ../src/appointment.c:2722 ../src/appointment.c:2912 ../src/reminder.c:761
+#: ../src/appointment.c:2835 ../src/appointment.c:3027 ../src/reminder.c:758
 msgid "days"
 msgstr "天"
 
-#: ../src/appointment.c:2724 ../src/appointment.c:2914 ../src/reminder.c:763
+#: ../src/appointment.c:2837 ../src/appointment.c:3029 ../src/reminder.c:760
 msgid "hours"
 msgstr "小時"
 
-#: ../src/appointment.c:2726 ../src/appointment.c:2916 ../src/reminder.c:765
+#: ../src/appointment.c:2839 ../src/appointment.c:3031 ../src/reminder.c:762
 msgid "mins"
 msgstr "分鐘"
 
 #. Availability (only for EVENT)
-#: ../src/appointment.c:2738
+#: ../src/appointment.c:2851
 msgid "Availability"
 msgstr "能赴約否"
 
 #. completed (only for TODO)
-#: ../src/appointment.c:2746 ../src/appointment.c:3348
+#: ../src/appointment.c:2859 ../src/appointment.c:3459
 msgid "Completed"
-msgstr "完成"
+msgstr "結束"
 
-#: ../src/appointment.c:2749
+#: ../src/appointment.c:2862
 msgid "Done"
 msgstr "完成"
 
 #. categories
-#: ../src/appointment.c:2770
+#: ../src/appointment.c:2883
 msgid "Categories"
 msgstr "分類"
 
-#: ../src/appointment.c:2782
+#: ../src/appointment.c:2895
 msgid ""
 "This is special category, which can be used to color this appointment in "
 "list views."
-msgstr ""
+msgstr "這是特殊分類，用來為此約會在清單檢視加上顏色。"
 
-#: ../src/appointment.c:2787
+#: ../src/appointment.c:2900
 msgid "update colors for categories."
 msgstr "更新分類的顏色"
 
 #. priority
-#: ../src/appointment.c:2793
+#: ../src/appointment.c:2906
 msgid "Priority"
 msgstr "優先序"
 
+#: ../src/appointment.c:2910
+msgid ""
+"If you set this 8 or bigger, the appointment is NOT shown on list windows.\n"
+"You can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n"
+"(Alarms will still fire normally.)\n"
+"(There is undocumented parameter so that you can change the default limit of 8.)"
+msgstr "若將此設為 8 或以上，該約會就＊不會＊在清單視窗顯示。\n可以此功能令清單視窗清爽一點，但亦會令此約會較難找到。\n(「提醒」功能仍會正常運作。)\n(此功能沒有正式紀錄，故您可變更該為 8 的預設限制。)"
+
 #. note
-#: ../src/appointment.c:2803
+#: ../src/appointment.c:2918
 msgid "Note"
 msgstr "備註"
 
-#: ../src/appointment.c:2824
+#: ../src/appointment.c:2939
 msgid ""
 "These shorthand commands take effect immediately:\n"
 "    <D> inserts current date in local date format\n"
@@ -773,126 +864,124 @@
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
-msgstr ""
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
+msgstr "此等快捷指令會馬上生效：\n    <D> 以本地日期格式插入目前日期\n    <T> 插入時間和\n    <DT> 插入日期和時間。\n\n只有在見到之後才會轉換：\n    <&Ynnnn> 會轉換為目前年份減 nnnn。\n(例如可用來提醒某人現在多少歲。)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before Start"
-msgstr ""
+msgstr "(開始之前)"
 
-#: ../src/appointment.c:2895
+#: ../src/appointment.c:3010
 msgid "Before End"
-msgstr ""
+msgstr "(結束之前)"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After Start"
-msgstr "在這之後開始"
+msgstr "(開始之後)"
 
-#: ../src/appointment.c:2896
+#: ../src/appointment.c:3011
 msgid "After End"
-msgstr ""
+msgstr "(結束之後)"
 
-#: ../src/appointment.c:2903
+#: ../src/appointment.c:3018
 msgid "Alarm"
 msgstr "提醒"
 
 #. **** ALARM TIME ****
-#: ../src/appointment.c:2909
+#: ../src/appointment.c:3024
 msgid "Alarm time"
 msgstr "提醒時間"
 
-#: ../src/appointment.c:2933
+#: ../src/appointment.c:3048
 msgid ""
 "Often you want to get alarm:\n"
 " 1) before Event start\n"
 " 2) before Todo end\n"
 " 3) after Todo start"
-msgstr ""
+msgstr "通常需要提醒的三種情況：\n 1) 事件開始之前\n 2) 待辦事項結束之前\n 3) 待辦事項開始之後"
 
-#: ../src/appointment.c:2938
+#: ../src/appointment.c:3053
 msgid "Persistent alarm"
-msgstr ""
+msgstr "重覆提醒"
 
-#: ../src/appointment.c:2940
+#: ../src/appointment.c:3055
 msgid ""
 "Select this if you want Orage to remind you even if it has not been active "
 "when the alarm happened."
-msgstr ""
+msgstr "如果您想要在 Orage 未啟動時提醒您已發生的事件，選取這個選項。"
 
 #. **** Audio Alarm ****
-#: ../src/appointment.c:2949
+#: ../src/appointment.c:3064
 msgid "Sound"
 msgstr "鈴聲"
 
-#: ../src/appointment.c:2953 ../src/appointment.c:3074
+#: ../src/appointment.c:3068 ../src/appointment.c:3188
 msgid "Use"
 msgstr "使用"
 
-#: ../src/appointment.c:2955
+#: ../src/appointment.c:3070
 msgid "Select this if you want audible alarm"
 msgstr "若您想聽見鬧鈴提醒請選取這個選項"
 
-#: ../src/appointment.c:2972
+#: ../src/appointment.c:3087
 msgid "Repeat alarm sound"
 msgstr "重複提醒鈴聲"
 
-#: ../src/appointment.c:2988 ../src/appointment.c:3290
+#: ../src/appointment.c:3103 ../src/appointment.c:3402
 msgid "times"
-msgstr "次數"
+msgstr "次"
 
-#: ../src/appointment.c:3004
+#: ../src/appointment.c:3119
 msgid "sec interval"
-msgstr "秒數間隔"
+msgstr "秒間隔"
 
 #. **** Display Alarm ****
-#: ../src/appointment.c:3014
+#: ../src/appointment.c:3129
 msgid "Visual"
 msgstr "視覺"
 
-#: ../src/appointment.c:3018
+#: ../src/appointment.c:3133
 msgid "Use Orage window"
 msgstr "使用 Orage 視窗"
 
-#: ../src/appointment.c:3020
+#: ../src/appointment.c:3135
 msgid "Select this if you want Orage window alarm"
-msgstr ""
+msgstr "若想有 Orage 視窗的話選此"
 
-#: ../src/appointment.c:3032
+#: ../src/appointment.c:3147
 msgid "Use notification"
 msgstr "使用系統通知"
 
-#: ../src/appointment.c:3034
+#: ../src/appointment.c:3149
 msgid "Select this if you want notification alarm"
-msgstr ""
+msgstr "若想有提醒通知的話選此"
 
-#: ../src/appointment.c:3040
+#: ../src/appointment.c:3155
 msgid "Set timeout"
 msgstr "設定時限"
 
-#: ../src/appointment.c:3043
+#: ../src/appointment.c:3157
 msgid "Select this if you want notification to expire automatically"
-msgstr ""
+msgstr "若想通知自動失效的話選此"
 
-#: ../src/appointment.c:3054
+#: ../src/appointment.c:3168
 msgid "0 = system default expiration time"
-msgstr "0 = 系統預設的到期時間"
+msgstr "0 = 系統預設的失效時間"
 
-#: ../src/appointment.c:3059
+#: ../src/appointment.c:3173
 msgid "seconds"
 msgstr "秒"
 
 #. **** Procedure Alarm ****
-#: ../src/appointment.c:3070
-#, fuzzy
+#: ../src/appointment.c:3184
 msgid "Procedure"
-msgstr "處理"
+msgstr "程序"
 
-#: ../src/appointment.c:3076
+#: ../src/appointment.c:3190
 msgid "Select this if you want procedure or script alarm"
-msgstr ""
+msgstr "若想使用自訂程序或 script 的話選此"
 
-#: ../src/appointment.c:3082
+#: ../src/appointment.c:3196
 msgid ""
 "You must enter all escape etc characters yourself.\n"
 "This string is just given to shell to process.\n"
@@ -902,151 +991,146 @@
 "\t<&AT> alarm time\n"
 "\t<&ST> appointment start time\n"
 "\t<&ET> appointment end time"
-msgstr ""
+msgstr "必須自行輸入所有溢出(escape)等字元。\n本字串僅會交給 shell 處理。\n以下特殊指令會在執行口時替換：\n\t<&T>  約會標題\n\t<&D>  約會說明\n\t<&AT> 約會時間\n\t<&ST> 約會開始時間\n\t<&ET> 約會結束時間"
 
-#: ../src/appointment.c:3094
+#: ../src/appointment.c:3208
 msgid "Test this alarm by raising it now"
-msgstr ""
+msgstr "以立即喚醒來測試提醒"
 
-#: ../src/appointment.c:3101
+#: ../src/appointment.c:3215
 msgid "<b>Default alarm</b>"
 msgstr "<b>預設提醒</b>"
 
-#: ../src/appointment.c:3109
+#: ../src/appointment.c:3223
 msgid "Store current settings as default alarm"
 msgstr "將目前設定儲存為預設提醒"
 
-#: ../src/appointment.c:3114
+#: ../src/appointment.c:3228
 msgid "Set current settings from default alarm"
 msgstr "將目前設定設定為預設提醒"
 
-#: ../src/appointment.c:3176
-msgid "None"
-msgstr "無"
-
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Daily"
 msgstr "每日"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Weekly"
 msgstr "每週"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Monthly"
 msgstr "每月"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Yearly"
 msgstr "每年"
 
-#: ../src/appointment.c:3176
+#: ../src/appointment.c:3290
 msgid "Hourly"
 msgstr "每小時"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Mon"
 msgstr "週一"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Tue"
 msgstr "週二"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Wed"
 msgstr "週三"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Thu"
 msgstr "週四"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Fri"
 msgstr "週五"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sat"
 msgstr "週六"
 
-#: ../src/appointment.c:3178
+#: ../src/appointment.c:3292
 msgid "Sun"
 msgstr "週日"
 
-#: ../src/appointment.c:3183
+#: ../src/appointment.c:3297
 msgid "Recurrence"
 msgstr "再現"
 
 #. complexity
-#: ../src/appointment.c:3189
+#: ../src/appointment.c:3303
 msgid "Complexity"
-msgstr ""
+msgstr "複雜性"
 
-#: ../src/appointment.c:3192
+#: ../src/appointment.c:3306
 msgid "Basic"
 msgstr "基本"
 
-#: ../src/appointment.c:3198
+#: ../src/appointment.c:3312
 msgid "Advanced"
 msgstr "進階"
 
-#: ../src/appointment.c:3202
+#: ../src/appointment.c:3316
 msgid "Use this if you want regular repeating event"
-msgstr ""
+msgstr "如果您需要有規律的事件的話，使用這個"
 
-#: ../src/appointment.c:3204
+#: ../src/appointment.c:3318
 msgid ""
 "Use this if you need complex times like:\n"
 " Every Saturday and Sunday or \n"
 " First Tuesday every month"
-msgstr ""
+msgstr "如果您需要像是以下例子的複雜規律的話，使用這個：\n 每個星期日及星期六或 \n 每個月的第一個星期二"
 
 #. frequency
-#: ../src/appointment.c:3211
+#: ../src/appointment.c:3324
 msgid "Frequency"
 msgstr "頻率"
 
-#: ../src/appointment.c:3217
+#: ../src/appointment.c:3330
 msgid "Each"
-msgstr ""
+msgstr "："
 
-#: ../src/appointment.c:3224
-#, fuzzy
+#: ../src/appointment.c:3337
 msgid "occurrence"
-msgstr "出現"
+msgstr "次"
 
-#: ../src/appointment.c:3228
+#: ../src/appointment.c:3341
 msgid ""
 "Limit frequency to certain interval.\n"
 " For example: Every third day:\n"
 " Frequency = Daily and Interval = 3"
-msgstr ""
+msgstr "以特定的時間區間限制頻率\n 例如：每三天：\n 頻率 = 每日 以及 區間 = 3"
 
-#: ../src/appointment.c:3274
+#: ../src/appointment.c:3386
 msgid "Limit"
 msgstr "限制"
 
-#: ../src/appointment.c:3276
+#: ../src/appointment.c:3388
 msgid "Repeat forever"
 msgstr "持續重複"
 
-#: ../src/appointment.c:3282
+#: ../src/appointment.c:3394
 msgid "Repeat "
 msgstr "重複"
 
-#: ../src/appointment.c:3298
+#: ../src/appointment.c:3410
 msgid "Repeat until "
 msgstr "重複直到"
 
 #. weekdays (only for complex settings)
-#: ../src/appointment.c:3311
+#: ../src/appointment.c:3423
 msgid "Weekdays"
 msgstr "週幾"
 
-#: ../src/appointment.c:3323
+#: ../src/appointment.c:3435
 msgid "Which day"
-msgstr ""
+msgstr "哪天"
 
-#: ../src/appointment.c:3331
+#: ../src/appointment.c:3443
 msgid ""
 "Specify which weekday for monthly and yearly events.\n"
 " For example:\n"
@@ -1054,880 +1138,995 @@
 "\tFrequency = Monthly,\n"
 "\tWeekdays = check only Wednesday,\n"
 "\tWhich day = select 2 from the number below Wednesday"
-msgstr ""
+msgstr "為「每月」和「每年」事件指定星期幾。\n 例如：\n 每個月的第二個星期三：\n\t頻率 = 「每月」、\n\t週幾 = 只勾選「週三」、\n\t哪天 = 在「週三」之下選 2"
 
 #. TODO base (only for TODOs)
-#: ../src/appointment.c:3339
+#: ../src/appointment.c:3450
 msgid "TODO base"
-msgstr ""
+msgstr "「待辦」事項基於"
 
-#: ../src/appointment.c:3352
+#: ../src/appointment.c:3463
 msgid ""
 "TODO reoccurs regularly starting on start time and repeating after each "
 "interval no matter when it was last completed"
-msgstr ""
+msgstr "待辦事項會在每個時間區間的開始時間定期重新出現，無論它什麼時候被完成"
 
-#: ../src/appointment.c:3354
+#: ../src/appointment.c:3465
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
-msgstr ""
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
+msgstr "待辦事項定期重新出現的時間是基於完成時間和最後完成時間中的時間間隔。\n(請注意，您無法顯示待辦事項中的所有事件，因為每次完成後都會有基礎的變更。)"
 
 #. exceptions
-#: ../src/appointment.c:3361
+#: ../src/appointment.c:3471
 msgid "Exceptions"
 msgstr "例外"
 
-#: ../src/appointment.c:3374
+#: ../src/appointment.c:3484
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
-msgstr ""
+msgstr "點擊下面的日曆以加入更多例外日期。\n例外日期可以是排除(-)或是包含(+)取決於您的選擇。\n點擊資料以移除。"
 
-#: ../src/appointment.c:3379
+#: ../src/appointment.c:3489
 msgid "Add excluded date (-)"
 msgstr "新增排除的日期"
 
-#: ../src/appointment.c:3381
+#: ../src/appointment.c:3491
 msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
+msgstr "排除的日期是這個約會不會發生的所有日期"
 
-#: ../src/appointment.c:3387
+#: ../src/appointment.c:3497
 msgid "Add included time (+)"
 msgstr "新增包含的日期"
 
-#: ../src/appointment.c:3389
+#: ../src/appointment.c:3499
 msgid ""
 "Included times have same timezone than start time, but they may have "
 "different time"
-msgstr ""
+msgstr "包含的時間與開始時間應為同一時區，但它們可以是不同時間"
 
 #. calendars showing the action days
-#: ../src/appointment.c:3406
+#: ../src/appointment.c:3516
 msgid "Action dates"
 msgstr "工作日"
 
 #. ********* View menu *********
 #. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1044 ../src/mainbox.c:305
+#: ../src/day-view.c:289 ../src/event-list.c:1104 ../src/mainbox.c:323
 msgid "_View"
 msgstr "檢視(_V)"
 
 #. ********* Go menu   *********
-#: ../src/day-view.c:278 ../src/event-list.c:1063
+#: ../src/day-view.c:303 ../src/event-list.c:1123
 msgid "_Go"
 msgstr "前往(_G)"
 
-#: ../src/day-view.c:319 ../src/event-list.c:1110
+#: ../src/day-view.c:377 ../src/event-list.c:1169
 msgid "New"
 msgstr "新增"
 
-#: ../src/day-view.c:324 ../src/event-list.c:1119
-msgid "Back"
-msgstr "返回"
-
-#: ../src/day-view.c:326 ../src/event-list.c:1121 ../src/functions.c:143
-#: ../src/tray_icon.c:460
-msgid "Today"
-msgstr "今天"
-
-#: ../src/day-view.c:328 ../src/event-list.c:1123
-msgid "Forward"
-msgstr "前進"
+#: ../src/day-view.c:382
+msgid "Back one week"
+msgstr "返回一週"
+
+#: ../src/day-view.c:384
+msgid "Back one day"
+msgstr "返回一天"
+
+#: ../src/day-view.c:388
+msgid "Forward one day"
+msgstr "向前一天"
+
+#: ../src/day-view.c:390
+msgid "Forward one week"
+msgstr "向前一週"
 
-#: ../src/day-view.c:333 ../src/event-list.c:1128
+#: ../src/day-view.c:395 ../src/event-list.c:1187
 msgid "Refresh"
 msgstr "重新整理"
 
-#: ../src/day-view.c:338 ../src/event-list.c:1135 ../src/interface.c:809
+#: ../src/day-view.c:400 ../src/event-list.c:1194 ../src/interface.c:834
 msgid "Close"
 msgstr "關閉"
 
-#: ../src/day-view.c:454
+#: ../src/day-view.c:549
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/day-view.c:704
+#: ../src/day-view.c:807
 msgid "       Number of days to show"
 msgstr "       要顯示的日數"
 
-#: ../src/day-view.c:935
+#: ../src/day-view.c:1073
 msgid "Orage - day view"
 msgstr "Orage - 日檢視"
 
 #. date only appointment
-#: ../src/event-list.c:190
+#: ../src/event-list.c:191
 msgid "All day"
 msgstr "全天"
 
-#: ../src/event-list.c:580 ../src/event-list.c:1281
+#: ../src/event-list.c:596 ../src/event-list.c:1370
 msgid "Time"
 msgstr "時間"
 
-#: ../src/event-list.c:748
+#: ../src/event-list.c:784
 msgid "No rows have been selected."
 msgstr "尚未選取列。"
 
-#: ../src/event-list.c:749
+#: ../src/event-list.c:785
 msgid "Click a row to select it and after that you can copy it."
 msgstr "點擊一列以選取它，之後您就能複製它。"
 
-#: ../src/event-list.c:918
+#: ../src/event-list.c:968
 msgid ""
 "You will permanently remove all\n"
 "selected appointments."
-msgstr ""
-"您將永遠移除所有\n"
-"選取的約會。"
+msgstr "您將永遠移除所有\n選取的約會。"
+
+#: ../src/event-list.c:971
+msgid "Yes, remove them"
+msgstr "是，移除之"
+
+#: ../src/event-list.c:1178
+msgid "Back"
+msgstr "返回"
+
+#: ../src/event-list.c:1182
+msgid "Forward"
+msgstr "前進"
 
-#: ../src/event-list.c:1130
+#: ../src/event-list.c:1189
 msgid "Find"
 msgstr "尋找"
 
-#: ../src/event-list.c:1137
+#: ../src/event-list.c:1196
 msgid "Dayview"
 msgstr "日檢視"
 
-#: ../src/event-list.c:1170
-msgid "Extra days to show "
-msgstr "要顯示的額外日數"
+#: ../src/event-list.c:1231
+msgid "Extra days to show:"
+msgstr "要顯示的額外日數："
+
+#: ../src/event-list.c:1240
+msgid "only first repeating"
+msgstr "僅首先重複"
+
+#: ../src/event-list.c:1245
+msgid ""
+"Check this if you only want to see the first repeating event. By default all are shown.\n"
+"Note that this also shows all urgencies.\n"
+"Note that repeating events may appear earlier in the list as the first occurrence only is listed."
+msgstr "如果您只想看到第一個重覆的事件，勾選這個。預設為全部顯示。\n注意，這也會顯示所有緊急事件。\n注意，重複的事件將只會在列表中第一次出現的地方出現。"
+
+#: ../src/event-list.c:1250
+msgid "also old"
+msgstr "也是舊的"
+
+#: ../src/event-list.c:1252
+msgid ""
+"Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\n"
+"Note that extra days selection still defines if newer appointments are listed'."
+msgstr "如果您也想要看到舊的事件，勾選這個。這將只能在「僅首先重複」選項開啟時啟動以避免過長的列表。\n請注意，額外的天數選擇仍有限制，如果有較新的約會被列出。"
 
-#: ../src/event-list.c:1201
+#: ../src/event-list.c:1290
 msgid "Journal entries starting from:"
-msgstr ""
+msgstr "日誌項目開始日期："
 
-#: ../src/event-list.c:1221
+#: ../src/event-list.c:1310
 msgid "Search"
 msgstr "搜尋"
 
-#: ../src/event-list.c:1224
+#: ../src/event-list.c:1313
 msgid "Search text "
 msgstr "搜尋文字"
 
-#: ../src/event-list.c:1289
+#: ../src/event-list.c:1378
 msgid "Flags"
 msgstr "旗標"
 
-#: ../src/event-list.c:1297
+#: ../src/event-list.c:1386
 msgid "Title"
 msgstr "標題"
 
-#: ../src/event-list.c:1323
-#, fuzzy
+#: ../src/event-list.c:1412
 msgid ""
 "Double click line to edit it.\n"
 "\n"
 "Flags in order:\n"
 "\t 1. Alarm: n=no alarm\n"
-"\t\t A=visual Alarm S=also Sound alarm\n"
+"\t\t A=Alarm is set P=Persistent alarm is set\n"
 "\t 2. Recurrence: n=no recurrence\n"
-"\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n"
+"\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n"
 "\t 3. Type: f=free B=Busy\n"
 "\t 4. Located in file:\n"
 "\t\tO=Orage A=Archive F=Foreign\n"
 "\t 5. Appointment type:\n"
 "\t\tE=Event T=Todo J=Journal"
-msgstr ""
-"雙擊此行以開始編輯。\n"
-"\n"
-"旗標順序:\n"
-"\t 1. 鬧鐘: n=不用鬧鐘\n"
-"\t\tA=顯示鬧鐘 S=並用音效鬧鈴\n"
-"\t 2. 再現: n=不用再現\n"
-"\t\t D=每天 W=每週 M=每月 Y=每天\n"
-"\t 3. 情況: f=有閒 B=無閒"
-
-#: ../src/functions.c:141
-msgid "Pick the date"
-msgstr "挑選日期"
+msgstr "雙擊您想要編輯的行以啟用編輯。\n\n旗標依序是：\n\t 1. 提醒：n=無提醒\n\t\t A=提醒已設定 P=持續性提醒已設定\n\t 2. 重覆出現：n=不重覆\n\t\t H=每小時 D=每天 W=每週 M=每月 Y=每年\n\t 3. 類型：f=空閒 B=忙碌\n\t 4. 檔案位置：\n\t\tO=Orage A=封存檔 F=外部檔案\n\t 5. 約會類型：\n\t\tE=事件 T=待辦 J=日誌"
 
 #. remove since it has ended
 #: ../src/ical-archive.c:267
 msgid "\tRecur ended, moving to archive file."
-msgstr ""
+msgstr "\t重複結束。移至封存檔。"
 
-#: ../src/ical-archive.c:329
+#: ../src/ical-archive.c:330
 msgid "Archiving not enabled. Exiting"
-msgstr ""
+msgstr "未啟用封存功能。結束。"
 
-#: ../src/ical-archive.c:347
+#: ../src/ical-archive.c:349
 #, c-format
 msgid "Archiving threshold: %d month(s)"
-msgstr "封存門檻: %d 個月"
+msgstr "封存門檻：%d 個月"
 
 #. yy mon day
-#: ../src/ical-archive.c:350
+#: ../src/ical-archive.c:352
 #, c-format
 msgid "\tArchiving events, which are older than: %04d-%02d-%02d"
-msgstr ""
+msgstr "\t正在封存事件，其舊於：%04d-%02d-%02d"
 
-#: ../src/ical-archive.c:377
+#: ../src/ical-archive.c:379
 #, c-format
 msgid "Archiving uid: %s"
 msgstr "正在封存 UID：%s"
 
 #. VTODO not completed, do not archive
-#: ../src/ical-archive.c:383
+#: ../src/ical-archive.c:385
 msgid "\tVTODO not complete; not archived"
-msgstr ""
+msgstr "\tVTODO 不完整; 不會存檔"
 
 #. it is recurrent event
-#: ../src/ical-archive.c:388
+#: ../src/ical-archive.c:390
 #, c-format
 msgid "\tRecurring. End year: %04d, month: %02d, day: %02d"
-msgstr ""
+msgstr "\t正在重複。結束年份：%04d，月份：%02d，日：%02d"
 
-#: ../src/ical-archive.c:405
+#: ../src/ical-archive.c:407
 msgid "Archiving done\n"
 msgstr "封存完成\n"
 
 #. PHASE 1: go through base orage file and remove "repeat" shortcuts
-#: ../src/ical-archive.c:421
+#: ../src/ical-archive.c:423
 msgid "Starting archive removal."
 msgstr "正在開始封存移除。"
 
-#: ../src/ical-archive.c:422
+#: ../src/ical-archive.c:424
 msgid "\tPHASE 1: reset recurring appointments"
-msgstr ""
+msgstr "\t階段 1： 重設週期性約會"
 
 #. PHASE 2: go through archive file and add everything back to base orage.
 #. * After that delete the whole arch file
-#: ../src/ical-archive.c:444
+#: ../src/ical-archive.c:446
 msgid "\tPHASE 2: return archived appointments"
-msgstr ""
+msgstr "\t階段 2： 恢復所有已存檔的約會"
 
-#: ../src/ical-archive.c:470
+#: ../src/ical-archive.c:472
 msgid "Archive removal done\n"
 msgstr "封存移除完成\n"
 
-#: ../src/ical-code.c:932
+#: ../src/ical-code.c:972
 msgid "Orage default alarm"
 msgstr "Orage 預設提醒"
 
-#: ../src/ical-code.c:3115
+#: ../src/ical-code.c:3179
+msgid "Created alarm list for main Orage file:"
+msgstr "為主 Orage 檔建立的提醒清單："
+
+#: ../src/ical-code.c:3181
 #, c-format
-msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
+msgid "Created alarm list for foreign file: %s (%s)"
+msgstr "為外部檔案建立的提醒清單：%s (%s)"
+
+#: ../src/ical-code.c:3183
+#, c-format
+msgid "\tAdded %d alarms. Processed %d events."
+msgstr "\t加入了 %d 個提醒。處理了 %d 個事件。"
 
-#: ../src/ical-code.c:3117
+#: ../src/ical-code.c:3185
 #, c-format
 msgid ""
 "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
+msgstr "\t找到 %d 個提醒，其中有 %d 個處於活躍狀態。 (搜尋到 %d 個週期性提醒)"
 
 #: ../src/ical-expimp.c:123
 msgid "Starting import file preprocessing"
-msgstr ""
+msgstr "正在開啟匯入檔案預處理"
 
 #: ../src/ical-expimp.c:158
 msgid "... Patched DCREATED to be CREATED."
-msgstr ""
+msgstr "... 已修正 DCREATED 為已創建"
 
 #: ../src/ical-expimp.c:197
 msgid "... Patched timezone to Orage format."
-msgstr ""
+msgstr "... 已修正時區為 Orage 的格式。"
 
 #: ../src/ical-expimp.c:206
 msgid "Import file preprocessing done"
-msgstr ""
+msgstr "完成匯入檔案預處理"
+
+#: ../src/interface.c:89 ../src/interface.c:104
+#, c-format
+msgid "Found external update on file %s."
+msgstr "在檔案 %s 找到外部升級。"
+
+#: ../src/interface.c:112
+msgid "Refreshing alarms and calendar due to external file update."
+msgstr "根據外部檔案更新刷新提醒和行事曆。"
 
-#: ../src/interface.c:284
+#: ../src/interface.c:271
 msgid "Calendar files"
 msgstr "行事曆檔案"
 
 #: ../src/interface.c:631
 msgid "Current foreign files"
-msgstr ""
+msgstr "目前的外部檔案"
 
-#: ../src/interface.c:643
+#: ../src/interface.c:648
 msgid "READ ONLY"
 msgstr "唯讀"
 
-#: ../src/interface.c:645
+#: ../src/interface.c:650
 msgid "READ WRITE"
 msgstr "可讀寫"
 
-#: ../src/interface.c:663
+#: ../src/interface.c:669
 msgid "***** No foreign files *****"
-msgstr ""
+msgstr "***** 無外部檔案 *****"
+
+#: ../src/interface.c:682
+msgid "Foreign file add failed"
+msgstr "未能加入外部檔案"
+
+#: ../src/interface.c:689
+msgid "Orage can only handle 10 foreign files. Limit reached."
+msgstr "Orage 只能處理 10 個外部檔案。已到達上限。"
 
-#: ../src/interface.c:974
+#: ../src/interface.c:697
+msgid "Filename is empty."
+msgstr "空白檔名。"
+
+#: ../src/interface.c:705
+msgid "Name is empty."
+msgstr "空白名稱。"
+
+#: ../src/interface.c:713
+msgid "File does not exist."
+msgstr "無此檔案。"
+
+#: ../src/interface.c:722
+msgid "Same filename already exists in Orage."
+msgstr "Orage 已有同名檔案。"
+
+#: ../src/interface.c:730
+msgid "Same name already exists in Orage."
+msgstr "Orage 已有相同名稱。"
+
+#: ../src/interface.c:965
 msgid "Import/export"
 msgstr "匯入/匯出"
 
-#: ../src/interface.c:981
+#: ../src/interface.c:972
 msgid "Import"
 msgstr "匯入"
 
-#: ../src/interface.c:986
+#: ../src/interface.c:977
 msgid "Read from file:"
 msgstr "讀取檔案："
 
-#: ../src/interface.c:1003
+#: ../src/interface.c:994
 msgid ""
 "Separate filenames with comma(,).\n"
 " NOTE: comma is not valid character in filenames for Orage."
-msgstr ""
+msgstr "以半形逗號(,)分隔檔案名稱。\n注意：用於 Orage 的檔案名稱不能有逗號。"
 
-#: ../src/interface.c:1008
+#: ../src/interface.c:999
 msgid "Export"
 msgstr "匯出"
 
-#: ../src/interface.c:1013
+#: ../src/interface.c:1004
 msgid "Write to file:"
 msgstr "寫入檔案："
 
-#: ../src/interface.c:1034 ../src/interface.c:1046
+#: ../src/interface.c:1025 ../src/interface.c:1037
 msgid "Select"
 msgstr "選取"
 
-#: ../src/interface.c:1037
+#: ../src/interface.c:1028
 msgid "All appointments"
 msgstr "所有約會"
 
-#: ../src/interface.c:1050
+#: ../src/interface.c:1041
 msgid "Named appointments: "
 msgstr "命名的約會："
 
-#: ../src/interface.c:1062
+#: ../src/interface.c:1053
 msgid ""
 "Note that only main file appointments are read.\n"
 "Archived and Foreign events are not exported."
-msgstr ""
+msgstr "注意：只會讀取主檔案的約會。\n不會匯出已封存的和外部的事件。"
 
-#: ../src/interface.c:1065
+#: ../src/interface.c:1056
 msgid ""
 "Note that only main file appointments are read.\n"
 "Foreign events are not exported."
-msgstr ""
+msgstr "注意：只會讀取主檔案的約會。\n不會匯出外部的事件。"
 
-#: ../src/interface.c:1068
+#: ../src/interface.c:1059
 msgid "You can easily drag these from event-list window."
-msgstr ""
+msgstr "可輕易拖曳事件清單視窗。"
 
-#: ../src/interface.c:1070
+#: ../src/interface.c:1061
 msgid "Orage appointment UIDs separated by commas."
-msgstr ""
+msgstr "以半形逗號分隔的 Orage 約會 UID。"
 
-#: ../src/interface.c:1076
+#: ../src/interface.c:1067
 msgid "Archive"
 msgstr "封存檔案"
 
-#: ../src/interface.c:1084
+#: ../src/interface.c:1075
 #, c-format
 msgid "Archive now (threshold: %d months)"
-msgstr "立即封存 (門檻: %d 個月)"
+msgstr "立即封存 (門檻：%d 個月)"
 
-#: ../src/interface.c:1094
+#: ../src/interface.c:1085
 msgid "You can change archive threshold in parameters"
-msgstr ""
+msgstr "可在參數變更封存門檻"
 
-#: ../src/interface.c:1101
+#: ../src/interface.c:1092
 msgid "Revert archive now"
 msgstr "立刻還原封存"
 
-#: ../src/interface.c:1107
+#: ../src/interface.c:1098
 msgid ""
 "Return all archived events into main orage file and remove arch file.\n"
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
-msgstr ""
+msgstr "傳回所有已存檔的事件到主 orage 檔案並移除所有架構檔。\n當要匯出及移動 orage 中的約會\n到其他系統時非常有用。"
 
-#: ../src/interface.c:1118
+#: ../src/interface.c:1109
 msgid "Orage files"
 msgstr "Orage 檔案"
 
-#: ../src/interface.c:1125
+#: ../src/interface.c:1116
 msgid "Orage main calendar file"
 msgstr "Orage 主行事曆檔"
 
-#: ../src/interface.c:1130 ../src/interface.c:1195
-msgid "Current file"
-msgstr "目前檔案"
-
-#: ../src/interface.c:1137 ../src/interface.c:1202
-msgid "New file"
-msgstr "新增檔案"
-
-#: ../src/interface.c:1153 ../src/interface.c:1219
-msgid "Action options"
-msgstr "動作選項"
+#: ../src/interface.c:1121 ../src/interface.c:1186
+msgid "Current file:"
+msgstr "目前檔案："
+
+#: ../src/interface.c:1128 ../src/interface.c:1193
+msgid "New file:"
+msgstr "新檔案："
+
+#: ../src/interface.c:1144 ../src/interface.c:1210
+msgid "Action options:"
+msgstr "動作選項："
 
-#: ../src/interface.c:1156 ../src/interface.c:1222
+#: ../src/interface.c:1147 ../src/interface.c:1213
 msgid "Rename"
 msgstr "重新命名"
 
-#: ../src/interface.c:1160
+#: ../src/interface.c:1151
 msgid ""
 "Orage internal file rename only.\n"
 "Does not touch external filesystem at all.\n"
 "New file must exist."
-msgstr ""
+msgstr "只有 Orage 內部檔案重新命名。\n不會接觸到外部的檔案系統。\n新檔案應該存在。"
 
-#: ../src/interface.c:1164 ../src/interface.c:1227
+#: ../src/interface.c:1155 ../src/interface.c:1218
 msgid "Copy"
 msgstr "複製"
 
-#: ../src/interface.c:1168
+#: ../src/interface.c:1159
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
+msgstr "目前的檔案已複製並在舊位置保持未修改的狀態。"
 
-#: ../src/interface.c:1172 ../src/interface.c:1232
+#: ../src/interface.c:1163 ../src/interface.c:1223
 msgid "Move"
 msgstr "移動"
 
-#: ../src/interface.c:1176
+#: ../src/interface.c:1167
 msgid "Current file is moved and vanishes from the old place."
-msgstr ""
+msgstr "目前的檔案已複製並在舊位置消失。"
 
-#: ../src/interface.c:1190
+#: ../src/interface.c:1181
 msgid "Archive file"
 msgstr "封存檔案"
 
-#: ../src/interface.c:1254
+#: ../src/interface.c:1245
 msgid "Foreign files"
-msgstr ""
+msgstr "外部檔案"
 
-#: ../src/interface.c:1261
+#: ../src/interface.c:1252
 msgid "Add new foreign file"
-msgstr ""
+msgstr "加入新外部檔案"
 
-#: ../src/interface.c:1266
+#: ../src/interface.c:1257
 msgid "Foreign file:"
-msgstr ""
+msgstr "外部檔案："
 
-#: ../src/interface.c:1284
-msgid "Options"
-msgstr "選項"
+#. label = gtk_label_new(_("Options:"));
+#. gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+#: ../src/interface.c:1279
+msgid "Visible name:"
+msgstr "可見名稱："
 
-#: ../src/interface.c:1286
+#: ../src/interface.c:1285
 msgid "Read only"
 msgstr "唯讀"
 
-#: ../src/interface.c:1294
+#: ../src/interface.c:1292
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
-msgstr ""
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
+msgstr "設定這個選項，如果您想要讓 Orage 無法更動這個檔案。\n請注意，如果修改外來的檔案可能會造成它們與原先的工具不相容！"
+
+#: ../src/interface.c:1294
+msgid "This internal name is displayed to user instead of file name."
+msgstr "會向使用者顯示此內部名稱，而非檔案名稱。"
 
 #: ../src/interface.c:1308
 msgid "Exchange data - Orage"
 msgstr "交換資料 - Orage"
 
-#: ../src/main.c:268
+#: ../src/main.c:275
 #, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr ""
+msgstr "\t此為 %s 第 %s 版\n\n"
 
-#: ../src/main.c:270
+#: ../src/main.c:277
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
+msgstr "\t以 GNU 通用公共授權條款釋出。\n"
 
-#: ../src/main.c:271
+#: ../src/main.c:278
 #, c-format
 msgid "\tCompiled against GTK+-%d.%d.%d, "
-msgstr ""
+msgstr "\t使用 GTK+-%d.%d.%d 編譯, "
 
-#: ../src/main.c:273
+#: ../src/main.c:280
 #, c-format
 msgid "using GTK+-%d.%d.%d.\n"
-msgstr ""
+msgstr "使用 GTK+-%d.%d.%d.\n"
 
-#: ../src/main.c:276
+#: ../src/main.c:283
 #, c-format
 msgid "\tUsing DBUS for import.\n"
-msgstr ""
+msgstr "\t正在使用 DBUS 匯入。\n"
 
-#: ../src/main.c:278
+#: ../src/main.c:285
 #, c-format
 msgid "\tNot using DBUS. Import works only partially.\n"
-msgstr ""
+msgstr "\t不使用 DBUS，只會部份匯入。\n"
 
-#: ../src/main.c:281
+#: ../src/main.c:288
 #, c-format
 msgid "\tUsing libnotify.\n"
-msgstr ""
+msgstr "\t使用 libnotify。\n"
 
-#: ../src/main.c:283
+#: ../src/main.c:290
 #, c-format
 msgid "\tNot using libnotify.\n"
-msgstr ""
+msgstr "\t不使用 libnotify。\n"
 
-#: ../src/main.c:286
+#: ../src/main.c:293
 #, c-format
 msgid "\tUsing automatic archiving.\n"
-msgstr ""
+msgstr "\t使用自動封存。\n"
 
-#: ../src/main.c:288
+#: ../src/main.c:295
 #, c-format
 msgid "\tNot using archiving.\n"
-msgstr ""
+msgstr "\t不使用自動封存。\n"
 
-#: ../src/main.c:291
+#: ../src/main.c:298
 #, c-format
 msgid "\tUsing operating system package libical.\n"
-msgstr ""
+msgstr "\t正在使用作業系統軟體包 libical。\n"
 
-#: ../src/main.c:293
+#: ../src/main.c:300
 #, c-format
 msgid "\tUsing Orage local version of libical.\n"
-msgstr ""
+msgstr "\t正在使用 Orage 本地版本的 libical。\n"
 
-#: ../src/main.c:306
+#: ../src/main.c:313
 #, c-format
 msgid ""
 "Usage: orage [options] [files]\n"
 "\n"
-msgstr ""
+msgstr "用法：orage [選項] [檔案]\n\n"
 
-#: ../src/main.c:307
+#: ../src/main.c:314
 #, c-format
 msgid "Options:\n"
 msgstr "選項：\n"
 
-#: ../src/main.c:308
+#: ../src/main.c:315
 #, c-format
 msgid "--version (-v) \t\tshow version of orage\n"
-msgstr ""
+msgstr "--version (-v) \t\t顯示 orage 的版本\n"
 
-#: ../src/main.c:309
+#: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
-msgstr ""
+msgstr "--help (-h) \t\t顯示此文字\n"
 
-#: ../src/main.c:310
+#: ../src/main.c:317
 #, c-format
 msgid "--preferences (-p) \tshow preferences form\n"
-msgstr ""
+msgstr "--preferences (-p) \t顯示偏好設定表格\n"
 
-#: ../src/main.c:311
+#: ../src/main.c:318
 #, c-format
 msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
+msgstr "--toggle (-t) \t\t讓 orage 可見/不可見\n"
 
-#: ../src/main.c:312
+#: ../src/main.c:319
 #, c-format
-msgid "--add-foreign (-a) file [RW] \tadd a foreign file\n"
-msgstr ""
+msgid "--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"
+msgstr "--add-foreign (-a) 檔案 [RW] [名稱] \t加入外部檔案\n"
 
-#: ../src/main.c:313
+#: ../src/main.c:320
 #, c-format
 msgid "--remove-foreign (-r) file \tremove a foreign file\n"
-msgstr ""
+msgstr "--remove-foreign (-r) 檔案 \t移除外部檔案\n"
 
-#: ../src/main.c:314
+#: ../src/main.c:321
 #, c-format
 msgid ""
 "--export (-e) file [appointment...] \texport appointments from Orage to "
 "file\n"
-msgstr ""
+msgstr "--export (-e) file [appointment...] \t從 Orage 匯出約會到檔案\n"
 
-#: ../src/main.c:316
+#: ../src/main.c:323
 #, c-format
 msgid "files=ical files to load into orage\n"
-msgstr ""
+msgstr "檔案=要載入到 orage 的 ical 檔\n"
 
-#: ../src/main.c:318
+#: ../src/main.c:325
 #, c-format
 msgid "\tdbus not included in orage. \n"
-msgstr ""
+msgstr "\tdbus 不包含在 orage 中。 \n"
 
-#: ../src/main.c:319
+#: ../src/main.c:326
 #, c-format
 msgid ""
 "\twithout dbus [files] and foreign file options(-a & -r) can only be used "
 "when starting orage \n"
-msgstr ""
+msgstr "\t無 dbus [files] 及外部檔案選項(-a & -r) 只能在啟動 orage 時使用 \n"
 
-#: ../src/main.c:511
+#: ../src/main.c:535
 #, c-format
 msgid ""
 "\n"
 "Unknown option %s\n"
 "\n"
-msgstr ""
+msgstr "\n不明選項 %s\n\n"
 
-#: ../src/mainbox.c:287
+#: ../src/mainbox.c:305
 msgid "_Exchange data"
 msgstr "交換資料(_E)"
 
 #. Edit menu
-#: ../src/mainbox.c:298
+#: ../src/mainbox.c:316
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../src/mainbox.c:308
+#: ../src/mainbox.c:326
 msgid "View selected _date"
 msgstr "檢視所選的日期(_D)"
 
-#: ../src/mainbox.c:311
+#: ../src/mainbox.c:329
 msgid "View selected _week"
 msgstr "檢視所選的週(_W)"
 
-#: ../src/mainbox.c:317
+#: ../src/mainbox.c:335
 msgid "Select _Today"
 msgstr "選擇今日(_T)"
 
-#: ../src/mainbox.c:323
+#: ../src/mainbox.c:341
 msgid "Show _Globaltime"
 msgstr "顯示全球時間(_G)"
 
 #. Help menu
-#: ../src/mainbox.c:327
+#: ../src/mainbox.c:345
 msgid "_Help"
-msgstr "幫助(_H)"
+msgstr "求助(_H)"
 
-#: ../src/mainbox.c:448
-msgid "Never"
-msgstr "永不"
+#: ../src/mainbox.c:414 ../src/reminder.c:1138
+msgid "No title defined"
+msgstr "未定義標題"
+
+#: ../src/mainbox.c:471
+#, c-format
+msgid " Location: %s\n"
+msgstr " 位置：%s\n"
 
-#: ../src/mainbox.c:453
-#, fuzzy, c-format
+#: ../src/mainbox.c:481
+#, c-format
 msgid ""
-"Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" Due:\t%s\n"
-" Done:\t%s\n"
+"\n"
 " Note:\n"
 "%s"
-msgstr ""
-"標題：%s\n"
-" 位置：%s\n"
-" 開始：\t%s\n"
-" 結束：\t%s\n"
-" 備註：\n"
-"%s"
+msgstr "\n 註記：\n%s"
+
+#: ../src/mainbox.c:489
+msgid "Never"
+msgstr "永不"
 
-#: ../src/mainbox.c:460
+#: ../src/mainbox.c:495
 #, c-format
 msgid ""
 "Title: %s\n"
-" Location: %s\n"
-" Start:\t%s\n"
-" End:\t%s\n"
-" Note:\n"
-"%s"
-msgstr ""
-"標題：%s\n"
-" 位置：%s\n"
-" 開始：\t%s\n"
-" 結束：\t%s\n"
-" 備註：\n"
-"%s"
+"%s Start:\t%s\n"
+" Due:\t%s\n"
+" Done:\t%s%s"
+msgstr "標題： %s\n%s 開始：\t%s\n結束：\t%s\n 完成：\t%s%s"
+
+#: ../src/mainbox.c:503
+#, c-format
+msgid ""
+"Title: %s\n"
+"%s Start:\t%s\n"
+" End:\t%s%s"
+msgstr "標題： %s\n%s 開始：\t%s\n 結束：\t%s%s"
 
-#: ../src/mainbox.c:546
+#: ../src/mainbox.c:613
 msgid "<b>To do:</b>"
 msgstr "<b>待辦：</b>"
 
-#: ../src/mainbox.c:582
+#: ../src/mainbox.c:649
 #, c-format
 msgid "<b>Events for %s:</b>"
-msgstr ""
+msgstr "<b>%s 的事件：</b>"
 
-#: ../src/mainbox.c:593
+#: ../src/mainbox.c:660
 #, c-format
 msgid "<b>Events for %s - %s:</b>"
-msgstr ""
+msgstr "<b>%s - %s 的事件：</b>"
 
-#: ../src/parameters.c:522
+#: ../src/parameters.c:492
 msgid "Main settings"
 msgstr "主要設定值"
 
-#: ../src/parameters.c:528
+#: ../src/parameters.c:498
 msgid "Timezone"
 msgstr "時區"
 
-#: ../src/parameters.c:543
+#: ../src/parameters.c:513
 msgid "You should always define your local timezone."
 msgstr "您應該要定義您的本地時區。"
 
-#: ../src/parameters.c:552
+#: ../src/parameters.c:521
 msgid "Archive threshold (months)"
 msgstr "封存門檻 (月)"
 
-#: ../src/parameters.c:562
+#: ../src/parameters.c:531
 msgid "(0 = no archiving)"
 msgstr "(0 = 不封存)"
 
-#: ../src/parameters.c:565
+#: ../src/parameters.c:534
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
+msgstr "封存功能是用來在處理事件時節省時間及空間的。"
 
-#: ../src/parameters.c:574
+#: ../src/parameters.c:542
 msgid "Sound command"
 msgstr "音效指令"
 
-#: ../src/parameters.c:589
+#: ../src/parameters.c:557
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
+msgstr "這個命令會傳到殼層中並在提醒時發出聲音。"
 
-#: ../src/parameters.c:605
-msgid "Display settings"
-msgstr "外觀設定值"
-
-#: ../src/parameters.c:613
-msgid "Calendar main window"
-msgstr "行事曆主視窗"
+#: ../src/parameters.c:596
+msgid "Calendar window"
+msgstr "行事曆視窗"
 
-#: ../src/parameters.c:618
+#: ../src/parameters.c:603
+msgid "Calendar visual details"
+msgstr "行事曆可見細節"
+
+#: ../src/parameters.c:609
 msgid "Show borders"
 msgstr "顯示邊框"
 
-#: ../src/parameters.c:625
+#: ../src/parameters.c:614
 msgid "Show menu"
 msgstr "顯示選單"
 
-#: ../src/parameters.c:632
-msgid "Show month and year"
-msgstr "顯示月和年"
-
-#: ../src/parameters.c:639
+#: ../src/parameters.c:622
 msgid "Show day names"
 msgstr "顯示週幾"
 
-#: ../src/parameters.c:646
+#: ../src/parameters.c:627
 msgid "Show week numbers"
 msgstr "顯示第幾週"
 
-#: ../src/parameters.c:653
+#: ../src/parameters.c:635
+msgid "Show month and year"
+msgstr "顯示月和年"
+
+#: ../src/parameters.c:655
+msgid "Calendar info boxes"
+msgstr "分隔開的行事曆"
+
+#: ../src/parameters.c:660
 msgid "Show todo list"
 msgstr "顯示待辦清單"
 
-#: ../src/parameters.c:660
+#: ../src/parameters.c:667
 msgid "Number of days to show in event window"
-msgstr ""
+msgstr "在事件視窗顯示日數"
 
-#: ../src/parameters.c:666
+#: ../src/parameters.c:673
 msgid "0 = do not show event list at all"
-msgstr ""
+msgstr "0 = 不顯示事件清單"
 
-#: ../src/parameters.c:676
+#: ../src/parameters.c:686
+msgid "Calendar visibility"
+msgstr "行事曆可見度"
+
+#: ../src/parameters.c:691
 msgid "Show on all desktops"
 msgstr "在所有桌面中顯示"
 
-#: ../src/parameters.c:683
+#: ../src/parameters.c:696
 msgid "Keep on top"
 msgstr "顯示在最上層"
 
-#: ../src/parameters.c:690
+#: ../src/parameters.c:704
 msgid "Show in taskbar"
 msgstr "在工作列中顯示"
 
-#: ../src/parameters.c:697
+#: ../src/parameters.c:709
 msgid "Show in pager"
 msgstr "在頁面切換器中顯示"
 
-#: ../src/parameters.c:704
+#: ../src/parameters.c:717
 msgid "Show in systray"
 msgstr "在系統匣中顯示"
 
-#: ../src/parameters.c:739
+#: ../src/parameters.c:738
 msgid "Calendar start"
 msgstr "行事曆啟動"
 
-#: ../src/parameters.c:744
+#: ../src/parameters.c:743
 msgid "Show"
 msgstr "顯示"
 
-#: ../src/parameters.c:756
+#: ../src/parameters.c:755
 msgid "Hide"
 msgstr "隱藏"
 
-#: ../src/parameters.c:768
+#: ../src/parameters.c:767
 msgid "Minimized"
 msgstr "最小化"
 
-#: ../src/parameters.c:793
+#: ../src/parameters.c:787
+msgid "On calendar window open"
+msgstr "行事曆視窗開啟時"
+
+#: ../src/parameters.c:792
+msgid "Select today's date"
+msgstr "選取今天日期"
+
+#: ../src/parameters.c:805
+msgid "Select previously selected date"
+msgstr "選取之前選取的日期"
+
+#: ../src/parameters.c:823
+msgid "Calendar day double click shows"
+msgstr "雙擊行事曆日子時顯示"
+
+#: ../src/parameters.c:828
+msgid "Days view"
+msgstr "日檢視"
+
+#: ../src/parameters.c:840
+msgid "Event list"
+msgstr "事件清單"
+
+#: ../src/parameters.c:862
 msgid "Extra settings"
 msgstr "其他設定值"
 
-#: ../src/parameters.c:801
-#, fuzzy
-msgid "On Calendar Window Open"
-msgstr "月曆視窗"
-
-#: ../src/parameters.c:806
-msgid "Select Today's Date"
-msgstr "選取今天的日期"
+#: ../src/parameters.c:869
+msgid "Event list window"
+msgstr "事件清單視窗"
 
-#: ../src/parameters.c:819
-msgid "Select Previously Selected Date"
-msgstr ""
+#: ../src/parameters.c:874
+msgid "Number of extra days to show in event list"
+msgstr "在事件清單顯示的額外日數"
+
+#: ../src/parameters.c:883
+msgid ""
+"This is just the default value, you can change it in the actual eventlist "
+"window."
+msgstr "此僅為預設值；可在實際的事件清單視窗變更。"
+
+#: ../src/parameters.c:891
+msgid "Show only first repeating event"
+msgstr "僅顯示僅首先重複事件"
+
+#: ../src/parameters.c:907
+msgid "Day view window default first day"
+msgstr "日子檢視視窗預設首日"
+
+#: ../src/parameters.c:912
+msgid "First day of week"
+msgstr "一週首天"
 
-#: ../src/parameters.c:836
+#: ../src/parameters.c:925
+msgid "Selected day"
+msgstr "所選日子"
+
+#: ../src/parameters.c:943
 msgid "Use dynamic tray icon"
 msgstr "使用動態系統匣圖示"
 
-#: ../src/parameters.c:841
+#: ../src/parameters.c:948
 msgid "Use dynamic icon"
 msgstr "使用動態圖示"
 
-#: ../src/parameters.c:847
+#: ../src/parameters.c:954
 msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
+msgstr "動態圖示會顯示目前的月份和日期。"
 
-#: ../src/parameters.c:856
-msgid "Main Calendar double click shows"
-msgstr ""
+#: ../src/parameters.c:962 ../src/parameters.c:967
+msgid "Use wakeup timer"
+msgstr "使用喚醒計時器"
 
-#: ../src/parameters.c:861
-msgid "Days view"
-msgstr "日檢視"
+#: ../src/parameters.c:973
+msgid ""
+"Use this timer if Orage has problems waking up properly after suspend or "
+"hibernate. (For example tray icon not refreshed or alarms not firing.)"
+msgstr "若 Orage 在暫停或休眠後有無法正常喚醒的問題，請使用此選項。(舉例來說，系統匣圖示未重新整理，或提醒沒有執行。)"
 
-#: ../src/parameters.c:873
-msgid "Event list"
-msgstr ""
+#: ../src/parameters.c:982
+msgid "Foreign file default visual alarm"
+msgstr "外部檔案預設視覺提醒"
 
-#: ../src/parameters.c:890
-msgid "Eventlist window"
-msgstr ""
+#: ../src/parameters.c:987
+msgid "Orage window"
+msgstr "Orage 視窗"
 
-#: ../src/parameters.c:894
-msgid "Number of extra days to show in event list"
-msgstr ""
+#: ../src/parameters.c:1000
+msgid "Notify notification"
+msgstr "通知功能"
 
-#: ../src/parameters.c:902
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
+#: ../src/parameters.c:1018
+msgid "Always quit when asked to close"
+msgstr "當要求關閉時必定結束"
 
-#: ../src/parameters.c:910 ../src/parameters.c:915
-msgid "Use wakeup timer"
-msgstr "使用喚醒計時器"
+#: ../src/parameters.c:1023
+msgid "Always quit"
+msgstr "必定結束"
 
-#: ../src/parameters.c:921
+#: ../src/parameters.c:1029
 msgid ""
-"Use this timer if Orage has problems waking up properly after suspend or "
-"hibernate. (For example tray icon not refreshed or alarms not firing.)"
-msgstr ""
-"若 Orage 在暫停或休眠後有無法正常喚醒的問題，請使用此選項。(舉例來說，系統匣"
-"圖示未重新整理，或提醒沒有執行。)"
+"By default Orage stays open in the background when asked to close. This "
+"option changes Orage to quit and never stay in background when it is asked "
+"to close."
+msgstr "當 Orage 被要求關閉時，預設會留在背景執行。本選項會將 Orage 改為當被要求關閉時完全結束，不會留在背景執行。"
 
-#: ../src/parameters.c:938
+#: ../src/parameters.c:1045
 msgid "Orage Preferences"
 msgstr "Orage 偏好設定"
 
-#: ../src/parameters.c:1050
+#: ../src/parameters.c:1157
 msgid "First Orage start. Searching default timezone."
 msgstr "第一次 Orage 啟動。正在搜尋預設時區。"
 
-#: ../src/parameters.c:1069
+#: ../src/parameters.c:1176
 #, c-format
 msgid "Default timezone set to %s."
 msgstr "預設時區設定為 %s。"
 
-#: ../src/parameters.c:1072
+#: ../src/parameters.c:1179
 msgid "Default timezone not found, please, set it manually."
 msgstr "找不到預設時區，請手動設定。"
 
@@ -1939,39 +2138,35 @@
 msgid "Open"
 msgstr "開啟"
 
-#: ../src/reminder.c:722
+#: ../src/reminder.c:719
 msgid "Reminder - Orage"
 msgstr "提醒 - Orage"
 
-#: ../src/reminder.c:808
+#: ../src/reminder.c:803
+msgid "Postpone"
+msgstr "延後"
+
+#: ../src/reminder.c:805
 msgid "Remind me again after the specified time"
 msgstr "在指定時間請再提醒我一次"
 
-#. Note that this goes to the main area. Temporary for the version
-#: ../src/reminder.c:811
-msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-
-#: ../src/reminder.c:1099
-#, fuzzy
+#: ../src/reminder.c:1091
 msgid "Next active alarms:"
-msgstr "下一個使用中的提醒："
+msgstr "下個使用中的提醒："
 
-#: ../src/reminder.c:1152 ../src/reminder.c:1157
+#: ../src/reminder.c:1145
 #, c-format
 msgid ""
 "\n"
 "%02d d %02d h %02d min to: %s"
-msgstr ""
+msgstr "\n尚有 %02d 日 %02d 時 %02d 分至 %s "
 
-#: ../src/reminder.c:1166
+#: ../src/reminder.c:1154
 #, c-format
 msgid ""
 "\n"
 "No active alarms found"
-msgstr ""
-"\n"
-"找不到使用中的提醒"
+msgstr "\n找不到使用中的提醒"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -1994,1542 +2189,2229 @@
 msgstr "非洲/阿爾及爾"
 
 #: ../src/timezone_names.c:41
-msgid "Africa/Asmera"
+msgid "Africa/Asmara"
 msgstr "非洲/阿斯馬拉"
 
 #: ../src/timezone_names.c:42
+msgid "Africa/Asmera"
+msgstr "非洲/阿斯馬拉"
+
+#: ../src/timezone_names.c:43
 msgid "Africa/Bamako"
 msgstr "非洲/巴馬科"
 
-#: ../src/timezone_names.c:43
+#: ../src/timezone_names.c:44
 msgid "Africa/Bangui"
 msgstr "非洲/班基"
 
-#: ../src/timezone_names.c:44
+#: ../src/timezone_names.c:45
 msgid "Africa/Banjul"
 msgstr "非洲/班竹"
 
-#: ../src/timezone_names.c:45
+#: ../src/timezone_names.c:46
 msgid "Africa/Bissau"
 msgstr "非洲/比索"
 
-#: ../src/timezone_names.c:46
+#: ../src/timezone_names.c:47
 msgid "Africa/Blantyre"
 msgstr "非洲/布蘭泰爾"
 
-#: ../src/timezone_names.c:47
+#: ../src/timezone_names.c:48
 msgid "Africa/Brazzaville"
 msgstr "非洲/布拉薩"
 
-#: ../src/timezone_names.c:48
+#: ../src/timezone_names.c:49
 msgid "Africa/Bujumbura"
 msgstr "非洲/布松布拉"
 
-#: ../src/timezone_names.c:49
+#: ../src/timezone_names.c:50
 msgid "Africa/Cairo"
 msgstr "非洲/開羅"
 
-#: ../src/timezone_names.c:50
+#: ../src/timezone_names.c:51
 msgid "Africa/Casablanca"
 msgstr "非洲/卡薩布蘭加"
 
-#: ../src/timezone_names.c:51
+#: ../src/timezone_names.c:52
 msgid "Africa/Ceuta"
 msgstr "非洲/休達"
 
-#: ../src/timezone_names.c:52
+#: ../src/timezone_names.c:53
 msgid "Africa/Conakry"
 msgstr "非洲/科納克里"
 
-#: ../src/timezone_names.c:53
+#: ../src/timezone_names.c:54
 msgid "Africa/Dakar"
 msgstr "非洲/達卡"
 
-#: ../src/timezone_names.c:54
+#: ../src/timezone_names.c:55
 msgid "Africa/Dar_es_Salaam"
 msgstr "非洲/三蘭港"
 
-#: ../src/timezone_names.c:55
+#: ../src/timezone_names.c:56
 msgid "Africa/Djibouti"
 msgstr "非洲/吉布地"
 
-#: ../src/timezone_names.c:56
+#: ../src/timezone_names.c:57
 msgid "Africa/Douala"
 msgstr "非洲/都阿拉"
 
-#: ../src/timezone_names.c:57
+#: ../src/timezone_names.c:58
 msgid "Africa/El_Aaiun"
 msgstr "非洲/愛恩"
 
-#: ../src/timezone_names.c:58
+#: ../src/timezone_names.c:59
 msgid "Africa/Freetown"
 msgstr "非洲/自由城"
 
-#: ../src/timezone_names.c:59
+#: ../src/timezone_names.c:60
 msgid "Africa/Gaborone"
 msgstr "非洲/嘉伯隆里"
 
-#: ../src/timezone_names.c:60
+#: ../src/timezone_names.c:61
 msgid "Africa/Harare"
 msgstr "非洲/哈拉雷"
 
-#: ../src/timezone_names.c:61
+#: ../src/timezone_names.c:62
+msgid "Africa/Juba"
+msgstr "非洲/朱巴"
+
+#: ../src/timezone_names.c:63
 msgid "Africa/Johannesburg"
 msgstr "非洲/約翰尼斯堡"
 
-#: ../src/timezone_names.c:62
+#: ../src/timezone_names.c:64
 msgid "Africa/Kampala"
 msgstr "非洲/康培拉"
 
-#: ../src/timezone_names.c:63
+#: ../src/timezone_names.c:65
 msgid "Africa/Khartoum"
 msgstr "非洲/喀土穆"
 
-#: ../src/timezone_names.c:64
+#: ../src/timezone_names.c:66
 msgid "Africa/Kigali"
 msgstr "非洲/吉佳利"
 
-#: ../src/timezone_names.c:65
+#: ../src/timezone_names.c:67
 msgid "Africa/Kinshasa"
 msgstr "非洲/金夏沙"
 
-#: ../src/timezone_names.c:66
+#: ../src/timezone_names.c:68
 msgid "Africa/Lagos"
 msgstr "非洲/拉哥斯"
 
-#: ../src/timezone_names.c:67
+#: ../src/timezone_names.c:69
 msgid "Africa/Libreville"
 msgstr "非洲/自由市"
 
-#: ../src/timezone_names.c:68
+#: ../src/timezone_names.c:70
 msgid "Africa/Lome"
 msgstr "非洲/洛梅"
 
-#: ../src/timezone_names.c:69
+#: ../src/timezone_names.c:71
 msgid "Africa/Luanda"
 msgstr "非洲/魯安達"
 
-#: ../src/timezone_names.c:70
+#: ../src/timezone_names.c:72
 msgid "Africa/Lubumbashi"
 msgstr "非洲/羅彭巴布"
 
-#: ../src/timezone_names.c:71
+#: ../src/timezone_names.c:73
 msgid "Africa/Lusaka"
 msgstr "非洲/路沙卡"
 
-#: ../src/timezone_names.c:72
+#: ../src/timezone_names.c:74
 msgid "Africa/Malabo"
 msgstr "非洲/馬拉博"
 
-#: ../src/timezone_names.c:73
+#: ../src/timezone_names.c:75
 msgid "Africa/Maputo"
 msgstr "非洲/馬布多"
 
-#: ../src/timezone_names.c:74
+#: ../src/timezone_names.c:76
 msgid "Africa/Maseru"
 msgstr "非洲/馬塞魯"
 
-#: ../src/timezone_names.c:75
+#: ../src/timezone_names.c:77
 msgid "Africa/Mbabane"
 msgstr "非洲/墨巴本"
 
-#: ../src/timezone_names.c:76
+#: ../src/timezone_names.c:78
 msgid "Africa/Mogadishu"
 msgstr "非洲/摩加迪休"
 
-#: ../src/timezone_names.c:77
+#: ../src/timezone_names.c:79
 msgid "Africa/Monrovia"
 msgstr "非洲/蒙羅維亞"
 
-#: ../src/timezone_names.c:78
+#: ../src/timezone_names.c:80
 msgid "Africa/Nairobi"
 msgstr "非洲/奈洛比"
 
-#: ../src/timezone_names.c:79
+#: ../src/timezone_names.c:81
 msgid "Africa/Ndjamena"
 msgstr "非洲/恩加美納"
 
-#: ../src/timezone_names.c:80
+#: ../src/timezone_names.c:82
 msgid "Africa/Niamey"
 msgstr "非洲/尼阿美"
 
-#: ../src/timezone_names.c:81
+#: ../src/timezone_names.c:83
 msgid "Africa/Nouakchott"
 msgstr "非洲/諾克少"
 
-#: ../src/timezone_names.c:82
+#: ../src/timezone_names.c:84
 msgid "Africa/Ouagadougou"
 msgstr "非洲/瓦加杜古"
 
-#: ../src/timezone_names.c:83
+#: ../src/timezone_names.c:85
 msgid "Africa/Porto-Novo"
 msgstr "非洲/新港"
 
-#: ../src/timezone_names.c:84
+#: ../src/timezone_names.c:86
 msgid "Africa/Sao_Tome"
 msgstr "非洲/聖多美"
 
-#: ../src/timezone_names.c:85
+#: ../src/timezone_names.c:87
 msgid "Africa/Timbuktu"
 msgstr "非洲/廷巴克圖"
 
-#: ../src/timezone_names.c:86
+#: ../src/timezone_names.c:88
 msgid "Africa/Tripoli"
 msgstr "非洲/的黎波里"
 
-#: ../src/timezone_names.c:87
+#: ../src/timezone_names.c:89
 msgid "Africa/Tunis"
 msgstr "非洲/突尼斯"
 
-#: ../src/timezone_names.c:88
+#: ../src/timezone_names.c:90
 msgid "Africa/Windhoek"
 msgstr "非洲/溫荷克"
 
-#: ../src/timezone_names.c:89
+#: ../src/timezone_names.c:91
 msgid "America"
 msgstr "美洲"
 
-#: ../src/timezone_names.c:90
+#: ../src/timezone_names.c:92
 msgid "America/Adak"
 msgstr "北美洲/艾達克"
 
-#: ../src/timezone_names.c:91
+#: ../src/timezone_names.c:93
 msgid "America/Anchorage"
 msgstr "北美洲/安哥拉治"
 
-#: ../src/timezone_names.c:92
+#: ../src/timezone_names.c:94
 msgid "America/Anguilla"
 msgstr "中美洲/安吉拉"
 
-#: ../src/timezone_names.c:93
+#: ../src/timezone_names.c:95
 msgid "America/Antigua"
 msgstr "中美洲/安地瓜"
 
-#: ../src/timezone_names.c:94
+#: ../src/timezone_names.c:96
 msgid "America/Araguaina"
 msgstr "南美洲/阿拉瓜伊納"
 
-#: ../src/timezone_names.c:95
-#, fuzzy
+#: ../src/timezone_names.c:97
 msgid "America/Argentina/Buenos_Aires"
-msgstr "南美洲/布宜諾斯艾利斯"
+msgstr "南美洲/阿根廷/布宜諾斯艾利斯"
 
-#: ../src/timezone_names.c:96
-#, fuzzy
+#: ../src/timezone_names.c:98
 msgid "America/Argentina/Catamarca"
-msgstr "南美洲/卡塔馬卡"
+msgstr "南美洲/阿根廷/卡塔馬卡"
 
-#: ../src/timezone_names.c:97
-#, fuzzy
+#: ../src/timezone_names.c:99
+msgid "America/Argentina/ComodRivadavia"
+msgstr "南美洲/阿根廷/ComodRivadavia"
+
+#: ../src/timezone_names.c:100
 msgid "America/Argentina/Cordoba"
-msgstr "南美洲/科多巴"
+msgstr "南美洲/阿根廷/科多巴"
 
-#: ../src/timezone_names.c:98
-#, fuzzy
+#: ../src/timezone_names.c:101
 msgid "America/Argentina/Jujuy"
-msgstr "南美洲/呼回"
+msgstr "南美洲/阿根廷/呼回"
 
-#: ../src/timezone_names.c:99
-#, fuzzy
+#: ../src/timezone_names.c:102
+msgid "America/Argentina/La_Rioja"
+msgstr "南美洲/阿根廷/La_Rioja"
+
+#: ../src/timezone_names.c:103
 msgid "America/Argentina/Mendoza"
-msgstr "南美洲/門多薩"
+msgstr "南美洲/阿根廷/門多薩"
 
-#: ../src/timezone_names.c:100
+#: ../src/timezone_names.c:104
+msgid "America/Argentina/Rio_Gallegos"
+msgstr "南美洲/阿根廷/Rio_Gallegos"
+
+#: ../src/timezone_names.c:105
+msgid "America/Argentina/Salta"
+msgstr "南美洲/阿根廷/Salta"
+
+#: ../src/timezone_names.c:106
+msgid "America/Argentina/San_Juan"
+msgstr "南美洲/阿根廷/San_Juan"
+
+#: ../src/timezone_names.c:107
+msgid "America/Argentina/San_Luis"
+msgstr "南美洲/阿根廷/San_Luis"
+
+#: ../src/timezone_names.c:108
+msgid "America/Argentina/Tucuman"
+msgstr "南美洲/阿根廷/Tucuman"
+
+#: ../src/timezone_names.c:109
+msgid "America/Argentina/Ushuaia"
+msgstr "南美洲/阿根廷/Ushuaia"
+
+#: ../src/timezone_names.c:110
 msgid "America/Aruba"
 msgstr "南美洲/阿路巴"
 
-#: ../src/timezone_names.c:101
+#: ../src/timezone_names.c:111
 msgid "America/Asuncion"
 msgstr "南美洲/亞松森"
 
-#: ../src/timezone_names.c:102
+#: ../src/timezone_names.c:112
+msgid "America/Atikokan"
+msgstr "北美洲/Atikokan"
+
+#: ../src/timezone_names.c:113
+msgid "America/Atka"
+msgstr "北美洲/Atka"
+
+#: ../src/timezone_names.c:114
+msgid "America/Bahia"
+msgstr "南美洲/Bahia"
+
+#: ../src/timezone_names.c:115
+msgid "America/Bahia_Banderas"
+msgstr "美洲/Bahia_Banderas"
+
+#: ../src/timezone_names.c:116
 msgid "America/Barbados"
 msgstr "南美洲/巴貝多"
 
-#: ../src/timezone_names.c:103
+#: ../src/timezone_names.c:117
 msgid "America/Belem"
 msgstr "南美洲/貝郎"
 
-#: ../src/timezone_names.c:104
+#: ../src/timezone_names.c:118
 msgid "America/Belize"
 msgstr "南美洲/貝里斯"
 
-#: ../src/timezone_names.c:105
+#: ../src/timezone_names.c:119
+msgid "America/Blanc-Sablon"
+msgstr "北美洲/Blanc-Sablon"
+
+#: ../src/timezone_names.c:120
 msgid "America/Boa_Vista"
 msgstr "南美洲/保維斯塔島"
 
-#: ../src/timezone_names.c:106
+#: ../src/timezone_names.c:121
 msgid "America/Bogota"
 msgstr "南美洲/波哥大"
 
-#: ../src/timezone_names.c:107
+#: ../src/timezone_names.c:122
 msgid "America/Boise"
 msgstr "北美洲/波伊西"
 
-#: ../src/timezone_names.c:108
+#: ../src/timezone_names.c:123
 msgid "America/Buenos_Aires"
 msgstr "南美洲/布宜諾斯艾利斯"
 
-#: ../src/timezone_names.c:109
+#: ../src/timezone_names.c:124
 msgid "America/Cambridge_Bay"
 msgstr "北美洲/劍橋灣"
 
-#: ../src/timezone_names.c:110
+#: ../src/timezone_names.c:125
+msgid "America/Campo_Grande"
+msgstr "南美洲/Campo_Grande"
+
+#: ../src/timezone_names.c:126
 msgid "America/Cancun"
 msgstr "南美洲/坎昆"
 
-#: ../src/timezone_names.c:111
+#: ../src/timezone_names.c:127
 msgid "America/Caracas"
 msgstr "南美洲/卡拉卡斯"
 
-#: ../src/timezone_names.c:112
+#: ../src/timezone_names.c:128
 msgid "America/Catamarca"
 msgstr "南美洲/卡塔馬卡"
 
-#: ../src/timezone_names.c:113
+#: ../src/timezone_names.c:129
 msgid "America/Cayenne"
 msgstr "南美洲/凱恩"
 
-#: ../src/timezone_names.c:114
+#: ../src/timezone_names.c:130
 msgid "America/Cayman"
 msgstr "中美洲/開曼群島"
 
-#: ../src/timezone_names.c:115
+#: ../src/timezone_names.c:131
 msgid "America/Chicago"
 msgstr "北美洲/芝加哥"
 
-#: ../src/timezone_names.c:116
+#: ../src/timezone_names.c:132
 msgid "America/Chihuahua"
 msgstr "南美洲/濟華花"
 
-#: ../src/timezone_names.c:117
+#: ../src/timezone_names.c:133
+msgid "America/Coral_Harbour"
+msgstr "北美洲/Coral_Harbour"
+
+#: ../src/timezone_names.c:134
 msgid "America/Cordoba"
 msgstr "南美洲/科多巴"
 
-#: ../src/timezone_names.c:118
+#: ../src/timezone_names.c:135
 msgid "America/Costa_Rica"
 msgstr "中美洲/哥斯大黎加"
 
-#: ../src/timezone_names.c:119
+#: ../src/timezone_names.c:136
+msgid "America/Creston"
+msgstr "北美洲/Creston"
+
+#: ../src/timezone_names.c:137
 msgid "America/Cuiaba"
 msgstr "南美洲/古雅巴"
 
-#: ../src/timezone_names.c:120
+#: ../src/timezone_names.c:138
 msgid "America/Curacao"
 msgstr "南美洲/科拉克"
 
-#: ../src/timezone_names.c:121
+#: ../src/timezone_names.c:139
+msgid "America/Danmarkshavn"
+msgstr "北美洲/Danmarkshavn"
+
+#: ../src/timezone_names.c:140
 msgid "America/Dawson"
 msgstr "北美洲/道森"
 
-#: ../src/timezone_names.c:122
+#: ../src/timezone_names.c:141
 msgid "America/Dawson_Creek"
 msgstr "北美洲/道森克里克"
 
-#: ../src/timezone_names.c:123
+#: ../src/timezone_names.c:142
 msgid "America/Denver"
 msgstr "北美洲/丹佛"
 
-#: ../src/timezone_names.c:124
+#: ../src/timezone_names.c:143
 msgid "America/Detroit"
 msgstr "北美洲/底特律"
 
-#: ../src/timezone_names.c:125
+#: ../src/timezone_names.c:144
 msgid "America/Dominica"
 msgstr "中美洲/多明尼加"
 
-#: ../src/timezone_names.c:126
+#: ../src/timezone_names.c:145
 msgid "America/Edmonton"
 msgstr "北美洲/愛民頓"
 
-#: ../src/timezone_names.c:127
+#: ../src/timezone_names.c:146
+msgid "America/Ensenada"
+msgstr "美洲/Ensenada"
+
+#: ../src/timezone_names.c:147
 msgid "America/Eirunepe"
 msgstr "南美洲/艾魯內佩"
 
-#: ../src/timezone_names.c:128
+#: ../src/timezone_names.c:148
 msgid "America/El_Salvador"
 msgstr "中美洲/薩爾瓦多"
 
-#: ../src/timezone_names.c:129
+#: ../src/timezone_names.c:149
 msgid "America/Fortaleza"
 msgstr "南美洲/佛達雷莎"
 
-#: ../src/timezone_names.c:130
+#: ../src/timezone_names.c:150
+msgid "America/Fort_Wayne"
+msgstr "北美洲/Fort_Wayne"
+
+#: ../src/timezone_names.c:151
 msgid "America/Glace_Bay"
 msgstr "北美洲/葛雷斯灣"
 
-#: ../src/timezone_names.c:131
+#: ../src/timezone_names.c:152
 msgid "America/Godthab"
 msgstr "北美洲/戈薩普"
 
-#: ../src/timezone_names.c:132
+#: ../src/timezone_names.c:153
 msgid "America/Goose_Bay"
 msgstr "北美洲/鵝灣"
 
-#: ../src/timezone_names.c:133
+#: ../src/timezone_names.c:154
 msgid "America/Grand_Turk"
 msgstr "中美洲/大特克斯島"
 
-#: ../src/timezone_names.c:134
+#: ../src/timezone_names.c:155
 msgid "America/Grenada"
 msgstr "中美洲/格瑞那達"
 
-#: ../src/timezone_names.c:135
+#: ../src/timezone_names.c:156
 msgid "America/Guadeloupe"
 msgstr "北美洲/瓜德魯普島"
 
-#: ../src/timezone_names.c:136
+#: ../src/timezone_names.c:157
 msgid "America/Guatemala"
 msgstr "中美洲/瓜地馬拉"
 
-#: ../src/timezone_names.c:137
+#: ../src/timezone_names.c:158
 msgid "America/Guayaquil"
 msgstr "南美洲/惠夜基"
 
-#: ../src/timezone_names.c:138
+#: ../src/timezone_names.c:159
 msgid "America/Guyana"
 msgstr "南美洲/圭亞那"
 
-#: ../src/timezone_names.c:139
+#: ../src/timezone_names.c:160
 msgid "America/Halifax"
 msgstr "北美洲/哈利法克斯市"
 
-#: ../src/timezone_names.c:140
+#: ../src/timezone_names.c:161
 msgid "America/Havana"
 msgstr "中美洲/哈瓦那"
 
-#: ../src/timezone_names.c:141
+#: ../src/timezone_names.c:162
 msgid "America/Hermosillo"
 msgstr "北美洲/厄莫休"
 
-#: ../src/timezone_names.c:142
+#: ../src/timezone_names.c:163
 msgid "America/Indiana/Indianapolis"
 msgstr "北美洲/印第安那州/印第安納波里斯巿"
 
-#: ../src/timezone_names.c:143
+#: ../src/timezone_names.c:164
 msgid "America/Indiana/Knox"
 msgstr "北美洲/印第安那州/諾克斯"
 
-#: ../src/timezone_names.c:144
+#: ../src/timezone_names.c:165
 msgid "America/Indiana/Marengo"
 msgstr "北美洲/印第安那州/馬倫哥"
 
-#: ../src/timezone_names.c:145
+#: ../src/timezone_names.c:166
+msgid "America/Indiana/Petersburg"
+msgstr "北美洲/印弟安那州/Petersburg"
+
+#: ../src/timezone_names.c:167
+msgid "America/Indiana/Tell_City"
+msgstr "北美洲/印弟安那州/Tell_City"
+
+#: ../src/timezone_names.c:168
 msgid "America/Indiana/Vevay"
 msgstr "北美洲/印第安那州/維維市"
 
-#: ../src/timezone_names.c:146
+#: ../src/timezone_names.c:169
+msgid "America/Indiana/Vincennes"
+msgstr "北美洲/印弟安那州/Vincennes"
+
+#: ../src/timezone_names.c:170
+msgid "America/Indiana/Winamac"
+msgstr "北美洲/印弟安那州/Winamac"
+
+#: ../src/timezone_names.c:171
 msgid "America/Indianapolis"
 msgstr "北美洲/印第安納波里斯"
 
-#: ../src/timezone_names.c:147
+#: ../src/timezone_names.c:172
 msgid "America/Inuvik"
 msgstr "北美洲/因紐特"
 
-#: ../src/timezone_names.c:148
+#: ../src/timezone_names.c:173
 msgid "America/Iqaluit"
 msgstr "北美洲/伊魁特"
 
-#: ../src/timezone_names.c:149
+#: ../src/timezone_names.c:174
 msgid "America/Jamaica"
 msgstr "中美洲/牙買加"
 
-#: ../src/timezone_names.c:150
+#: ../src/timezone_names.c:175
 msgid "America/Jujuy"
 msgstr "南美洲/呼回"
 
-#: ../src/timezone_names.c:151
+#: ../src/timezone_names.c:176
 msgid "America/Juneau"
 msgstr "北美洲/朱諾"
 
-#: ../src/timezone_names.c:152
+#: ../src/timezone_names.c:177
 msgid "America/Kentucky/Louisville"
 msgstr "北美洲/肯德基州/路易斯維爾"
 
-#: ../src/timezone_names.c:153
+#: ../src/timezone_names.c:178
 msgid "America/Kentucky/Monticello"
 msgstr "北美洲/肯德基州/蒙提薩羅"
 
-#: ../src/timezone_names.c:154
+#: ../src/timezone_names.c:179
+msgid "America/Knox_IN"
+msgstr "北美洲/Knox_IN"
+
+#: ../src/timezone_names.c:180
+msgid "America/Kralendijk"
+msgstr "美洲/Kralendijk"
+
+#: ../src/timezone_names.c:181
 msgid "America/La_Paz"
 msgstr "南美洲/拉巴斯"
 
-#: ../src/timezone_names.c:155
+#: ../src/timezone_names.c:182
 msgid "America/Lima"
 msgstr "南美洲/利馬"
 
-#: ../src/timezone_names.c:156
+#: ../src/timezone_names.c:183
 msgid "America/Los_Angeles"
 msgstr "北美洲/洛杉磯"
 
-#: ../src/timezone_names.c:157
+#: ../src/timezone_names.c:184
 msgid "America/Louisville"
 msgstr "北美洲/路易斯維爾"
 
-#: ../src/timezone_names.c:158
+#: ../src/timezone_names.c:185
+msgid "America/Lower_Princes"
+msgstr "北美洲/Lower_Princes"
+
+#: ../src/timezone_names.c:186
 msgid "America/Maceio"
 msgstr "南美洲/馬賽約"
 
-#: ../src/timezone_names.c:159
+#: ../src/timezone_names.c:187
 msgid "America/Managua"
 msgstr "中美洲/馬納瓜"
 
-#: ../src/timezone_names.c:160
+#: ../src/timezone_names.c:188
 msgid "America/Manaus"
 msgstr "南美洲/瑪瑙斯"
 
-#: ../src/timezone_names.c:161
+#: ../src/timezone_names.c:189
+msgid "America/Marigot"
+msgstr "南美洲/Marigot"
+
+#: ../src/timezone_names.c:190
 msgid "America/Martinique"
 msgstr "中美洲/法屬馬丁尼克"
 
-#: ../src/timezone_names.c:162
+#: ../src/timezone_names.c:191
+msgid "America/Matamoros"
+msgstr "南美洲/Matamoros"
+
+#: ../src/timezone_names.c:192
 msgid "America/Mazatlan"
 msgstr "北美洲/馬薩特蘭"
 
-#: ../src/timezone_names.c:163
+#: ../src/timezone_names.c:193
 msgid "America/Mendoza"
 msgstr "南美洲/門多薩"
 
-#: ../src/timezone_names.c:164
+#: ../src/timezone_names.c:194
 msgid "America/Menominee"
 msgstr "北美洲/美諾米尼"
 
-#: ../src/timezone_names.c:165
+#: ../src/timezone_names.c:195
 msgid "America/Merida"
 msgstr "北美洲/美利達"
 
-#: ../src/timezone_names.c:166
+#: ../src/timezone_names.c:196
+msgid "America/Metlakatla"
+msgstr "北美洲/Metlakatla"
+
+#: ../src/timezone_names.c:197
 msgid "America/Mexico_City"
 msgstr "北美洲/墨西哥城"
 
-#: ../src/timezone_names.c:167
+#: ../src/timezone_names.c:198
 msgid "America/Miquelon"
 msgstr "北美洲/密克隆"
 
-#: ../src/timezone_names.c:168
+#: ../src/timezone_names.c:199
+msgid "America/Moncton"
+msgstr "北美洲/Moncton"
+
+#: ../src/timezone_names.c:200
 msgid "America/Monterrey"
 msgstr "北美洲/蒙特里"
 
-#: ../src/timezone_names.c:169
+#: ../src/timezone_names.c:201
 msgid "America/Montevideo"
 msgstr "南美洲/蒙特維多"
 
-#: ../src/timezone_names.c:170
+#: ../src/timezone_names.c:202
 msgid "America/Montreal"
 msgstr "北美洲/蒙特婁"
 
-#: ../src/timezone_names.c:171
+#: ../src/timezone_names.c:203
 msgid "America/Montserrat"
 msgstr "中美洲/蒙哲臘"
 
-#: ../src/timezone_names.c:172
+#: ../src/timezone_names.c:204
 msgid "America/Nassau"
 msgstr "中美洲/拿索"
 
-#: ../src/timezone_names.c:173
+#: ../src/timezone_names.c:205
 msgid "America/New_York"
 msgstr "北美洲/紐約"
 
-#: ../src/timezone_names.c:174
+#: ../src/timezone_names.c:206
 msgid "America/Nipigon"
 msgstr "北美洲/尼匹岡"
 
-#: ../src/timezone_names.c:175
+#: ../src/timezone_names.c:207
 msgid "America/Nome"
 msgstr "北美洲/諾母"
 
-#: ../src/timezone_names.c:176
+#: ../src/timezone_names.c:208
+msgid "America/North_Dakota/Beulah"
+msgstr "美洲/北達科他州/Beulah"
+
+#: ../src/timezone_names.c:209
+msgid "America/North_Dakota/Center"
+msgstr "美洲/北達科他州/Center"
+
+#: ../src/timezone_names.c:210
+msgid "America/North_Dakota/New_Salem"
+msgstr "美洲/北達科他州/New_Salem"
+
+#: ../src/timezone_names.c:211
 msgid "America/Noronha"
 msgstr "南美洲/諾若尼亞"
 
-#: ../src/timezone_names.c:177
+#: ../src/timezone_names.c:212
+msgid "America/Ojinaga"
+msgstr "美洲/Ojinaga"
+
+#: ../src/timezone_names.c:213
 msgid "America/Panama"
 msgstr "中美洲/巴拿馬"
 
-#: ../src/timezone_names.c:178
+#: ../src/timezone_names.c:214
 msgid "America/Pangnirtung"
 msgstr "北美洲/龐納唐"
 
-#: ../src/timezone_names.c:179
+#: ../src/timezone_names.c:215
 msgid "America/Paramaribo"
 msgstr "南美洲/巴拉馬利波市"
 
-#: ../src/timezone_names.c:180
+#: ../src/timezone_names.c:216
 msgid "America/Phoenix"
 msgstr "北美洲/鳳凰城"
 
-#: ../src/timezone_names.c:181
+#: ../src/timezone_names.c:217
 msgid "America/Port-au-Prince"
 msgstr "中美洲/太子港"
 
-#: ../src/timezone_names.c:182
+#: ../src/timezone_names.c:218
 msgid "America/Port_of_Spain"
 msgstr "中美洲/西班牙港"
 
-#: ../src/timezone_names.c:183
+#: ../src/timezone_names.c:219
+msgid "America/Porto_Acre"
+msgstr "南美洲/Porto_Acre"
+
+#: ../src/timezone_names.c:220
 msgid "America/Porto_Velho"
 msgstr "南美洲/維留港"
 
-#: ../src/timezone_names.c:184
+#: ../src/timezone_names.c:221
 msgid "America/Puerto_Rico"
 msgstr "中美洲/波多黎各"
 
-#: ../src/timezone_names.c:185
+#: ../src/timezone_names.c:222
 msgid "America/Rainy_River"
 msgstr "北美洲/雨河鎮"
 
-#: ../src/timezone_names.c:186
+#: ../src/timezone_names.c:223
 msgid "America/Rankin_Inlet"
 msgstr "北美洲/雷今海口"
 
-#: ../src/timezone_names.c:187
+#: ../src/timezone_names.c:224
 msgid "America/Recife"
 msgstr "南美洲/海席飛"
 
-#: ../src/timezone_names.c:188
+#: ../src/timezone_names.c:225
 msgid "America/Regina"
 msgstr "北美洲/雷嘉那"
 
-#: ../src/timezone_names.c:189
+#: ../src/timezone_names.c:226
+msgid "America/Resolute"
+msgstr "北美洲/Resolute"
+
+#: ../src/timezone_names.c:227
 msgid "America/Rio_Branco"
 msgstr "南美洲/白河"
 
-#: ../src/timezone_names.c:190
+#: ../src/timezone_names.c:228
 msgid "America/Rosario"
 msgstr "南美洲/羅沙里市"
 
-#: ../src/timezone_names.c:191
+#: ../src/timezone_names.c:229
+msgid "America/Santa_Isabel"
+msgstr "美洲/Santa_Isabel"
+
+#: ../src/timezone_names.c:230
+msgid "America/Santarem"
+msgstr "南美洲/Santarem"
+
+#: ../src/timezone_names.c:231
 msgid "America/Santiago"
 msgstr "南美洲/聖地牙哥"
 
-#: ../src/timezone_names.c:192
+#: ../src/timezone_names.c:232
 msgid "America/Santo_Domingo"
 msgstr "中美洲/聖多明哥"
 
-#: ../src/timezone_names.c:193
+#: ../src/timezone_names.c:233
 msgid "America/Sao_Paulo"
 msgstr "南美洲/聖保羅"
 
-#: ../src/timezone_names.c:194
+#: ../src/timezone_names.c:234
 msgid "America/Scoresbysund"
 msgstr "北美洲/史科斯比孫"
 
-#: ../src/timezone_names.c:195
+#: ../src/timezone_names.c:235
 msgid "America/Shiprock"
 msgstr "北美洲/船岩市"
 
-#: ../src/timezone_names.c:196
+#: ../src/timezone_names.c:236
+msgid "America/Sitka"
+msgstr "北美洲/Sitka"
+
+#: ../src/timezone_names.c:237
+msgid "America/St_Barthelemy"
+msgstr "美洲/St_Barthelemy"
+
+#: ../src/timezone_names.c:238
 msgid "America/St_Johns"
 msgstr "中美洲/聖約翰"
 
-#: ../src/timezone_names.c:197
+#: ../src/timezone_names.c:239
 msgid "America/St_Kitts"
 msgstr "中美洲/聖啟斯"
 
-#: ../src/timezone_names.c:198
+#: ../src/timezone_names.c:240
 msgid "America/St_Lucia"
 msgstr "中美洲/聖露西亞"
 
-#: ../src/timezone_names.c:199
+#: ../src/timezone_names.c:241
 msgid "America/St_Thomas"
 msgstr "中美洲/聖湯瑪斯"
 
-#: ../src/timezone_names.c:200
+#: ../src/timezone_names.c:242
 msgid "America/St_Vincent"
 msgstr "中美洲/聖文森"
 
-#: ../src/timezone_names.c:201
+#: ../src/timezone_names.c:243
 msgid "America/Swift_Current"
 msgstr "北美洲/斯威夫特卡倫特"
 
-#: ../src/timezone_names.c:202
+#: ../src/timezone_names.c:244
 msgid "America/Tegucigalpa"
 msgstr "中美洲/德古西加巴"
 
-#: ../src/timezone_names.c:203
+#: ../src/timezone_names.c:245
 msgid "America/Thule"
 msgstr "北美洲/述利"
 
-#: ../src/timezone_names.c:204
+#: ../src/timezone_names.c:246
 msgid "America/Thunder_Bay"
 msgstr "北美洲/雷灣市"
 
-#: ../src/timezone_names.c:205
+#: ../src/timezone_names.c:247
 msgid "America/Tijuana"
 msgstr "北美洲/提華納"
 
-#: ../src/timezone_names.c:206
+#: ../src/timezone_names.c:248
+msgid "America/Toronto"
+msgstr "北美洲/多倫多"
+
+#: ../src/timezone_names.c:249
 msgid "America/Tortola"
 msgstr "中美洲/托爾托拉島"
 
-#: ../src/timezone_names.c:207
+#: ../src/timezone_names.c:250
 msgid "America/Vancouver"
 msgstr "北美洲/溫哥華"
 
-#: ../src/timezone_names.c:208
+#: ../src/timezone_names.c:251
+msgid "America/Virgin"
+msgstr "美洲/Virgin"
+
+#: ../src/timezone_names.c:252
 msgid "America/Whitehorse"
 msgstr "北美洲/白馬市"
 
-#: ../src/timezone_names.c:209
+#: ../src/timezone_names.c:253
 msgid "America/Winnipeg"
 msgstr "北美洲/溫尼伯"
 
-#: ../src/timezone_names.c:210
+#: ../src/timezone_names.c:254
 msgid "America/Yakutat"
 msgstr "北美洲/亞庫塔特"
 
-#: ../src/timezone_names.c:211
+#: ../src/timezone_names.c:255
 msgid "America/Yellowknife"
 msgstr "北美洲/黃刀鎮"
 
-#: ../src/timezone_names.c:212
+#: ../src/timezone_names.c:256
 msgid "Antarctica"
 msgstr "南極洲"
 
-#: ../src/timezone_names.c:213
+#: ../src/timezone_names.c:257
 msgid "Antarctica/Casey"
 msgstr "南極洲/凱西研究站"
 
-#: ../src/timezone_names.c:214
+#: ../src/timezone_names.c:258
 msgid "Antarctica/Davis"
 msgstr "南極洲/戴維斯研究站"
 
-#: ../src/timezone_names.c:215
+#: ../src/timezone_names.c:259
 msgid "Antarctica/DumontDUrville"
 msgstr "南極洲/杜蒙杜荷維勒科學中心"
 
-#: ../src/timezone_names.c:216
+#: ../src/timezone_names.c:260
+msgid "Antarctica/Macquarie"
+msgstr "南極洲/Macquarie"
+
+#: ../src/timezone_names.c:261
 msgid "Antarctica/Mawson"
 msgstr "南極洲/墨生研究站"
 
-#: ../src/timezone_names.c:217
+#: ../src/timezone_names.c:262
 msgid "Antarctica/McMurdo"
 msgstr "南極洲/麥克馬多基地"
 
-#: ../src/timezone_names.c:218
+#: ../src/timezone_names.c:263
 msgid "Antarctica/Palmer"
 msgstr "南極洲/巴麥"
 
-#: ../src/timezone_names.c:219
+#: ../src/timezone_names.c:264
+msgid "Antarctica/Rothera"
+msgstr "南極洲/Rothera"
+
+#: ../src/timezone_names.c:265
 msgid "Antarctica/South_Pole"
 msgstr "南極洲/南極點"
 
-#: ../src/timezone_names.c:220
+#: ../src/timezone_names.c:266
 msgid "Antarctica/Syowa"
 msgstr "南極洲/昭和觀測站"
 
-#: ../src/timezone_names.c:221
+#: ../src/timezone_names.c:267
 msgid "Antarctica/Vostok"
 msgstr "南極洲/東方研究站"
 
-#: ../src/timezone_names.c:222
+#: ../src/timezone_names.c:268
 msgid "Arctic"
 msgstr "北極"
 
-#: ../src/timezone_names.c:223
+#: ../src/timezone_names.c:269
 msgid "Arctic/Longyearbyen"
 msgstr "北極/隆伊爾畢"
 
-#: ../src/timezone_names.c:224
+#: ../src/timezone_names.c:270
 msgid "Asia"
 msgstr "亞洲"
 
-#: ../src/timezone_names.c:225
+#: ../src/timezone_names.c:271
 msgid "Asia/Aden"
 msgstr "亞洲/亞丁"
 
-#: ../src/timezone_names.c:226
+#: ../src/timezone_names.c:272
 msgid "Asia/Almaty"
 msgstr "亞洲/阿拉木圖"
 
-#: ../src/timezone_names.c:227
+#: ../src/timezone_names.c:273
 msgid "Asia/Amman"
 msgstr "亞洲/安曼"
 
-#: ../src/timezone_names.c:228
+#: ../src/timezone_names.c:274
 msgid "Asia/Anadyr"
 msgstr "亞洲/阿納德爾"
 
-#: ../src/timezone_names.c:229
+#: ../src/timezone_names.c:275
 msgid "Asia/Aqtau"
 msgstr "亞洲/阿克圖"
 
-#: ../src/timezone_names.c:230
+#: ../src/timezone_names.c:276
 msgid "Asia/Aqtobe"
 msgstr "亞洲/阿克托貝"
 
-#: ../src/timezone_names.c:231
+#: ../src/timezone_names.c:277
 msgid "Asia/Ashgabat"
 msgstr "亞洲/阿什格巴特"
 
-#: ../src/timezone_names.c:232
+#: ../src/timezone_names.c:278
+msgid "Asia/Ashkhabad"
+msgstr "亞洲/阿什哈巴特"
+
+#: ../src/timezone_names.c:279
 msgid "Asia/Baghdad"
 msgstr "亞洲/巴格達"
 
-#: ../src/timezone_names.c:233
+#: ../src/timezone_names.c:280
 msgid "Asia/Bahrain"
 msgstr "亞洲/巴林"
 
-#: ../src/timezone_names.c:234
+#: ../src/timezone_names.c:281
 msgid "Asia/Baku"
 msgstr "亞洲/巴庫"
 
-#: ../src/timezone_names.c:235
+#: ../src/timezone_names.c:282
 msgid "Asia/Bangkok"
 msgstr "亞洲/曼谷"
 
-#: ../src/timezone_names.c:236
+#: ../src/timezone_names.c:283
 msgid "Asia/Beirut"
 msgstr "亞洲/貝魯特"
 
-#: ../src/timezone_names.c:237
+#: ../src/timezone_names.c:284
 msgid "Asia/Bishkek"
 msgstr "亞洲/比斯凱克"
 
-#: ../src/timezone_names.c:238
+#: ../src/timezone_names.c:285
 msgid "Asia/Brunei"
 msgstr "亞洲/汶萊"
 
-#: ../src/timezone_names.c:239
+#: ../src/timezone_names.c:286
 msgid "Asia/Calcutta"
 msgstr "亞洲/加爾各答"
 
-#: ../src/timezone_names.c:240
-msgid "Asia/Chungking"
+#: ../src/timezone_names.c:287
+msgid "Asia/Choibalsan"
+msgstr "亞洲/Choibalsan"
+
+#: ../src/timezone_names.c:288
+msgid "Asia/Chongqing"
 msgstr "亞洲/重慶"
 
-#: ../src/timezone_names.c:241
+#: ../src/timezone_names.c:289
+msgid "Asia/Chungking"
+msgstr "亞洲/重慶(Chungking)"
+
+#: ../src/timezone_names.c:290
 msgid "Asia/Colombo"
 msgstr "亞洲/可倫坡"
 
-#: ../src/timezone_names.c:242
+#: ../src/timezone_names.c:291
+msgid "Asia/Dacca"
+msgstr "亞洲/Dacca"
+
+#: ../src/timezone_names.c:292
 msgid "Asia/Damascus"
 msgstr "亞洲/大馬士革"
 
-#: ../src/timezone_names.c:243
+#: ../src/timezone_names.c:293
 msgid "Asia/Dhaka"
 msgstr "亞洲/達卡"
 
-#: ../src/timezone_names.c:244
+#: ../src/timezone_names.c:294
 msgid "Asia/Dili"
 msgstr "亞洲/帝利"
 
-#: ../src/timezone_names.c:245
+#: ../src/timezone_names.c:295
 msgid "Asia/Dubai"
 msgstr "亞洲/杜拜"
 
-#: ../src/timezone_names.c:246
+#: ../src/timezone_names.c:296
 msgid "Asia/Dushanbe"
 msgstr "亞洲/杜尚貝"
 
-#: ../src/timezone_names.c:247
+#: ../src/timezone_names.c:297
 msgid "Asia/Gaza"
 msgstr "亞洲/加薩"
 
-#: ../src/timezone_names.c:248
+#: ../src/timezone_names.c:298
 msgid "Asia/Harbin"
 msgstr "亞洲/哈爾濱"
 
-#: ../src/timezone_names.c:249
+#: ../src/timezone_names.c:299
+msgid "Asia/Hebron"
+msgstr "亞洲/Hebron"
+
+#: ../src/timezone_names.c:300
 msgid "Asia/Hong_Kong"
 msgstr "亞洲/香港"
 
-#: ../src/timezone_names.c:250
+#: ../src/timezone_names.c:301
+msgid "Asia/Ho_Chi_Minh"
+msgstr "亞洲/胡志明市"
+
+#: ../src/timezone_names.c:302
 msgid "Asia/Hovd"
 msgstr "亞洲/科布多"
 
-#: ../src/timezone_names.c:251
+#: ../src/timezone_names.c:303
 msgid "Asia/Irkutsk"
 msgstr "亞洲/伊爾庫玆克"
 
-#: ../src/timezone_names.c:252
+#: ../src/timezone_names.c:304
 msgid "Asia/Istanbul"
 msgstr "亞洲/伊斯坦堡"
 
-#: ../src/timezone_names.c:253
+#: ../src/timezone_names.c:305
 msgid "Asia/Jakarta"
 msgstr "亞洲/雅加達"
 
-#: ../src/timezone_names.c:254
+#: ../src/timezone_names.c:306
 msgid "Asia/Jayapura"
 msgstr "亞洲/加亞布拉港"
 
-#: ../src/timezone_names.c:255
+#: ../src/timezone_names.c:307
 msgid "Asia/Jerusalem"
 msgstr "亞洲/耶路撒冷"
 
-#: ../src/timezone_names.c:256
+#: ../src/timezone_names.c:308
 msgid "Asia/Kabul"
 msgstr "亞洲/喀布爾"
 
-#: ../src/timezone_names.c:257
+#: ../src/timezone_names.c:309
 msgid "Asia/Kamchatka"
 msgstr "亞洲/勘察加半島"
 
-#: ../src/timezone_names.c:258
+#: ../src/timezone_names.c:310
 msgid "Asia/Karachi"
 msgstr "亞洲/喀拉蚩"
 
-#: ../src/timezone_names.c:259
+#: ../src/timezone_names.c:311
 msgid "Asia/Kashgar"
 msgstr "亞洲/喀什噶爾"
 
-#: ../src/timezone_names.c:260
+#: ../src/timezone_names.c:312
+msgid "Asia/Kathmandu"
+msgstr "亞洲/Kathmandu"
+
+#: ../src/timezone_names.c:313
 msgid "Asia/Katmandu"
 msgstr "亞洲/加德滿都"
 
-#: ../src/timezone_names.c:261
+#: ../src/timezone_names.c:314
+msgid "Asia/Khandyga"
+msgstr "亞洲/Khandyga"
+
+#: ../src/timezone_names.c:315
+msgid "Asia/Kolkata"
+msgstr "亞洲/Kolkata"
+
+#: ../src/timezone_names.c:316
 msgid "Asia/Krasnoyarsk"
 msgstr "亞洲/克拉斯諾雅斯科"
 
-#: ../src/timezone_names.c:262
+#: ../src/timezone_names.c:317
 msgid "Asia/Kuala_Lumpur"
 msgstr "亞洲/吉隆坡"
 
-#: ../src/timezone_names.c:263
+#: ../src/timezone_names.c:318
 msgid "Asia/Kuching"
 msgstr "亞洲/古晉"
 
-#: ../src/timezone_names.c:264
+#: ../src/timezone_names.c:319
 msgid "Asia/Kuwait"
 msgstr "亞洲/科威特"
 
-#: ../src/timezone_names.c:265
+#: ../src/timezone_names.c:320
 msgid "Asia/Macao"
+msgstr "亞洲/澳門(Macao)"
+
+#: ../src/timezone_names.c:321
+msgid "Asia/Macau"
 msgstr "亞洲/澳門"
 
-#: ../src/timezone_names.c:266
+#: ../src/timezone_names.c:322
 msgid "Asia/Magadan"
 msgstr "亞洲/馬加丹"
 
-#: ../src/timezone_names.c:267
+#: ../src/timezone_names.c:323
+msgid "Asia/Makassar"
+msgstr "亞洲/Makassar"
+
+#: ../src/timezone_names.c:324
 msgid "Asia/Manila"
 msgstr "亞洲/馬尼拉"
 
-#: ../src/timezone_names.c:268
+#: ../src/timezone_names.c:325
 msgid "Asia/Muscat"
 msgstr "亞洲/馬斯開特"
 
-#: ../src/timezone_names.c:269
+#: ../src/timezone_names.c:326
 msgid "Asia/Nicosia"
 msgstr "亞洲/尼古西亞"
 
-#: ../src/timezone_names.c:270
+#: ../src/timezone_names.c:327
+msgid "Asia/Novokuznetsk"
+msgstr "亞洲/Novokuznetsk"
+
+#: ../src/timezone_names.c:328
 msgid "Asia/Novosibirsk"
 msgstr "亞洲/新西伯利亞"
 
-#: ../src/timezone_names.c:271
+#: ../src/timezone_names.c:329
 msgid "Asia/Omsk"
 msgstr "亞洲/鄂木斯克"
 
-#: ../src/timezone_names.c:272
+#: ../src/timezone_names.c:330
+msgid "Asia/Oral"
+msgstr "亞洲/Oral"
+
+#: ../src/timezone_names.c:331
 msgid "Asia/Phnom_Penh"
 msgstr "亞洲/金邊"
 
-#: ../src/timezone_names.c:273
+#: ../src/timezone_names.c:332
 msgid "Asia/Pontianak"
 msgstr "亞洲/坤甸"
 
-#: ../src/timezone_names.c:274
+#: ../src/timezone_names.c:333
 msgid "Asia/Pyongyang"
 msgstr "亞洲/平壤"
 
-#: ../src/timezone_names.c:275
+#: ../src/timezone_names.c:334
 msgid "Asia/Qatar"
 msgstr "亞洲/卡達"
 
-#: ../src/timezone_names.c:276
+#: ../src/timezone_names.c:335
+msgid "Asia/Qyzylorda"
+msgstr "亞洲/Qyzylorda"
+
+#: ../src/timezone_names.c:336
 msgid "Asia/Rangoon"
 msgstr "亞洲/仰光"
 
-#: ../src/timezone_names.c:277
+#: ../src/timezone_names.c:337
 msgid "Asia/Riyadh"
 msgstr "亞洲/利雅德"
 
-#: ../src/timezone_names.c:278
+#: ../src/timezone_names.c:338
+msgid "Asia/Riyadh87"
+msgstr "亞洲/Riyadh87"
+
+#: ../src/timezone_names.c:339
+msgid "Asia/Riyadh88"
+msgstr "亞洲/Riyadh88"
+
+#: ../src/timezone_names.c:340
+msgid "Asia/Riyadh89"
+msgstr "亞洲/Riyadh89"
+
+#: ../src/timezone_names.c:341
 msgid "Asia/Saigon"
 msgstr "亞洲/西貢"
 
-#: ../src/timezone_names.c:279
+#: ../src/timezone_names.c:342
+msgid "Asia/Sakhalin"
+msgstr "亞洲/Sakhalin"
+
+#: ../src/timezone_names.c:343
 msgid "Asia/Samarkand"
 msgstr "亞洲/撒馬兒罕"
 
-#: ../src/timezone_names.c:280
+#: ../src/timezone_names.c:344
 msgid "Asia/Seoul"
 msgstr "亞洲/首爾"
 
-#: ../src/timezone_names.c:281
+#: ../src/timezone_names.c:345
 msgid "Asia/Shanghai"
 msgstr "亞洲/上海"
 
-#: ../src/timezone_names.c:282
+#: ../src/timezone_names.c:346
 msgid "Asia/Singapore"
 msgstr "亞洲/新加坡"
 
-#: ../src/timezone_names.c:283
+#: ../src/timezone_names.c:347
 msgid "Asia/Taipei"
 msgstr "亞洲/台北"
 
-#: ../src/timezone_names.c:284
+#: ../src/timezone_names.c:348
 msgid "Asia/Tashkent"
 msgstr "亞洲/塔什干"
 
-#: ../src/timezone_names.c:285
+#: ../src/timezone_names.c:349
 msgid "Asia/Tbilisi"
 msgstr "亞洲/提比里西"
 
-#: ../src/timezone_names.c:286
+#: ../src/timezone_names.c:350
 msgid "Asia/Tehran"
 msgstr "亞洲/德黑蘭"
 
-#: ../src/timezone_names.c:287
+#: ../src/timezone_names.c:351
+msgid "Asia/Tel_Aviv"
+msgstr "亞洲/特拉維夫"
+
+#: ../src/timezone_names.c:352
+msgid "Asia/Thimbu"
+msgstr "亞洲/Thimbu"
+
+#: ../src/timezone_names.c:353
 msgid "Asia/Thimphu"
 msgstr "亞洲/烏魯木齊"
 
-#: ../src/timezone_names.c:288
+#: ../src/timezone_names.c:354
 msgid "Asia/Tokyo"
 msgstr "亞洲/東京"
 
-#: ../src/timezone_names.c:289
+#: ../src/timezone_names.c:355
 msgid "Asia/Ujung_Pandang"
 msgstr "亞洲/錫江"
 
-#: ../src/timezone_names.c:290
+#: ../src/timezone_names.c:356
 msgid "Asia/Ulaanbaatar"
 msgstr "亞洲/烏蘭巴托"
 
-#: ../src/timezone_names.c:291
+#: ../src/timezone_names.c:357
+msgid "Asia/Ulan_Bator"
+msgstr "亞洲/Ulan_Bator"
+
+#: ../src/timezone_names.c:358
 msgid "Asia/Urumqi"
 msgstr "亞洲/烏魯木齊"
 
-#: ../src/timezone_names.c:292
+#: ../src/timezone_names.c:359
+msgid "Asia/Ust-Nera"
+msgstr "亞洲/Ust-Nera"
+
+#: ../src/timezone_names.c:360
 msgid "Asia/Vientiane"
 msgstr "亞洲/永珍"
 
-#: ../src/timezone_names.c:293
+#: ../src/timezone_names.c:361
 msgid "Asia/Vladivostok"
 msgstr "亞洲/海參崴"
 
-#: ../src/timezone_names.c:294
+#: ../src/timezone_names.c:362
 msgid "Asia/Yakutsk"
 msgstr "亞洲/雅庫次克"
 
-#: ../src/timezone_names.c:295
+#: ../src/timezone_names.c:363
 msgid "Asia/Yekaterinburg"
 msgstr "亞洲/葉卡捷林堡"
 
-#: ../src/timezone_names.c:296
+#: ../src/timezone_names.c:364
 msgid "Asia/Yerevan"
 msgstr "亞洲/葉里溫"
 
-#: ../src/timezone_names.c:297
+#: ../src/timezone_names.c:365
 msgid "Atlantic"
 msgstr "大西洋"
 
-#: ../src/timezone_names.c:298
+#: ../src/timezone_names.c:366
 msgid "Atlantic/Azores"
 msgstr "大西洋/亞速爾群島"
 
-#: ../src/timezone_names.c:299
+#: ../src/timezone_names.c:367
 msgid "Atlantic/Bermuda"
 msgstr "大西洋/百慕達"
 
-#: ../src/timezone_names.c:300
+#: ../src/timezone_names.c:368
 msgid "Atlantic/Canary"
 msgstr "大西洋/加那利群島"
 
-#: ../src/timezone_names.c:301
+#: ../src/timezone_names.c:369
 msgid "Atlantic/Cape_Verde"
 msgstr "大西洋/維德角"
 
-#: ../src/timezone_names.c:302
-msgid "Atlantic/Faeroe"
-msgstr "大西洋/法羅群島"
+#: ../src/timezone_names.c:370
+msgid "Atlantic/Faeroe"
+msgstr "大西洋/法羅群島"
+
+#: ../src/timezone_names.c:371
+msgid "Atlantic/Faroe"
+msgstr "大西洋/Faroe"
+
+#: ../src/timezone_names.c:372
+msgid "Atlantic/Jan_Mayen"
+msgstr "大西洋/珍瑪煙島"
+
+#: ../src/timezone_names.c:373
+msgid "Atlantic/Madeira"
+msgstr "大西洋/馬德拉群島"
+
+#: ../src/timezone_names.c:374
+msgid "Atlantic/Reykjavik"
+msgstr "大西洋/雷克雅維克"
+
+#: ../src/timezone_names.c:375
+msgid "Atlantic/South_Georgia"
+msgstr "大西洋/南喬治亞"
+
+#: ../src/timezone_names.c:376
+msgid "Atlantic/St_Helena"
+msgstr "大西洋/聖赫勒拿島"
+
+#: ../src/timezone_names.c:377
+msgid "Atlantic/Stanley"
+msgstr "大西洋/史坦利港"
+
+#: ../src/timezone_names.c:378
+msgid "Australia"
+msgstr "澳洲"
+
+#: ../src/timezone_names.c:379
+msgid "Australia/ACT"
+msgstr "澳洲/ACT"
+
+#: ../src/timezone_names.c:380
+msgid "Australia/Adelaide"
+msgstr "澳洲/阿得雷德市"
+
+#: ../src/timezone_names.c:381
+msgid "Australia/Brisbane"
+msgstr "澳洲/布里斯本市"
+
+#: ../src/timezone_names.c:382
+msgid "Australia/Broken_Hill"
+msgstr "澳洲/斷山"
+
+#: ../src/timezone_names.c:383
+msgid "Australia/Currie"
+msgstr "澳洲/Currie"
+
+#: ../src/timezone_names.c:384
+msgid "Australia/Darwin"
+msgstr "澳洲/達爾文"
+
+#: ../src/timezone_names.c:385
+msgid "Australia/Eucla"
+msgstr "澳洲/Eucla"
+
+#: ../src/timezone_names.c:386
+msgid "Australia/Hobart"
+msgstr "澳洲/荷巴特"
+
+#: ../src/timezone_names.c:387
+msgid "Australia/Lindeman"
+msgstr "澳洲/林得曼島"
+
+#: ../src/timezone_names.c:388
+msgid "Australia/Lord_Howe"
+msgstr "澳洲/豪勛爵群島"
+
+#: ../src/timezone_names.c:389
+msgid "Australia/Melbourne"
+msgstr "澳洲/墨爾本"
+
+#: ../src/timezone_names.c:390
+msgid "Australia/Perth"
+msgstr "澳洲/伯斯"
+
+#: ../src/timezone_names.c:391
+msgid "Australia/Sydney"
+msgstr "澳洲/雪梨"
+
+#: ../src/timezone_names.c:392
+msgid "Brazil"
+msgstr "巴西"
+
+#: ../src/timezone_names.c:393
+msgid "Brazil/Acre"
+msgstr "巴西/Acre"
+
+#: ../src/timezone_names.c:394
+msgid "Brazil/DeNoronha"
+msgstr "巴西/DeNoronha"
+
+#: ../src/timezone_names.c:395
+msgid "Brazil/East"
+msgstr "巴西/東部"
+
+#: ../src/timezone_names.c:396
+msgid "Brazil/West"
+msgstr "巴西/西部"
+
+#: ../src/timezone_names.c:397
+msgid "Canada"
+msgstr "加拿大"
+
+#: ../src/timezone_names.c:398
+msgid "Canada/Atlantic"
+msgstr "加拿大/大西洋"
+
+#: ../src/timezone_names.c:399
+msgid "Canada/Central"
+msgstr "加拿大/中部"
+
+#: ../src/timezone_names.c:400
+msgid "Canada/East-Saskatchewan"
+msgstr "加拿大/East-Saskatchewan"
+
+#: ../src/timezone_names.c:401
+msgid "Canada/Eastern"
+msgstr "加拿大/東部"
+
+#: ../src/timezone_names.c:402
+msgid "Canada/Mountain"
+msgstr "加拿大/山部地區"
+
+#: ../src/timezone_names.c:403
+msgid "Canada/Newfoundland"
+msgstr "加拿大/Newfoundland"
+
+#: ../src/timezone_names.c:404
+msgid "Canada/Pacific"
+msgstr "加拿大/太平洋"
+
+#: ../src/timezone_names.c:405
+msgid "Canada/Saskatchewan"
+msgstr "加拿大/Saskatchewan"
+
+#: ../src/timezone_names.c:406
+msgid "Canada/Yukon"
+msgstr "加拿大/育空地區"
 
-#: ../src/timezone_names.c:303
-msgid "Atlantic/Jan_Mayen"
-msgstr "大西洋/珍瑪煙島"
+#: ../src/timezone_names.c:407
+msgid "Chile"
+msgstr "智利"
 
-#: ../src/timezone_names.c:304
-msgid "Atlantic/Madeira"
-msgstr "大西洋/馬德拉群島"
+#: ../src/timezone_names.c:408
+msgid "Chile/Continental"
+msgstr "智利/大陸地區"
 
-#: ../src/timezone_names.c:305
-msgid "Atlantic/Reykjavik"
-msgstr "大西洋/雷克雅維克"
+#: ../src/timezone_names.c:409
+msgid "Chile/EasterIsland"
+msgstr "智利/復活節島"
 
-#: ../src/timezone_names.c:306
-msgid "Atlantic/South_Georgia"
-msgstr "大西洋/南喬治亞"
+#: ../src/timezone_names.c:410
+msgid "Etc"
+msgstr "其他"
 
-#: ../src/timezone_names.c:307
-msgid "Atlantic/St_Helena"
-msgstr "大西洋/聖赫勒拿島"
+#: ../src/timezone_names.c:411
+msgid "Etc/GMT"
+msgstr "其他/GMT"
 
-#: ../src/timezone_names.c:308
-msgid "Atlantic/Stanley"
-msgstr "大西洋/史坦利港"
+#: ../src/timezone_names.c:412
+msgid "Etc/GMT+0"
+msgstr "其他/GMT+0"
 
-#: ../src/timezone_names.c:309
-msgid "Australia"
-msgstr "澳洲"
+#: ../src/timezone_names.c:413
+msgid "Etc/GMT+1"
+msgstr "其他/GMT+1"
 
-#: ../src/timezone_names.c:310
-msgid "Australia/Adelaide"
-msgstr "澳洲/阿得雷德市"
+#: ../src/timezone_names.c:414
+msgid "Etc/GMT+10"
+msgstr "其他/GMT+10"
 
-#: ../src/timezone_names.c:311
-msgid "Australia/Brisbane"
-msgstr "澳洲/布里斯本市"
+#: ../src/timezone_names.c:415
+msgid "Etc/GMT+11"
+msgstr "其他/GMT+11"
 
-#: ../src/timezone_names.c:312
-msgid "Australia/Broken_Hill"
-msgstr "澳洲/斷山"
+#: ../src/timezone_names.c:416
+msgid "Etc/GMT+12"
+msgstr "其他/GMT+12"
 
-#: ../src/timezone_names.c:313
-msgid "Australia/Darwin"
-msgstr "澳洲/達爾文"
+#: ../src/timezone_names.c:417
+msgid "Etc/GMT+2"
+msgstr "其他/GMT+2"
 
-#: ../src/timezone_names.c:314
-msgid "Australia/Hobart"
-msgstr "澳洲/荷巴特"
+#: ../src/timezone_names.c:418
+msgid "Etc/GMT+3"
+msgstr "其他/GMT+3"
 
-#: ../src/timezone_names.c:315
-msgid "Australia/Lindeman"
-msgstr "澳洲/林得曼島"
+#: ../src/timezone_names.c:419
+msgid "Etc/GMT+4"
+msgstr "其他/GMT+4"
 
-#: ../src/timezone_names.c:316
-msgid "Australia/Lord_Howe"
-msgstr "澳洲/豪勛爵群島"
+#: ../src/timezone_names.c:420
+msgid "Etc/GMT+5"
+msgstr "其他/GMT+5"
 
-#: ../src/timezone_names.c:317
-msgid "Australia/Melbourne"
-msgstr "澳洲/墨爾本"
+#: ../src/timezone_names.c:421
+msgid "Etc/GMT+6"
+msgstr "其他/GMT+6"
 
-#: ../src/timezone_names.c:318
-msgid "Australia/Perth"
-msgstr "澳洲/伯斯"
+#: ../src/timezone_names.c:422
+msgid "Etc/GMT+7"
+msgstr "其他/GMT+7"
 
-#: ../src/timezone_names.c:319
-msgid "Australia/Sydney"
-msgstr "澳洲/雪梨"
+#: ../src/timezone_names.c:423
+msgid "Etc/GMT+8"
+msgstr "其他/GMT+8"
 
-#: ../src/timezone_names.c:320
+#: ../src/timezone_names.c:424
+msgid "Etc/GMT+9"
+msgstr "其他/GMT+9"
+
+#: ../src/timezone_names.c:425
+msgid "Etc/GMT-0"
+msgstr "其他/GMT-0"
+
+#: ../src/timezone_names.c:426
+msgid "Etc/GMT-1"
+msgstr "其他/GMT-1"
+
+#: ../src/timezone_names.c:427
+msgid "Etc/GMT-10"
+msgstr "其他/GMT-10"
+
+#: ../src/timezone_names.c:428
+msgid "Etc/GMT-11"
+msgstr "其他/GMT-11"
+
+#: ../src/timezone_names.c:429
+msgid "Etc/GMT-12"
+msgstr "其他/GMT-12"
+
+#: ../src/timezone_names.c:430
+msgid "Etc/GMT-13"
+msgstr "其他/GMT-13"
+
+#: ../src/timezone_names.c:431
+msgid "Etc/GMT-14"
+msgstr "其他/GMT-14"
+
+#: ../src/timezone_names.c:432
+msgid "Etc/GMT-2"
+msgstr "其他/GMT-2"
+
+#: ../src/timezone_names.c:433
+msgid "Etc/GMT-3"
+msgstr "其他/GMT-3"
+
+#: ../src/timezone_names.c:434
+msgid "Etc/GMT-4"
+msgstr "其他/GMT-4"
+
+#: ../src/timezone_names.c:435
+msgid "Etc/GMT-5"
+msgstr "其他/GMT-5"
+
+#: ../src/timezone_names.c:436
+msgid "Etc/GMT-6"
+msgstr "其他/GMT-6"
+
+#: ../src/timezone_names.c:437
+msgid "Etc/GMT-7"
+msgstr "其他/GMT-7"
+
+#: ../src/timezone_names.c:438
+msgid "Etc/GMT-8"
+msgstr "其他/GMT-8"
+
+#: ../src/timezone_names.c:439
+msgid "Etc/GMT-9"
+msgstr "其他/GMT-9"
+
+#: ../src/timezone_names.c:440
+msgid "Etc/GMT0"
+msgstr "其他/GMT0"
+
+#: ../src/timezone_names.c:441
+msgid "Etc/Greenwich"
+msgstr "其他/格林威治"
+
+#: ../src/timezone_names.c:442
+msgid "Etc/UCT"
+msgstr "其他/UCT"
+
+#: ../src/timezone_names.c:443
+msgid "Etc/UTC"
+msgstr "其他/UTC"
+
+#: ../src/timezone_names.c:444
+msgid "Etc/Universal"
+msgstr "其他/國際通用時"
+
+#: ../src/timezone_names.c:445
+msgid "Etc/Zulu"
+msgstr "其他/Zulu"
+
+#: ../src/timezone_names.c:446
 msgid "Europe"
 msgstr "歐洲"
 
-#: ../src/timezone_names.c:321
+#: ../src/timezone_names.c:447
 msgid "Europe/Amsterdam"
 msgstr "歐洲/阿姆斯特丹"
 
-#: ../src/timezone_names.c:322
+#: ../src/timezone_names.c:448
 msgid "Europe/Andorra"
 msgstr "歐洲/安道爾"
 
-#: ../src/timezone_names.c:323
+#: ../src/timezone_names.c:449
 msgid "Europe/Athens"
 msgstr "歐洲/雅典"
 
-#: ../src/timezone_names.c:324
+#: ../src/timezone_names.c:450
 msgid "Europe/Belfast"
 msgstr "歐洲/貝爾法斯特"
 
-#: ../src/timezone_names.c:325
+#: ../src/timezone_names.c:451
 msgid "Europe/Belgrade"
 msgstr "歐洲/貝爾格勒"
 
-#: ../src/timezone_names.c:326
+#: ../src/timezone_names.c:452
 msgid "Europe/Berlin"
 msgstr "歐洲/柏林"
 
-#: ../src/timezone_names.c:327
+#: ../src/timezone_names.c:453
 msgid "Europe/Bratislava"
 msgstr "歐洲/布拉提斯拉瓦"
 
-#: ../src/timezone_names.c:328
+#: ../src/timezone_names.c:454
 msgid "Europe/Brussels"
 msgstr "歐洲/布魯塞爾"
 
-#: ../src/timezone_names.c:329
+#: ../src/timezone_names.c:455
 msgid "Europe/Bucharest"
 msgstr "歐洲/布加勒斯特"
 
-#: ../src/timezone_names.c:330
+#: ../src/timezone_names.c:456
 msgid "Europe/Budapest"
 msgstr "歐洲/布達佩斯"
 
-#: ../src/timezone_names.c:331
+#: ../src/timezone_names.c:457
+msgid "Europe/Busingen"
+msgstr "歐洲/Busingen"
+
+#: ../src/timezone_names.c:458
 msgid "Europe/Chisinau"
 msgstr "歐洲/基西紐"
 
-#: ../src/timezone_names.c:332
+#: ../src/timezone_names.c:459
 msgid "Europe/Copenhagen"
 msgstr "歐洲/哥本哈根"
 
-#: ../src/timezone_names.c:333
+#: ../src/timezone_names.c:460
 msgid "Europe/Dublin"
 msgstr "歐洲/都柏林"
 
-#: ../src/timezone_names.c:334
+#: ../src/timezone_names.c:461
 msgid "Europe/Gibraltar"
 msgstr "歐洲/直布羅陀"
 
-#: ../src/timezone_names.c:335
+#: ../src/timezone_names.c:462
+msgid "Europe/Guernsey"
+msgstr "歐洲/Guernsey"
+
+#: ../src/timezone_names.c:463
 msgid "Europe/Helsinki"
 msgstr "歐洲/赫爾辛基"
 
-#: ../src/timezone_names.c:336
+#: ../src/timezone_names.c:464
+msgid "Europe/Isle_of_Man"
+msgstr "歐洲/曼島(Isle_of_Man)"
+
+#: ../src/timezone_names.c:465
 msgid "Europe/Istanbul"
 msgstr "歐洲/伊斯坦堡"
 
-#: ../src/timezone_names.c:337
+#: ../src/timezone_names.c:466
+msgid "Europe/Jersey"
+msgstr "歐洲/Jersey"
+
+#: ../src/timezone_names.c:467
 msgid "Europe/Kaliningrad"
 msgstr "歐洲/加里寧格勒"
 
-#: ../src/timezone_names.c:338
+#: ../src/timezone_names.c:468
 msgid "Europe/Kiev"
 msgstr "歐洲/基輔"
 
-#: ../src/timezone_names.c:339
+#: ../src/timezone_names.c:469
 msgid "Europe/Lisbon"
 msgstr "歐洲/里斯本"
 
-#: ../src/timezone_names.c:340
+#: ../src/timezone_names.c:470
 msgid "Europe/Ljubljana"
 msgstr "歐洲/盧布亞那"
 
-#: ../src/timezone_names.c:341
+#: ../src/timezone_names.c:471
 msgid "Europe/London"
 msgstr "歐洲/倫敦"
 
-#: ../src/timezone_names.c:342
+#: ../src/timezone_names.c:472
 msgid "Europe/Luxembourg"
 msgstr "歐洲/盧森堡"
 
-#: ../src/timezone_names.c:343
+#: ../src/timezone_names.c:473
 msgid "Europe/Madrid"
 msgstr "歐洲/馬德里"
 
-#: ../src/timezone_names.c:344
+#: ../src/timezone_names.c:474
 msgid "Europe/Malta"
 msgstr "歐洲/馬爾他"
 
-#: ../src/timezone_names.c:345
+#: ../src/timezone_names.c:475
+msgid "Europe/Mariehamn"
+msgstr "歐洲/Mariehamn"
+
+#: ../src/timezone_names.c:476
 msgid "Europe/Minsk"
 msgstr "歐洲/明斯克"
 
-#: ../src/timezone_names.c:346
+#: ../src/timezone_names.c:477
 msgid "Europe/Monaco"
 msgstr "歐洲/摩納哥"
 
-#: ../src/timezone_names.c:347
+#: ../src/timezone_names.c:478
 msgid "Europe/Moscow"
 msgstr "歐洲/莫斯科"
 
-#: ../src/timezone_names.c:348
+#: ../src/timezone_names.c:479
 msgid "Europe/Nicosia"
 msgstr "歐洲/尼古西亞"
 
-#: ../src/timezone_names.c:349
+#: ../src/timezone_names.c:480
 msgid "Europe/Oslo"
 msgstr "歐洲/奧斯陸"
 
-#: ../src/timezone_names.c:350
+#: ../src/timezone_names.c:481
 msgid "Europe/Paris"
 msgstr "歐洲/巴黎"
 
-#: ../src/timezone_names.c:351
+#: ../src/timezone_names.c:482
+msgid "Europe/Podgorica"
+msgstr "歐洲/Podgorica"
+
+#: ../src/timezone_names.c:483
 msgid "Europe/Prague"
 msgstr "歐洲/布拉格"
 
-#: ../src/timezone_names.c:352
+#: ../src/timezone_names.c:484
 msgid "Europe/Riga"
 msgstr "歐洲/里加"
 
-#: ../src/timezone_names.c:353
+#: ../src/timezone_names.c:485
 msgid "Europe/Rome"
 msgstr "歐洲/羅馬"
 
-#: ../src/timezone_names.c:354
+#: ../src/timezone_names.c:486
 msgid "Europe/Samara"
 msgstr "歐洲/薩瑪羅"
 
-#: ../src/timezone_names.c:355
+#: ../src/timezone_names.c:487
 msgid "Europe/San_Marino"
 msgstr "歐洲/聖馬利諾"
 
-#: ../src/timezone_names.c:356
+#: ../src/timezone_names.c:488
 msgid "Europe/Sarajevo"
 msgstr "歐洲/塞拉耶佛"
 
-#: ../src/timezone_names.c:357
+#: ../src/timezone_names.c:489
 msgid "Europe/Simferopol"
 msgstr "歐洲/辛菲羅波爾"
 
-#: ../src/timezone_names.c:358
+#: ../src/timezone_names.c:490
 msgid "Europe/Skopje"
 msgstr "歐洲/史高比耶"
 
-#: ../src/timezone_names.c:359
+#: ../src/timezone_names.c:491
 msgid "Europe/Sofia"
 msgstr "歐洲/索菲亞"
 
-#: ../src/timezone_names.c:360
+#: ../src/timezone_names.c:492
 msgid "Europe/Stockholm"
 msgstr "歐洲/斯德哥爾摩"
 
-#: ../src/timezone_names.c:361
+#: ../src/timezone_names.c:493
 msgid "Europe/Tallinn"
 msgstr "歐洲/塔林"
 
-#: ../src/timezone_names.c:362
+#: ../src/timezone_names.c:494
 msgid "Europe/Tirane"
 msgstr "歐洲/地拉那"
 
-#: ../src/timezone_names.c:363
+#: ../src/timezone_names.c:495
+msgid "Europe/Tiraspol"
+msgstr "歐洲/Tiraspol"
+
+#: ../src/timezone_names.c:496
 msgid "Europe/Uzhgorod"
 msgstr "歐洲/烏玆哥洛"
 
-#: ../src/timezone_names.c:364
+#: ../src/timezone_names.c:497
 msgid "Europe/Vaduz"
 msgstr "歐洲/瓦都茲"
 
-#: ../src/timezone_names.c:365
+#: ../src/timezone_names.c:498
 msgid "Europe/Vatican"
 msgstr "歐洲/梵蒂岡"
 
-#: ../src/timezone_names.c:366
+#: ../src/timezone_names.c:499
 msgid "Europe/Vienna"
 msgstr "歐洲/維也納"
 
-#: ../src/timezone_names.c:367
+#: ../src/timezone_names.c:500
 msgid "Europe/Vilnius"
 msgstr "歐洲/維爾紐斯"
 
-#: ../src/timezone_names.c:368
+#: ../src/timezone_names.c:501
+msgid "Europe/Volgograd"
+msgstr "歐洲/Volgograd"
+
+#: ../src/timezone_names.c:502
 msgid "Europe/Warsaw"
 msgstr "歐洲/華沙"
 
-#: ../src/timezone_names.c:369
+#: ../src/timezone_names.c:503
 msgid "Europe/Zagreb"
 msgstr "歐洲/札格瑞布"
 
-#: ../src/timezone_names.c:370
+#: ../src/timezone_names.c:504
 msgid "Europe/Zaporozhye"
 msgstr "歐洲/扎波羅熱"
 
-#: ../src/timezone_names.c:371
+#: ../src/timezone_names.c:505
 msgid "Europe/Zurich"
 msgstr "歐洲/蘇黎士"
 
-#: ../src/timezone_names.c:372
+#: ../src/timezone_names.c:506
 msgid "Indian"
 msgstr "印度次大陸"
 
-#: ../src/timezone_names.c:373
+#: ../src/timezone_names.c:507
 msgid "Indian/Antananarivo"
 msgstr "印度/安塔那那利弗"
 
-#: ../src/timezone_names.c:374
+#: ../src/timezone_names.c:508
 msgid "Indian/Chagos"
 msgstr "印度/查哥斯群島"
 
-#: ../src/timezone_names.c:375
+#: ../src/timezone_names.c:509
 msgid "Indian/Christmas"
 msgstr "印度/聖誕島"
 
-#: ../src/timezone_names.c:376
+#: ../src/timezone_names.c:510
 msgid "Indian/Cocos"
 msgstr "印度/科克斯島"
 
-#: ../src/timezone_names.c:377
+#: ../src/timezone_names.c:511
 msgid "Indian/Comoro"
 msgstr "印度/科摩洛群島"
 
-#: ../src/timezone_names.c:378
+#: ../src/timezone_names.c:512
 msgid "Indian/Kerguelen"
 msgstr "印度/克格連群島"
 
-#: ../src/timezone_names.c:379
+#: ../src/timezone_names.c:513
 msgid "Indian/Mahe"
 msgstr "印度/馬埃"
 
-#: ../src/timezone_names.c:380
+#: ../src/timezone_names.c:514
 msgid "Indian/Maldives"
 msgstr "印度/馬爾地夫"
 
-#: ../src/timezone_names.c:381
+#: ../src/timezone_names.c:515
 msgid "Indian/Mauritius"
 msgstr "印度/模里西斯"
 
-#: ../src/timezone_names.c:382
+#: ../src/timezone_names.c:516
 msgid "Indian/Mayotte"
 msgstr "印度/馬約特"
 
-#: ../src/timezone_names.c:383
+#: ../src/timezone_names.c:517
 msgid "Indian/Reunion"
 msgstr "印度/留尼旺島"
 
-#: ../src/timezone_names.c:384
+#: ../src/timezone_names.c:518
+msgid "Mexico"
+msgstr "Mexico"
+
+#: ../src/timezone_names.c:519
+msgid "Mexico/BajaNorte"
+msgstr "墨西哥/BajaNorte"
+
+#: ../src/timezone_names.c:520
+msgid "Mexico/BajaSur"
+msgstr "墨西哥/BajaSur"
+
+#: ../src/timezone_names.c:521
+msgid "Mexico/General"
+msgstr "墨西哥/一般"
+
+#: ../src/timezone_names.c:522
+msgid "Mideast"
+msgstr "中東"
+
+#: ../src/timezone_names.c:523
+msgid "Mideast/Riyadh87"
+msgstr "中東/Riyadh87"
+
+#: ../src/timezone_names.c:524
+msgid "Mideast/Riyadh88"
+msgstr "中東/Riyadh88"
+
+#: ../src/timezone_names.c:525
+msgid "Mideast/Riyadh89"
+msgstr "中東/Riyadh89"
+
+#: ../src/timezone_names.c:526
 msgid "Pacific"
 msgstr "太平洋"
 
-#: ../src/timezone_names.c:385
+#: ../src/timezone_names.c:527
 msgid "Pacific/Apia"
 msgstr "太平洋/阿庇亞"
 
-#: ../src/timezone_names.c:386
+#: ../src/timezone_names.c:528
 msgid "Pacific/Auckland"
 msgstr "太平洋/奧克蘭"
 
-#: ../src/timezone_names.c:387
+#: ../src/timezone_names.c:529
 msgid "Pacific/Chatham"
 msgstr "太平洋/查坦島"
 
-#: ../src/timezone_names.c:388
+#: ../src/timezone_names.c:530
+msgid "Pacific/Chuuk"
+msgstr "太平洋/Chuuk"
+
+#: ../src/timezone_names.c:531
 msgid "Pacific/Easter"
 msgstr "太平洋/復活節島"
 
-#: ../src/timezone_names.c:389
+#: ../src/timezone_names.c:532
 msgid "Pacific/Efate"
 msgstr "太平洋/艾法特島"
 
-#: ../src/timezone_names.c:390
+#: ../src/timezone_names.c:533
 msgid "Pacific/Enderbury"
 msgstr "太平洋/恩得伯利島"
 
-#: ../src/timezone_names.c:391
+#: ../src/timezone_names.c:534
 msgid "Pacific/Fakaofo"
 msgstr "太平洋/法考福環礁"
 
-#: ../src/timezone_names.c:392
+#: ../src/timezone_names.c:535
 msgid "Pacific/Fiji"
 msgstr "太平洋/斐濟"
 
-#: ../src/timezone_names.c:393
+#: ../src/timezone_names.c:536
 msgid "Pacific/Funafuti"
 msgstr "太平洋/富那富提"
 
-#: ../src/timezone_names.c:394
+#: ../src/timezone_names.c:537
 msgid "Pacific/Galapagos"
 msgstr "太平洋/龜島群島"
 
-#: ../src/timezone_names.c:395
+#: ../src/timezone_names.c:538
 msgid "Pacific/Gambier"
 msgstr "太平洋/甘比爾群島"
 
-#: ../src/timezone_names.c:396
+#: ../src/timezone_names.c:539
 msgid "Pacific/Guadalcanal"
 msgstr "太平洋/瓜達卡納爾"
 
-#: ../src/timezone_names.c:397
+#: ../src/timezone_names.c:540
 msgid "Pacific/Guam"
 msgstr "太平洋/關島"
 
-#: ../src/timezone_names.c:398
+#: ../src/timezone_names.c:541
 msgid "Pacific/Honolulu"
 msgstr "太平洋/檀香山"
 
-#: ../src/timezone_names.c:399
+#: ../src/timezone_names.c:542
 msgid "Pacific/Johnston"
 msgstr "太平洋/京斯頓礁群"
 
-#: ../src/timezone_names.c:400
+#: ../src/timezone_names.c:543
 msgid "Pacific/Kiritimati"
 msgstr "太平洋/聖誕島"
 
-#: ../src/timezone_names.c:401
+#: ../src/timezone_names.c:544
 msgid "Pacific/Kosrae"
 msgstr "太平洋/庫賽埃島"
 
-#: ../src/timezone_names.c:402
+#: ../src/timezone_names.c:545
 msgid "Pacific/Kwajalein"
 msgstr "太平洋/瓜佳蓮市"
 
-#: ../src/timezone_names.c:403
+#: ../src/timezone_names.c:546
 msgid "Pacific/Majuro"
 msgstr "太平洋/馬紹爾"
 
-#: ../src/timezone_names.c:404
+#: ../src/timezone_names.c:547
 msgid "Pacific/Marquesas"
 msgstr "太平洋/馬貴士群島"
 
-#: ../src/timezone_names.c:405
+#: ../src/timezone_names.c:548
 msgid "Pacific/Midway"
 msgstr "太平洋/中途島"
 
-#: ../src/timezone_names.c:406
+#: ../src/timezone_names.c:549
 msgid "Pacific/Nauru"
 msgstr "太平洋/諾魯"
 
-#: ../src/timezone_names.c:407
+#: ../src/timezone_names.c:550
 msgid "Pacific/Niue"
 msgstr "太平洋/紐埃"
 
-#: ../src/timezone_names.c:408
+#: ../src/timezone_names.c:551
 msgid "Pacific/Norfolk"
 msgstr "太平洋/諾福克島"
 
-#: ../src/timezone_names.c:409
+#: ../src/timezone_names.c:552
 msgid "Pacific/Noumea"
 msgstr "太平洋/努米亞"
 
-#: ../src/timezone_names.c:410
+#: ../src/timezone_names.c:553
 msgid "Pacific/Pago_Pago"
 msgstr "太平洋/巴哥巴哥"
 
-#: ../src/timezone_names.c:411
+#: ../src/timezone_names.c:554
 msgid "Pacific/Palau"
 msgstr "太平洋/帛琉"
 
-#: ../src/timezone_names.c:412
+#: ../src/timezone_names.c:555
 msgid "Pacific/Pitcairn"
 msgstr "太平洋/庇開恩島"
 
-#: ../src/timezone_names.c:413
+#: ../src/timezone_names.c:556
+msgid "Pacific/Pohnpei"
+msgstr "太平洋/Pohnpei"
+
+#: ../src/timezone_names.c:557
 msgid "Pacific/Ponape"
 msgstr "太平洋/波納佩"
 
-#: ../src/timezone_names.c:414
+#: ../src/timezone_names.c:558
 msgid "Pacific/Port_Moresby"
 msgstr "太平洋/莫士比港"
 
-#: ../src/timezone_names.c:415
+#: ../src/timezone_names.c:559
 msgid "Pacific/Rarotonga"
 msgstr "太平洋/拉羅東加"
 
-#: ../src/timezone_names.c:416
+#: ../src/timezone_names.c:560
 msgid "Pacific/Saipan"
 msgstr "太平洋/塞班島"
 
-#: ../src/timezone_names.c:417
+#: ../src/timezone_names.c:561
+msgid "Pacific/Samoa"
+msgstr "太平洋/薩摩亞"
+
+#: ../src/timezone_names.c:562
 msgid "Pacific/Tahiti"
 msgstr "太平洋/大溪地"
 
-#: ../src/timezone_names.c:418
+#: ../src/timezone_names.c:563
 msgid "Pacific/Tarawa"
 msgstr "太平洋/塔拉瓦"
 
-#: ../src/timezone_names.c:419
+#: ../src/timezone_names.c:564
 msgid "Pacific/Tongatapu"
 msgstr "太平洋/東加大浦"
 
-#: ../src/timezone_names.c:420
+#: ../src/timezone_names.c:565
 msgid "Pacific/Truk"
 msgstr "太平洋/特魯克"
 
-#: ../src/timezone_names.c:421
+#: ../src/timezone_names.c:566
 msgid "Pacific/Wake"
 msgstr "太平洋/威克島"
 
-#: ../src/timezone_names.c:422
+#: ../src/timezone_names.c:567
 msgid "Pacific/Wallis"
 msgstr "太平洋/沃里斯"
 
-#: ../src/timezone_names.c:423
+#: ../src/timezone_names.c:568
 msgid "Pacific/Yap"
 msgstr "太平洋/雅浦"
 
+#: ../src/timezone_names.c:569
+msgid "SystemV"
+msgstr "SystemV"
+
+#: ../src/timezone_names.c:570
+msgid "SystemV/AST4"
+msgstr "SystemV/AST4"
+
+#: ../src/timezone_names.c:571
+msgid "SystemV/AST4ADT"
+msgstr "SystemV/AST4ADT"
+
+#: ../src/timezone_names.c:572
+msgid "SystemV/CST6"
+msgstr "SystemV/CST6"
+
+#: ../src/timezone_names.c:573
+msgid "SystemV/CST6CDT"
+msgstr "SystemV/CST6CDT"
+
+#: ../src/timezone_names.c:574
+msgid "SystemV/EST5"
+msgstr "SystemV/EST5"
+
+#: ../src/timezone_names.c:575
+msgid "SystemV/EST5/EDT"
+msgstr "SystemV/EST5/EDT"
+
+#: ../src/timezone_names.c:576
+msgid "SystemV/HST10"
+msgstr "SystemV/HST10"
+
+#: ../src/timezone_names.c:577
+msgid "SystemV/MST7"
+msgstr "SystemV/MST7"
+
+#: ../src/timezone_names.c:578
+msgid "SystemV/MST7/MNT"
+msgstr "SystemV/MST7/MNT"
+
+#: ../src/timezone_names.c:579
+msgid "SystemV/PST8"
+msgstr "SystemV/PST8"
+
+#: ../src/timezone_names.c:580
+msgid "SystemV/PST8/PDT"
+msgstr "SystemV/PST8/PDT"
+
+#: ../src/timezone_names.c:581
+msgid "SystemV/YST9"
+msgstr "SystemV/YST9"
+
+#: ../src/timezone_names.c:582
+msgid "SystemV/YST9/YDT"
+msgstr "SystemV/YST9/YDT"
+
+#: ../src/timezone_names.c:583
+msgid "US"
+msgstr "美國"
+
+#: ../src/timezone_names.c:584
+msgid "US/Alaska"
+msgstr "美國/阿拉斯加"
+
+#: ../src/timezone_names.c:585
+msgid "US/Aleutian"
+msgstr "美國/阿留申群島"
+
+#: ../src/timezone_names.c:586
+msgid "US/Arizona"
+msgstr "美國/阿利桑那州"
+
+#: ../src/timezone_names.c:587
+msgid "US/Central"
+msgstr "美國/中部"
+
+#: ../src/timezone_names.c:588
+msgid "US/Eastern"
+msgstr "美國/東部"
+
+#: ../src/timezone_names.c:589
+msgid "US/East-Indiana"
+msgstr "美國/印弟安那州東部"
+
+#: ../src/timezone_names.c:590
+msgid "US/Hawaii"
+msgstr "美國/夏威夷"
+
+#: ../src/timezone_names.c:591
+msgid "US/Indiana-Starke"
+msgstr "美國/Indiana-Starke"
+
+#: ../src/timezone_names.c:592
+msgid "US/Michigan"
+msgstr "美國/密歇根州"
+
+#: ../src/timezone_names.c:593
+msgid "US/Mountain"
+msgstr "美國/山區時區"
+
+#: ../src/timezone_names.c:594
+msgid "US/Pacific"
+msgstr "美國/太平洋"
+
+#: ../src/timezone_names.c:595
+msgid "US/Pacific-New"
+msgstr "美國/太平洋 (新)"
+
+#: ../src/timezone_names.c:596
+msgid "US/Samoa"
+msgstr "美國/薩摩亞"
+
 #: ../src/tray_icon.c:469
 msgid "New appointment"
 msgstr "新約會"
@@ -3547,148 +4429,26 @@
 msgstr "顯示時間與日期 ?"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
-#: ../xfcalendar.desktop.in.h:1
-msgid "Calendar"
-msgstr "行事曆"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-msgid "Orage Calendar Preferences"
-msgstr "Orage 行事曆偏好設定"
-
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
 msgid "Orage preferences"
 msgstr "Orage 偏好設定"
 
-#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
 msgid "Settings for the Xfce 4 Calendar Application (Orage)"
 msgstr "設定 Xfce 4 行事曆程式 (Orage)"
 
-#: ../xfcalendar.desktop.in.h:2
-msgid "Desktop calendar"
-msgstr "桌面行事曆"
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
+msgid "Orage Calendar Preferences"
+msgstr "Orage 行事曆偏好設定"
 
+#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
 #: ../xfcalendar.desktop.in.h:3
+msgid "Calendar"
+msgstr "行事曆"
+
+#: ../xfcalendar.desktop.in.h:1
 msgid "Orage Calendar"
 msgstr "Orage 行事曆"
 
-#~ msgid "Orage clock"
-#~ msgstr "Orage 時鐘"
-
-#~ msgid "Contributor"
-#~ msgstr "參與貢獻者"
-
-#~ msgid "Warning"
-#~ msgstr "警告"
-
-#~ msgid "Display"
-#~ msgstr "顯示"
-
-#~ msgid "Select always today"
-#~ msgstr "選擇今天日期(_T)"
-
-#~ msgid "Vary"
-#~ msgstr "每年"
-
-#~ msgid "Select timezone"
-#~ msgstr "選擇時區"
-
-#~ msgid "Modify Preferences"
-#~ msgstr "Orage 偏好設定"
-
-#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr "設定任一可用的 時區值 (=TZ) 或請從清單中自行挑選。"
-
-#~ msgid "show line _1:"
-#~ msgstr "顯示行數(_1):"
-
-#~ msgid "show line _2:"
-#~ msgstr "顯示行數(_2):"
-
-#~ msgid "show line _3:"
-#~ msgstr "顯示行數(_3):"
-
-#~ msgid "Properties"
-#~ msgstr "內容"
-
-#~ msgid "Show event list"
-#~ msgstr "在系統匣中顯示"
-
-#~ msgid "Xfce 4 Calendar Settings"
-#~ msgstr "Xfce 4 月曆偏好設定"
-
-#~ msgid "Monday"
-#~ msgstr "今天"
-
-#~ msgid "Tuesday"
-#~ msgstr "今天"
-
-#~ msgid "Wednesday"
-#~ msgstr "每星期"
-
-#~ msgid "Thursday"
-#~ msgstr "今天"
-
-#~ msgid "Friday"
-#~ msgstr "天"
-
-#~ msgid "Sunday"
-#~ msgstr "鈴聲"
-
-#~ msgid "Days"
-#~ msgstr "天"
-
-#~ msgid "normal"
-#~ msgstr "一般"
-
-#~ msgid "%m/%d/%Y"
-#~ msgstr "%m/%d/%Y"
-
-#~ msgid "Calendar Files"
-#~ msgstr "日曆檔案"
-
-#~ msgid "Calendar borders"
-#~ msgstr "月曆邊界"
-
-#~ msgid "Hidden"
-#~ msgstr "隱藏"
-
-#~ msgid "3 months"
-#~ msgstr "3 個月"
-
-#~ msgid "6 months"
-#~ msgstr "6 個月"
-
-#~ msgid "1 year"
-#~ msgstr "1 年"
-
-#~ msgid "Application"
-#~ msgstr "應用程式"
-
-#~ msgid "Button Label|Orage"
-#~ msgstr "Orage"
-
-#~ msgid "Core developer"
-#~ msgstr "核心開發者"
-
-#~ msgid ""
-#~ "You will remove all information \n"
-#~ "associated with this date."
-#~ msgstr "您將刪除與該日期有關的所有資訊。"
-
-#~ msgid "Clear"
-#~ msgstr "清除"
-
-#~ msgid "uid"
-#~ msgstr "uid"
-
-#~ msgid "This should not happen"
-#~ msgstr "不應發生此種情況"
-
-#~ msgid "Cannot create MCS client channel"
-#~ msgstr "無法建立 MCS 客戶端通道"
-
-#~ msgid "Open archive file..."
-#~ msgstr "開啟封存檔案..."
-
-#~ msgid "Close archive file"
-#~ msgstr "關閉封存檔案"
+#: ../xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "桌面行事曆"
diff -Nru orage-4.8.3/sounds/Makefile.in orage-4.12.1/sounds/Makefile.in
--- orage-4.8.3/sounds/Makefile.in	2012-01-04 12:52:49.000000000 +0000
+++ orage-4.12.1/sounds/Makefile.in	2015-04-10 10:26:54.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,17 +80,34 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = sounds
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -68,12 +129,20 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(soundsdir)"
 DATA = $(sounds_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -99,6 +168,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -122,6 +192,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -147,6 +221,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -172,6 +247,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -192,6 +269,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -220,11 +298,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -297,8 +376,11 @@
 	-rm -rf .libs _libs
 install-soundsDATA: $(sounds_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(soundsdir)" || $(MKDIR_P) "$(DESTDIR)$(soundsdir)"
 	@list='$(sounds_DATA)'; test -n "$(soundsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(soundsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(soundsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -312,14 +394,12 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(sounds_DATA)'; test -n "$(soundsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(soundsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(soundsdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(soundsdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -369,10 +449,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -453,16 +538,16 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-soundsDATA \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-soundsDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-soundsDATA install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-soundsDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Nru orage-4.8.3/src/appointment.c orage-4.12.1/src/appointment.c
--- orage-4.8.3/src/appointment.c	2011-12-22 08:42:25.000000000 +0000
+++ orage-4.12.1/src/appointment.c	2015-04-10 10:26:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2011 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2005 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -26,6 +26,7 @@
 #endif
 
 #define _XOPEN_SOURCE /* glibc2 needs this */
+#define _XOPEN_SOURCE_EXTENDED 1 /* strptime needs this in posix systems */
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -75,7 +76,6 @@
     GtkWidget *cur_frame;
     GtkWidget *cur_frame_vbox;
 
-    GtkTooltips *tooltips;
     GtkAccelGroup *accelgroup;
 
     gpointer *apptw;
@@ -87,7 +87,7 @@
 /*  
  *  these are the main functions in this file:
  */ 
-static void fill_appt_window(appt_win *apptw, char *action, char *par);
+static gboolean fill_appt_window(appt_win *apptw, char *action, char *par);
 static gboolean fill_appt_from_apptw(xfical_appt *appt, appt_win *apptw);
 
 
@@ -723,7 +723,6 @@
         ((day_win *)apptw->dw)->apptw_list = 
                 g_list_remove(((day_win *)apptw->dw)->apptw_list, apptw);
     gtk_widget_destroy(apptw->Window);
-    gtk_object_destroy(GTK_OBJECT(apptw->Tooltips));
     g_free(apptw->xf_uid);
     g_free(apptw->par);
     xfical_appt_free((xfical_appt *)apptw->xf_appt);
@@ -737,7 +736,9 @@
     if (apptw->appointment_changed == TRUE) {
         result = orage_warning_dialog(GTK_WINDOW(apptw->Window)
                 , _("The appointment information has been modified.")
-                , _("Do you want to continue?"));
+                , _("Do you want to continue?")
+                , _("No, do not leave")
+                , _("Yes, ignore modifications and leave"));
 
         if (result == GTK_RESPONSE_YES) {
             app_free_memory(apptw);
@@ -1119,33 +1120,122 @@
     return(TRUE);
 }
 
+static void add_file_select_cb(appt_win *apptw)
+{
+    GtkWidget *toolbar_separator;
+    GtkWidget *tool_item;
+    gint i = 0;
+    gboolean use_list = FALSE;
+
+    /* Build insert file selection combobox */
+    apptw->File_insert_cb = NULL;
+    if (g_par.foreign_count == 0) { /* we do not have foreign files */
+        return;
+    }
+
+    apptw->File_insert_cb = gtk_combo_box_new_text();
+    gtk_widget_set_tooltip_text(apptw->File_insert_cb
+            , _("Add new appointment to this file."));
+    gtk_combo_box_append_text(GTK_COMBO_BOX(apptw->File_insert_cb), _("Orage default file"));
+    gtk_combo_box_set_active(GTK_COMBO_BOX(apptw->File_insert_cb), 0);
+    for (i = 0; i < g_par.foreign_count; i++) {
+        if (!g_par.foreign_data[i].read_only) { /* do not add to RO files */
+            gtk_combo_box_append_text(GTK_COMBO_BOX(apptw->File_insert_cb)
+                    , g_par.foreign_data[i].name);
+            use_list = TRUE;
+        }
+    }
+
+    if (!use_list) { /* it is not needed after all */
+        gtk_widget_destroy(apptw->File_insert_cb);
+        apptw->File_insert_cb = NULL;
+    }
+
+    /* Add insert file combobox to toolbar */
+    toolbar_separator = orage_toolbar_append_separator(apptw->Toolbar, -1);
+    tool_item = GTK_WIDGET(gtk_tool_item_new());
+    gtk_container_add(GTK_CONTAINER(tool_item), apptw->File_insert_cb);
+    gtk_toolbar_insert(GTK_TOOLBAR(apptw->Toolbar), GTK_TOOL_ITEM(tool_item), -1);
+}
+
+static void remove_file_select_cb(appt_win *apptw)
+{
+    if (apptw->File_insert_cb)
+        gtk_widget_destroy(apptw->File_insert_cb);
+}
+
 static gboolean save_xfical_from_appt_win(appt_win *apptw)
 {
-    gboolean ok = FALSE;
+#undef P_N
+#define P_N "save_xfical_from_appt_win: "
+    gint result, i;
+    gboolean ok = FALSE, found = FALSE;
     xfical_appt *appt = (xfical_appt *)apptw->xf_appt;
+    char *xf_file_id, *tmp;
 
     if (fill_appt_from_apptw(appt, apptw)) {
+        ok = TRUE;
         /* Here we try to save the event... */
-        if (!xfical_file_open(TRUE))
+        if (!xfical_file_open(TRUE)) {
+            orage_message(150, P_N "file open and update failed: %s", apptw->xf_uid);
             return(FALSE);
+        }
         if (apptw->appointment_add) {
-            apptw->xf_uid = g_strdup(xfical_appt_add(appt));
-            ok = (apptw->xf_uid ? TRUE : FALSE);
+            /* first check which file we are adding to */
+            if (apptw->File_insert_cb) {
+                tmp = gtk_combo_box_get_active_text(
+                        GTK_COMBO_BOX(apptw->File_insert_cb));
+                if (strcmp(tmp, _("Orage default file")) == 0) {
+                    xf_file_id = g_strdup("O00.");
+                }
+                else {
+                    for (i = 0; i < g_par.foreign_count && !found; i++) {
+                        if (strcmp(g_par.foreign_data[i].file, tmp) == 0 ||
+                            strcmp(g_par.foreign_data[i].name, tmp) == 0) {
+                            found = TRUE;
+                        }
+                    }
+                    if (found) { /* it should always been found */
+                        xf_file_id = g_strdup_printf("F%02d.", i-1);
+                    }
+                    else { /* error! */
+                        orage_message(150, P_N "Matching foreign file not found: %s", tmp);
+                        ok = FALSE;
+                    }
+                }
+            }
+            else {
+                xf_file_id = g_strdup("O00.");
+            }
+            if (ok) {
+                apptw->xf_uid = g_strdup(xfical_appt_add(xf_file_id, appt));
+                g_free(xf_file_id);
+                ok = (apptw->xf_uid ? TRUE : FALSE);
+            }
             if (ok) {
                 apptw->appointment_add = FALSE;
                 gtk_widget_set_sensitive(apptw->Duplicate, TRUE);
                 gtk_widget_set_sensitive(apptw->File_menu_duplicate, TRUE);
                 orage_message(10, "Added: %s", apptw->xf_uid);
+                remove_file_select_cb(apptw);
             }
-            else
-                orage_message(150, "Addition failed: %s", apptw->xf_uid);
+            else {
+                orage_message(150, P_N "Addition failed: %s", apptw->xf_uid);
+                result = orage_error_dialog(GTK_WINDOW(apptw->Window)
+                        , _("Appointment addition failed.")
+                        , _("Error happened when adding appointment. Look more details from the log file."));
             }
+        }
         else {
             ok = xfical_appt_mod(apptw->xf_uid, appt);
             if (ok)
                 orage_message(10, "Modified: %s", apptw->xf_uid);
-            else
-                orage_message(150, "Modification failed: %s", apptw->xf_uid);
+            else {
+                orage_message(150, P_N "Modification failed: %s", apptw->xf_uid);
+                result = orage_error_dialog(GTK_WINDOW(apptw->Window)
+                        , _("Appointment update failed.")
+                        , _("Look more details from the log file. (Perhaps file was updated external from Orage?)"));
+            }
         }
         xfical_file_close(TRUE);
         if (ok) {
@@ -1187,21 +1277,28 @@
 
 static void delete_xfical_from_appt_win(appt_win *apptw)
 {
+#undef P_N
+#define P_N "delete_xfical_from_appt_win: "
     gint result;
+    gboolean ok = FALSE;
 
     result = orage_warning_dialog(GTK_WINDOW(apptw->Window)
             , _("This appointment will be permanently removed.")
-            , _("Do you want to continue?"));
+            , _("Do you want to continue?")
+            , _("No, cancel the removal")
+            , _("Yes, remove it"));
                                  
     if (result == GTK_RESPONSE_YES) {
         if (!apptw->appointment_add) {
-            if (!xfical_file_open(TRUE))
-                    return;
-            result = xfical_appt_del(apptw->xf_uid);
-            if (result)
+            if (!xfical_file_open(TRUE)) {
+                orage_message(150, P_N "file open and removal failed: %s", apptw->xf_uid);
+                return;
+            }
+            ok = xfical_appt_del(apptw->xf_uid);
+            if (ok)
                 orage_message(10, "Removed: %s", apptw->xf_uid);
             else
-                g_warning("Removal failed: %s", apptw->xf_uid);
+                orage_message(150, P_N "Removal failed: %s", apptw->xf_uid);
             xfical_file_close(TRUE);
         }
 
@@ -1234,8 +1331,10 @@
 
     /* do not keep track of appointments created here */
     apptw2 = create_appt_win("COPY", apptw->xf_uid);
-    gtk_window_get_position(GTK_WINDOW(apptw->Window), &x, &y);
-    gtk_window_move(GTK_WINDOW(apptw2->Window), x+20, y+20);
+    if (apptw2) {
+        gtk_window_get_position(GTK_WINDOW(apptw->Window), &x, &y);
+        gtk_window_move(GTK_WINDOW(apptw2->Window), x+20, y+20);
+    }
 }
 
 static void on_appFileDuplicate_menu_activate_cb(GtkMenuItem *mi
@@ -1273,8 +1372,14 @@
 static void on_Date_button_clicked_cb(GtkWidget *button, gpointer *user_data)
 {
     appt_win *apptw = (appt_win *)user_data;
+    GtkWidget *selDate_dialog;
+
+    selDate_dialog = gtk_dialog_new_with_buttons(
+            _("Pick the date"), GTK_WINDOW(apptw->Window),
+            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+            _("Today"), 1, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
 
-    if (orage_date_button_clicked(button, apptw->Window))
+    if (orage_date_button_clicked(button, selDate_dialog))
         mark_appointment_changed(apptw);
 }
 
@@ -1282,8 +1387,14 @@
         , gpointer *user_data)
 {
     appt_win *apptw = (appt_win *)user_data;
+    GtkWidget *selDate_dialog;
 
-    if (orage_date_button_clicked(button, apptw->Window))
+    selDate_dialog = gtk_dialog_new_with_buttons(
+            _("Pick the date"), GTK_WINDOW(apptw->Window),
+            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+            _("Today"), 1, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
+
+    if (orage_date_button_clicked(button, selDate_dialog))
         mark_appointment_changed(apptw);
     refresh_recur_calendars((appt_win *)user_data);
 }
@@ -1349,7 +1460,8 @@
     text[i-2] = '\0';
     if (text[i-1] == '+') {
         strcpy(recur_exception->type, "RDATE");
-        strcpy(recur_exception->time, orage_i18_time_to_icaltime(text));
+        strncpy(recur_exception->time, orage_i18_time_to_icaltime(text), 16);
+        recur_exception->time[16] = '\0';
     }
     else {
         strcpy(recur_exception->type, "EXDATE");
@@ -1361,18 +1473,20 @@
            but if this fails (=return NULL) we may have date from somewhere 
            else */
         if ((char *)strptime(text, "%x %R", &tm_time) == NULL)
-            strcpy(recur_exception->time, orage_i18_date_to_icaldate(text));
+            strncpy(recur_exception->time, orage_i18_date_to_icaldate(text), 16);
         else
-            strcpy(recur_exception->time, orage_i18_time_to_icaltime(text));
+            strncpy(recur_exception->time, orage_i18_time_to_icaltime(text), 16);
+        recur_exception->time[16] = '\0';
 #else
         /* we should not have date-times as we are using internal libical,
            which only uses dates, but if this returns non null, we may have 
            datetime from somewhere else */
         tmp = (char *)strptime(text, "%x", &tm_time);
         if (ORAGE_STR_EXISTS(tmp))
-            strcpy(recur_exception->time, orage_i18_time_to_icaltime(text));
+            strncpy(recur_exception->time, orage_i18_time_to_icaltime(text), 16);
         else
-            strcpy(recur_exception->time, orage_i18_date_to_icaldate(text));
+            strncpy(recur_exception->time, orage_i18_date_to_icaldate(text), 16);
+        recur_exception->time[16] = '\0';
 #endif
     }
     text[i-2] = ' ';
@@ -1435,8 +1549,10 @@
         strcpy(tmp_type, "-");
     else if (!strcmp(p_type, "RDATE"))
         strcpy(tmp_type, "+");
-    else
-        strcpy(tmp_type, p_type);
+    else {
+        strncpy(tmp_type, p_type, 1);
+        tmp_type[1] = '\0';
+    }
     text = g_strdup_printf("%s %s", p_time, tmp_type);
 
     /* Then, let's keep the GList updated */
@@ -1669,8 +1785,8 @@
             appt->start_tz_loc = g_strdup("floating");
         appt->end_tz_loc = g_strdup(appt->start_tz_loc);
         appt->duration = 30*60;
-        /* use completed by default for new TODO */
-        appt->completed = TRUE;
+        /* use NOT completed by default for new TODO */
+        appt->completed = FALSE;
         /* use duration by default for new appointments */
         appt->use_duration = TRUE;
         g_sprintf(appt->completedtime,"%sT%02d%02d00"
@@ -1904,7 +2020,6 @@
 
     orage_category_refill_cb((appt_win *)catw->apptw);
     gtk_widget_destroy(catw->window);
-    gtk_object_destroy(GTK_OBJECT(catw->tooltips));
     g_free(catw);
 }
 
@@ -2045,7 +2160,6 @@
             , _("Colors of categories - Orage"));
     gtk_window_set_default_size(GTK_WINDOW(catw->window), 390, 360);
 
-    catw->tooltips = gtk_tooltips_new();
     catw->accelgroup = gtk_accel_group_new();
     gtk_window_add_accel_group(GTK_WINDOW(catw->window), catw->accelgroup);
 
@@ -2297,7 +2411,7 @@
 }
 
 /* Fill appointment window with data */
-static void fill_appt_window(appt_win *apptw, char *action, char *par)
+static gboolean fill_appt_window(appt_win *apptw, char *action, char *par)
 {
     xfical_appt *appt;
     struct tm *t;
@@ -2305,8 +2419,7 @@
     /********************* INIT *********************/
     orage_message(10, "%s appointment: %s", action, par);
     if ((appt = fill_appt_window_get_appt(apptw, action, par)) == NULL) {
-        apptw->xf_appt = NULL;
-        return;
+        return(FALSE);
     }
     apptw->xf_appt = appt;
 
@@ -2332,7 +2445,12 @@
     }
     else {
         g_error("fill_appt_window: unknown parameter\n");
-        return;
+        g_free(appt);
+        apptw->xf_appt = NULL;
+        return(FALSE);
+    }
+    if (apptw->appointment_add) {
+        add_file_select_cb(apptw);
     }
     if (!appt->completed) { /* some nice default */
         t = orage_localtime(); /* probably completed today? */
@@ -2368,6 +2486,7 @@
     set_notify_sensitivity(apptw);
     set_proc_sensitivity(apptw);
     mark_appointment_unchanged(apptw);
+    return(TRUE);
 }
 
 static void build_menu(appt_win *apptw)
@@ -2435,7 +2554,9 @@
 
     fpath = orage_config_file_location(ORAGE_DEFAULT_ALARM_DIR_FILE);
     if (!read_only)  /* we need to empty it before each write */
-        g_remove(fpath);
+        if (g_remove(fpath)) {
+            orage_message(150, "orage_alarm_file_open: g_remove failed.");
+        }
     if ((orc = orage_rc_file_open(fpath, read_only)) == NULL) {
         orage_message(150, "orage_alarm_file_open: default alarm file open failed.");
     }
@@ -2582,25 +2703,24 @@
 
     apptw->Toolbar = gtk_toolbar_new();
     gtk_box_pack_start(GTK_BOX(apptw->Vbox), apptw->Toolbar, FALSE, FALSE, 0);
-    gtk_toolbar_set_tooltips(GTK_TOOLBAR(apptw->Toolbar), TRUE);
 
     /* Add buttons to the toolbar */
     apptw->Save = orage_toolbar_append_button(apptw->Toolbar
-            , "gtk-save", apptw->Tooltips, _("Save"), i++);
+            , "gtk-save", _("Save"), i++);
     apptw->SaveClose = orage_toolbar_append_button(apptw->Toolbar
-            , "gtk-close", apptw->Tooltips, _("Save and close"), i++);
+            , "gtk-close", _("Save and close"), i++);
 
     toolbar_separator = orage_toolbar_append_separator(apptw->Toolbar, i++);
 
     apptw->Revert = orage_toolbar_append_button(apptw->Toolbar
-            , "gtk-revert-to-saved", apptw->Tooltips, _("Revert"), i++);
+            , "gtk-revert-to-saved", _("Revert"), i++);
     apptw->Duplicate = orage_toolbar_append_button(apptw->Toolbar
-            , "gtk-copy", apptw->Tooltips, _("Duplicate"), i++);
+            , "gtk-copy", _("Duplicate"), i++);
 
     toolbar_separator = orage_toolbar_append_separator(apptw->Toolbar, i++);
 
     apptw->Delete = orage_toolbar_append_button(apptw->Toolbar
-            , "gtk-delete", apptw->Tooltips, _("Delete"), i++);
+            , "gtk-delete", _("Delete"), i++);
 
     g_signal_connect((gpointer)apptw->Save, "clicked"
             , G_CALLBACK(on_appSave_clicked_cb), apptw);
@@ -2632,21 +2752,21 @@
     hbox =  gtk_hbox_new(FALSE, 0);
     apptw->Type_event_rb = gtk_radio_button_new_with_label(NULL, _("Event"));
     gtk_box_pack_start(GTK_BOX(hbox), apptw->Type_event_rb, FALSE, FALSE, 15);
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Type_event_rb
-            , _("Event that will happen sometime. For example:\nMeeting or birthday or TV show."), NULL);
+    gtk_widget_set_tooltip_text(apptw->Type_event_rb
+            , _("Event that will happen sometime. For example:\nMeeting or birthday or TV show."));
 
     apptw->Type_todo_rb = gtk_radio_button_new_with_mnemonic_from_widget(
             GTK_RADIO_BUTTON(apptw->Type_event_rb) , _("Todo"));
     gtk_box_pack_start(GTK_BOX(hbox), apptw->Type_todo_rb, FALSE, FALSE, 15);
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Type_todo_rb
-            , _("Something that you should do sometime. For example:\nWash your car or test new version of Orage."), NULL);
+    gtk_widget_set_tooltip_text(apptw->Type_todo_rb
+            , _("Something that you should do sometime. For example:\nWash your car or test new version of Orage."));
 
     apptw->Type_journal_rb = gtk_radio_button_new_with_mnemonic_from_widget(
             GTK_RADIO_BUTTON(apptw->Type_event_rb) , _("Journal"));
     gtk_box_pack_start(GTK_BOX(hbox), apptw->Type_journal_rb
             , FALSE, FALSE, 15);
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Type_journal_rb
-            , _("Make a note that something happened. For example:\nRemark that your mother called or first snow came."), NULL);
+    gtk_widget_set_tooltip_text(apptw->Type_journal_rb
+            , _("Make a note that something happened. For example:\nRemark that your mother called or first snow came."));
 
     orage_table_add_row(apptw->TableGeneral
             , apptw->Type_label, hbox
@@ -2778,13 +2898,13 @@
             , apptw->Categories_cb);
     gtk_box_pack_start(GTK_BOX(apptw->Categories_hbox)
             , apptw->Categories_cb_event, FALSE, FALSE, 4);
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Categories_cb_event
-            , _("This is special category, which can be used to color this appointment in list views."), NULL);
+    gtk_widget_set_tooltip_text(apptw->Categories_cb_event
+            , _("This is special category, which can be used to color this appointment in list views."));
     apptw->Categories_button =gtk_button_new_from_stock(GTK_STOCK_SELECT_COLOR);
     gtk_box_pack_start(GTK_BOX(apptw->Categories_hbox), apptw->Categories_button
             , FALSE, FALSE, 0);
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Categories_button
-            , _("update colors for categories."), NULL);
+    gtk_widget_set_tooltip_text(apptw->Categories_button
+            , _("update colors for categories."));
     orage_table_add_row(apptw->TableGeneral
             , apptw->Categories_label, apptw->Categories_hbox
             , ++row, (GTK_EXPAND | GTK_FILL), (0));
@@ -2793,6 +2913,8 @@
     apptw->Priority_label = gtk_label_new(_("Priority"));
     apptw->Priority_spin = gtk_spin_button_new_with_range(0, 9, 1);
     gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(apptw->Priority_spin), TRUE);
+    gtk_widget_set_tooltip_text(apptw->Priority_spin
+            , _("If you set this 8 or bigger, the appointment is NOT shown on list windows.\nYou can use that feature to unclutter your list windows, but it makes it more difficult to find this appointment.\n(Alarms will still fire normally.)\n(There is undocumented parameter so that you can change the default limit of 8.)"));
     hbox = gtk_hbox_new(FALSE, 0);
     gtk_box_pack_start(GTK_BOX(hbox), apptw->Priority_spin, FALSE, FALSE, 0);
     orage_table_add_row(apptw->TableGeneral
@@ -2820,8 +2942,8 @@
             , apptw->Note, event
             , ++row, (GTK_EXPAND | GTK_FILL), (GTK_EXPAND | GTK_FILL));
 
-    gtk_tooltips_set_tip(apptw->Tooltips, event
-            , _("These shorthand commands take effect immediately:\n    <D> inserts current date in local date format\n    <T> inserts time and\n    <DT> inserts date and time.\n\nThese are converted only later when they are seen:\n    <&Ynnnn> is translated to current year minus nnnn.\n(This can be used for example in birthday reminders to tell how old the person will be.)"), NULL);
+    gtk_widget_set_tooltip_text(event
+            , _("These shorthand commands take effect immediately:\n    <D> inserts current date in local date format\n    <T> inserts time and\n    <DT> inserts date and time.\n\nThese are converted only later when they are seen:\n    <&Ynnnn> is translated to current year minus nnnn.\n(This can be used for example in birthday reminders to tell how old the person will be.)"));
 
     /* Take care of the title entry to build the appointment window title */
     g_signal_connect((gpointer)apptw->Title_entry, "changed"
@@ -2929,15 +3051,15 @@
     orage_table_add_row(apptw->TableAlarm
             , apptw->Alarm_label, apptw->Alarm_hbox
             , row = 0, (GTK_FILL), (GTK_FILL));
-    gtk_tooltips_set_tip(apptw->Tooltips, event
-            , _("Often you want to get alarm:\n 1) before Event start\n 2) before Todo end\n 3) after Todo start"), NULL);
+    gtk_widget_set_tooltip_text(event
+            , _("Often you want to get alarm:\n 1) before Event start\n 2) before Todo end\n 3) after Todo start"));
 
     /***** Persistent Alarm *****/
     apptw->Per_hbox = gtk_hbox_new(FALSE, 6);
     apptw->Per_checkbutton = 
             gtk_check_button_new_with_mnemonic(_("Persistent alarm"));
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Per_checkbutton
-            , _("Select this if you want Orage to remind you even if it has not been active when the alarm happened."), NULL);
+    gtk_widget_set_tooltip_text(apptw->Per_checkbutton
+            , _("Select this if you want Orage to remind you even if it has not been active when the alarm happened."));
     gtk_box_pack_start(GTK_BOX(apptw->Per_hbox), apptw->Per_checkbutton
             , FALSE, TRUE, 0);
 
@@ -2951,8 +3073,8 @@
     apptw->Sound_hbox = gtk_hbox_new(FALSE, 6);
     apptw->Sound_checkbutton = 
             gtk_check_button_new_with_mnemonic(_("Use"));
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Sound_checkbutton
-            , _("Select this if you want audible alarm"), NULL);
+    gtk_widget_set_tooltip_text(apptw->Sound_checkbutton
+            , _("Select this if you want audible alarm"));
     gtk_box_pack_start(GTK_BOX(apptw->Sound_hbox), apptw->Sound_checkbutton
             , FALSE, TRUE, 0);
 
@@ -3016,8 +3138,8 @@
     apptw->Display_hbox_orage = gtk_hbox_new(FALSE, 0);
     apptw->Display_checkbutton_orage = 
             gtk_check_button_new_with_mnemonic(_("Use Orage window"));
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Display_checkbutton_orage
-            , _("Select this if you want Orage window alarm"), NULL);
+    gtk_widget_set_tooltip_text(apptw->Display_checkbutton_orage
+            , _("Select this if you want Orage window alarm"));
     gtk_box_pack_start(GTK_BOX(apptw->Display_hbox_orage)
             , apptw->Display_checkbutton_orage
             , FALSE, TRUE, 0);
@@ -3030,18 +3152,17 @@
     apptw->Display_hbox_notify = gtk_hbox_new(FALSE, 0);
     apptw->Display_checkbutton_notify = 
             gtk_check_button_new_with_mnemonic(_("Use notification"));
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Display_checkbutton_notify
-            , _("Select this if you want notification alarm"), NULL);
+    gtk_widget_set_tooltip_text(apptw->Display_checkbutton_notify
+            , _("Select this if you want notification alarm"));
     gtk_box_pack_start(GTK_BOX(apptw->Display_hbox_notify)
             , apptw->Display_checkbutton_notify
             , FALSE, TRUE, 0);
 
     apptw->Display_checkbutton_expire_notify = 
             gtk_check_button_new_with_mnemonic(_("Set timeout"));
-    gtk_tooltips_set_tip(apptw->Tooltips
-            , apptw->Display_checkbutton_expire_notify
+    gtk_widget_set_tooltip_text(apptw->Display_checkbutton_expire_notify
             , _("Select this if you want notification to expire automatically")
-            , NULL);
+            );
     gtk_box_pack_start(GTK_BOX(apptw->Display_hbox_notify)
             , apptw->Display_checkbutton_expire_notify
             , FALSE, TRUE, 10);
@@ -3050,8 +3171,8 @@
             gtk_spin_button_new_with_range(0, 999, 1);
     gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(apptw->Display_spin_expire_notify)
             , TRUE);
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Display_spin_expire_notify
-            , _("0 = system default expiration time"), NULL);
+    gtk_widget_set_tooltip_text(apptw->Display_spin_expire_notify
+            , _("0 = system default expiration time"));
     gtk_box_pack_start(GTK_BOX(apptw->Display_hbox_notify)
             , apptw->Display_spin_expire_notify
             , FALSE, TRUE, 10);
@@ -3072,14 +3193,14 @@
     apptw->Proc_hbox = gtk_hbox_new(FALSE, 6);
     apptw->Proc_checkbutton = 
             gtk_check_button_new_with_mnemonic(_("Use"));
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Proc_checkbutton
-            , _("Select this if you want procedure or script alarm"), NULL);
+    gtk_widget_set_tooltip_text(apptw->Proc_checkbutton
+            , _("Select this if you want procedure or script alarm"));
     gtk_box_pack_start(GTK_BOX(apptw->Proc_hbox), apptw->Proc_checkbutton
             , FALSE, TRUE, 0);
 
     apptw->Proc_entry = gtk_entry_new();
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Proc_entry
-            , _("You must enter all escape etc characters yourself.\nThis string is just given to shell to process.\nThe following special commands are replaced at run time:\n\t<&T>  appointment title\n\t<&D>  appointment description\n\t<&AT> alarm time\n\t<&ST> appointment start time\n\t<&ET> appointment end time"), NULL);
+    gtk_widget_set_tooltip_text(apptw->Proc_entry
+            , _("You must enter all escape etc characters yourself.\nThis string is just given to shell to process.\nThe following special commands are replaced at run time:\n\t<&T>  appointment title\n\t<&D>  appointment description\n\t<&AT> alarm time\n\t<&ST> appointment start time\n\t<&ET> appointment end time"));
     gtk_box_pack_start(GTK_BOX(apptw->Proc_hbox), apptw->Proc_entry
             , TRUE, TRUE, 0);
 
@@ -3090,8 +3211,8 @@
     /***** Test Alarm *****/
     gtk_box_pack_start(GTK_BOX(vbox), gtk_hseparator_new(), FALSE, FALSE, 3);
     apptw->Test_button = gtk_button_new_from_stock("gtk-execute");
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Test_button
-            , _("Test this alarm by raising it now"), NULL);
+    gtk_widget_set_tooltip_text(apptw->Test_button
+            , _("Test this alarm by raising it now"));
     gtk_box_pack_start(GTK_BOX(vbox), apptw->Test_button, FALSE, FALSE, 0);
 
     /***** Default Alarm Settings *****/
@@ -3105,13 +3226,13 @@
     apptw->Default_savebutton = gtk_button_new_from_stock("gtk-save");
     gtk_box_pack_start(GTK_BOX(apptw->Default_hbox), apptw->Default_savebutton
             , TRUE, TRUE, 0);
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Default_savebutton
-            , _("Store current settings as default alarm"), NULL);
+    gtk_widget_set_tooltip_text(apptw->Default_savebutton
+            , _("Store current settings as default alarm"));
     apptw->Default_readbutton =gtk_button_new_from_stock("gtk-revert-to-saved");
     gtk_box_pack_start(GTK_BOX(apptw->Default_hbox), apptw->Default_readbutton
             , TRUE, TRUE, 0);
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Default_readbutton
-            , _("Set current settings from default alarm"), NULL);
+    gtk_widget_set_tooltip_text(apptw->Default_readbutton
+            , _("Set current settings from default alarm"));
 
     gtk_box_pack_end(GTK_BOX(vbox), apptw->Default_hbox, FALSE, FALSE, 0);
     gtk_box_pack_end(GTK_BOX(vbox), gtk_hseparator_new(), FALSE, FALSE, 3);
@@ -3195,14 +3316,13 @@
     apptw->Recur_feature_advanced_rb = 
             gtk_radio_button_new_with_mnemonic_from_widget(
                     GTK_RADIO_BUTTON(apptw->Recur_feature_normal_rb)
-                    , _("Advanced"));
+                            , _("Advanced"));
     gtk_box_pack_start(GTK_BOX(apptw->Recur_feature_hbox)
             , apptw->Recur_feature_advanced_rb, FALSE, FALSE, 20);
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_feature_normal_rb
-            , _("Use this if you want regular repeating event"), NULL);
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_feature_advanced_rb
-            , _("Use this if you need complex times like:\n Every Saturday and Sunday or \n First Tuesday every month")
-            , NULL);
+    gtk_widget_set_tooltip_text(apptw->Recur_feature_normal_rb
+            , _("Use this if you want regular repeating event"));
+    gtk_widget_set_tooltip_text(apptw->Recur_feature_advanced_rb
+            , _("Use this if you need complex times like:\n Every Saturday and Sunday or \n First Tuesday every month"));
     orage_table_add_row(apptw->TableRecur
             , apptw->Recur_feature_label, apptw->Recur_feature_hbox
             , row = 0, (GTK_EXPAND | GTK_FILL), (0));
@@ -3224,9 +3344,8 @@
     apptw->Recur_int_spin_label2 = gtk_label_new(_("occurrence"));
     gtk_box_pack_start(GTK_BOX(apptw->Recur_freq_hbox)
             , apptw->Recur_int_spin_label2, FALSE, FALSE, 5);
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_int_spin
-            , _("Limit frequency to certain interval.\n For example: Every third day:\n Frequency = Daily and Interval = 3")
-            , NULL);
+    gtk_widget_set_tooltip_text(apptw->Recur_int_spin
+            , _("Limit frequency to certain interval.\n For example: Every third day:\n Frequency = Daily and Interval = 3"));
     orage_table_add_row(apptw->TableRecur
             , apptw->Recur_freq_label, apptw->Recur_freq_hbox
             , ++row, (GTK_EXPAND | GTK_FILL), (GTK_FILL));
@@ -3327,9 +3446,8 @@
                 gtk_spin_button_new_with_range(-9, 9, 1);
         gtk_box_pack_start(GTK_BOX(apptw->Recur_byday_spin_hbox)
                 , apptw->Recur_byday_spin[i], FALSE, FALSE, 0);
-        gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_byday_spin[i]
-                , _("Specify which weekday for monthly and yearly events.\n For example:\n Second Wednesday each month:\n\tFrequency = Monthly,\n\tWeekdays = check only Wednesday,\n\tWhich day = select 2 from the number below Wednesday")
-                , NULL);
+        gtk_widget_set_tooltip_text(apptw->Recur_byday_spin[i]
+                , _("Specify which weekday for monthly and yearly events.\n For example:\n Second Wednesday each month:\n\tFrequency = Monthly,\n\tWeekdays = check only Wednesday,\n\tWhich day = select 2 from the number below Wednesday"));
     }
     orage_table_add_row(apptw->TableRecur
             , apptw->Recur_byday_spin_label, apptw->Recur_byday_spin_hbox
@@ -3348,11 +3466,10 @@
                             , _("Completed"));
     gtk_box_pack_start(GTK_BOX(apptw->Recur_todo_base_hbox)
             , apptw->Recur_todo_base_done_rb, FALSE, FALSE, 15);
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_todo_base_start_rb
-            , _("TODO reoccurs regularly starting on start time and repeating after each interval no matter when it was last completed"), NULL);
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_todo_base_done_rb
-            , _("TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)")
-            , NULL);
+    gtk_widget_set_tooltip_text(apptw->Recur_todo_base_start_rb
+            , _("TODO reoccurs regularly starting on start time and repeating after each interval no matter when it was last completed"));
+    gtk_widget_set_tooltip_text(apptw->Recur_todo_base_done_rb
+            , _("TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"));
     orage_table_add_row(apptw->TableRecur
             , apptw->Recur_todo_base_label, apptw->Recur_todo_base_hbox
             , ++row ,(GTK_EXPAND | GTK_FILL), (0));
@@ -3370,23 +3487,23 @@
     gtk_scrolled_window_add_with_viewport(
             GTK_SCROLLED_WINDOW(apptw->Recur_exception_scroll_win)
             , apptw->Recur_exception_rows_vbox);
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_exception_scroll_win
-            , _("Add more exception dates by clicking the calendar days below.\nException is either exclusion(-) or inclusion(+) depending on the selection.\nRemove by clicking the data."), NULL);
+    gtk_widget_set_tooltip_text(apptw->Recur_exception_scroll_win
+            , _("Add more exception dates by clicking the calendar days below.\nException is either exclusion(-) or inclusion(+) depending on the selection.\nRemove by clicking the data."));
     apptw->Recur_exception_type_vbox = gtk_vbox_new(FALSE, 0);
     gtk_box_pack_start(GTK_BOX(apptw->Recur_exception_hbox)
             , apptw->Recur_exception_type_vbox, TRUE, TRUE, 5);
     apptw->Recur_exception_excl_rb = gtk_radio_button_new_with_label(NULL
             , _("Add excluded date (-)"));
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_exception_excl_rb
-            , _("Excluded days are full days where this appointment is not happening"), NULL);
+    gtk_widget_set_tooltip_text(apptw->Recur_exception_excl_rb
+            , _("Excluded days are full days where this appointment is not happening"));
     gtk_box_pack_start(GTK_BOX(apptw->Recur_exception_type_vbox)
             , apptw->Recur_exception_excl_rb, FALSE, FALSE, 0);
     apptw->Recur_exception_incl_rb = 
             gtk_radio_button_new_with_mnemonic_from_widget(
                     GTK_RADIO_BUTTON(apptw->Recur_exception_excl_rb)
                     , _("Add included time (+)"));
-    gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_exception_incl_rb
-            , _("Included times have same timezone than start time, but they may have different time"), NULL);
+    gtk_widget_set_tooltip_text(apptw->Recur_exception_incl_rb
+            , _("Included times have same timezone than start time, but they may have different time"));
     apptw->Recur_exception_incl_spin_hh = 
             gtk_spin_button_new_with_range(0, 23, 1);
     apptw->Recur_exception_incl_spin_mm = 
@@ -3504,7 +3621,6 @@
     apptw->el = NULL;
     apptw->dw = NULL;
     apptw->appointment_changed = FALSE;
-    apptw->Tooltips = gtk_tooltips_new();
     apptw->accel_group = gtk_accel_group_new();
 
     apptw->Window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -3531,8 +3647,7 @@
     g_signal_connect((gpointer)apptw->Window, "delete-event"
             , G_CALLBACK(on_appWindow_delete_event_cb), apptw);
 
-    fill_appt_window(apptw, action, par);
-    if (apptw->xf_appt) { /* all fine */
+    if (fill_appt_window(apptw, action, par)) { /* all fine */
         enable_general_page_signals(apptw);
         enable_alarm_page_signals(apptw);
         enable_recurrence_page_signals(apptw);
diff -Nru orage-4.8.3/src/appointment.h orage-4.12.1/src/appointment.h
--- orage-4.8.3/src/appointment.h	2011-01-13 10:28:33.000000000 +0000
+++ orage-4.12.1/src/appointment.h	2015-04-10 10:26:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2011 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,6 @@
 typedef struct _appt_win
 {
     GtkAccelGroup *accel_group;
-    GtkTooltips *Tooltips;
 
     GtkWidget *Window;
     GtkWidget *Vbox;
@@ -47,6 +46,7 @@
     GtkWidget *Duplicate;
     GtkWidget *Save;
     GtkWidget *SaveClose;
+    GtkWidget *File_insert_cb;
 
     GtkWidget *Notebook;
     GtkWidget *General_notebook_page;
diff -Nru orage-4.8.3/src/day-view.c orage-4.12.1/src/day-view.c
--- orage-4.8.3/src/day-view.c	2011-01-20 21:26:28.000000000 +0000
+++ orage-4.12.1/src/day-view.c	2015-04-10 10:26:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2007-2011 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2007-2013 Juha Kautto  (juha at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -127,6 +127,12 @@
     appt_win *apptw;
     GList *apptw_list;
 
+    gtk_window_get_size(GTK_WINDOW(dw->Window)
+            , &g_par.dw_size_x, &g_par.dw_size_y);
+    gtk_window_get_position(GTK_WINDOW(dw->Window)
+            , &g_par.dw_pos_x, &g_par.dw_pos_y);
+    write_parameters();
+
     /* need to clean the appointment list and inform all appointments that
      * we are not interested anymore (= should not get updated) */
     apptw_list = dw->apptw_list;
@@ -142,7 +148,6 @@
     g_list_free(dw->apptw_list);
 
     gtk_widget_destroy(dw->Window);
-    gtk_object_destroy(GTK_OBJECT(dw->Tooltips));
     g_free(dw);
     dw = NULL;
 }
@@ -166,10 +171,11 @@
 
 static void create_new_appointment(day_win *dw)
 {
-    char *s_date, a_day[10];
+    char *s_date, a_day[9];
 
     s_date = (char *)gtk_button_get_label(GTK_BUTTON(dw->StartDate_button));
-    strcpy(a_day, orage_i18_date_to_icaldate(s_date));
+    strncpy(a_day, orage_i18_date_to_icaldate(s_date), 8);
+    dw->a_day[8] = '\0';
 
     do_appt_win("NEW", a_day, dw);
 }
@@ -223,26 +229,46 @@
     go_to_today((day_win *)user_data);
 }
 
-static void on_Go_previous_activate_cb(GtkMenuItem *mi, gpointer user_data)
+static void on_Go_previous_week_activate_cb(GtkMenuItem *mi, gpointer user_data)
+{
+    changeSelectedDate((day_win *)user_data, -7);
+}
+
+static void on_Go_previous_day_activate_cb(GtkMenuItem *mi, gpointer user_data)
 {
     changeSelectedDate((day_win *)user_data, -1);
 }
 
-static void on_Previous_clicked(GtkButton *b, gpointer user_data)
+static void on_Previous_day_clicked(GtkButton *b, gpointer user_data)
 {
     changeSelectedDate((day_win *)user_data, -1);
 }
 
-static void on_Go_next_activate_cb(GtkMenuItem *mi, gpointer user_data)
+static void on_Previous_week_clicked(GtkButton *b, gpointer user_data)
+{
+    changeSelectedDate((day_win *)user_data, -7);
+}
+
+static void on_Go_next_day_activate_cb(GtkMenuItem *mi, gpointer user_data)
 {
     changeSelectedDate((day_win *)user_data, 1);
 }
 
-static void on_Next_clicked(GtkButton *b, gpointer user_data)
+static void on_Go_next_week_activate_cb(GtkMenuItem *mi, gpointer user_data)
+{
+    changeSelectedDate((day_win *)user_data, 7);
+}
+
+static void on_Next_day_clicked(GtkButton *b, gpointer user_data)
 {
     changeSelectedDate((day_win *)user_data, 1);
 }
 
+static void on_Next_week_clicked(GtkButton *b, gpointer user_data)
+{
+    changeSelectedDate((day_win *)user_data, 7);
+}
+
 static void build_menu(day_win *dw)
 {
     GtkWidget *menu_separator;
@@ -276,21 +302,51 @@
 
     /********** Go menu   **********/
     dw->Go_menu = orage_menu_new(_("_Go"), dw->Menubar);
+
     dw->Go_menu_today = orage_image_menu_item_new_from_stock("gtk-home"
             , dw->Go_menu, dw->accel_group);
     gtk_widget_add_accelerator(dw->Go_menu_today
             , "activate", dw->accel_group
             , GDK_Home, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
-    dw->Go_menu_prev = orage_image_menu_item_new_from_stock("gtk-go-back"
+    gtk_widget_add_accelerator(dw->Go_menu_today
+            , "activate", dw->accel_group
+            , GDK_KP_Home, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
+
+    dw->Go_menu_prev_week = orage_image_menu_item_new_from_stock("gtk-go-up"
             , dw->Go_menu, dw->accel_group);
-    gtk_widget_add_accelerator(dw->Go_menu_prev
+    gtk_widget_add_accelerator(dw->Go_menu_prev_week
+            , "activate", dw->accel_group
+            , GDK_Page_Up, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
+    gtk_widget_add_accelerator(dw->Go_menu_prev_week
+            , "activate", dw->accel_group
+            , GDK_KP_Page_Up, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
+
+    dw->Go_menu_prev_day = orage_image_menu_item_new_from_stock("gtk-go-back"
+            , dw->Go_menu, dw->accel_group);
+    gtk_widget_add_accelerator(dw->Go_menu_prev_day
             , "activate", dw->accel_group
             , GDK_Left, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
-    dw->Go_menu_next = orage_image_menu_item_new_from_stock("gtk-go-forward"
+    gtk_widget_add_accelerator(dw->Go_menu_prev_day
+            , "activate", dw->accel_group
+            , GDK_KP_Left, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
+
+    dw->Go_menu_next_day = orage_image_menu_item_new_from_stock("gtk-go-forward"
             , dw->Go_menu, dw->accel_group);
-    gtk_widget_add_accelerator(dw->Go_menu_next
+    gtk_widget_add_accelerator(dw->Go_menu_next_day
             , "activate", dw->accel_group
             , GDK_Right, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
+    gtk_widget_add_accelerator(dw->Go_menu_next_day
+            , "activate", dw->accel_group
+            , GDK_KP_Right, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
+
+    dw->Go_menu_next_week = orage_image_menu_item_new_from_stock("gtk-go-down"
+            , dw->Go_menu, dw->accel_group);
+    gtk_widget_add_accelerator(dw->Go_menu_next_week
+            , "activate", dw->accel_group
+            , GDK_Page_Down, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
+    gtk_widget_add_accelerator(dw->Go_menu_next_week
+            , "activate", dw->accel_group
+            , GDK_KP_Page_Down, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
 
     g_signal_connect((gpointer)dw->File_menu_new, "activate"
             , G_CALLBACK(on_File_newApp_activate_cb), dw);
@@ -300,10 +356,14 @@
             , G_CALLBACK(on_View_refresh_activate_cb), dw);
     g_signal_connect((gpointer)dw->Go_menu_today, "activate"
             , G_CALLBACK(on_Go_today_activate_cb), dw);
-    g_signal_connect((gpointer)dw->Go_menu_prev, "activate"
-            , G_CALLBACK(on_Go_previous_activate_cb), dw);
-    g_signal_connect((gpointer)dw->Go_menu_next, "activate"
-            , G_CALLBACK(on_Go_next_activate_cb), dw);
+    g_signal_connect((gpointer)dw->Go_menu_prev_week, "activate"
+            , G_CALLBACK(on_Go_previous_week_activate_cb), dw);
+    g_signal_connect((gpointer)dw->Go_menu_prev_day, "activate"
+            , G_CALLBACK(on_Go_previous_day_activate_cb), dw);
+    g_signal_connect((gpointer)dw->Go_menu_next_day, "activate"
+            , G_CALLBACK(on_Go_next_day_activate_cb), dw);
+    g_signal_connect((gpointer)dw->Go_menu_next_week, "activate"
+            , G_CALLBACK(on_Go_next_week_activate_cb), dw);
 }
 
 static void build_toolbar(day_win *dw)
@@ -313,38 +373,45 @@
 
     dw->Toolbar = gtk_toolbar_new();
     gtk_box_pack_start(GTK_BOX(dw->Vbox), dw->Toolbar, FALSE, FALSE, 0);
-    gtk_toolbar_set_tooltips(GTK_TOOLBAR(dw->Toolbar), TRUE);
 
     dw->Create_toolbutton = orage_toolbar_append_button(dw->Toolbar
-            , "gtk-new", dw->Tooltips, _("New"), i++);
+            , "gtk-new", _("New"), i++);
 
     toolbar_separator = orage_toolbar_append_separator(dw->Toolbar, i++);
 
-    dw->Previous_toolbutton = orage_toolbar_append_button(dw->Toolbar
-            , "gtk-go-back", dw->Tooltips, _("Back"), i++);
+    dw->Previous_week_toolbutton = orage_toolbar_append_button(dw->Toolbar
+            , "gtk-go-up", _("Back one week"), i++);
+    dw->Previous_day_toolbutton = orage_toolbar_append_button(dw->Toolbar
+            , "gtk-go-back", _("Back one day"), i++);
     dw->Today_toolbutton = orage_toolbar_append_button(dw->Toolbar
-            , "gtk-home", dw->Tooltips, _("Today"), i++);
-    dw->Next_toolbutton = orage_toolbar_append_button(dw->Toolbar
-            , "gtk-go-forward", dw->Tooltips, _("Forward"), i++);
+            , "gtk-home", _("Today"), i++);
+    dw->Next_day_toolbutton = orage_toolbar_append_button(dw->Toolbar
+            , "gtk-go-forward", _("Forward one day"), i++);
+    dw->Next_week_toolbutton = orage_toolbar_append_button(dw->Toolbar
+            , "gtk-go-down", _("Forward one week"), i++);
 
     toolbar_separator = orage_toolbar_append_separator(dw->Toolbar, i++);
 
     dw->Refresh_toolbutton = orage_toolbar_append_button(dw->Toolbar
-            , "gtk-refresh", dw->Tooltips, _("Refresh"), i++);
+            , "gtk-refresh", _("Refresh"), i++);
 
     toolbar_separator = orage_toolbar_append_separator(dw->Toolbar, i++);
 
     dw->Close_toolbutton = orage_toolbar_append_button(dw->Toolbar
-            , "gtk-close", dw->Tooltips, _("Close"), i++);
+            , "gtk-close", _("Close"), i++);
 
     g_signal_connect((gpointer)dw->Create_toolbutton, "clicked"
             , G_CALLBACK(on_Create_toolbutton_clicked_cb), dw);
-    g_signal_connect((gpointer)dw->Previous_toolbutton, "clicked"
-            , G_CALLBACK(on_Previous_clicked), dw);
+    g_signal_connect((gpointer)dw->Previous_week_toolbutton, "clicked"
+            , G_CALLBACK(on_Previous_week_clicked), dw);
+    g_signal_connect((gpointer)dw->Previous_day_toolbutton, "clicked"
+            , G_CALLBACK(on_Previous_day_clicked), dw);
     g_signal_connect((gpointer)dw->Today_toolbutton, "clicked"
             , G_CALLBACK(on_Today_clicked), dw);
-    g_signal_connect((gpointer)dw->Next_toolbutton, "clicked"
-            , G_CALLBACK(on_Next_clicked), dw);
+    g_signal_connect((gpointer)dw->Next_day_toolbutton, "clicked"
+            , G_CALLBACK(on_Next_day_clicked), dw);
+    g_signal_connect((gpointer)dw->Next_week_toolbutton, "clicked"
+            , G_CALLBACK(on_Next_week_clicked), dw);
     g_signal_connect((gpointer)dw->Refresh_toolbutton, "clicked"
             , G_CALLBACK(on_Refresh_clicked), dw);
     g_signal_connect((gpointer)dw->Close_toolbutton, "clicked"
@@ -385,8 +452,14 @@
 static void on_Date_button_clicked_cb(GtkWidget *button, gpointer *user_data)
 {
     day_win *dw = (day_win *)user_data;
+    GtkWidget *selDate_dialog;
+
+     selDate_dialog = gtk_dialog_new_with_buttons(
+             _("Pick the date"), GTK_WINDOW(dw->Window),
+             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+             _("Today"), 1, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
 
-    if (orage_date_button_clicked(button, dw->Window))
+    if (orage_date_button_clicked(button, selDate_dialog))
         refresh_day_win(dw);
 }
 
@@ -410,6 +483,12 @@
     }
 }
 
+static void on_arrow_up_press_event_cb(GtkWidget *widget
+        , GdkEventButton *event, gpointer *user_data)
+{
+    changeSelectedDate((day_win *)user_data, -7);
+}
+
 static void on_arrow_left_press_event_cb(GtkWidget *widget
         , GdkEventButton *event, gpointer *user_data)
 {
@@ -422,15 +501,23 @@
     changeSelectedDate((day_win *)user_data, 1);
 }
 
+static void on_arrow_down_press_event_cb(GtkWidget *widget
+        , GdkEventButton *event, gpointer *user_data)
+{
+    changeSelectedDate((day_win *)user_data, 7);
+}
+
 static void add_row(day_win *dw, xfical_appt *appt)
 {
     gint row, start_row, end_row, days;
     gint col, start_col, end_col, first_col, last_col;
     gint height, start_height, end_height;
-    gchar *tip, *start_date, *end_date, *tmp_title, *tmp_note;
+    gchar *tip, *start_date, *end_date, *tmp_title, *tip_title;
+    gchar *tmp_note, *tip_note;
     GtkWidget *ev, *lab, *hb;
     struct tm tm_start, tm_end, tm_first;
     GdkColor *color;
+    gchar *format_bold = "<b> %s </b>";
 
     /* First clarify timings */
     tm_start = orage_icaltime_to_tm_time(appt->starttimecur, FALSE);
@@ -440,6 +527,9 @@
     end_col   = orage_days_between(&tm_first, &tm_end)+1;
     days      = orage_days_between(&tm_start, &tm_end);
 
+    if (start_col > dw->days) { /* can happen if timezones pass date change */
+        return; /* this does not fit, so we just skip it */
+    }
     if (start_col < 1) {
         col = 1;
         row = 0;
@@ -448,11 +538,22 @@
         col = start_col;
         row = tm_start.tm_hour;
     }
+    if (end_col < 1) { /* can happen if timezones pass date change */
+        return; /* this does not fit, so we just skip it */
+    }
+    if (end_col > dw->days) { /* can happen if timezones pass date change */
+        end_col = days;
+    }
 
     /* then add the appointment */
     tmp_title = orage_process_text_commands(
             appt->title ? appt->title : _("Unknown"));
-    tmp_note = orage_process_text_commands(appt->note);
+    tip_title = g_markup_printf_escaped(format_bold, tmp_title);
+    tmp_note = orage_process_text_commands(
+            appt->note ? appt->note : "");
+    tmp_note = orage_limit_text(tmp_note, 50, 10);
+    tip_note = g_markup_escape_text(tmp_note, strlen(tmp_note));
+    g_free(tmp_note);
     ev = gtk_event_box_new();
     lab = gtk_label_new(tmp_title);
     gtk_container_add(GTK_CONTAINER(ev), lab);
@@ -475,13 +576,13 @@
         start_date = g_strdup(orage_tm_date_to_i18_date(&tm_start));
         if (days == 0)
             tip = g_strdup_printf("%s\n%s\n%s"
-                    , tmp_title, start_date, tmp_note);
+                    , tip_title, start_date, tip_note);
         else {
             tm_end.tm_year -= 1900;
             tm_end.tm_mon -= 1;
             end_date = g_strdup(orage_tm_date_to_i18_date(&tm_end));
             tip = g_strdup_printf("%s\n%s - %s\n%s"
-                    , tmp_title, start_date, end_date, tmp_note);
+                    , tip_title, start_date, end_date, tip_note);
             g_free(end_date);
         }
         g_free(start_date);
@@ -503,8 +604,8 @@
         }
         if (days == 0)
             tip = g_strdup_printf("%s\n%02d:%02d-%02d:%02d\n%s"
-                    , tmp_title, tm_start.tm_hour, tm_start.tm_min
-                    , tm_end.tm_hour, tm_end.tm_min, tmp_note);
+                    , tip_title, tm_start.tm_hour, tm_start.tm_min
+                    , tm_end.tm_hour, tm_end.tm_min, tip_note);
         else {
     /* we took the date in unnormalized format, so we need to do that now */
             tm_start.tm_year -= 1900;
@@ -514,14 +615,14 @@
             start_date = g_strdup(orage_tm_date_to_i18_date(&tm_start));
             end_date = g_strdup(orage_tm_date_to_i18_date(&tm_end));
             tip = g_strdup_printf("%s\n%s %02d:%02d - %s %02d:%02d\n%s"
-                    , tmp_title
+                    , tip_title
                     , start_date, tm_start.tm_hour, tm_start.tm_min
-                    , end_date, tm_end.tm_hour, tm_end.tm_min, tmp_note);
+                    , end_date, tm_end.tm_hour, tm_end.tm_min, tip_note);
             g_free(start_date);
             g_free(end_date);
         }
     }
-    gtk_tooltips_set_tip(dw->Tooltips, ev, tip, NULL);
+    gtk_widget_set_tooltip_markup(ev, tip);
     /*
     gtk_box_pack_start(GTK_BOX(hb2), ev, FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(hb), hb2, TRUE, TRUE, 0);
@@ -530,9 +631,10 @@
     g_object_set_data_full(G_OBJECT(ev), "UID", g_strdup(appt->uid), g_free);
     g_signal_connect((gpointer)ev, "button-press-event"
             , G_CALLBACK(on_button_press_event_cb), dw);
-    g_free(tip);
     g_free(tmp_title);
-    g_free(tmp_note);
+    g_free(tip);
+    g_free(tip_title);
+    g_free(tip_note);
 
     /* and finally draw the line to show how long the appointment is,
      * but only if it is Busy type event (=availability != 0) 
@@ -602,7 +704,8 @@
 
     ical_type = XFICAL_TYPE_EVENT;
     s_date = (char *)gtk_button_get_label(GTK_BUTTON(dw->StartDate_button));
-    strcpy(dw->a_day, orage_i18_date_to_icaldate(s_date));
+    strncpy(dw->a_day, orage_i18_date_to_icaldate(s_date), 8);
+    dw->a_day[8] = '\0';
     dw->days = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(dw->day_spin));
 
     /* first search base orage file */
@@ -690,13 +793,15 @@
 static void build_day_view_header(day_win *dw, char *start_date)
 {
     GtkWidget *hbox, *label;
+    struct tm tm_date;
+    char *first_date;
+    int diff_to_weeks_first_day;
 
     hbox = gtk_hbox_new(FALSE, 0);
     gtk_box_pack_start(GTK_BOX(dw->Vbox), hbox, FALSE, FALSE, 10);
 
     label = gtk_label_new(_("Start"));
     gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 10);
-
     /* start date button */
     dw->StartDate_button = gtk_button_new();
     gtk_box_pack_start(GTK_BOX(hbox), dw->StartDate_button, FALSE, FALSE, 0);
@@ -710,8 +815,26 @@
     gtk_box_pack_start(GTK_BOX(hbox), dw->day_spin, FALSE, FALSE, 0);
 
     /* initial values */
+    if (g_par.dw_week_mode) { /* we want to start form week start day */
+        tm_date = orage_i18_date_to_tm_date(start_date);
+        /* tm_date.wday: 0 = Sunday, 1 = Monday, 2 = Tuesday, ... 6 = Saturday
+           g_par.ical_weekstartday: 0 = Monday, 1 = Tuesday, ... 6 = Sunday */
+        diff_to_weeks_first_day = tm_date.tm_wday - (g_par.ical_weekstartday+1);
+        if (diff_to_weeks_first_day < 0)
+            diff_to_weeks_first_day += 7;
+        if (diff_to_weeks_first_day == 0) { /* we are on week start day */
+            first_date = start_date;
+        }
+        else {
+            orage_move_day(&tm_date, -1*diff_to_weeks_first_day);
+            first_date = orage_tm_date_to_i18_date(&tm_date);
+        }
+    }
+    else {
+        first_date = start_date;
+    }
     gtk_button_set_label(GTK_BUTTON(dw->StartDate_button)
-            , (const gchar *)start_date);
+            , (const gchar *)first_date);
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(dw->day_spin), 7);
 
     /* sizes */
@@ -789,15 +912,29 @@
     GtkWidget *arrow, *ev;
 
     ev = gtk_event_box_new();
-    if (col == 0) {
-        arrow = gtk_arrow_new(GTK_ARROW_LEFT, GTK_SHADOW_NONE);
-        g_signal_connect((gpointer)ev, "button-press-event"
-                , G_CALLBACK(on_arrow_left_press_event_cb), dw);
+    if (g_par.dw_week_mode) {
+        if (col == 0) {
+            arrow = gtk_arrow_new(GTK_ARROW_UP, GTK_SHADOW_NONE);
+            g_signal_connect((gpointer)ev, "button-press-event"
+                    , G_CALLBACK(on_arrow_up_press_event_cb), dw);
+        }
+        else {
+            arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+            g_signal_connect((gpointer)ev, "button-press-event"
+                    , G_CALLBACK(on_arrow_down_press_event_cb), dw);
+        }
     }
     else {
-        arrow = gtk_arrow_new(GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
-        g_signal_connect((gpointer)ev, "button-press-event"
-                , G_CALLBACK(on_arrow_right_press_event_cb), dw);
+        if (col == 0) {
+            arrow = gtk_arrow_new(GTK_ARROW_LEFT, GTK_SHADOW_NONE);
+            g_signal_connect((gpointer)ev, "button-press-event"
+                    , G_CALLBACK(on_arrow_left_press_event_cb), dw);
+        }
+        else {
+            arrow = gtk_arrow_new(GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
+            g_signal_connect((gpointer)ev, "button-press-event"
+                    , G_CALLBACK(on_arrow_right_press_event_cb), dw);
+        }
     }
     gtk_container_add(GTK_CONTAINER(ev), arrow);
     gtk_widget_set_size_request(ev, dw->hour_req.width
@@ -927,11 +1064,14 @@
     /* initialisation + main window + base vbox */
     dw = g_new0(day_win, 1);
     dw->scroll_pos = -1; /* not set */
-    dw->Tooltips = gtk_tooltips_new();
     dw->accel_group = gtk_accel_group_new();
 
     dw->Window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_default_size(GTK_WINDOW(dw->Window), 690, 390);
+    if (g_par.dw_size_x || g_par.dw_size_y)
+        gtk_window_set_default_size(GTK_WINDOW(dw->Window)
+                , g_par.dw_size_x, g_par.dw_size_y);
+    if (g_par.dw_pos_x || g_par.dw_pos_y)
+        gtk_window_move(GTK_WINDOW(dw->Window), g_par.dw_pos_x, g_par.dw_pos_y);
     gtk_window_set_title(GTK_WINDOW(dw->Window), _("Orage - day view"));
     gtk_window_add_accel_group(GTK_WINDOW(dw->Window), dw->accel_group);
 
diff -Nru orage-4.8.3/src/day-view.h orage-4.12.1/src/day-view.h
--- orage-4.8.3/src/day-view.h	2011-01-13 10:28:43.000000000 +0000
+++ orage-4.12.1/src/day-view.h	2015-04-10 10:26:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2011 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,6 @@
 typedef struct _day_win
 {
     GtkAccelGroup *accel_group;
-    GtkTooltips   *Tooltips;
 
     GtkWidget *Window;
     GtkWidget *Vbox;
@@ -42,14 +41,18 @@
     GtkWidget *View_menu_refresh;
     GtkWidget *Go_menu;
     GtkWidget *Go_menu_today;
-    GtkWidget *Go_menu_prev;
-    GtkWidget *Go_menu_next;
+    GtkWidget *Go_menu_prev_day;
+    GtkWidget *Go_menu_prev_week;
+    GtkWidget *Go_menu_next_day;
+    GtkWidget *Go_menu_next_week;
 
     GtkWidget *Toolbar;
     GtkWidget *Create_toolbutton;
-    GtkWidget *Previous_toolbutton;
+    GtkWidget *Previous_week_toolbutton;
+    GtkWidget *Previous_day_toolbutton;
     GtkWidget *Today_toolbutton;
-    GtkWidget *Next_toolbutton;
+    GtkWidget *Next_day_toolbutton;
+    GtkWidget *Next_week_toolbutton;
     GtkWidget *Refresh_toolbutton;
     GtkWidget *Close_toolbutton;
 
diff -Nru orage-4.8.3/src/event-list.c orage-4.12.1/src/event-list.c
--- orage-4.8.3/src/event-list.c	2011-11-26 14:26:26.000000000 +0000
+++ orage-4.12.1/src/event-list.c	2015-04-10 10:26:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2011 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2005 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -49,6 +49,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
+#include <glib.h>
 #include <glib/gprintf.h>
 
 #include "orage-i18n.h"
@@ -162,7 +163,7 @@
 {
     char *result;
     char *tmp;
-    int i = 0;
+    int i = 0, j = 0;
     char *start_ical_time;
     char *end_ical_time;
     gboolean same_date;
@@ -177,14 +178,14 @@
         /* special formatting for 1 day VEVENTS */
         if (start_ical_time[8] == 'T') { /* time part available */
             if (strncmp(start_ical_time, par, 8) < 0)
-                i = g_strlcpy(result, "+00:00 ", 50);
+                g_strlcpy(result, "+00:00 ", 50);
             else
-                i += append_time(result, start_ical_time, i);
+                append_time(result, start_ical_time, i);
             i = g_strlcat(result, "- ", 50);
             if (strncmp(par, end_ical_time , 8) < 0)
-                i = g_strlcat(result, "24:00+", 50);
+                g_strlcat(result, "24:00+", 50);
             else
-                i += append_time(result, end_ical_time, i);
+                append_time(result, end_ical_time, i);
         }
         else {/* date only appointment */
             i = g_strlcpy(result, _("All day"), 50);
@@ -196,10 +197,10 @@
         i = g_strlcpy(result, tmp, 50);
         if (start_ical_time[8] == 'T') { /* time part available */
             result[i++] = ' ';
-            i += append_time(result, start_ical_time, i);
+            append_time(result, start_ical_time, i);
             i = g_strlcat(result, "- ", 50);
             if (el->page == TODO_PAGE && !appt->use_due_time) {
-                i = g_strlcat(result, "...", 50);
+                g_strlcat(result, "...", 50);
             }
             else {
                 if (!same_date) {
@@ -208,18 +209,18 @@
                     i = g_strlcat(result, tmp, 50);
                     result[i++] = ' ';
                 }
-                i += append_time(result, end_ical_time, i);
+                append_time(result, end_ical_time, i);
             }
         }
         else {/* date only */
-            i = g_strlcat(result, " - ", 50);
+            g_strlcat(result, " - ", 50);
             if (el->page == TODO_PAGE && !appt->use_due_time) {
-                i = g_strlcat(result, "...", 50);
+                g_strlcat(result, "...", 50);
             }
             else {
                 t = orage_icaltime_to_tm_time(appt->endtimecur, TRUE);
                 tmp = orage_tm_date_to_i18_date(&t);
-                i = g_strlcat(result, tmp, 50);
+                g_strlcat(result, tmp, 50);
             }
         }
     }
@@ -373,9 +374,10 @@
     guint           len = 50;
 
     stime = format_time(el, appt, par);
-    if (appt->alarmtime != 0)
-        if (appt->sound != NULL)
-            flags[0] = 'S';
+    if (appt->display_alarm_orage || appt->display_alarm_notify 
+    ||  appt->sound_alarm || appt->procedure_alarm)
+        if (appt->alarm_persistent)
+            flags[0] = 'P';
         else
             flags[0] = 'A';
     else
@@ -391,8 +393,10 @@
         flags[1] = 'M';
     else if (appt->freq == XFICAL_FREQ_YEARLY)
         flags[1] = 'Y';
+    else if (appt->freq == XFICAL_FREQ_HOURLY)
+        flags[1] = 'H';
     else
-        flags[1] = 'n';
+        flags[1] = '?';
 
     if (appt->availability != 0)
         flags[2] = 'B';
@@ -497,7 +501,7 @@
     GList *appt_list=NULL, *tmp;
     xfical_appt *appt;
 
-    if (ical_type == XFICAL_TYPE_EVENT) {
+    if (ical_type == XFICAL_TYPE_EVENT && !el->only_first) {
         xfical_get_each_app_within_time(a_day, el->days+1
                 , ical_type, file_type, &appt_list);
         for (tmp = g_list_first(appt_list);
@@ -517,7 +521,19 @@
              appt;
              appt = xfical_appt_get_next_on_day(a_day, FALSE, el->days
                     , ical_type, file_type)) {
-            add_el_row(el, appt, par);
+            /*
+            g_print("Title: %s a_day %s\n\tstart %s end %s\n \tcur start %s end %s\n "
+                  , appt->title, a_day
+                  , appt->starttime, appt->endtime
+                  , appt->starttimecur, appt->endtimecur
+                      );
+                      */
+            /* fix bug 8508: Do not show event if it is normal (= has time)
+               and it has ended at midnight (=early morning) */
+            if (!(appt->endtimecur[8] == 'T' 
+                && strncmp(appt->endtimecur+9, "000000", 6) == 0
+                && strncmp(appt->endtimecur, a_day, 8) == 0))
+                add_el_row(el, appt, par);
             xfical_appt_free(appt);
         }
     }
@@ -590,20 +606,40 @@
     char      *stime;  /* in icaltime format */
     char      a_day[9]; /* yyyymmdd */
     struct tm *t, t_title;
+    GDate *d1, *d2;
 
     if (el->days == 0)
         refresh_time_field(el);
     el->days = gtk_spin_button_get_value(GTK_SPIN_BUTTON(el->event_spin));
+    /*
+    el->only_first = gtk_toggle_button_get_active(
+            GTK_TOGGLE_BUTTON(el->event_only_first_checkbutton));
+            */
+    el->show_old = gtk_toggle_button_get_active(
+            GTK_TOGGLE_BUTTON(el->event_show_old_checkbutton));
     title = (char *)gtk_window_get_title(GTK_WINDOW(el->Window));
     t_title = orage_i18_date_to_tm_date(title); 
-    stime = orage_tm_time_to_icaltime(&t_title);
-    strncpy(a_day, stime, 8);
+    if (el->show_old && el->only_first) {
+        /* just take any old enough date, so that all events fit in */
+        strncpy(a_day, "19000101", 8); 
+        /* we need to adjust also number of days shown */
+        d1 = g_date_new_dmy(1, 1, 1900);
+        d2 = g_date_new_dmy(t_title.tm_mday, t_title.tm_mon+1
+                , t_title.tm_year+1900);
+        el->days += g_date_days_between(d1, d2);
+        g_date_free(d1);
+        g_date_free(d2);
+    }
+    else { /* we show starting from selected day */
+        stime = orage_tm_time_to_icaltime(&t_title);
+        strncpy(a_day, stime, 8);
+    }
     a_day[8] = '\0';
     t = orage_localtime();
     g_sprintf(el->time_now, "%02d:%02d", t->tm_hour, t->tm_min);
-    if (   t_title.tm_year == t->tm_year
-        && t_title.tm_mon  == t->tm_mon
-        && t_title.tm_mday == t->tm_mday)
+    if (t_title.tm_year == t->tm_year
+    &&  t_title.tm_mon  == t->tm_mon
+    &&  t_title.tm_mday == t->tm_mday)
         el->today = TRUE;
     else
         el->today = FALSE; 
@@ -622,7 +658,8 @@
     stime = orage_tm_time_to_icaltime(t);
     strncpy(a_day, stime, 8);
     a_day[8] = '\0';
-    strncpy(el->date_now, stime, XFICAL_APPT_TIME_FORMAT_LEN);
+    strncpy(el->date_now, stime, XFICAL_APPT_TIME_FORMAT_LEN-1);
+    el->date_now[XFICAL_APPT_TIME_FORMAT_LEN-1] = '\0';
     app_data(el, a_day, NULL);
 }
 
@@ -631,8 +668,9 @@
     char     a_day[9];  /* yyyymmdd */
 
     el->days = 10*365; /* long enough time to get everything from future */
-    strcpy(a_day, orage_i18_date_to_icaldate(gtk_button_get_label(
-            GTK_BUTTON(el->journal_start_button))));
+    strncpy(a_day, orage_i18_date_to_icaldate(gtk_button_get_label(
+            GTK_BUTTON(el->journal_start_button))), 8);
+    a_day[8] = '\0';
 
     app_data(el, a_day, NULL);
 }
@@ -789,7 +827,6 @@
     g_list_free(el->apptw_list);
 
     gtk_widget_destroy(el->Window); /* destroy the eventlist window */
-    gtk_object_destroy(GTK_OBJECT(el->Tooltips));
     g_free(el);
     el = NULL;
 }
@@ -881,10 +918,11 @@
 
 static void create_new_appointment(el_win *el)
 {
-    char *title, a_day[10];
+    char *title, a_day[9];
 
     title = (char *)gtk_window_get_title(GTK_WINDOW(el->Window));
-    strcpy(a_day, orage_i18_date_to_icaldate(title));
+    strncpy(a_day, orage_i18_date_to_icaldate(title), 8);
+    a_day[8] = '\0';
     do_appt_win("NEW", a_day, el);
 }
 
@@ -903,6 +941,21 @@
     refresh_el_win((el_win *)user_data);
 }
 
+static void on_only_first_clicked(GtkCheckButton *b, gpointer user_data)
+{
+    el_win *el = (el_win *)user_data;
+
+    el->only_first = gtk_toggle_button_get_active(
+            GTK_TOGGLE_BUTTON(el->event_only_first_checkbutton));
+    gtk_widget_set_sensitive(el->event_show_old_checkbutton, el->only_first);
+    refresh_el_win((el_win *)user_data);
+}
+
+static void on_show_old_clicked(GtkCheckButton *b, gpointer user_data)
+{
+    refresh_el_win((el_win *)user_data);
+}
+
 static void delete_appointment(el_win *el)
 {
     gint result;
@@ -916,7 +969,10 @@
 
     result = orage_warning_dialog(GTK_WINDOW(el->Window)
             , _("You will permanently remove all\nselected appointments.")
-            , _("Do you want to continue?"));
+            , _("Do you want to continue?")
+            , _("No, cancel the removal")
+            , _("Yes, remove them"));
+
     if (result == GTK_RESPONSE_YES) {
         if (!xfical_file_open(TRUE))
             return;
@@ -969,7 +1025,14 @@
         , gpointer *user_data)
 {
     el_win *el = (el_win *)user_data;
-    if (orage_date_button_clicked(button, el->Window))
+    GtkWidget *selDate_dialog;
+
+    selDate_dialog = gtk_dialog_new_with_buttons(
+            _("Pick the date"), GTK_WINDOW(el->Window),
+            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+            _("Today"), 1, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
+
+    if (orage_date_button_clicked(button, selDate_dialog))
         refresh_el_win(el);
 }
 
@@ -1003,11 +1066,13 @@
             g_free(uid);
         }
     }
-    if (!gtk_selection_data_set_text(selection_data, result->str, -1))
-        g_warning("drag_data_get failed\n");
     g_list_foreach(list, (GFunc)gtk_tree_path_free, NULL);
     g_list_free(list);
-    g_string_free(result, TRUE);
+    if (result) {
+        if (!gtk_selection_data_set_text(selection_data, result->str, -1))
+            g_warning("drag_data_get failed\n");
+        g_string_free(result, TRUE);
+    }
 }
 
 static void build_menu(el_win *el)
@@ -1104,37 +1169,36 @@
 
     el->Toolbar = gtk_toolbar_new();
     gtk_box_pack_start(GTK_BOX(el->Vbox), el->Toolbar, FALSE, FALSE, 0);
-    gtk_toolbar_set_tooltips(GTK_TOOLBAR(el->Toolbar), TRUE);
 
     el->Create_toolbutton = orage_toolbar_append_button(el->Toolbar
-            , "gtk-new", el->Tooltips, _("New"), i++);
+            , "gtk-new", _("New"), i++);
     el->Copy_toolbutton = orage_toolbar_append_button(el->Toolbar
-            , "gtk-copy", el->Tooltips, _("Duplicate"), i++);
+            , "gtk-copy", _("Duplicate"), i++);
     el->Delete_toolbutton = orage_toolbar_append_button(el->Toolbar
-            , "gtk-delete", el->Tooltips, _("Delete"), i++);
+            , "gtk-delete", _("Delete"), i++);
 
     toolbar_separator = orage_toolbar_append_separator(el->Toolbar, i++);
     
     el->Previous_toolbutton = orage_toolbar_append_button(el->Toolbar
-            , "gtk-go-back", el->Tooltips, _("Back"), i++);
+            , "gtk-go-back", _("Back"), i++);
     el->Today_toolbutton = orage_toolbar_append_button(el->Toolbar
-            , "gtk-home", el->Tooltips, _("Today"), i++);
+            , "gtk-home", _("Today"), i++);
     el->Next_toolbutton = orage_toolbar_append_button(el->Toolbar
-            , "gtk-go-forward", el->Tooltips, _("Forward"), i++);
+            , "gtk-go-forward", _("Forward"), i++);
 
     toolbar_separator = orage_toolbar_append_separator(el->Toolbar, i++);
 
     el->Refresh_toolbutton = orage_toolbar_append_button(el->Toolbar
-            , "gtk-refresh", el->Tooltips, _("Refresh"), i++);
+            , "gtk-refresh", _("Refresh"), i++);
     el->Search_toolbutton = orage_toolbar_append_button(el->Toolbar
-            , "gtk-find", el->Tooltips, _("Find"), i++);
+            , "gtk-find", _("Find"), i++);
 
     toolbar_separator = orage_toolbar_append_separator(el->Toolbar, i++);
 
     el->Close_toolbutton = orage_toolbar_append_button(el->Toolbar
-            , "gtk-close", el->Tooltips, _("Close"), i++);
+            , "gtk-close", _("Close"), i++);
     el->Dayview_toolbutton = orage_toolbar_append_button(el->Toolbar
-            , "gtk-zoom-in", el->Tooltips, _("Dayview"), i++);
+            , "gtk-zoom-in", _("Dayview"), i++);
 
     g_signal_connect((gpointer)el->Create_toolbutton, "clicked"
             , G_CALLBACK(on_Create_toolbutton_clicked_cb), el);
@@ -1161,23 +1225,53 @@
 static void build_event_tab(el_win *el)
 {
     GtkWidget *label;
+    GtkWidget *hbox;
 
+    hbox =  gtk_hbox_new(FALSE, 0);
     el->event_tab_label = gtk_label_new(_("Event"));
     /* we do not really need table, but it is efficient and easy way to
        do this. Using hboxes takes actually more memory */
     el->event_notebook_page = orage_table_new(1, BORDER_SIZE);
 
-    label = gtk_label_new(_("Extra days to show "));
-    el->event_spin = gtk_spin_button_new_with_range(0, 999, 1);
+    label = gtk_label_new(_("Extra days to show:"));
+
+    el->event_spin = gtk_spin_button_new_with_range(0, 99999, 1);
+    gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(el->event_spin), TRUE);
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(el->event_spin)
             , (gdouble)el->days);
+    gtk_box_pack_start(GTK_BOX(hbox), el->event_spin, FALSE, FALSE, 2);
+
+    el->event_only_first_checkbutton =
+            gtk_check_button_new_with_label(_("only first repeating"));
+    gtk_toggle_button_set_active(
+            GTK_TOGGLE_BUTTON(el->event_only_first_checkbutton)
+                    , el->only_first);
+    gtk_widget_set_tooltip_text(el->event_only_first_checkbutton
+            , _("Check this if you only want to see the first repeating event. By default all are shown.\nNote that this also shows all urgencies.\nNote that repeating events may appear earlier in the list as the first occurrence only is listed."));
+    gtk_box_pack_start(GTK_BOX(hbox), el->event_only_first_checkbutton
+            , FALSE, FALSE, 15);
+
+    el->event_show_old_checkbutton =
+            gtk_check_button_new_with_label(_("also old"));
+    gtk_widget_set_tooltip_text(el->event_show_old_checkbutton
+            , _("Check this if you want to see old events also. This can only be selected after 'only first repeating' is enabled to avoid very long lists.\nNote that extra days selection still defines if newer appointments are listed'."));
+    gtk_toggle_button_set_active(
+            GTK_TOGGLE_BUTTON(el->event_show_old_checkbutton), el->only_first);
+    gtk_widget_set_sensitive(el->event_show_old_checkbutton, el->only_first);
+    gtk_box_pack_start(GTK_BOX(hbox), el->event_show_old_checkbutton
+            , FALSE, FALSE, 15);
+
     orage_table_add_row(el->event_notebook_page
-            , label, el->event_spin, 0, (GTK_FILL), (0));
+            , label, hbox, 0, (GTK_FILL), (0));
 
     gtk_notebook_append_page(GTK_NOTEBOOK(el->Notebook)
             , el->event_notebook_page, el->event_tab_label);
     g_signal_connect((gpointer)el->event_spin, "value-changed"
             , G_CALLBACK(on_spin_changed), el);
+    g_signal_connect((gpointer)el->event_only_first_checkbutton, "clicked"
+            , G_CALLBACK(on_only_first_clicked), el);
+    g_signal_connect((gpointer)el->event_show_old_checkbutton, "clicked"
+            , G_CALLBACK(on_show_old_clicked), el);
 }
 
 static void build_todo_tab(el_win *el)
@@ -1320,7 +1414,7 @@
     gtk_tree_view_append_column(GTK_TREE_VIEW(el->TreeView), col);
     gtk_tree_view_column_set_visible(col, FALSE);
 
-    gtk_tooltips_set_tip(el->Tooltips, el->TreeView, _("Double click line to edit it.\n\nFlags in order:\n\t 1. Alarm: n=no alarm\n\t\t A=visual Alarm S=also Sound alarm\n\t 2. Recurrence: n=no recurrence\n\t\t D=Daily W=Weekly M=Monthly Y=Yearly\n\t 3. Type: f=free B=Busy\n\t 4. Located in file:\n\t\tO=Orage A=Archive F=Foreign\n\t 5. Appointment type:\n\t\tE=Event T=Todo J=Journal"), NULL);
+    gtk_widget_set_tooltip_text(el->TreeView, _("Double click line to edit it.\n\nFlags in order:\n\t 1. Alarm: n=no alarm\n\t\t A=Alarm is set P=Persistent alarm is set\n\t 2. Recurrence: n=no recurrence\n\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n\t 3. Type: f=free B=Busy\n\t 4. Located in file:\n\t\tO=Orage A=Archive F=Foreign\n\t 5. Appointment type:\n\t\tE=Event T=Todo J=Journal"));
 
     g_signal_connect(el->TreeView, "row-activated",
             G_CALLBACK(editEvent), el);
@@ -1335,9 +1429,10 @@
     el = g_new(el_win, 1);
     el->today = FALSE;
     el->days = g_par.el_days;
+    el->only_first = g_par.el_only_first;
+    el->show_old = el->only_first;
     el->time_now[0] = 0;
     el->apptw_list = NULL;
-    el->Tooltips = gtk_tooltips_new();
     el->accel_group = gtk_accel_group_new();
 
     el->Window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
diff -Nru orage-4.8.3/src/event-list.h orage-4.12.1/src/event-list.h
--- orage-4.8.3/src/event-list.h	2011-01-13 10:28:54.000000000 +0000
+++ orage-4.12.1/src/event-list.h	2015-04-10 10:26:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2011 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2005 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -36,7 +36,6 @@
 typedef struct _el_win
 {
     GtkAccelGroup *accel_group;
-    GtkTooltips   *Tooltips;
 
     GtkWidget *Window;
     GtkWidget *Vbox;
@@ -71,6 +70,8 @@
     GtkWidget *event_tab_label;
     GtkWidget *event_notebook_page;
     GtkWidget *event_spin;
+    GtkWidget *event_only_first_checkbutton;
+    GtkWidget *event_show_old_checkbutton;
     GtkWidget *todo_tab_label;
     GtkWidget *todo_notebook_page;
     GtkWidget *journal_tab_label;
@@ -88,6 +89,8 @@
 
     /* these are used to build the data into event list */
     gboolean today;       /* flag: today or not */
+    gboolean only_first;  /* flag: show only the first repeating event */
+    gboolean show_old;    /* flag: show also very old events */
     int      days;        /* how many extra days to show; usually 0 */
     el_page  page;        /* appointment page to show */
     char     time_now[6]; /* hh:mm */
diff -Nru orage-4.8.3/src/functions.c orage-4.12.1/src/functions.c
--- orage-4.8.3/src/functions.c	2012-01-03 11:56:00.000000000 +0000
+++ orage-4.12.1/src/functions.c	2015-04-10 10:26:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2011 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2003-2005 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,6 +22,7 @@
  */
 
 #define _XOPEN_SOURCE /* glibc2 needs this */
+#define _XOPEN_SOURCE_EXTENDED 1 /* strptime needs this in posix systems */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -88,7 +89,7 @@
 void orage_message(gint level, const char *format, ...)
 {
     va_list args;
-    char *formatted;
+    char *formatted, time_stamp[10];
     struct tm *t = orage_localtime();
 
     if (level < g_log_level)
@@ -97,17 +98,17 @@
     formatted = g_strdup_vprintf(format, args);
     va_end(args);
 
-    g_print("%02d:%02d:%02d ", t->tm_hour, t->tm_min, t->tm_sec);
+    g_sprintf(time_stamp, "%02d:%02d:%02d ", t->tm_hour, t->tm_min, t->tm_sec);
     if (level < 0)
-        g_debug("%s", formatted);
+        g_debug("%s%s", time_stamp, formatted);
     else if (level < 100) 
-        g_message("Orage **: %s", formatted);
+        g_message("Orage **: %s %s", time_stamp, formatted);
     else if (level < 200) 
-        g_warning("%s", formatted);
+        g_warning("%s%s", time_stamp, formatted);
     else if (level < 300) 
-        g_critical("%s", formatted);
+        g_critical("%s%s", time_stamp, formatted);
     else
-        g_error("Orage **: %s", formatted);
+        g_error("Orage **: %s%s", time_stamp, formatted);
     g_free(formatted);
 }
 
@@ -128,15 +129,18 @@
     return(combo_box);
 }
 
-gboolean orage_date_button_clicked(GtkWidget *button, GtkWidget *win)
+gboolean orage_date_button_clicked(GtkWidget *button, GtkWidget *selDate_dialog)
 {
-    GtkWidget *selDate_dialog;
+/*  GtkWidget *selDate_dialog; */
     GtkWidget *selDate_calendar;
     gint result;
     char *new_date=NULL, *cur_date;
     struct tm cur_t;
     gboolean changed, allocated=FALSE;
 
+    /*
+       For some unknown reason NLS does not work in this file, so this
+       has to be done in the main code:
     selDate_dialog = gtk_dialog_new_with_buttons(
             _("Pick the date"), GTK_WINDOW(win),
             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -145,6 +149,7 @@
             GTK_STOCK_OK,
             GTK_RESPONSE_ACCEPT,
             NULL);
+            */
 
     selDate_calendar = gtk_calendar_new();
     gtk_container_add(GTK_CONTAINER(GTK_DIALOG(selDate_dialog)->vbox)
@@ -227,14 +232,12 @@
 }
 
 GtkWidget *orage_toolbar_append_button(GtkWidget *toolbar
-    , const gchar *stock_id, GtkTooltips *tooltips, const char *tooltip_text
-    , gint pos)
+    , const gchar *stock_id, const char *tooltip_text, gint pos)
 {
     GtkWidget *button;
 
     button = (GtkWidget *)gtk_tool_button_new_from_stock(stock_id);
-    gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(button), tooltips
-            , (const gchar *) tooltip_text, NULL);
+    gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(button), tooltip_text);
     gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(button), pos);
     return button;
 }
@@ -331,7 +334,7 @@
 {
 #undef P_N
 #define P_N "orage_replace_text: "
-    /* these point to the original string and travel it until no more commands 
+    /* these point to the original string and travel it until no more olds 
      * are found:
      * cur points to the current head (after each old if any found)
      * cmd points to the start of next old in text */
@@ -367,6 +370,82 @@
     return(beq);
 }
 
+/* This is helper function for orage_limit_text. It takes char pointer
+   to string start and length and adds that "line" to the beginning of 
+   old_result and returns the new_result.
+*/
+static char* add_line(char *old_result, char *start, int line_len
+        , int max_line_len)
+{
+    char *tmp;
+    char *line;          /* new line to add */
+    char *new_result;
+
+    if (line_len > max_line_len) {
+        tmp = g_strndup(start, max_line_len-3);
+        if (*(start+line_len-1) == '\n') { /* need to add line change */
+            line = g_strjoin("", tmp, "...\n", NULL);
+        }
+        else {
+            line = g_strjoin("", tmp, "...", NULL);
+        }
+        g_free(tmp);
+    }
+    else {
+        line = g_strndup(start, line_len);
+    }
+    /* note that old_result can be NULL */
+    new_result = g_strjoin("", line, old_result, NULL);
+    g_free(line);
+    g_free(old_result);
+    return(new_result);
+}
+
+/* cuts text to fit in a box defined with max_line_len and max_lines.
+   This is usefull for example in tooltips to avoid too broad and too may lines
+   to be visible.
+   You can always use this like 
+   str=orage_limit_text(str, max_line_len, max_lines);
+   but it may point to new place.
+*/
+char *orage_limit_text(char *text, int max_line_len, int max_lines)
+{
+#undef P_N
+#define P_N "orage_limit_text: "
+    /* these point to the original string and travel it until no more cuts 
+     * are needed:
+     * cur points to the current end of text character.
+     * eol is pointing to the end of current line */
+    char *cur, *eol;
+    char *result=NULL;   /* end result is collected to this */
+    int text_len=strlen(text);
+    int line_cnt=0;
+
+    if (text_len < 2) /* nothing to do */
+        return(text);
+    /* we start from the end and collect upto max_lines to a new buffer, but
+     * cut them to max_line_len before accepting */
+    for (cur = text+text_len-2, eol = text+text_len-1;
+         (cur > text) && (line_cnt < max_lines); cur--) {
+        if (*cur == '\n') {
+            /* line found, collect the line */
+            result = add_line(result, cur+1, eol-cur, max_line_len);
+            line_cnt++;
+            eol = cur;
+        }
+    }
+    /* Need to process first line also as it does not start with line end */
+    if ((cur == text) && (line_cnt < max_lines)) {
+        result = add_line(result, cur, eol-cur+1, max_line_len);
+    }
+    if (result) {
+        g_free(text);
+        return(result);
+    }
+    else 
+        return(text);
+}
+
 /* this will change <&Xnnn> type commands to numbers or text as defined.
  * Currently the only command is 
  * <&Ynnnn> which calculates years between current year and nnnn */
@@ -519,6 +598,18 @@
     return(framebox);
 }
 
+GtkWidget *orage_create_custom_stock_button(const gchar *stock_id
+        , const gchar *label_text) {
+    GtkWidget *button;
+    GtkWidget *image;
+
+    image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_BUTTON);
+    button = gtk_button_new_with_label(label_text);
+    gtk_button_set_image((GtkButton*)button, image);
+    
+    return(button);
+}
+
 /*******************************************************
  * time convert and manipulation functions
  *******************************************************/
@@ -553,18 +644,18 @@
 
 char *orage_tm_time_to_i18_time(struct tm *tm_time)
 {
-    static char i18_time[40];
+    static char i18_time[128];
 
-    if (strftime(i18_time, 40, "%x %R", tm_time) == 0)
+    if (strftime(i18_time, 128, "%x %R", tm_time) == 0)
         g_error("Orage: orage_tm_time_to_i18_time too long string in strftime");
     return(i18_time);
 }
 
 char *orage_tm_date_to_i18_date(struct tm *tm_date)
 {
-    static char i18_date[32];
+    static char i18_date[128];
 
-    if (strftime(i18_date, 32, "%x", tm_date) == 0)
+    if (strftime(i18_date, 128, "%x", tm_date) == 0)
         g_error("Orage: orage_tm_date_to_i18_date too long string in strftime");
     return(i18_date);
 }
@@ -726,34 +817,9 @@
 /* move one day forward or backward */
 void orage_move_day(struct tm *t, int day)
 {
-    gint monthdays[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-
-    if (day < -1 || day > 1) {
-        g_warning("orage: orage_move_day wrong parameter %d", day);
-    }
-    t->tm_year += 1900;
-    if (((t->tm_year%4) == 0) 
-    && (((t->tm_year%100) != 0) || ((t->tm_year%400) == 0)))
-        ++monthdays[1]; /* leap year, february has 29 days */
-
     t->tm_mday += day; /* may be negative */
-    if (t->tm_mday == 0) { /*  we went to previous month */
-        if (--t->tm_mon == -1) { /* previous year */
-            --t->tm_year;
-            t->tm_mon = 11;
-        }
-        t->tm_mday = monthdays[t->tm_mon];
-    }
-    else if (t->tm_mday > (monthdays[t->tm_mon])) { /* next month */
-        if (++t->tm_mon == 12) {
-            ++t->tm_year;
-            t->tm_mon = 0;
-        }
-        t->tm_mday = 1;
-    }
-    t->tm_year -= 1900;
-    /* need to fill missing tm_wday and tm_yday, which are in use 
-     * in some locale's default date. For example in en_IN. mktime does it */
+    /* mktime adjusts t correctly. It also fills missing tm_wday and tm_yday, 
+     * which are in use in some locale's default date. For example in en_IN */
     if (mktime(t) == (time_t) -1) {
         g_warning("orage: orage_move_day mktime failed %d %d %d"
                 , t->tm_year, t->tm_mon, t->tm_mday);
@@ -816,7 +882,7 @@
         ok = FALSE;
     }
     /* write file */
-    if (!g_file_set_contents(target, text, -1, &error)) {
+    if (ok && !g_file_set_contents(target, text, -1, &error)) {
         orage_message(150, "orage_copy_file: Could not write file (%s) error:%s"
                 , target, error->message);
         g_error_free(error);
@@ -1127,7 +1193,8 @@
 }
 
 gint orage_warning_dialog(GtkWindow *parent
-        , char *primary_text, char *secondary_text)
+        , char *primary_text, char *secondary_text
+        , char *no_text, char *yes_text)
 {
     GtkWidget *dialog;
     gint result;
@@ -1135,11 +1202,13 @@
     dialog = gtk_message_dialog_new(parent
             , GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT
             , GTK_MESSAGE_WARNING
-            , GTK_BUTTONS_YES_NO
+            , GTK_BUTTONS_NONE
             , "%s", primary_text);
     if (secondary_text) 
         gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog)
                 , "%s", secondary_text);
+    gtk_dialog_add_buttons(GTK_DIALOG(dialog)
+            , no_text, GTK_RESPONSE_NO, yes_text, GTK_RESPONSE_YES, NULL);
     result = gtk_dialog_run(GTK_DIALOG(dialog));
     gtk_widget_destroy(dialog);
     return(result);
diff -Nru orage-4.8.3/src/functions.h orage-4.12.1/src/functions.h
--- orage-4.8.3/src/functions.h	2012-01-03 11:56:07.000000000 +0000
+++ orage-4.12.1/src/functions.h	2015-04-10 10:26:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2006-2011 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2006-2013 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2005-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -70,8 +70,7 @@
 gboolean orage_exec(const char *cmd, gboolean *cmd_active, GError **error);
 
 GtkWidget *orage_toolbar_append_button(GtkWidget *toolbar
-        , const gchar *stock_id, GtkTooltips *tooltips
-        , const char *tooltip_text, gint pos);
+        , const gchar *stock_id, const char *tooltip_text, gint pos);
 GtkWidget *orage_toolbar_append_separator(GtkWidget *toolbar, gint pos);
 
 GtkWidget *orage_table_new(guint rows, guint border);
@@ -85,8 +84,11 @@
 GtkWidget *orage_separator_menu_item_new(GtkWidget *menu);
 GtkWidget *orage_menu_item_new_with_mnemonic(const gchar *label
         , GtkWidget *menu);
+
 char *orage_replace_text(char *text, char *old, char *new);
+char *orage_limit_text(char *text, int max_line_len, int max_lines);
 char *orage_process_text_commands(char *text);
+
 GtkWidget *orage_period_hbox_new(gboolean head_space, gboolean tail_space
         , GtkWidget *spin_dd, GtkWidget *dd_label
         , GtkWidget *spin_hh, GtkWidget *hh_label
@@ -134,11 +136,14 @@
 gint orage_info_dialog(GtkWindow *parent
         , char *primary_text, char *secondary_text);
 gint orage_warning_dialog(GtkWindow *parent
-        , char *primary_text, char *secondary_text);
+        , char *primary_text, char *secondary_text
+        , char *no_text, char *yes_text);
 gint orage_error_dialog(GtkWindow *parent
         , char *primary_text, char *secondary_text);
 GtkWidget *orage_create_framebox_with_content(const gchar *title
         , GtkWidget *content);
+GtkWidget *orage_create_custom_stock_button(const gchar *stock_id
+        , const gchar *label_text);
 
 /* NOTE: the following is in main.c */
 void orage_toggle_visible(void);
diff -Nru orage-4.8.3/src/ical-archive.c orage-4.12.1/src/ical-archive.c
--- orage-4.8.3/src/ical-archive.c	2011-11-26 07:42:12.000000000 +0000
+++ orage-4.12.1/src/ical-archive.c	2015-04-10 10:26:26.000000000 +0000
@@ -319,6 +319,7 @@
     xfical_period per;
     icalcomponent *c, *c2;
     icalproperty *p;
+    struct tm tm_threshold;
     struct tm *threshold;
     char *uid;
 
@@ -333,7 +334,8 @@
         orage_message(250, P_N "file open error");
         return(FALSE);
     }
-    threshold = orage_localtime();
+    memcpy(&tm_threshold, orage_localtime(), sizeof(tm_threshold));
+    threshold=&tm_threshold;
     threshold->tm_mday = 1;
     threshold->tm_year += 1900;
     threshold->tm_mon += 1; /* convert from 0...11 to 1...12 */
diff -Nru orage-4.8.3/src/ical-code.c orage-4.12.1/src/ical-code.c
--- orage-4.8.3/src/ical-code.c	2011-11-29 07:33:15.000000000 +0000
+++ orage-4.12.1/src/ical-code.c	2015-04-10 10:26:26.000000000 +0000
@@ -47,6 +47,7 @@
 #include <time.h>
 #include <math.h>
 
+#include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <glib/gprintf.h>
@@ -359,6 +360,7 @@
             }
         }
     }
+
     ic_file_modified = FALSE;
     return(TRUE);
 }
@@ -369,12 +371,27 @@
 #define P_N "xfical_file_open: "
     gboolean ok;
     gint i;
+    struct stat s;
 
 #ifdef ORAGE_DEBUG
     orage_message(-100, P_N);
 #endif
+    /* make sure there are no external updates or they will be overwritten */
+    if (g_par.latest_file_change)
+        orage_external_update_check(NULL);
     ok = ic_internal_file_open(&ic_ical, &ic_fical, g_par.orage_file, FALSE
             , FALSE);
+    /* store last access time */
+    if (ok)
+        if (g_stat(g_par.orage_file, &s) < 0) {
+            orage_message(150, P_N "stat of %s failed: %d (%s)",
+                    g_par.orage_file, errno, strerror(errno));
+            g_par.latest_file_change = (time_t)0;
+        }
+        else {
+            g_par.latest_file_change = s.st_mtime;
+        }
+
     if (ok && foreign) /* let's open foreign files */
         for (i = 0; i < g_par.foreign_count; i++) {
             ok = ic_internal_file_open(&(ic_f_ical[i].ical)
@@ -383,8 +400,21 @@
             if (!ok) {
                 ic_f_ical[i].ical = NULL;
                 ic_f_ical[i].fical = NULL;
+                g_par.foreign_data[i].latest_file_change = (time_t)0;
+            }
+            else {
+                /* store last access time */
+                if (g_stat(g_par.foreign_data[i].file, &s) < 0) {
+                    orage_message(150, P_N "stat of %s failed: %d (%s)",
+                            g_par.foreign_data[i].file, errno, strerror(errno));
+                    g_par.foreign_data[i].latest_file_change = (time_t)0;
+                }
+                else {
+                    g_par.foreign_data[i].latest_file_change = s.st_mtime;
+                }
             }
         }
+
     return(ok);
 }
 
@@ -426,6 +456,7 @@
 #undef  P_N 
 #define P_N "xfical_file_close: "
     gint i;
+    struct stat s;
 
 #ifdef ORAGE_DEBUG
     orage_message(-100, P_N);
@@ -442,18 +473,27 @@
             orage_message(-10, P_N "canceling delayed close");
 #endif
         }
-        if (ic_file_modified) { /* close it now */
+        if (ic_file_modified || g_par.file_close_delay == 0) { /* close it now */
 #ifdef ORAGE_DEBUG
             orage_message(-10, P_N "closing file now");
 #endif
-            icalset_free(ic_fical);
-            ic_fical = NULL;
+            delayed_file_close(NULL);
+            /* store last access time */
+            if (g_stat(g_par.orage_file, &s) < 0) {
+                orage_message(150, P_N "stat of %s failed: %d (%s)",
+                        g_par.orage_file, errno, strerror(errno));
+                g_par.latest_file_change = (time_t)0;
+            }
+            else {
+                g_par.latest_file_change = s.st_mtime;
+            }
         }
-        else { /* close it later = after 10 minutes (to save time) */
+        else { /* close it later (to save time) */
 #ifdef ORAGE_DEBUG
-            orage_message(-10, P_N "closing file after 10 minutes");
+            orage_message(-10, P_N "closing file after %d seconds",
+                    g_par.file_close_delay);
 #endif
-            file_close_timer = g_timeout_add_seconds(10*60
+            file_close_timer = g_timeout_add_seconds(g_par.file_close_delay
                     , (GtkFunction)delayed_file_close, NULL);
         }
     }
@@ -465,6 +505,15 @@
             else {
                 icalset_free(ic_f_ical[i].fical);
                 ic_f_ical[i].fical = NULL;
+                /* store last access time */
+                if (g_stat(g_par.foreign_data[i].file, &s) < 0) {
+                    orage_message(150, P_N "stat of %s failed: %d (%s)",
+                            g_par.foreign_data[i].file, errno, strerror(errno));
+                    g_par.foreign_data[i].latest_file_change = (time_t)0;
+                }
+                else {
+                    g_par.foreign_data[i].latest_file_change = s.st_mtime;
+                }
             }
         }
 }
@@ -477,16 +526,8 @@
 #ifdef ORAGE_DEBUG
     orage_message(-100, P_N);
 #endif
-    if (file_close_timer) { 
-            /* We are closing main ical file and delayed close is in progress. 
-             * Closing must be cancelled since we are now closing the file. */
-        g_source_remove(file_close_timer);
-        file_close_timer = 0;
-#ifdef ORAGE_DEBUG
-        orage_message(-10, P_N "canceling delayed close");
-#endif
-    }
-    delayed_file_close(NULL);
+    ic_file_modified = TRUE;
+    xfical_file_close(TRUE);
 }
 
 char *ic_get_char_timezone(icalproperty *p)
@@ -1446,7 +1487,7 @@
     dtstamp = icaltime_current_time_with_zone(utc_icaltimezone);
     if (add) {
         int_uid = ic_generate_uid();
-        ext_uid = g_strconcat("O00.", int_uid, NULL);
+        ext_uid = g_strconcat(uid, int_uid, NULL);
         appt->uid = ext_uid;
         create_time = dtstamp;
     }
@@ -1556,10 +1597,9 @@
   *           This ical id is owned by the routine. Do not deallocate it.
   *           It will be overwrittewritten by next invocation of this function.
   */
-char *xfical_appt_add(xfical_appt *appt)
+char *xfical_appt_add(char *ical_file_id, xfical_appt *appt)
 {
-    /* FIXME: make it possible to add events into foreign files */
-    return(appt_add_internal(appt, TRUE, NULL, icaltime_null_time()));
+    return(appt_add_internal(appt, TRUE, ical_file_id, icaltime_null_time()));
 }
 
 static gboolean get_alarm_trigger(icalcomponent *ca,  xfical_appt *appt)
@@ -1675,8 +1715,12 @@
             appt->note = (char *)icalproperty_get_description(p);
             */
         /* default display alarm is orage if none is set */
-        if (!appt->display_alarm_orage && !appt->display_alarm_notify)	
-            appt->display_alarm_orage = TRUE;
+        if (!appt->display_alarm_orage && !appt->display_alarm_notify) {
+            if (g_par.use_foreign_display_alarm_notify)
+                appt->display_alarm_notify = TRUE;
+            else
+                appt->display_alarm_orage = TRUE;
+        }
     }
     else if (act == ICAL_ACTION_AUDIO) {
         get_alarm_data_x(ca, appt);
@@ -2448,6 +2492,7 @@
     icalset *fbase;
     char *uid, *int_uid;
     int i;
+    struct stat s;
 
 #ifdef ORAGE_DEBUG
     orage_message(-100, P_N);
@@ -2480,15 +2525,12 @@
         orage_message(260, P_N "unknown file type %s", ical_uid);
         return(FALSE);
     }
-    if (ical_uid == NULL) {
-        orage_message(130, P_N "Got NULL uid. doing nothing");
-        return(FALSE);
-     }
+
     for (c = icalcomponent_get_first_component(base, ICAL_ANY_COMPONENT); 
          c != 0;
          c = icalcomponent_get_next_component(base, ICAL_ANY_COMPONENT)) {
         uid = (char *)icalcomponent_get_uid(c);
-        if (strcmp(uid, int_uid) == 0) {
+        if (ORAGE_STR_EXISTS(uid) && strcmp(uid, int_uid) == 0) {
             icalcomponent_remove_component(base, c);
             icalset_mark(fbase);
             xfical_alarm_build_list_internal(FALSE);
@@ -2720,6 +2762,17 @@
     per = ic_get_period(c, TRUE);
     next_alarm_time = count_first_alarm_time(per, trg.duration, rel);
     alarm_start_diff = icaltime_subtract(next_alarm_time, per.stime);
+    /* Due to the hack in date time calculation in count_first_alarm_time,
+       we need to set next_alarm_time to local timezone so that 
+       icaltime_compare works. Fix for Bug 8525
+     */
+    if (icaltime_is_date(per.stime)) {
+        if (local_icaltimezone != utc_icaltimezone) {
+            next_alarm_time.is_utc        = 0;
+            next_alarm_time.is_daylight   = 0;
+            next_alarm_time.zone          = local_icaltimezone;
+        }
+    }
     /*
 orage_message(120, P_N "current %s %s", icaltime_as_ical_string(cur_time), icaltime_get_tzid(cur_time));
 orage_message(120, P_N "Start %s %s", icaltime_as_ical_string(per.stime), icaltime_get_tzid(per.stime));
@@ -2791,6 +2844,17 @@
 */
         }
         icalrecur_iterator_free(ri);
+        /* Due to the hack in date time calculation in count_first_alarm_time,
+           we need to set next_alarm_time to local timezone so that 
+           icaltime_compare works. Fix for Bug 8525
+         */
+        if (icaltime_is_date(per.stime)) {
+            if (local_icaltimezone != utc_icaltimezone) {
+                next_alarm_time.is_utc        = 0;
+                next_alarm_time.is_daylight   = 0;
+                next_alarm_time.zone          = local_icaltimezone;
+            }
+        }
         if (icaltime_compare(cur_time, next_alarm_time) <= 0) {
             trg_active = TRUE;
         }
@@ -3048,7 +3112,7 @@
 }
 
 static void xfical_alarm_build_list_internal_real(gboolean first_list_today
-        , icalcomponent *base, char *file_type)
+        , icalcomponent *base, char *file_type, char *file_name)
 {
 #undef P_N
 #define P_N "xfical_alarm_build_list_internal_real: "
@@ -3091,6 +3155,11 @@
                             (char *)icalcomponent_get_description(c));
                 }
             }
+            if (trg_active) {
+                cnt_act_alarm++;
+                process_alarm_data(ca, new_alarm);
+            }
+            /*
             if (trg_processed) {
                 if (trg_active) {
                     cnt_act_alarm++;
@@ -3101,6 +3170,7 @@
                 orage_message(140, P_N "Found alarm without trigger %s. Skipping it"
                         , icalcomponent_get_uid(c));
             }
+            */
         }  /* ALARM */
         if (trg_active) {
             alarm_add(new_alarm);
@@ -3112,19 +3182,16 @@
         }
     }  /* COMPONENT */
     if (first_list_today) {
-        orage_message(60, _("Build alarm list: Added %d alarms. Processed %d events.")
-                , cnt_alarm_add, cnt_event);
-        orage_message(60, _("\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)")
-                , cnt_alarm, cnt_act_alarm, cnt_repeat);
-    }
-/*
-    else {
-        orage_message(60, _("Build alarm list: Added %d alarms. Processed %d events.")
+        if (strcmp(file_type, "O00.") == 0)
+            orage_message(60, _("Created alarm list for main Orage file:"));
+        else 
+            orage_message(60, _("Created alarm list for foreign file: %s (%s)")
+                    , file_name, file_type);
+        orage_message(60, _("\tAdded %d alarms. Processed %d events.")
                 , cnt_alarm_add, cnt_event);
         orage_message(60, _("\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)")
                 , cnt_alarm, cnt_act_alarm, cnt_repeat);
     }
-*/
 }
 
 static void xfical_alarm_build_list_internal(gboolean first_list_today)
@@ -3142,12 +3209,13 @@
 
     /* first search base orage file */
     strcpy(file_type, "O00.");
-    xfical_alarm_build_list_internal_real(first_list_today, ic_ical, file_type);
+    xfical_alarm_build_list_internal_real(first_list_today, ic_ical, file_type
+            , NULL);
     /* then process all foreign files */
     for (i = 0; i < g_par.foreign_count; i++) {
         g_sprintf(file_type, "F%02d.", i);
-        xfical_alarm_build_list_internal_real(first_list_today, ic_f_ical[i].ical
-                , file_type);
+        xfical_alarm_build_list_internal_real(first_list_today
+                , ic_f_ical[i].ical, file_type, g_par.foreign_data[i].name);
     }
     setup_orage_alarm_clock(); /* keep reminders upto date */
     build_mainbox_info();      /* refresh main calendar window lists */
@@ -3160,9 +3228,10 @@
 #ifdef ORAGE_DEBUG
     orage_message(-100, P_N);
 #endif
-    xfical_file_open(TRUE);
-    xfical_alarm_build_list_internal(first_list_today);
-    xfical_file_close(TRUE);
+    if (xfical_file_open(TRUE)) {
+        xfical_alarm_build_list_internal(first_list_today);
+        xfical_file_close(TRUE);
+    }
 }
 
  /* Read next EVENT/TODO/JOURNAL component on the specified date from 
@@ -3299,6 +3368,13 @@
             g_strlcpy(appt->endtimecur, icaltime_as_ical_string(per.etime)
                     , 17);
         }
+        /*
+    if (file_type[0] == 'F') {
+    orage_message(100, P_N "starttimecur:%s endtimecur:%s", appt->starttimecur, appt->endtimecur);
+    orage_message(10, P_N "Title (%s)\n\tfound Start:%s End:%s\n\tlimit Start:%s End:%s"
+            , appt->title, appt->starttimecur, appt->endtimecur, icaltime_as_ical_string(asdate), icaltime_as_ical_string(aedate));
+    }
+    */
         return(appt);
     }
     else
@@ -3409,6 +3485,7 @@
         GtkCalendar *cal;
         guint year; 
         guint month;
+        gint orig_start_hour, orig_end_hour;
         xfical_appt appt;
     } *cal_data;
     time_t temp;
@@ -3429,15 +3506,39 @@
         gmtime_r(&temp, &end_tm);
     }
     sdate = icaltime_from_string(orage_tm_time_to_icaltime(&start_tm));
-    sdate = convert_to_zone(sdate, cal_data->appt.start_tz_loc);
-    sdate = icaltime_convert_to_zone(sdate, local_icaltimezone);
     edate = icaltime_from_string(orage_tm_time_to_icaltime(&end_tm));
-    edate = convert_to_zone(edate, cal_data->appt.end_tz_loc);
+    if (cal_data->appt.freq != XFICAL_FREQ_HOURLY
+    &&  start_tm.tm_hour != cal_data->orig_start_hour) {
+        orage_message(-10, P_N "FIXING WRONG HOUR Title (%s) %d -> %d (day %d)", cal_data->appt.title, start_tm.tm_hour, cal_data->orig_start_hour, start_tm.tm_mday);
+        /* WHEN we arrive here, libical has done an extra UTC conversion,
+          which we need to undo */
+        sdate = convert_to_zone(sdate, "UTC");
+        edate = convert_to_zone(edate, "UTC");
+    }
+    else {
+        sdate = convert_to_zone(sdate, cal_data->appt.start_tz_loc);
+        edate = convert_to_zone(edate, cal_data->appt.end_tz_loc);
+    }
+    sdate = icaltime_convert_to_zone(sdate, local_icaltimezone);
     edate = icaltime_convert_to_zone(edate, local_icaltimezone);
     /*
-    g_print(P_N "sdate(day, mon, year):%d %d %d edate:%d %d %d\n"
+    if (cal_data->appt.freq != XFICAL_FREQ_HOURLY
+    &&  end_tm.tm_hour != cal_data->orig_end_hour) {
+    }
+    else {
+    }
+    */
+    /* fix for bug 8508 prevent showing extra day in calendar.
+       Only has effect when end date is midnight */
+    icaltime_adjust(&edate, 0, 0, 0, -1);
+    /*
+    g_print(P_N "sdate:%d %d %d edate:%d %d %d\n \tspan end %s\n \tappt end %s\n \tCUR appt end %s\n"
              , sdate.day , sdate.month , sdate.year
-             , edate.day , edate.month , edate.year);
+             , edate.day , edate.month , edate.year
+             , icaltime_as_ical_string(edate)
+             , cal_data->appt.endtime
+             , cal_data->appt.endtimecur
+             );
              */
     xfical_mark_calendar_days(cal_data->cal, cal_data->year, cal_data->month
             , sdate.year, sdate.month, sdate.day
@@ -3462,10 +3563,12 @@
     gboolean key_found;
     icalcomponent_kind kind;
     char *tmp;
+    struct icaltimetype start;
     struct mark_calendar_data {
         GtkCalendar *cal;
         guint year; 
         guint month;
+        gint orig_start_hour, orig_end_hour;
         xfical_appt appt;
     } cal_data;
 
@@ -3488,40 +3591,63 @@
         /*
         icaltime_adjust(&nedate, 0, 0, 0, 0);
         */
-        cal_data.cal = gtkcal;
-        cal_data.year = year;
-        cal_data.month = month;
         /* FIXME: we read the whole appointent just to get start and end 
-         * timezones. too heavy? */
-        key_found = get_appt_from_icalcomponent(c, &cal_data.appt);
-        icalcomponent_foreach_recurrence(c, nsdate, nedate, mark_calendar
-                , (void *)&cal_data);
-        g_free(cal_data.appt.categories);
+         * timezones for mark_calendar. too heavy? */
+        /* 1970 check due to bug 9507 */
+        p = icalcomponent_get_first_property(c, ICAL_DTSTART_PROPERTY);
+        start = icalproperty_get_dtstart(p);
+        if (start.year >= 1970) {
+            cal_data.cal = gtkcal;
+            cal_data.year = year;
+            cal_data.month = month;
+            key_found = get_appt_from_icalcomponent(c, &cal_data.appt);
+        /* BUG 7929. If calendar file contains same timezone definition than
+           what the time is in, libical returns wrong time in span.
+           But as the hour only changes with HOURLY repeating appointments,
+           we can replace received hour with the hour from start time */
+            /*
+            p = icalcomponent_get_first_property(c, ICAL_DTEND_PROPERTY);
+            start = icalproperty_get_dtend(p);
+            cal_data.orig_end_hour = start.hour;
+            */
+            p = icalcomponent_get_first_property(c, ICAL_DTSTART_PROPERTY);
+            start = icalproperty_get_dtstart(p);
+            cal_data.orig_start_hour = start.hour;
+            icalcomponent_foreach_recurrence(c, nsdate, nedate, mark_calendar
+                    , (void *)&cal_data);
+            g_free(cal_data.appt.categories);
+        }
+        else {
         /*
-                , (void *)gtkcal);
-        xfical_mark_calendar_days(gtkcal, year, month
-                , per.stime.year, per.stime.month, per.stime.day
-                , per.etime.year, per.etime.month, per.etime.day);
-        if ((p = icalcomponent_get_first_property(c
-                , ICAL_RRULE_PROPERTY)) != 0) {
-            nsdate = icaltime_null_time();
-            rrule = icalproperty_get_rrule(p);
-            ri = icalrecur_iterator_new(rrule, per.stime);
-            for (nsdate = icalrecur_iterator_next(ri),
-                    nedate = icaltime_add(nsdate, per.duration);
-                 !icaltime_is_null_time(nsdate)
-                    && (nsdate.year*12+nsdate.month) <= (year*12+month);
-                 nsdate = icalrecur_iterator_next(ri),
-                    nedate = icaltime_add(nsdate, per.duration)) {
-                if (!icalproperty_recurrence_is_excluded(c, &per.stime
-                            , &nsdate))
-                    xfical_mark_calendar_days(gtkcal, year, month
-                            , nsdate.year, nsdate.month, nsdate.day
-                            , nedate.year, nedate.month, nedate.day);
-            }
-            icalrecur_iterator_free(ri);
-        } 
+    g_print(P_N "(mon, year):%d %d (%d %d %d - %d %d %d)\n"
+             , month , year
+             , nsdate.day , nsdate.month , nsdate.year
+             , nedate.day , nedate.month , nedate.year);
     */
+            per = ic_get_period(c, TRUE);
+            xfical_mark_calendar_days(gtkcal, year, month
+                    , per.stime.year, per.stime.month, per.stime.day
+                    , per.etime.year, per.etime.month, per.etime.day);
+            if ((p = icalcomponent_get_first_property(c
+                    , ICAL_RRULE_PROPERTY)) != 0) {
+                nsdate = icaltime_null_time();
+                rrule = icalproperty_get_rrule(p);
+                ri = icalrecur_iterator_new(rrule, per.stime);
+                for (nsdate = icalrecur_iterator_next(ri),
+                        nedate = icaltime_add(nsdate, per.duration);
+                     !icaltime_is_null_time(nsdate)
+                        && (nsdate.year*12+nsdate.month) <= (year*12+month);
+                     nsdate = icalrecur_iterator_next(ri),
+                        nedate = icaltime_add(nsdate, per.duration)) {
+                    if (!icalproperty_recurrence_is_excluded(c, &per.stime
+                                , &nsdate))
+                        xfical_mark_calendar_days(gtkcal, year, month
+                                , nsdate.year, nsdate.month, nsdate.day
+                                , nedate.year, nedate.month, nedate.day);
+                }
+                icalrecur_iterator_free(ri);
+            } 
+        } 
     } /* ICAL_VEVENT_COMPONENT */
     else if (kind == ICAL_VTODO_COMPONENT) {
         per = ic_get_period(c, TRUE);
@@ -3637,21 +3763,24 @@
 #undef P_N
 #define P_N "add_appt_to_list: "
     xfical_appt *appt;
-    struct icaltimetype start, end;
+    struct icaltimetype sdate, edate;
     struct tm start_tm, end_tm;
+    time_t temp_t;
     gboolean key_found;
+    icalproperty *p = NULL;
     typedef struct _app_data
     {
         GList **list;
         gchar *file_type;
         /* Need to check that returned value is withing limits.
            Check more from BUG 5764 and 7886. */
-        struct icaltimetype asdate, aedate;
+        gchar asdate[17], aedate[17];
+        gint orig_start_hour, orig_end_hour;
     } app_data;
     app_data *data1;
         /* Need to check that returned value is withing limits.
            Check more from BUG 5764 and 7886. */
-    icaltime_span limit_span, test_span;
+    icaltime_span test_span;
 
 #ifdef ORAGE_DEBUG
     orage_message(-100, P_N);
@@ -3664,43 +3793,85 @@
     xfical_appt_get_fill_internal(appt, data1->file_type);
     gmtime_r(&span->start, &start_tm);
     gmtime_r(&span->end, &end_tm);
+    /*
+    if (data1->file_type[0] == 'F') {
+    orage_message(10, P_N "1 Title (%s)\n\tcur Start:%s End:%s\n\tlimit Start:%s End:%s\n\traw Start:%s (%s) End:%s (%s)\n\tSpan Start:%d (%d) End:%d (%d)\n\tREAL Span Start:%d End:%d\n\t orig start:%d, orig:end:%d"
+, appt->title
+, appt->starttimecur, appt->endtimecur
+, data1->asdate, data1->aedate
+, appt->starttime, appt->start_tz_loc, appt->endtime, appt->end_tz_loc
+, start_tm.tm_mday, start_tm.tm_hour, end_tm.tm_mday, end_tm.tm_hour
+, &span->start, &span->end
+, data1->orig_start_hour, data1->orig_end_hour
+            );
+    }
+    */
     /* BUG 7886. we are called with wrong span->end when we have full day
        event. This is libical bug and needs to be fixed properly later, but
        now I just work around it.
     FIXME: code whole loop correctly = function icalcomponent_foreach_recurrence
     */
-    test_span = *span;
     if (appt->endtime[8] != 'T' && !appt->use_duration) {
+        test_span = *span;
         test_span.end -= 24*60*60;
         gmtime_r(&test_span.end, &end_tm);
         /* now end is correct, but we still have been called wrongly on
            the last day */
     }
     /* end of bug workaround */
-    start = icaltime_from_string(orage_tm_time_to_icaltime(&start_tm));
-    start = convert_to_zone(start, appt->start_tz_loc);
-    start = icaltime_convert_to_zone(start, local_icaltimezone);
     /* FIXME: should we use interval instead ? */
-    end = icaltime_from_string(orage_tm_time_to_icaltime(&end_tm));
-    end = convert_to_zone(end, appt->end_tz_loc);
-    end = icaltime_convert_to_zone(end, local_icaltimezone);
+    sdate = icaltime_from_string(orage_tm_time_to_icaltime(&start_tm));
+    edate = icaltime_from_string(orage_tm_time_to_icaltime(&end_tm));
+    /* BUG 7929. If calendar file contains same timezone definition than what
+       the time is in, libical returns wrong time in span. But as the hour
+       only changes with HOURLY repeating appointments, we can replace received
+       hour with the hour from start time */
+    if (appt->freq != XFICAL_FREQ_HOURLY 
+    &&  start_tm.tm_hour != data1->orig_start_hour) {
+        orage_message(-10, P_N "FIXING WRONG HOUR Title (%s) %d -> %d (day %d)", appt->title, start_tm.tm_hour, data1->orig_start_hour, start_tm.tm_mday);
+        /* WHEN we arrive here, libical has done an extra UTC conversion,
+           which we need to undo */
+        sdate = convert_to_zone(sdate, "UTC");
+        edate = convert_to_zone(edate, "UTC");
+    }
+    else {
+        sdate = convert_to_zone(sdate, appt->start_tz_loc);
+        edate = convert_to_zone(edate, appt->end_tz_loc);
+    }
+    sdate = icaltime_convert_to_zone(sdate, local_icaltimezone);
+    edate = icaltime_convert_to_zone(edate, local_icaltimezone);
+
 
-    strcpy(appt->starttimecur, icaltime_as_ical_string(start));
-    strcpy(appt->endtimecur, icaltime_as_ical_string(end));
+    strncpy(appt->starttimecur, icaltime_as_ical_string(sdate), 16);
+    appt->starttimecur[16] = '\0';
+    strncpy(appt->endtimecur, icaltime_as_ical_string(edate), 16);
+    appt->endtimecur[16] = '\0';
     /*
-    orage_message(100, P_N "starttimecur:%s endtimecur:%s", appt->starttimecur, appt->endtimecur);
-    orage_message(10, P_N "Title (%s)\n\tfound Start:%s End:%s\n\tlimit Start:%s End:%s"
-            , appt->title, appt->starttimecur, appt->endtimecur, icaltime_as_ical_string(data1->asdate), icaltime_as_ical_string(data1->aedate));
             */
         /* Need to check that returned value is withing limits.
            Check more from BUG 5764 and 7886. */
-    limit_span = icaltime_span_new(data1->asdate, data1->aedate, TRUE);
-    if (!icaltime_span_overlaps(&test_span, &limit_span)) {
+    /* starttimecur and endtimecur are in local timezone. Compare that to
+       limits, which are also localtimezone DATEs */
+    /*
+    if (data1->file_type[0] == 'F') {
+    orage_message(10, P_N "2 Title (%s)\n\tcur Start:%s End:%s\n\tlimit Start:%s End:%s\n\traw Start:%s (%s) End:%s (%s)\n\tSpan Start:%d End:%d sdate:%s edate:%s"
+, appt->title
+, appt->starttimecur, appt->endtimecur
+, data1->asdate, data1->aedate
+, appt->starttime, appt->start_tz_loc, appt->endtime, appt->end_tz_loc
+, start_tm.tm_mday, end_tm.tm_mday
+, icaltime_as_ical_string(sdate), icaltime_as_ical_string(edate)
+            );
+    }
+    */
+    if (strncmp(appt->endtimecur, data1->asdate, 16) <= 0
+    || strncmp(appt->starttimecur, data1->aedate, 16) >= 0) {
         /* we do not need this. Free the memory */
         xfical_appt_free(appt);
     } 
-    else /* add to list like with internal libical */
+    else {/* add to list like with internal libical */
         *data1->list = g_list_prepend(*data1->list, appt);
+    } 
 }
 
 /* Fetch each appointment within the specified time period and add those
@@ -3714,13 +3885,17 @@
     struct icaltimetype asdate, aedate;    /* period to check */
     icalcomponent *c=NULL;
     icalcomponent_kind ikind = ICAL_VEVENT_COMPONENT;
+    icalcomponent *c2=NULL;
+    icalproperty *p = NULL;
+    struct icaltimetype start;
     typedef struct _app_data
     {
         GList **list;
         gchar *file_type;
         /* Need to check that returned value is withing limits.
            Check more from BUG 5764 and 7886. */
-        struct icaltimetype asdate, aedate;
+        gchar asdate[17], aedate[17];
+        gint orig_start_hour, orig_end_hour;
     } app_data;
     app_data data1;
 
@@ -3745,13 +3920,52 @@
     data1.file_type = file_type;
         /* Need to check that returned value is withing limits.
            Check more from BUG 5764 and 7886. */
-    data1.asdate = asdate;
-    data1.aedate = aedate;
+    g_strlcpy((char *)&data1.asdate, icaltime_as_ical_string(asdate), 17);
+    g_strlcpy(&data1.asdate[8], "T000000", 9);
+    g_strlcpy((char *)&data1.aedate, icaltime_as_ical_string(aedate), 17);
+    g_strlcpy(&data1.aedate[8], "T000000", 9);
+    /* Hack for bug 8382: Take one more day earlier and later than needed
+       due to UTC conversion. (And drop those days later then.) */
+    icaltime_adjust(&asdate, -1, 0, 0, 0);
+    icaltime_adjust(&aedate, 1, 0, 0, 0);
     for (c = icalcomponent_get_first_component(base, ikind);
          c != 0;
          c = icalcomponent_get_next_component(base, ikind)) {
-        icalcomponent_foreach_recurrence(c, asdate, aedate, add_appt_to_list
-                , (void *)&data1);
+        /* BUG 7929. If calendar file contains same timezone definition than
+           what the time is in, libical returns wrong time in span.
+           But as the hour only changes with HOURLY repeating appointments,
+           we can replace received hour with the hour from start time */
+        /*
+        p = icalcomponent_get_first_property(c, ICAL_DTEND_PROPERTY);
+            if (p != NULL) {
+        start = icalproperty_get_dtend(p);
+        data1.orig_end_hour = start.hour;
+            }
+            else {
+                g_print("NULL ***********\n");
+            }
+            g_print("ORIG END HOUR %d ***********\n", data1.orig_end_hour);
+            */
+        p = icalcomponent_get_first_property(c, ICAL_DTSTART_PROPERTY);
+        start = icalproperty_get_dtstart(p);
+        data1.orig_start_hour = start.hour;
+        /* FIXME: hack to fix year to be newer than 1970 based on BUG 9507 */
+        if (start.year < 1970) {
+            c2 = icalcomponent_new_clone(c);
+            p = icalcomponent_get_first_property(c2, ICAL_DTSTART_PROPERTY);
+            start = icalproperty_get_dtstart(p);
+            orage_message(-10, P_N "Adjusting temporarily old DTSTART time %d"
+                    , start.year);
+            start.year = 1970;
+            icalproperty_set_dtstart(p, start);
+            icalcomponent_foreach_recurrence(c2, asdate, aedate
+                    , add_appt_to_list, (void *)&data1);
+        }
+        /* FIXME: end of hack */
+        else {
+            icalcomponent_foreach_recurrence(c, asdate, aedate
+                    , add_appt_to_list, (void *)&data1);
+        }
     }
 }
 
@@ -3923,7 +4137,6 @@
         }
         beg -= strlen("\nBEGIN:"); /* we need to be able to find first, too */
         first = FALSE;
-        cur = beg;
     }
 
     if (!first) {
diff -Nru orage-4.8.3/src/ical-code.h orage-4.12.1/src/ical-code.h
--- orage-4.8.3/src/ical-code.h	2011-11-29 07:01:57.000000000 +0000
+++ orage-4.12.1/src/ical-code.h	2015-04-10 10:26:26.000000000 +0000
@@ -89,7 +89,7 @@
     gchar *note;
 
         /* alarm */
-    gint alarmtime; /* 0 means no alarms */
+    gint alarmtime;
     gboolean alarm_before; /* TRUE = before FALSE = after */
         /* TRUE = related to start FALSE= related to end */
     gboolean alarm_related_start; 
@@ -138,7 +138,7 @@
 void xfical_file_close_force(void);
 
 xfical_appt *xfical_appt_alloc();
-char *xfical_appt_add(xfical_appt *appt);
+char *xfical_appt_add(char *ical_file_id, xfical_appt *appt);
 xfical_appt *xfical_appt_get(char *ical_id);
 void xfical_appt_free(xfical_appt *appt);
 gboolean xfical_appt_mod(char *ical_id, xfical_appt *appt);
diff -Nru orage-4.8.3/src/interface.c orage-4.12.1/src/interface.c
--- orage-4.8.3/src/interface.c	2011-07-24 13:29:54.000000000 +0000
+++ orage-4.12.1/src/interface.c	2015-04-10 10:26:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2011 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2003-2005 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -70,39 +70,52 @@
 
 static void refresh_foreign_files(intf_win *intf_w, gboolean first);
 
-gboolean orage_foreign_files_check(gpointer user_data)
+gboolean orage_external_update_check(gpointer user_data)
 {
-    static time_t latest_foreign_file_change = (time_t)0;
+#undef P_N
+#define P_N "orage_external_update_check: "
     struct stat s;
     gint i;
-    gboolean changes_present = FALSE;
+    gboolean external_changes_present = FALSE;
 
-    if (!latest_foreign_file_change)
-        latest_foreign_file_change = time(NULL);
+    /* check main Orage file */
+    if (g_stat(g_par.orage_file, &s) < 0) {
+        orage_message(150, P_N "stat of %s failed: %d (%s)",
+                g_par.orage_file, errno, strerror(errno));
+    }
+    else {
+        if (s.st_mtime > g_par.latest_file_change) {
+            g_par.latest_file_change = s.st_mtime;
+            orage_message(10, _("Found external update on file %s.")
+                    , g_par.orage_file);  
+            external_changes_present = TRUE;
+        }
+    }
 
-    /* check foreign files */
+    /* check also foreign files */
     for (i = 0; i < g_par.foreign_count; i++) {
         if (g_stat(g_par.foreign_data[i].file, &s) < 0) {
-            g_warning("stat of %s failed: %d (%s)",
+            orage_message(150, P_N "stat of %s failed: %d (%s)",
                     g_par.foreign_data[i].file, errno, strerror(errno));
         }
-        else if (s.st_mtime > latest_foreign_file_change) {
-            latest_foreign_file_change = s.st_mtime;
-            orage_message(40, "updating %s", g_par.foreign_data[i].file);  
-            changes_present = TRUE;
+        else {
+            if (s.st_mtime > g_par.foreign_data[i].latest_file_change) {
+                g_par.foreign_data[i].latest_file_change = s.st_mtime;
+                orage_message(10, _("Found external update on file %s.")
+                        , g_par.foreign_data[i].file);
+                external_changes_present = TRUE;
+            }
         }
     }
     
-    if (changes_present == TRUE) {
+    if (external_changes_present) {
+        orage_message(80, _("Refreshing alarms and calendar due to external file update."));
+        xfical_file_close_force();
         xfical_alarm_build_list(FALSE);
         orage_mark_appointments();
     }
 
-    /* keep running ? */
-    if (g_par.foreign_count)
-        return(TRUE);
-    else /* no need to check changes if we do not have any files */
-        return(FALSE);
+    return(TRUE); /* keep running */
 }
 
 static void orage_file_entry_changed(GtkWidget *dialog, gpointer user_data)
@@ -119,32 +132,6 @@
     }
 }
 
-/* FIXME: This is now available in functions.c as orage_copy_file */
-static gboolean copy_file(gchar *source, gchar *target)
-{
-    gchar *text;
-    gsize text_len;
-    GError *error = NULL;
-    gboolean ok = TRUE;
-
-    /* read file */
-    if (!g_file_get_contents(source, &text, &text_len, &error)) {
-        g_warning("file save: Could not open ical file (%s) error:%s"
-                , source, error->message);
-        g_error_free(error);
-        ok = FALSE;
-    }
-    /* write file */
-    if (!g_file_set_contents(target, text, -1, &error)) {
-        g_warning("file save: Could not write ical file (%s) error:%s"
-                , target, error->message);
-        g_error_free(error);
-        ok = FALSE;
-    }
-    g_free(text);
-    return(ok);
-}
-
 static void orage_file_save_button_clicked(GtkButton *button
         , gpointer user_data)
 {
@@ -152,7 +139,7 @@
     gchar *s;
     gboolean ok = TRUE;
 
-    s = strdup(gtk_entry_get_text(GTK_ENTRY(intf_w->orage_file_entry)));
+    s = g_strdup(gtk_entry_get_text(GTK_ENTRY(intf_w->orage_file_entry)));
     if (gtk_toggle_button_get_active(
             GTK_TOGGLE_BUTTON(intf_w->orage_file_rename_rb))) {
         if (!g_file_test(s, G_FILE_TEST_EXISTS)) {
@@ -166,13 +153,13 @@
     }
     else if (gtk_toggle_button_get_active(
             GTK_TOGGLE_BUTTON(intf_w->orage_file_copy_rb))) {
-        ok = copy_file(g_par.orage_file, s);
+        ok = orage_copy_file(g_par.orage_file, s);
     }
     else if (gtk_toggle_button_get_active(
             GTK_TOGGLE_BUTTON(intf_w->orage_file_move_rb))) {
         if (g_rename(g_par.orage_file, s)) { /* failed */
             g_warning("rename failed. trying manual copy");
-            ok = copy_file(g_par.orage_file, s);
+            ok = orage_copy_file(g_par.orage_file, s);
             if (ok) { /* this is move. so let's remove the orig */
                if (g_remove(g_par.orage_file))
                    g_warning("file remove failed %s", g_par.orage_file);
@@ -220,7 +207,7 @@
     gchar *s;
     gboolean ok = TRUE;
 
-    s = strdup(gtk_entry_get_text(GTK_ENTRY(intf_w->archive_file_entry)));
+    s = g_strdup(gtk_entry_get_text(GTK_ENTRY(intf_w->archive_file_entry)));
     if (gtk_toggle_button_get_active(
             GTK_TOGGLE_BUTTON(intf_w->archive_file_rename_rb))) {
         if (!g_file_test(s, G_FILE_TEST_EXISTS)) {
@@ -234,13 +221,13 @@
     }
     else if (gtk_toggle_button_get_active(
             GTK_TOGGLE_BUTTON(intf_w->archive_file_copy_rb))) {
-        ok = copy_file(g_par.archive_file, s);
+        ok = orage_copy_file(g_par.archive_file, s);
     }
     else if (gtk_toggle_button_get_active(
             GTK_TOGGLE_BUTTON(intf_w->archive_file_move_rb))) {
         if (g_rename(g_par.archive_file, s)) { /* failed */
             g_warning("rename failed. trying manual copy");
-            ok = copy_file(g_par.archive_file, s);
+            ok = orage_copy_file(g_par.archive_file, s);
             if (ok) { /* this is move. so let's remove the orig */
                if (g_remove(g_par.archive_file))
                    g_warning("file remove failed %s", g_par.archive_file);
@@ -535,7 +522,7 @@
     intf_win *intf_w = (intf_win *)user_data;
     GtkWidget *f_chooser;
     gchar *entry_filename, *file_path=NULL;
-    gchar *cal_file;
+    gchar *cal_file, *cal_name;
 
     entry_filename = g_strdup(gtk_entry_get_text(
             (GtkEntry *)intf_w->for_new_entry));
@@ -551,8 +538,12 @@
         cal_file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(f_chooser));
         if (cal_file) {
             gtk_entry_set_text(GTK_ENTRY(intf_w->for_new_entry), cal_file);
-            gtk_widget_grab_focus(intf_w->for_new_entry);
-            gtk_editable_set_position(GTK_EDITABLE(intf_w->for_new_entry), -1);
+            cal_name = g_path_get_basename(cal_file);
+            gtk_entry_set_text(GTK_ENTRY(intf_w->for_new_name_entry), cal_name);
+            gtk_widget_grab_focus(intf_w->for_new_name_entry);
+            gtk_editable_set_position(GTK_EDITABLE(intf_w->for_new_name_entry)
+                    , -1);
+            g_free(cal_name);
             g_free(cal_file);
         }
     }
@@ -565,12 +556,16 @@
     int i;
 
     g_free(g_par.foreign_data[del_line].file);
+    g_free(g_par.foreign_data[del_line].name);
     g_par.foreign_count--;
     for (i = del_line; i < g_par.foreign_count; i++) {
         g_par.foreign_data[i].file = g_par.foreign_data[i+1].file;
         g_par.foreign_data[i].read_only = g_par.foreign_data[i+1].read_only;
+        g_par.foreign_data[i].latest_file_change = g_par.foreign_data[i+1].latest_file_change;
+        g_par.foreign_data[i].name = g_par.foreign_data[i+1].name;
     }
     g_par.foreign_data[i].file = NULL;
+    g_par.foreign_data[i].name = NULL;
 
     write_parameters();
     orage_mark_appointments();
@@ -591,7 +586,8 @@
         return(FALSE);
     }
     for (i = 0; i < g_par.foreign_count && !found; i++) {
-        if (strcmp(g_par.foreign_data[i].file, filename) == 0) {
+        if (strcmp(g_par.foreign_data[i].file, filename) == 0 ||
+            strcmp(g_par.foreign_data[i].name, filename) == 0) {
             found = TRUE;
         }
     }
@@ -606,9 +602,13 @@
 
 static void for_remove_button_clicked(GtkButton *button, gpointer user_data)
 {
+#undef P_N
+#define P_N "for_remove_button_clicked: "
     gint del_line = GPOINTER_TO_INT(user_data);
 
+    orage_message(90, P_N "Removing foreign file %s (%s).", g_par.foreign_data[del_line].name, g_par.foreign_data[del_line].file);
     orage_foreign_file_remove_line(del_line);
+    orage_message(90, P_N "Foreign file removed and Orage alarms refreshed.");
 }
 
 static void for_remove_button_clicked2(GtkButton *button, gpointer user_data)
@@ -636,7 +636,12 @@
     if (g_par.foreign_count) {
         for (i = 0; i < g_par.foreign_count; i++) {
             hbox = gtk_hbox_new(FALSE, 0);
-            label = gtk_label_new(g_par.foreign_data[i].file);
+            if (g_par.foreign_data[i].name) {
+                label = gtk_label_new(g_par.foreign_data[i].name);
+                gtk_widget_set_tooltip_text(label, g_par.foreign_data[i].file);
+            }
+            else
+                label = gtk_label_new(g_par.foreign_data[i].file);
             gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
             gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 5);
             if (g_par.foreign_data[i].read_only)
@@ -651,6 +656,7 @@
             orage_table_add_row(intf_w->for_cur_table
                     , label, hbox
                     , i, (GTK_EXPAND | GTK_FILL), (0));
+
             g_signal_connect((gpointer)button, "clicked"
                     , G_CALLBACK(for_remove_button_clicked),GINT_TO_POINTER(i));
             g_signal_connect_after((gpointer)button, "clicked"
@@ -666,63 +672,108 @@
     gtk_widget_show_all(intf_w->for_cur_frame);
 }
 
-static gboolean orage_foreign_file_add_internal(gchar *filename, gboolean read_only)
+static gboolean orage_foreign_file_add_internal(gchar *filename
+        , gchar *name, gboolean read_only, GtkWidget *main_window)
 {
+#undef P_N
+#define P_N "orage_foreign_file_add_internal: "
     gint i = 0;
+    gint result;
+    char *add_failed = _("Foreign file add failed");
 
     if (g_par.foreign_count > 9) {
-        g_warning("Orage can only handle 10 foreign files. Limit reached. New file not added.");
+        orage_message(150, P_N "Orage can only handle 10 foreign files. Limit reached. New file not added.");
+        if (main_window)
+            result = orage_error_dialog(GTK_WINDOW(main_window)
+                    , add_failed
+                    , _("Orage can only handle 10 foreign files. Limit reached."));
         return(FALSE);
     }
     if (!ORAGE_STR_EXISTS(filename)) {
-        g_warning("File is empty. New file not added.");
+        orage_message(150, P_N "File is empty. New file not added.");
+        if (main_window)
+            result = orage_error_dialog(GTK_WINDOW(main_window)
+                    , add_failed
+                    , _("Filename is empty."));
+        return(FALSE);
+    }
+    if (!ORAGE_STR_EXISTS(name)) {
+        orage_message(150, P_N "Name is empty. New file not added.");
+        if (main_window)
+            result = orage_error_dialog(GTK_WINDOW(main_window)
+                    , add_failed
+                    , _("Name is empty."));
         return(FALSE);
     }
     if (!g_file_test(filename, G_FILE_TEST_EXISTS)) {
-        g_warning("New file %s does not exist. New file not added."
-                , filename);
+        orage_message(150, P_N "New file %s does not exist. New file not added.", filename);
+        if (main_window)
+            result = orage_error_dialog(GTK_WINDOW(main_window)
+                    , add_failed
+                    , _("File does not exist."));
         return(FALSE);
     }
     for (i = 0; i < g_par.foreign_count; i++) {
         if (strcmp(g_par.foreign_data[i].file, filename) == 0) {
-            g_warning("Foreign file already exists.");
+            orage_message(150, P_N "Foreign file already exists. New file not added");
+            if (main_window)
+                result = orage_error_dialog(GTK_WINDOW(main_window)
+                        , add_failed
+                        , _("Same filename already exists in Orage."));
+                return(FALSE);
+        }
+        if (strcmp(g_par.foreign_data[i].name, name) == 0) {
+            orage_message(150, P_N "Foreign file name already exists. New file not added");
+            if (main_window)
+                result = orage_error_dialog(GTK_WINDOW(main_window)
+                        , add_failed
+                        , _("Same name already exists in Orage."));
             return(FALSE);
         }
     }
 
     g_par.foreign_data[g_par.foreign_count].file = g_strdup(filename);
+    g_par.foreign_data[g_par.foreign_count].name = g_strdup(name);
     g_par.foreign_data[g_par.foreign_count].read_only = read_only;
+    g_par.foreign_data[g_par.foreign_count].latest_file_change = (time_t)0;
     g_par.foreign_count++;
 
     write_parameters();
     orage_mark_appointments();
     xfical_alarm_build_list(FALSE);
-    if (g_par.foreign_count == 1) /* we just added our first foreign file */
-        g_timeout_add_seconds(30, (GtkFunction)orage_foreign_files_check, NULL);
     return(TRUE);
 }
 
 /* this is used from command line */
-gboolean orage_foreign_file_add(gchar *filename, gboolean read_only)
+gboolean orage_foreign_file_add(gchar *filename, gboolean read_only
+        , gchar *name)
 {
     if (interface_lock) {
         g_warning("Exchange window active, can't add files from cmd line\n");
         return(FALSE);
     }
-    return(orage_foreign_file_add_internal(filename, read_only));
+    return(orage_foreign_file_add_internal(filename, name, read_only, NULL));
 }
 
 static void for_add_button_clicked(GtkButton *button, gpointer user_data)
 {
+#undef P_N
+#define P_N "for_add_button_clicked: "
     intf_win *intf_w = (intf_win *)user_data;
     const gchar *entry_filename;
+    const gchar *entry_name;
     gboolean read_only;
 
     entry_filename = gtk_entry_get_text((GtkEntry *)intf_w->for_new_entry);
+    entry_name = gtk_entry_get_text((GtkEntry *)intf_w->for_new_name_entry);
     read_only = gtk_toggle_button_get_active(
             GTK_TOGGLE_BUTTON(intf_w->for_new_read_only));
-    if (orage_foreign_file_add_internal((char *)entry_filename, read_only))
+    if (orage_foreign_file_add_internal((char *)entry_filename
+                , (char *)entry_name, read_only, intf_w->main_window)) {
         refresh_foreign_files(intf_w, FALSE);
+        orage_message(80, P_N "New foreign file %s (%s) added.", entry_name
+                , entry_filename);
+    }
 }
 
 static void close_intf_w(gpointer user_data)
@@ -730,7 +781,6 @@
     intf_win *intf_w = (intf_win *)user_data;
 
     gtk_widget_destroy(intf_w->main_window);
-    gtk_object_destroy(GTK_OBJECT(intf_w->tooltips));
     g_free(intf_w);
     interface_lock = FALSE;
 }
@@ -754,10 +804,6 @@
 
 static void create_menu(intf_win *intf_w)
 {
-    /*
-    GtkWidget *menu_separator;
-    */
-
     /* Menu bar */
     intf_w->menubar = gtk_menu_bar_new();
     gtk_box_pack_start(GTK_BOX(intf_w->main_vbox), intf_w->menubar
@@ -766,22 +812,10 @@
     /* File menu */
     intf_w->filemenu = orage_menu_new(_("_File"), intf_w->menubar);
 
-    /*
-    intf_w->filemenu_save =
-            orage_image_menu_item_new_from_stock("gtk-save"
-                    , intf_w->filemenu, intf_w->accelgroup);
-
-    menu_separator = orage_separator_menu_item_new( intf_w->filemenu);
-    */
-    
     intf_w->filemenu_close = 
             orage_image_menu_item_new_from_stock("gtk-close" 
                     , intf_w->filemenu, intf_w->accelgroup);
 
-    /*
-    g_signal_connect((gpointer)intf_w->filemenu_save, "activate"
-            , G_CALLBACK(filemenu_save_activated), intf_w);
-            */
     g_signal_connect((gpointer)intf_w->filemenu_close, "activate"
             , G_CALLBACK(filemenu_close_activated), intf_w);
 }
@@ -794,24 +828,11 @@
     intf_w->toolbar = gtk_toolbar_new();
     gtk_box_pack_start(GTK_BOX(intf_w->main_vbox), intf_w->toolbar
             , FALSE, FALSE, 0);
-    gtk_toolbar_set_tooltips(GTK_TOOLBAR(intf_w->toolbar), TRUE);
 
     /* Buttons */
-    /*
-    intf_w->save_button = orage_toolbar_append_button(intf_w->toolbar
-            , "gtk-save", intf_w->tooltips, _("Save"), i++);
-
-    toolbar_separator = orage_toolbar_append_separator(intf_w->toolbar
-            , i++);
-            */
-
     intf_w->close_button = orage_toolbar_append_button(intf_w->toolbar
-            , "gtk-close", intf_w->tooltips, _("Close"), i++);
+            , "gtk-close", _("Close"), i++);
 
-    /*
-    g_signal_connect((gpointer)intf_w->save_button, "clicked"
-            , G_CALLBACK(save_button_clicked), intf_w);
-            */
     g_signal_connect((gpointer)intf_w->close_button, "clicked"
             , G_CALLBACK(close_button_clicked), intf_w);
 }
@@ -857,14 +878,16 @@
     gtk_drag_finish(context, TRUE, FALSE, d_time);
 }
 
-static void imp_file_drag_data_received(GtkWidget *widget, GdkDragContext *context
-        , gint x, gint y, GtkSelectionData *data, guint info, guint d_time)
+static void imp_file_drag_data_received(GtkWidget *widget
+        , GdkDragContext *context, gint x, gint y, GtkSelectionData *data
+        , guint info, guint d_time)
 {
     handle_file_drag_data(widget, context, data, d_time, TRUE);
 }
 
-static void exp_file_drag_data_received(GtkWidget *widget, GdkDragContext *context
-        , gint x, gint y, GtkSelectionData *data, guint info, guint d_time)
+static void exp_file_drag_data_received(GtkWidget *widget
+        , GdkDragContext *context, gint x, gint y, GtkSelectionData *data
+        , guint info, guint d_time)
 {
     handle_file_drag_data(widget, context, data, d_time, FALSE);
 }
@@ -880,32 +903,6 @@
     gtk_drag_finish(context, TRUE, FALSE, d_time);
 }
 
-/*
-gboolean drag_motion(GtkWidget *widget, GdkDragContext *context
-        , gint x, gint y, guint d_time)
-{
-g_print ("drag_motion\n");
-
-    if (context->actions & GDK_ACTION_COPY) {
-g_print ("drag_motion: accept\n");
-        gdk_drag_status(context, GDK_ACTION_COPY, d_time);
-        gtk_drag_highlight(widget);
-        return(TRUE);
-    }
-    else {
-g_print ("drag_motion: fail\n");
-        gdk_drag_status(context, 0, d_time);
-        return(FALSE);
-    }
-}
-
-void drag_leave(GtkWidget *widget, GdkDragContext *context, guint d_time)
-{
-g_print ("drag_leave\n");
-    gtk_drag_unhighlight(widget);
-}
-*/
-
 static gboolean drag_drop(GtkWidget *widget, GdkDragContext *context
         , gint x, gint y, guint d_time)
 {
@@ -917,12 +914,6 @@
 
 static void drag_and_drop_init(intf_win *intf_w)
 {
-    /*
-    g_signal_connect(intf_w->iea_imp_entry, "drag_motion"
-            , G_CALLBACK(drag_motion), NULL);
-    g_signal_connect(intf_w->iea_imp_entry, "drag_leave"
-            , G_CALLBACK(drag_leave), NULL);
-            */
     gtk_drag_dest_set(intf_w->iea_imp_entry
             , GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT
             , file_drag_targets, file_drag_target_count, GDK_ACTION_COPY);
@@ -969,8 +960,8 @@
     gchar *str;
 
     m_vbox = gtk_vbox_new(FALSE, 0);
-    /* FIXME: this could be simpler than framebox */
-    intf_w->iea_notebook_page = orage_create_framebox_with_content(NULL, m_vbox);
+    intf_w->iea_notebook_page = orage_create_framebox_with_content(
+            NULL, m_vbox);
     intf_w->iea_tab_label = gtk_label_new(_("Import/export"));
     gtk_notebook_append_page(GTK_NOTEBOOK(intf_w->notebook)
             , intf_w->iea_notebook_page, intf_w->iea_tab_label);
@@ -999,8 +990,8 @@
             , G_CALLBACK(imp_open_button_clicked), intf_w);
     g_signal_connect((gpointer)intf_w->iea_imp_save_button, "clicked"
             , G_CALLBACK(imp_save_button_clicked), intf_w);
-    gtk_tooltips_set_tip(intf_w->tooltips, intf_w->iea_imp_entry
-            , _("Separate filenames with comma(,).\n NOTE: comma is not valid character in filenames for Orage."), NULL);
+    gtk_widget_set_tooltip_text(intf_w->iea_imp_entry 
+            , _("Separate filenames with comma(,).\n NOTE: comma is not valid character in filenames for Orage."));
 
     /***** export *****/
     vbox = gtk_vbox_new(FALSE, 0);
@@ -1058,16 +1049,16 @@
     g_signal_connect((gpointer)intf_w->iea_exp_add_id_rb, "clicked"
             , G_CALLBACK(exp_add_id_rb_clicked), intf_w);
 #ifdef HAVE_ARCHIVE
-    gtk_tooltips_set_tip(intf_w->tooltips, intf_w->iea_exp_add_all_rb
-            , _("Note that only main file appointments are read.\nArchived and Foreign events are not exported."), NULL);
+    gtk_widget_set_tooltip_text(intf_w->iea_exp_add_all_rb
+            , _("Note that only main file appointments are read.\nArchived and Foreign events are not exported."));
 #else
-    gtk_tooltips_set_tip(intf_w->tooltips, intf_w->iea_exp_add_all_rb
-            , _("Note that only main file appointments are read.\nForeign events are not exported."), NULL);
+    gtk_widget_set_tooltip_text(intf_w->iea_exp_add_all_rb
+            , _("Note that only main file appointments are read.\nForeign events are not exported."));
 #endif
-    gtk_tooltips_set_tip(intf_w->tooltips, intf_w->iea_exp_add_id_rb
-            , _("You can easily drag these from event-list window."), NULL);
-    gtk_tooltips_set_tip(intf_w->tooltips, intf_w->iea_exp_id_entry
-            , _("Orage appointment UIDs separated by commas."), NULL);
+    gtk_widget_set_tooltip_text(intf_w->iea_exp_add_id_rb
+            , _("You can easily drag these from event-list window."));
+    gtk_widget_set_tooltip_text(intf_w->iea_exp_id_entry
+            , _("Orage appointment UIDs separated by commas."));
 
 #ifdef HAVE_ARCHIVE
     /***** archive *****/
@@ -1090,8 +1081,8 @@
 
     g_signal_connect((gpointer)intf_w->iea_arc_button1, "clicked"
             , G_CALLBACK(on_archive_button_clicked_cb), intf_w);
-    gtk_tooltips_set_tip(intf_w->tooltips, intf_w->iea_arc_button1
-            , _("You can change archive threshold in parameters"), NULL);
+    gtk_widget_set_tooltip_text(intf_w->iea_arc_button1
+            , _("You can change archive threshold in parameters"));
 
     hbox = gtk_hbox_new(FALSE, 0);
     intf_w->iea_arc_button2 = gtk_button_new_from_stock("gtk-execute");
@@ -1103,8 +1094,8 @@
 
     g_signal_connect((gpointer)intf_w->iea_arc_button2, "clicked"
             , G_CALLBACK(on_unarchive_button_clicked_cb), intf_w);
-    gtk_tooltips_set_tip(intf_w->tooltips, intf_w->iea_arc_button2
-            , _("Return all archived events into main orage file and remove arch file.\nThis is useful for example when doing export and moving orage\nappointments to another system."), NULL);
+    gtk_widget_set_tooltip_text(intf_w->iea_arc_button2
+            , _("Return all archived events into main orage file and remove arch file.\nThis is useful for example when doing export and moving orage\nappointments to another system."));
 #endif
 }
 
@@ -1127,14 +1118,14 @@
             , intf_w->orage_file_frame, FALSE, FALSE, 5);
 
     hbox = gtk_hbox_new(FALSE, 0);
-    label = gtk_label_new(_("Current file"));
+    label = gtk_label_new(_("Current file:"));
     gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
     label = gtk_label_new((const gchar *)g_par.orage_file);
     gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 5);
     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
 
     hbox = gtk_hbox_new(FALSE, 0);
-    label = gtk_label_new(_("New file"));
+    label = gtk_label_new(_("New file:"));
     gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
     intf_w->orage_file_entry = gtk_entry_new();
     gtk_entry_set_text(GTK_ENTRY(intf_w->orage_file_entry)
@@ -1150,30 +1141,30 @@
     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
 
     hbox = gtk_hbox_new(FALSE, 0);
-    label = gtk_label_new(_("Action options"));
+    label = gtk_label_new(_("Action options:"));
     gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
     intf_w->orage_file_rename_rb = 
             gtk_radio_button_new_with_label(NULL, _("Rename"));
     gtk_box_pack_start(GTK_BOX(hbox)
             , intf_w->orage_file_rename_rb, FALSE, FALSE, 5);
-    gtk_tooltips_set_tip(intf_w->tooltips, intf_w->orage_file_rename_rb
-            , _("Orage internal file rename only.\nDoes not touch external filesystem at all.\nNew file must exist."), NULL);
+    gtk_widget_set_tooltip_text(intf_w->orage_file_rename_rb
+            , _("Orage internal file rename only.\nDoes not touch external filesystem at all.\nNew file must exist."));
 
     intf_w->orage_file_copy_rb = 
             gtk_radio_button_new_with_mnemonic_from_widget(
                     GTK_RADIO_BUTTON(intf_w->orage_file_rename_rb), _("Copy"));
     gtk_box_pack_start(GTK_BOX(hbox)
             , intf_w->orage_file_copy_rb, FALSE, FALSE, 5);
-    gtk_tooltips_set_tip(intf_w->tooltips, intf_w->orage_file_copy_rb
-            , _("Current file is copied and stays unmodified in the old place."), NULL);
+    gtk_widget_set_tooltip_text(intf_w->orage_file_copy_rb
+            , _("Current file is copied and stays unmodified in the old place."));
 
     intf_w->orage_file_move_rb = 
             gtk_radio_button_new_with_mnemonic_from_widget(
                     GTK_RADIO_BUTTON(intf_w->orage_file_rename_rb), _("Move"));
     gtk_box_pack_start(GTK_BOX(hbox)
             , intf_w->orage_file_move_rb, FALSE, FALSE, 5);
-    gtk_tooltips_set_tip(intf_w->tooltips, intf_w->orage_file_move_rb
-            , _("Current file is moved and vanishes from the old place."), NULL);
+    gtk_widget_set_tooltip_text(intf_w->orage_file_move_rb
+            , _("Current file is moved and vanishes from the old place."));
     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
 
     g_signal_connect(G_OBJECT(intf_w->orage_file_open_button), "clicked"
@@ -1192,14 +1183,14 @@
             , intf_w->archive_file_frame, FALSE, FALSE, 5);
 
     hbox = gtk_hbox_new(FALSE, 0);
-    label = gtk_label_new(_("Current file"));
+    label = gtk_label_new(_("Current file:"));
     gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
     label = gtk_label_new((const gchar *)g_par.archive_file);
     gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 5);
     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
 
     hbox = gtk_hbox_new(FALSE, 0);
-    label = gtk_label_new(_("New file"));
+    label = gtk_label_new(_("New file:"));
     gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
     intf_w->archive_file_entry = gtk_entry_new();
     gtk_entry_set_text(GTK_ENTRY(intf_w->archive_file_entry)
@@ -1216,7 +1207,7 @@
     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
 
     hbox = gtk_hbox_new(FALSE, 0);
-    label = gtk_label_new(_("Action options"));
+    label = gtk_label_new(_("Action options:"));
     gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
     intf_w->archive_file_rename_rb = 
             gtk_radio_button_new_with_label(NULL, _("Rename"));
@@ -1281,17 +1272,26 @@
             , G_CALLBACK(for_add_button_clicked), intf_w);
 
     hbox = gtk_hbox_new(FALSE, 0);
-    label = gtk_label_new(_("Options"));
+    /*
+    label = gtk_label_new(_("Options:"));
     gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+    */
+    label = gtk_label_new(_("Visible name:"));
+    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+    intf_w->for_new_name_entry = gtk_entry_new();
+    gtk_box_pack_start(GTK_BOX(hbox), intf_w->for_new_name_entry
+            , TRUE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
     intf_w->for_new_read_only = gtk_check_button_new_with_label(_("Read only"));
     gtk_toggle_button_set_active(
             GTK_TOGGLE_BUTTON(intf_w->for_new_read_only), TRUE);
     gtk_box_pack_start(GTK_BOX(hbox), intf_w->for_new_read_only
             , FALSE, FALSE, 5);
-    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
 
-    gtk_tooltips_set_tip(intf_w->tooltips, intf_w->for_new_read_only
-            , _("Set this if you want to make sure that this file is never modified by Orage.\nNote that modifying foreign files may make them incompatible with the original tool, where they came from!"), NULL);
+    gtk_widget_set_tooltip_text(intf_w->for_new_read_only
+            , _("Set this if you want to make sure that this file is never modified by Orage.\nNote that modifying foreign files may make them incompatible with the original tool, where they came from!"));
+    gtk_widget_set_tooltip_text(intf_w->for_new_name_entry
+            , _("This internal name is displayed to user instead of file name."));
 
     /***** Current files *****/
     refresh_foreign_files(intf_w, TRUE);
@@ -1308,7 +1308,6 @@
             , _("Exchange data - Orage"));
     gtk_window_set_default_size(GTK_WINDOW(intf_w->main_window), 300, 200);
 
-    intf_w->tooltips = gtk_tooltips_new();
     intf_w->accelgroup = gtk_accel_group_new();
     gtk_window_add_accel_group(GTK_WINDOW(intf_w->main_window)
             , intf_w->accelgroup);
diff -Nru orage-4.8.3/src/interface.h orage-4.12.1/src/interface.h
--- orage-4.8.3/src/interface.h	2011-07-24 13:29:54.000000000 +0000
+++ orage-4.12.1/src/interface.h	2015-04-10 10:26:26.000000000 +0000
@@ -77,7 +77,7 @@
     GtkWidget *archive_file_copy_rb;
     GtkWidget *archive_file_move_rb;
 
-        /* Foreign tab */
+        /* Foreign files tab */
     GtkWidget *for_notebook_page;
     GtkWidget *for_tab_label;
     GtkWidget *for_tab_main_vbox;
@@ -87,18 +87,19 @@
     GtkWidget *for_new_open_button;
     GtkWidget *for_new_save_button;
     GtkWidget *for_new_read_only;
+    GtkWidget *for_new_name_entry;
     /* currrent files */
     GtkWidget *for_cur_frame;
     GtkWidget *for_cur_table;
 
-    GtkTooltips *tooltips;
     GtkAccelGroup *accelgroup;
 } intf_win;  /* interface = export/import window */
 
 void orage_external_interface(CalWin *xfcal);
 
-gboolean orage_foreign_files_check(gpointer user_data);
-gboolean orage_foreign_file_add(gchar *filename, gboolean read_only);
+gboolean orage_external_update_check(gpointer user_data);
+gboolean orage_foreign_file_add(gchar *filename, gboolean read_only
+        , gchar *name);
 gboolean orage_foreign_file_remove(gchar *filename);
 gboolean orage_import_file(gchar *entry_filename);
 gboolean orage_export_file(gchar *entry_filename, gint type, gchar *uids);
diff -Nru orage-4.8.3/src/mainbox.c orage-4.12.1/src/mainbox.c
--- orage-4.8.3/src/mainbox.c	2012-01-03 11:59:59.000000000 +0000
+++ orage-4.12.1/src/mainbox.c	2015-04-10 10:26:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2011 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2005 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -55,6 +55,7 @@
 #define ORAGE_DEBUG 1
 */
 
+static guint month_change_timer=0;
 
 gboolean orage_mark_appointments(void)
 {
@@ -81,7 +82,8 @@
     orage_message(-100, P_N);
 #endif
     /* cal has always a day selected here, so it is safe to read it */
-    strcpy(cur_date, orage_cal_to_icaldate(GTK_CALENDAR(cal->mCalendar)));
+    strncpy(cur_date, orage_cal_to_icaldate(GTK_CALENDAR(cal->mCalendar)), 8);
+    cur_date[8]='\0';
     create_appt_win("NEW", cur_date);
 }
 
@@ -107,7 +109,10 @@
 #ifdef ORAGE_DEBUG
     orage_message(-100, P_N);
 #endif
-    gtk_widget_hide(cal->mWindow);
+    if (g_par.close_means_quit)
+        gtk_main_quit();
+    else
+        gtk_widget_hide(cal->mWindow);
 }
 
 static void mFile_quit_activate_cb(GtkMenuItem *menuitem, gpointer user_data)
@@ -193,14 +198,29 @@
 #ifdef ORAGE_DEBUG
     orage_message(-100, P_N);
 #endif
-    helpdoc = g_strconcat("firefox ", PACKAGE_DATA_DIR
+    helpdoc = g_strconcat("exo-open ", PACKAGE_DATA_DIR
            , G_DIR_SEPARATOR_S, "orage"
            , G_DIR_SEPARATOR_S, "doc"
            , G_DIR_SEPARATOR_S, "C"
            , G_DIR_SEPARATOR_S, "orage.html"
            , NULL);
-    if (!orage_exec(helpdoc, FALSE, &error))
-        orage_message(100, "start of %s failed: %s", helpdoc, error->message);
+    if (!orage_exec(helpdoc, FALSE, &error)) {
+        orage_message(10, "%s failed: %s. Trying firefox", helpdoc
+                                    , error->message);
+        g_clear_error(&error);
+        g_free(helpdoc);
+        helpdoc = g_strconcat("firefox ", PACKAGE_DATA_DIR
+               , G_DIR_SEPARATOR_S, "orage"
+               , G_DIR_SEPARATOR_S, "doc"
+               , G_DIR_SEPARATOR_S, "C"
+               , G_DIR_SEPARATOR_S, "orage.html"
+               , NULL);
+        if (!orage_exec(helpdoc, FALSE, &error)) {
+            orage_message(100, "start of %s failed: %s", helpdoc
+                    , error->message);
+            g_clear_error(&error);
+        }
+    }
     g_free(helpdoc);
 }
 
@@ -237,6 +257,7 @@
     orage_message(-100, P_N);
 #endif
     orage_mark_appointments();
+    month_change_timer = 0;
     return(FALSE); /* we do this only once */
 }
 
@@ -244,7 +265,6 @@
 {
 #undef P_N
 #define P_N "mCalendar_month_changed_cb: "
-    static guint timer=0;
 #ifdef ORAGE_DEBUG
     orage_message(-100, P_N);
 #endif
@@ -255,11 +275,12 @@
      * running updates since this new one will overwrite them anyway.
      * Let's clear still the view to fix bug 3913 (only needed 
      * if there are changes in the calendar) */
-    if (timer)
-        g_source_remove(timer);
+    if (month_change_timer) {
+        g_source_remove(month_change_timer);
+    }
     if (calendar->num_marked_dates) /* undocumented, internal field; ugly */
         gtk_calendar_clear_marks(calendar);
-    timer = g_timeout_add(400, (GtkFunction)upd_calendar, calendar);
+    month_change_timer = g_timeout_add(400, (GtkFunction)upd_calendar, calendar);
 }
 
 static void build_menu(void)
@@ -380,6 +401,8 @@
     GtkWidget *ev, *label;
     CalWin *cal = (CalWin *)g_par.xfcal;
     gchar *tip, *tmp, *tmp_title, *tmp_note;
+    gchar *tip_title, *tip_location, *tip_note;
+    gchar *format_bold = "<b> %s </b>";
     struct tm *t;
     char  *l_time, *s_time, *s_timeonly, *e_time, *c_time, *na, *today;
     gint  len;
@@ -389,7 +412,9 @@
 #endif
     /***** add data into the vbox *****/
     ev = gtk_event_box_new();
-    tmp_title = orage_process_text_commands(appt->title);
+    tmp_title = appt->title
+            ? orage_process_text_commands(appt->title)
+            : g_strdup(_("No title defined"));
     s_time = g_strdup(orage_icaltime_to_i18_time(appt->starttimecur));
     if (todo) {
         e_time = g_strdup(appt->use_due_time
@@ -442,27 +467,52 @@
         g_free(e_time);
     }
 
-    /***** set hint *****/
-    tmp_note = orage_process_text_commands(appt->note);
+    /***** set tooltip hint *****/
+    tip_title = g_markup_printf_escaped(format_bold, tmp_title);
+    if (appt->location) {
+        tmp = g_markup_printf_escaped(format_bold, appt->location);
+        tip_location = g_strdup_printf(_(" Location: %s\n"), tmp);
+        g_free(tmp);
+    }
+    else {
+        tip_location = g_strdup("");
+    }
+    if (appt->note) {
+        tmp_note = orage_process_text_commands(appt->note);
+        tmp_note = orage_limit_text(tmp_note, 50, 10);
+        tmp = g_markup_escape_text(tmp_note, strlen(tmp_note));
+        tip_note = g_strdup_printf(_("\n Note:\n%s"), tmp);
+        g_free(tmp);
+    }
+    else {
+        tip_note = g_strdup("");
+    }
+
     if (todo) {
         na = _("Never");
         e_time = g_strdup(appt->use_due_time
                 ? orage_icaltime_to_i18_time(appt->endtimecur) : na);
         c_time = g_strdup(appt->completed
                 ? orage_icaltime_to_i18_time(appt->completedtime) : na);
-        tip = g_strdup_printf(_("Title: %s\n Location: %s\n Start:\t%s\n Due:\t%s\n Done:\t%s\n Note:\n%s")
-                , tmp_title, appt->location, s_time, e_time, c_time, tmp_note);
+
+        tip = g_strdup_printf(_("Title: %s\n%s Start:\t%s\n Due:\t%s\n Done:\t%s%s")
+                , tip_title, tip_location, s_time, e_time, c_time, tip_note);
 
         g_free(c_time);
     }
     else { /* it is event */
         e_time = g_strdup(orage_icaltime_to_i18_time(appt->endtimecur));
-        tip = g_strdup_printf(_("Title: %s\n Location: %s\n Start:\t%s\n End:\t%s\n Note:\n%s")
-                , tmp_title, appt->location, s_time, e_time, tmp_note);
+
+        tip = g_strdup_printf(_("Title: %s\n%s Start:\t%s\n End:\t%s%s")
+                , tip_title, tip_location, s_time, e_time, tip_note);
     }
-    gtk_tooltips_set_tip(cal->Tooltips, ev, tip, NULL);
+
+    gtk_widget_set_tooltip_markup(ev, tip);
+
+    g_free(tip_title);
+    g_free(tip_location);
+    g_free(tip_note);
     g_free(tmp_title);
-    g_free(tmp_note);
     g_free(s_time);
     g_free(e_time);
     g_free(tip);
@@ -487,10 +537,10 @@
     }
 }
 
-static gint list_order(gconstpointer a, gconstpointer b)
+static gint event_order(gconstpointer a, gconstpointer b)
 {
 #undef P_N
-#define P_N "list_order: "
+#define P_N "event_order: "
     xfical_appt *appt1, *appt2;
 
 #ifdef ORAGE_DEBUG
@@ -502,6 +552,26 @@
     return(strcmp(appt1->starttimecur, appt2->starttimecur));
 }
 
+static gint todo_order(gconstpointer a, gconstpointer b)
+{
+#undef P_N
+#define P_N "todo_order: "
+    xfical_appt *appt1, *appt2;
+
+#ifdef ORAGE_DEBUG
+    orage_message(-100, P_N);
+#endif
+    appt1 = (xfical_appt *)a;
+    appt2 = (xfical_appt *)b;
+
+    if (appt1->use_due_time && !appt2->use_due_time)
+        return(-1);
+    if (!appt1->use_due_time && appt2->use_due_time)
+        return(1);
+
+    return(strcmp(appt1->endtimecur, appt2->endtimecur));
+}
+
 static void info_process(gpointer a, gpointer pbox)
 {
 #undef P_N
@@ -649,7 +719,7 @@
     if (todo_list) {
         gtk_widget_destroy(cal->mTodo_vbox);
         create_mainbox_todo_info();
-        todo_list = g_list_sort(todo_list, list_order);
+        todo_list = g_list_sort(todo_list, todo_order);
         g_list_foreach(todo_list, (GFunc)info_process
                 , cal->mTodo_rows_vbox);
         g_list_free(todo_list);
@@ -706,7 +776,7 @@
     if (event_list) {
         gtk_widget_destroy(cal->mEvent_vbox);
         create_mainbox_event_info_box();
-        event_list = g_list_sort(event_list, list_order);
+        event_list = g_list_sort(event_list, event_order);
         g_list_foreach(event_list, (GFunc)info_process
                 , cal->mEvent_rows_vbox);
         g_list_free(event_list);
@@ -743,6 +813,19 @@
     xfical_file_close(TRUE);   
 }
 
+void build_mainbox_todo_box(void)
+{
+#undef P_N
+#define P_N "build_mainbox_todo_box: "
+#ifdef ORAGE_DEBUG
+    orage_message(-100, P_N);
+#endif
+    if (!xfical_file_open(TRUE))
+        return;
+    build_mainbox_todo_info();
+    xfical_file_close(TRUE);   
+}
+
 /**********************************************************************
  * This routine is called from ical-code xfical_alarm_build_list_internal
  * and ical files are already open at that time. So make sure ical files
@@ -778,7 +861,6 @@
     gdk_colormap_alloc_color(pic1_cmap, &cal->mBlue, FALSE, TRUE);
 
     cal->mAccel_group = gtk_accel_group_new();
-    cal->Tooltips = gtk_tooltips_new();
 
     gtk_window_set_title(GTK_WINDOW(cal->mWindow), _("Orage"));
     gtk_window_set_position(GTK_WINDOW(cal->mWindow), GTK_WIN_POS_NONE);
@@ -814,7 +896,6 @@
     g_signal_connect((gpointer) cal->mCalendar, "day_selected"
             , G_CALLBACK(mCalendar_day_selected_cb)
             , (gpointer) cal);
-
     g_signal_connect((gpointer) cal->mCalendar, "month-changed"
             , G_CALLBACK(mCalendar_month_changed_cb), (gpointer) cal);
 
diff -Nru orage-4.8.3/src/mainbox.h orage-4.12.1/src/mainbox.h
--- orage-4.8.3/src/mainbox.h	2011-01-13 10:30:00.000000000 +0000
+++ orage-4.12.1/src/mainbox.h	2015-04-10 10:26:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2011 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,6 @@
 typedef struct _CalWin
 {
     GtkAccelGroup *mAccel_group;
-    GtkTooltips   *Tooltips;
 
     GtkWidget *mWindow;
     GtkWidget *mVbox;
@@ -67,6 +66,7 @@
 gboolean orage_mark_appointments();
 void build_mainbox_info();
 void build_mainbox_event_box();
+void build_mainbox_todo_box();
 void mCalendar_month_changed_cb(GtkCalendar *calendar, gpointer user_data);
 
 #endif /* !__MAINBOX_H__ */
diff -Nru orage-4.8.3/src/main.c orage-4.12.1/src/main.c
--- orage-4.8.3/src/main.c	2011-11-25 07:51:37.000000000 +0000
+++ orage-4.12.1/src/main.c	2015-04-10 10:26:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2011 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2003-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -88,7 +88,7 @@
     GError *error = NULL;
     DBusGProxy *proxy;
 
-    g_type_init();
+    g_type_init(); /* deprecated in GLib 2.36 and happens now automatically */
     connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
     if (connection) {
        proxy = dbus_g_proxy_new_for_name(connection, "org.freedesktop.UPower"
@@ -169,10 +169,27 @@
     send_event("_XFCE_CALENDAR_RAISE");
 }
 
+static gboolean keep_tidy(void)
+{
+#ifdef HAVE_ARCHIVE
+    /* move old appointment to other file to keep the active
+       calendar file smaller and faster */
+    xfical_archive();
+#endif
+    
+    write_parameters();
+    return(TRUE);
+}
+
 static gboolean mWindow_delete_event_cb(GtkWidget *widget, GdkEvent *event
         , gpointer user_data)
 {
-    orage_toggle_visible();
+    if (g_par.close_means_quit) {
+        gtk_main_quit();
+    }
+    else {
+        orage_toggle_visible();
+    }
     return(TRUE);
 }
 
@@ -227,16 +244,6 @@
     return(FALSE);
 }
 
-static gboolean keep_tidy(void)
-{
-#ifdef HAVE_ARCHIVE
-    /* move old appointment to other file to keep the active
-       calendar file smaller and faster */
-    xfical_archive();
-#endif
-    return(TRUE);
-}
-
 /*
  * SaveYourself callback
  *
@@ -309,7 +316,7 @@
     g_print(_("--help (-h) \t\tprint this text\n"));
     g_print(_("--preferences (-p) \tshow preferences form\n"));
     g_print(_("--toggle (-t) \t\tmake orage visible/unvisible\n"));
-    g_print(_("--add-foreign (-a) file [RW] \tadd a foreign file\n"));
+    g_print(_("--add-foreign (-a) file [RW] [name] \tadd a foreign file\n"));
     g_print(_("--remove-foreign (-r) file \tremove a foreign file\n"));
     g_print(_("--export (-e) file [appointment...] \texport appointments from Orage to file\n"));
     g_print("\n");
@@ -372,24 +379,25 @@
 }
 
 static void add_foreign(gboolean running, char *file_name, gboolean initialized
-        , gboolean read_only)
+        , gboolean read_only, char *name)
 {
+    g_print("\nadd_foreign: file_name%s name:%s\n\n", file_name, name);
     if (running && !initialized) {
         /* let's use dbus since server is running there already */
 #ifdef HAVE_DBUS
-        if (orage_dbus_foreign_add(file_name, read_only))
-            orage_message(40, "add done foreign file=%s", file_name);
+        if (orage_dbus_foreign_add(file_name, read_only, name))
+            orage_message(40, "Add done online foreign file=%s", file_name);
         else
-            g_warning("add failed foreign file=%s\n", file_name);
+            orage_message(140, "Add failed online foreign file=%s\n", file_name);
 #else
-        g_warning("Can not do add foreign file without dbus. failed file=%s\n", file_name);
+        orage_message(140, "Can not do add foreign file to running Orage without dbus. Add failed foreign file=%s\n", file_name);
 #endif
     }
     else if (!running && initialized) { /* do it self directly */
-        if (orage_foreign_file_add(file_name, read_only))
-            orage_message(40, "add done foreign file=%s", file_name);
+        if (orage_foreign_file_add(file_name, read_only, name))
+            orage_message(40, "Add done foreign file=%s", file_name);
         else
-            g_warning("add failed foreign file=%s\n", file_name);
+            orage_message(140, "Add failed foreign file=%s\n", file_name);
     }
 }
 
@@ -399,18 +407,18 @@
         /* let's use dbus since server is running there already */
 #ifdef HAVE_DBUS
         if (orage_dbus_foreign_remove(file_name))
-            orage_message(40, "remove done foreign file=%s", file_name);
+            orage_message(40, "Remove done foreign file=%s", file_name);
         else
-            g_warning("remove failed foreign file=%s\n", file_name);
+            orage_message(140, "Remove failed foreign file=%s\n", file_name);
 #else
-        g_warning("Can not do remove foreign file without dbus. failed file=%s\n", file_name);
+        orage_message(140, "Can not do remove foreign file without dbus. Remove failed foreign file=%s\n", file_name);
 #endif
     }
     else if (!running && initialized) { /* do it self directly */
         if (orage_foreign_file_remove(file_name))
-            orage_message(40, "remove done foreign file=%s", file_name);
+            orage_message(40, "Remove done foreign file=%s", file_name);
         else
-            g_warning("remove failed foreign file=%s\n", file_name);
+            orage_message(140, "Remove failed foreign file=%s\n", file_name);
     }
 }
 
@@ -420,6 +428,7 @@
     int argi;
     gboolean end = FALSE;
     gboolean foreign_file_read_only = TRUE;
+    gboolean foreign_file_name_parameter = FALSE;
     gchar *export_uid_list = NULL;
     gchar *file_name = NULL;
 
@@ -474,11 +483,26 @@
                     !strcmp(argv[argi+2], "RW") ||
                     !strcmp(argv[argi+2], "READWRITE"))) {
                     foreign_file_read_only = FALSE;
+                    if (argi+3 < argc) {
+                        file_name = g_strdup(argv[argi+3]);
+                        foreign_file_name_parameter = TRUE;
+                    }
+                }
+                else if (argi+2 < argc) { /* take argi+2 as name of file */
+                    file_name = g_strdup(argv[argi+2]);
+                    foreign_file_name_parameter = TRUE;
+                }
+                if (!file_name) {
+                    file_name = g_path_get_basename(argv[argi+1]);
                 }
                 add_foreign(running, argv[++argi], initialized
-                        , foreign_file_read_only);
+                        , foreign_file_read_only, file_name);
                 if (!foreign_file_read_only)
                     ++argi;
+                if (foreign_file_name_parameter) {
+                    ++argi;
+                }
+                g_free(file_name);
             }
         }
         else if (!strcmp(argv[argi], "--remove-foreign") ||
@@ -612,9 +636,8 @@
     mCalendar_month_changed_cb(
             (GtkCalendar *)((CalWin *)g_par.xfcal)->mCalendar, NULL);
 
-    /* start monitoring foreign file updates if we have foreign files */
-    if (g_par.foreign_count)
-        g_timeout_add_seconds(30, (GtkFunction)orage_foreign_files_check, NULL);
+    /* start monitoring external file updates */
+    g_timeout_add_seconds(30, (GtkFunction)orage_external_update_check, NULL);
 
     /* let's check if I got filename as a parameter */
     initialized = TRUE;
diff -Nru orage-4.8.3/src/Makefile.am orage-4.12.1/src/Makefile.am
--- orage-4.8.3/src/Makefile.am	2010-12-17 07:10:21.000000000 +0000
+++ orage-4.12.1/src/Makefile.am	2015-04-10 10:26:26.000000000 +0000
@@ -25,6 +25,7 @@
 	orage-i18n.h						\
 	parameters.c						\
 	parameters.h						\
+	parameters_internal.h				\
 	reminder.c							\
 	reminder.h							\
 	timezone_names.c					\
diff -Nru orage-4.8.3/src/Makefile.in orage-4.12.1/src/Makefile.in
--- orage-4.8.3/src/Makefile.in	2012-01-04 12:52:49.000000000 +0000
+++ orage-4.12.1/src/Makefile.in	2015-04-10 10:26:54.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -64,12 +108,13 @@
 @HAVE_NOTIFY_TRUE@	$(NOTIFY_LIBS)
 
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -82,10 +127,10 @@
 	day-view.h event-list.c event-list.h functions.c functions.h \
 	ical-archive.c ical-code.c ical-code.h ical-internal.h \
 	ical-expimp.c interface.c interface.h main.c mainbox.c \
-	mainbox.h orage-i18n.h parameters.c parameters.h reminder.c \
-	reminder.h timezone_names.c timezone_selection.c \
-	timezone_selection.h tray_icon.c tray_icon.h \
-	tz_zoneinfo_read.c tz_zoneinfo_read.h
+	mainbox.h orage-i18n.h parameters.c parameters.h \
+	parameters_internal.h reminder.c reminder.h timezone_names.c \
+	timezone_selection.c timezone_selection.h tray_icon.c \
+	tray_icon.h tz_zoneinfo_read.c tz_zoneinfo_read.h
 @HAVE_DBUS_TRUE@am__objects_1 = orage-orage-dbus-object.$(OBJEXT) \
 @HAVE_DBUS_TRUE@	orage-orage-dbus-client.$(OBJEXT)
 am_orage_OBJECTS = $(am__objects_1) orage-about-xfcalendar.$(OBJEXT) \
@@ -109,30 +154,78 @@
 orage_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
 	$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-orage_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(orage_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+orage_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(orage_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(orage_SOURCES)
 DIST_SOURCES = $(am__orage_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -158,6 +251,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -181,6 +275,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -206,6 +304,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -231,6 +330,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -251,6 +352,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -279,11 +381,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -328,6 +431,7 @@
 	orage-i18n.h						\
 	parameters.c						\
 	parameters.h						\
+	parameters_internal.h				\
 	reminder.c							\
 	reminder.h							\
 	timezone_names.c					\
@@ -388,14 +492,19 @@
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -416,7 +525,8 @@
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -429,9 +539,10 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-orage$(EXEEXT): $(orage_OBJECTS) $(orage_DEPENDENCIES) 
+
+orage$(EXEEXT): $(orage_OBJECTS) $(orage_DEPENDENCIES) $(EXTRA_orage_DEPENDENCIES) 
 	@rm -f orage$(EXEEXT)
-	$(orage_LINK) $(orage_OBJECTS) $(orage_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(orage_LINK) $(orage_OBJECTS) $(orage_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -460,291 +571,291 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orage-tz_zoneinfo_read.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 orage-orage-dbus-object.o: orage-dbus-object.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-orage-dbus-object.o -MD -MP -MF $(DEPDIR)/orage-orage-dbus-object.Tpo -c -o orage-orage-dbus-object.o `test -f 'orage-dbus-object.c' || echo '$(srcdir)/'`orage-dbus-object.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-orage-dbus-object.Tpo $(DEPDIR)/orage-orage-dbus-object.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='orage-dbus-object.c' object='orage-orage-dbus-object.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-orage-dbus-object.o -MD -MP -MF $(DEPDIR)/orage-orage-dbus-object.Tpo -c -o orage-orage-dbus-object.o `test -f 'orage-dbus-object.c' || echo '$(srcdir)/'`orage-dbus-object.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-orage-dbus-object.Tpo $(DEPDIR)/orage-orage-dbus-object.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='orage-dbus-object.c' object='orage-orage-dbus-object.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-orage-dbus-object.o `test -f 'orage-dbus-object.c' || echo '$(srcdir)/'`orage-dbus-object.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-orage-dbus-object.o `test -f 'orage-dbus-object.c' || echo '$(srcdir)/'`orage-dbus-object.c
 
 orage-orage-dbus-object.obj: orage-dbus-object.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-orage-dbus-object.obj -MD -MP -MF $(DEPDIR)/orage-orage-dbus-object.Tpo -c -o orage-orage-dbus-object.obj `if test -f 'orage-dbus-object.c'; then $(CYGPATH_W) 'orage-dbus-object.c'; else $(CYGPATH_W) '$(srcdir)/orage-dbus-object.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-orage-dbus-object.Tpo $(DEPDIR)/orage-orage-dbus-object.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='orage-dbus-object.c' object='orage-orage-dbus-object.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-orage-dbus-object.obj -MD -MP -MF $(DEPDIR)/orage-orage-dbus-object.Tpo -c -o orage-orage-dbus-object.obj `if test -f 'orage-dbus-object.c'; then $(CYGPATH_W) 'orage-dbus-object.c'; else $(CYGPATH_W) '$(srcdir)/orage-dbus-object.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-orage-dbus-object.Tpo $(DEPDIR)/orage-orage-dbus-object.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='orage-dbus-object.c' object='orage-orage-dbus-object.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-orage-dbus-object.obj `if test -f 'orage-dbus-object.c'; then $(CYGPATH_W) 'orage-dbus-object.c'; else $(CYGPATH_W) '$(srcdir)/orage-dbus-object.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-orage-dbus-object.obj `if test -f 'orage-dbus-object.c'; then $(CYGPATH_W) 'orage-dbus-object.c'; else $(CYGPATH_W) '$(srcdir)/orage-dbus-object.c'; fi`
 
 orage-orage-dbus-client.o: orage-dbus-client.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-orage-dbus-client.o -MD -MP -MF $(DEPDIR)/orage-orage-dbus-client.Tpo -c -o orage-orage-dbus-client.o `test -f 'orage-dbus-client.c' || echo '$(srcdir)/'`orage-dbus-client.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-orage-dbus-client.Tpo $(DEPDIR)/orage-orage-dbus-client.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='orage-dbus-client.c' object='orage-orage-dbus-client.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-orage-dbus-client.o -MD -MP -MF $(DEPDIR)/orage-orage-dbus-client.Tpo -c -o orage-orage-dbus-client.o `test -f 'orage-dbus-client.c' || echo '$(srcdir)/'`orage-dbus-client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-orage-dbus-client.Tpo $(DEPDIR)/orage-orage-dbus-client.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='orage-dbus-client.c' object='orage-orage-dbus-client.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-orage-dbus-client.o `test -f 'orage-dbus-client.c' || echo '$(srcdir)/'`orage-dbus-client.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-orage-dbus-client.o `test -f 'orage-dbus-client.c' || echo '$(srcdir)/'`orage-dbus-client.c
 
 orage-orage-dbus-client.obj: orage-dbus-client.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-orage-dbus-client.obj -MD -MP -MF $(DEPDIR)/orage-orage-dbus-client.Tpo -c -o orage-orage-dbus-client.obj `if test -f 'orage-dbus-client.c'; then $(CYGPATH_W) 'orage-dbus-client.c'; else $(CYGPATH_W) '$(srcdir)/orage-dbus-client.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-orage-dbus-client.Tpo $(DEPDIR)/orage-orage-dbus-client.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='orage-dbus-client.c' object='orage-orage-dbus-client.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-orage-dbus-client.obj -MD -MP -MF $(DEPDIR)/orage-orage-dbus-client.Tpo -c -o orage-orage-dbus-client.obj `if test -f 'orage-dbus-client.c'; then $(CYGPATH_W) 'orage-dbus-client.c'; else $(CYGPATH_W) '$(srcdir)/orage-dbus-client.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-orage-dbus-client.Tpo $(DEPDIR)/orage-orage-dbus-client.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='orage-dbus-client.c' object='orage-orage-dbus-client.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-orage-dbus-client.obj `if test -f 'orage-dbus-client.c'; then $(CYGPATH_W) 'orage-dbus-client.c'; else $(CYGPATH_W) '$(srcdir)/orage-dbus-client.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-orage-dbus-client.obj `if test -f 'orage-dbus-client.c'; then $(CYGPATH_W) 'orage-dbus-client.c'; else $(CYGPATH_W) '$(srcdir)/orage-dbus-client.c'; fi`
 
 orage-about-xfcalendar.o: about-xfcalendar.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-about-xfcalendar.o -MD -MP -MF $(DEPDIR)/orage-about-xfcalendar.Tpo -c -o orage-about-xfcalendar.o `test -f 'about-xfcalendar.c' || echo '$(srcdir)/'`about-xfcalendar.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-about-xfcalendar.Tpo $(DEPDIR)/orage-about-xfcalendar.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='about-xfcalendar.c' object='orage-about-xfcalendar.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-about-xfcalendar.o -MD -MP -MF $(DEPDIR)/orage-about-xfcalendar.Tpo -c -o orage-about-xfcalendar.o `test -f 'about-xfcalendar.c' || echo '$(srcdir)/'`about-xfcalendar.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-about-xfcalendar.Tpo $(DEPDIR)/orage-about-xfcalendar.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='about-xfcalendar.c' object='orage-about-xfcalendar.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-about-xfcalendar.o `test -f 'about-xfcalendar.c' || echo '$(srcdir)/'`about-xfcalendar.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-about-xfcalendar.o `test -f 'about-xfcalendar.c' || echo '$(srcdir)/'`about-xfcalendar.c
 
 orage-about-xfcalendar.obj: about-xfcalendar.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-about-xfcalendar.obj -MD -MP -MF $(DEPDIR)/orage-about-xfcalendar.Tpo -c -o orage-about-xfcalendar.obj `if test -f 'about-xfcalendar.c'; then $(CYGPATH_W) 'about-xfcalendar.c'; else $(CYGPATH_W) '$(srcdir)/about-xfcalendar.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-about-xfcalendar.Tpo $(DEPDIR)/orage-about-xfcalendar.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='about-xfcalendar.c' object='orage-about-xfcalendar.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-about-xfcalendar.obj -MD -MP -MF $(DEPDIR)/orage-about-xfcalendar.Tpo -c -o orage-about-xfcalendar.obj `if test -f 'about-xfcalendar.c'; then $(CYGPATH_W) 'about-xfcalendar.c'; else $(CYGPATH_W) '$(srcdir)/about-xfcalendar.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-about-xfcalendar.Tpo $(DEPDIR)/orage-about-xfcalendar.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='about-xfcalendar.c' object='orage-about-xfcalendar.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-about-xfcalendar.obj `if test -f 'about-xfcalendar.c'; then $(CYGPATH_W) 'about-xfcalendar.c'; else $(CYGPATH_W) '$(srcdir)/about-xfcalendar.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-about-xfcalendar.obj `if test -f 'about-xfcalendar.c'; then $(CYGPATH_W) 'about-xfcalendar.c'; else $(CYGPATH_W) '$(srcdir)/about-xfcalendar.c'; fi`
 
 orage-appointment.o: appointment.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-appointment.o -MD -MP -MF $(DEPDIR)/orage-appointment.Tpo -c -o orage-appointment.o `test -f 'appointment.c' || echo '$(srcdir)/'`appointment.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-appointment.Tpo $(DEPDIR)/orage-appointment.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='appointment.c' object='orage-appointment.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-appointment.o -MD -MP -MF $(DEPDIR)/orage-appointment.Tpo -c -o orage-appointment.o `test -f 'appointment.c' || echo '$(srcdir)/'`appointment.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-appointment.Tpo $(DEPDIR)/orage-appointment.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='appointment.c' object='orage-appointment.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-appointment.o `test -f 'appointment.c' || echo '$(srcdir)/'`appointment.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-appointment.o `test -f 'appointment.c' || echo '$(srcdir)/'`appointment.c
 
 orage-appointment.obj: appointment.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-appointment.obj -MD -MP -MF $(DEPDIR)/orage-appointment.Tpo -c -o orage-appointment.obj `if test -f 'appointment.c'; then $(CYGPATH_W) 'appointment.c'; else $(CYGPATH_W) '$(srcdir)/appointment.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-appointment.Tpo $(DEPDIR)/orage-appointment.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='appointment.c' object='orage-appointment.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-appointment.obj -MD -MP -MF $(DEPDIR)/orage-appointment.Tpo -c -o orage-appointment.obj `if test -f 'appointment.c'; then $(CYGPATH_W) 'appointment.c'; else $(CYGPATH_W) '$(srcdir)/appointment.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-appointment.Tpo $(DEPDIR)/orage-appointment.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='appointment.c' object='orage-appointment.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-appointment.obj `if test -f 'appointment.c'; then $(CYGPATH_W) 'appointment.c'; else $(CYGPATH_W) '$(srcdir)/appointment.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-appointment.obj `if test -f 'appointment.c'; then $(CYGPATH_W) 'appointment.c'; else $(CYGPATH_W) '$(srcdir)/appointment.c'; fi`
 
 orage-day-view.o: day-view.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-day-view.o -MD -MP -MF $(DEPDIR)/orage-day-view.Tpo -c -o orage-day-view.o `test -f 'day-view.c' || echo '$(srcdir)/'`day-view.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-day-view.Tpo $(DEPDIR)/orage-day-view.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='day-view.c' object='orage-day-view.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-day-view.o -MD -MP -MF $(DEPDIR)/orage-day-view.Tpo -c -o orage-day-view.o `test -f 'day-view.c' || echo '$(srcdir)/'`day-view.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-day-view.Tpo $(DEPDIR)/orage-day-view.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='day-view.c' object='orage-day-view.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-day-view.o `test -f 'day-view.c' || echo '$(srcdir)/'`day-view.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-day-view.o `test -f 'day-view.c' || echo '$(srcdir)/'`day-view.c
 
 orage-day-view.obj: day-view.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-day-view.obj -MD -MP -MF $(DEPDIR)/orage-day-view.Tpo -c -o orage-day-view.obj `if test -f 'day-view.c'; then $(CYGPATH_W) 'day-view.c'; else $(CYGPATH_W) '$(srcdir)/day-view.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-day-view.Tpo $(DEPDIR)/orage-day-view.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='day-view.c' object='orage-day-view.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-day-view.obj -MD -MP -MF $(DEPDIR)/orage-day-view.Tpo -c -o orage-day-view.obj `if test -f 'day-view.c'; then $(CYGPATH_W) 'day-view.c'; else $(CYGPATH_W) '$(srcdir)/day-view.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-day-view.Tpo $(DEPDIR)/orage-day-view.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='day-view.c' object='orage-day-view.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-day-view.obj `if test -f 'day-view.c'; then $(CYGPATH_W) 'day-view.c'; else $(CYGPATH_W) '$(srcdir)/day-view.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-day-view.obj `if test -f 'day-view.c'; then $(CYGPATH_W) 'day-view.c'; else $(CYGPATH_W) '$(srcdir)/day-view.c'; fi`
 
 orage-event-list.o: event-list.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-event-list.o -MD -MP -MF $(DEPDIR)/orage-event-list.Tpo -c -o orage-event-list.o `test -f 'event-list.c' || echo '$(srcdir)/'`event-list.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-event-list.Tpo $(DEPDIR)/orage-event-list.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='event-list.c' object='orage-event-list.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-event-list.o -MD -MP -MF $(DEPDIR)/orage-event-list.Tpo -c -o orage-event-list.o `test -f 'event-list.c' || echo '$(srcdir)/'`event-list.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-event-list.Tpo $(DEPDIR)/orage-event-list.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='event-list.c' object='orage-event-list.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-event-list.o `test -f 'event-list.c' || echo '$(srcdir)/'`event-list.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-event-list.o `test -f 'event-list.c' || echo '$(srcdir)/'`event-list.c
 
 orage-event-list.obj: event-list.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-event-list.obj -MD -MP -MF $(DEPDIR)/orage-event-list.Tpo -c -o orage-event-list.obj `if test -f 'event-list.c'; then $(CYGPATH_W) 'event-list.c'; else $(CYGPATH_W) '$(srcdir)/event-list.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-event-list.Tpo $(DEPDIR)/orage-event-list.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='event-list.c' object='orage-event-list.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-event-list.obj -MD -MP -MF $(DEPDIR)/orage-event-list.Tpo -c -o orage-event-list.obj `if test -f 'event-list.c'; then $(CYGPATH_W) 'event-list.c'; else $(CYGPATH_W) '$(srcdir)/event-list.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-event-list.Tpo $(DEPDIR)/orage-event-list.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='event-list.c' object='orage-event-list.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-event-list.obj `if test -f 'event-list.c'; then $(CYGPATH_W) 'event-list.c'; else $(CYGPATH_W) '$(srcdir)/event-list.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-event-list.obj `if test -f 'event-list.c'; then $(CYGPATH_W) 'event-list.c'; else $(CYGPATH_W) '$(srcdir)/event-list.c'; fi`
 
 orage-functions.o: functions.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-functions.o -MD -MP -MF $(DEPDIR)/orage-functions.Tpo -c -o orage-functions.o `test -f 'functions.c' || echo '$(srcdir)/'`functions.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-functions.Tpo $(DEPDIR)/orage-functions.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='functions.c' object='orage-functions.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-functions.o -MD -MP -MF $(DEPDIR)/orage-functions.Tpo -c -o orage-functions.o `test -f 'functions.c' || echo '$(srcdir)/'`functions.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-functions.Tpo $(DEPDIR)/orage-functions.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='functions.c' object='orage-functions.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-functions.o `test -f 'functions.c' || echo '$(srcdir)/'`functions.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-functions.o `test -f 'functions.c' || echo '$(srcdir)/'`functions.c
 
 orage-functions.obj: functions.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-functions.obj -MD -MP -MF $(DEPDIR)/orage-functions.Tpo -c -o orage-functions.obj `if test -f 'functions.c'; then $(CYGPATH_W) 'functions.c'; else $(CYGPATH_W) '$(srcdir)/functions.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-functions.Tpo $(DEPDIR)/orage-functions.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='functions.c' object='orage-functions.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-functions.obj -MD -MP -MF $(DEPDIR)/orage-functions.Tpo -c -o orage-functions.obj `if test -f 'functions.c'; then $(CYGPATH_W) 'functions.c'; else $(CYGPATH_W) '$(srcdir)/functions.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-functions.Tpo $(DEPDIR)/orage-functions.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='functions.c' object='orage-functions.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-functions.obj `if test -f 'functions.c'; then $(CYGPATH_W) 'functions.c'; else $(CYGPATH_W) '$(srcdir)/functions.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-functions.obj `if test -f 'functions.c'; then $(CYGPATH_W) 'functions.c'; else $(CYGPATH_W) '$(srcdir)/functions.c'; fi`
 
 orage-ical-archive.o: ical-archive.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-ical-archive.o -MD -MP -MF $(DEPDIR)/orage-ical-archive.Tpo -c -o orage-ical-archive.o `test -f 'ical-archive.c' || echo '$(srcdir)/'`ical-archive.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-ical-archive.Tpo $(DEPDIR)/orage-ical-archive.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ical-archive.c' object='orage-ical-archive.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-ical-archive.o -MD -MP -MF $(DEPDIR)/orage-ical-archive.Tpo -c -o orage-ical-archive.o `test -f 'ical-archive.c' || echo '$(srcdir)/'`ical-archive.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-ical-archive.Tpo $(DEPDIR)/orage-ical-archive.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ical-archive.c' object='orage-ical-archive.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-ical-archive.o `test -f 'ical-archive.c' || echo '$(srcdir)/'`ical-archive.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-ical-archive.o `test -f 'ical-archive.c' || echo '$(srcdir)/'`ical-archive.c
 
 orage-ical-archive.obj: ical-archive.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-ical-archive.obj -MD -MP -MF $(DEPDIR)/orage-ical-archive.Tpo -c -o orage-ical-archive.obj `if test -f 'ical-archive.c'; then $(CYGPATH_W) 'ical-archive.c'; else $(CYGPATH_W) '$(srcdir)/ical-archive.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-ical-archive.Tpo $(DEPDIR)/orage-ical-archive.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ical-archive.c' object='orage-ical-archive.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-ical-archive.obj -MD -MP -MF $(DEPDIR)/orage-ical-archive.Tpo -c -o orage-ical-archive.obj `if test -f 'ical-archive.c'; then $(CYGPATH_W) 'ical-archive.c'; else $(CYGPATH_W) '$(srcdir)/ical-archive.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-ical-archive.Tpo $(DEPDIR)/orage-ical-archive.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ical-archive.c' object='orage-ical-archive.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-ical-archive.obj `if test -f 'ical-archive.c'; then $(CYGPATH_W) 'ical-archive.c'; else $(CYGPATH_W) '$(srcdir)/ical-archive.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-ical-archive.obj `if test -f 'ical-archive.c'; then $(CYGPATH_W) 'ical-archive.c'; else $(CYGPATH_W) '$(srcdir)/ical-archive.c'; fi`
 
 orage-ical-code.o: ical-code.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-ical-code.o -MD -MP -MF $(DEPDIR)/orage-ical-code.Tpo -c -o orage-ical-code.o `test -f 'ical-code.c' || echo '$(srcdir)/'`ical-code.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-ical-code.Tpo $(DEPDIR)/orage-ical-code.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ical-code.c' object='orage-ical-code.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-ical-code.o -MD -MP -MF $(DEPDIR)/orage-ical-code.Tpo -c -o orage-ical-code.o `test -f 'ical-code.c' || echo '$(srcdir)/'`ical-code.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-ical-code.Tpo $(DEPDIR)/orage-ical-code.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ical-code.c' object='orage-ical-code.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-ical-code.o `test -f 'ical-code.c' || echo '$(srcdir)/'`ical-code.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-ical-code.o `test -f 'ical-code.c' || echo '$(srcdir)/'`ical-code.c
 
 orage-ical-code.obj: ical-code.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-ical-code.obj -MD -MP -MF $(DEPDIR)/orage-ical-code.Tpo -c -o orage-ical-code.obj `if test -f 'ical-code.c'; then $(CYGPATH_W) 'ical-code.c'; else $(CYGPATH_W) '$(srcdir)/ical-code.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-ical-code.Tpo $(DEPDIR)/orage-ical-code.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ical-code.c' object='orage-ical-code.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-ical-code.obj -MD -MP -MF $(DEPDIR)/orage-ical-code.Tpo -c -o orage-ical-code.obj `if test -f 'ical-code.c'; then $(CYGPATH_W) 'ical-code.c'; else $(CYGPATH_W) '$(srcdir)/ical-code.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-ical-code.Tpo $(DEPDIR)/orage-ical-code.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ical-code.c' object='orage-ical-code.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-ical-code.obj `if test -f 'ical-code.c'; then $(CYGPATH_W) 'ical-code.c'; else $(CYGPATH_W) '$(srcdir)/ical-code.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-ical-code.obj `if test -f 'ical-code.c'; then $(CYGPATH_W) 'ical-code.c'; else $(CYGPATH_W) '$(srcdir)/ical-code.c'; fi`
 
 orage-ical-expimp.o: ical-expimp.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-ical-expimp.o -MD -MP -MF $(DEPDIR)/orage-ical-expimp.Tpo -c -o orage-ical-expimp.o `test -f 'ical-expimp.c' || echo '$(srcdir)/'`ical-expimp.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-ical-expimp.Tpo $(DEPDIR)/orage-ical-expimp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ical-expimp.c' object='orage-ical-expimp.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-ical-expimp.o -MD -MP -MF $(DEPDIR)/orage-ical-expimp.Tpo -c -o orage-ical-expimp.o `test -f 'ical-expimp.c' || echo '$(srcdir)/'`ical-expimp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-ical-expimp.Tpo $(DEPDIR)/orage-ical-expimp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ical-expimp.c' object='orage-ical-expimp.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-ical-expimp.o `test -f 'ical-expimp.c' || echo '$(srcdir)/'`ical-expimp.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-ical-expimp.o `test -f 'ical-expimp.c' || echo '$(srcdir)/'`ical-expimp.c
 
 orage-ical-expimp.obj: ical-expimp.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-ical-expimp.obj -MD -MP -MF $(DEPDIR)/orage-ical-expimp.Tpo -c -o orage-ical-expimp.obj `if test -f 'ical-expimp.c'; then $(CYGPATH_W) 'ical-expimp.c'; else $(CYGPATH_W) '$(srcdir)/ical-expimp.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-ical-expimp.Tpo $(DEPDIR)/orage-ical-expimp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ical-expimp.c' object='orage-ical-expimp.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-ical-expimp.obj -MD -MP -MF $(DEPDIR)/orage-ical-expimp.Tpo -c -o orage-ical-expimp.obj `if test -f 'ical-expimp.c'; then $(CYGPATH_W) 'ical-expimp.c'; else $(CYGPATH_W) '$(srcdir)/ical-expimp.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-ical-expimp.Tpo $(DEPDIR)/orage-ical-expimp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ical-expimp.c' object='orage-ical-expimp.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-ical-expimp.obj `if test -f 'ical-expimp.c'; then $(CYGPATH_W) 'ical-expimp.c'; else $(CYGPATH_W) '$(srcdir)/ical-expimp.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-ical-expimp.obj `if test -f 'ical-expimp.c'; then $(CYGPATH_W) 'ical-expimp.c'; else $(CYGPATH_W) '$(srcdir)/ical-expimp.c'; fi`
 
 orage-interface.o: interface.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-interface.o -MD -MP -MF $(DEPDIR)/orage-interface.Tpo -c -o orage-interface.o `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-interface.Tpo $(DEPDIR)/orage-interface.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='interface.c' object='orage-interface.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-interface.o -MD -MP -MF $(DEPDIR)/orage-interface.Tpo -c -o orage-interface.o `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-interface.Tpo $(DEPDIR)/orage-interface.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='interface.c' object='orage-interface.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-interface.o `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-interface.o `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
 
 orage-interface.obj: interface.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-interface.obj -MD -MP -MF $(DEPDIR)/orage-interface.Tpo -c -o orage-interface.obj `if test -f 'interface.c'; then $(CYGPATH_W) 'interface.c'; else $(CYGPATH_W) '$(srcdir)/interface.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-interface.Tpo $(DEPDIR)/orage-interface.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='interface.c' object='orage-interface.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-interface.obj -MD -MP -MF $(DEPDIR)/orage-interface.Tpo -c -o orage-interface.obj `if test -f 'interface.c'; then $(CYGPATH_W) 'interface.c'; else $(CYGPATH_W) '$(srcdir)/interface.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-interface.Tpo $(DEPDIR)/orage-interface.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='interface.c' object='orage-interface.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-interface.obj `if test -f 'interface.c'; then $(CYGPATH_W) 'interface.c'; else $(CYGPATH_W) '$(srcdir)/interface.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-interface.obj `if test -f 'interface.c'; then $(CYGPATH_W) 'interface.c'; else $(CYGPATH_W) '$(srcdir)/interface.c'; fi`
 
 orage-main.o: main.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-main.o -MD -MP -MF $(DEPDIR)/orage-main.Tpo -c -o orage-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-main.Tpo $(DEPDIR)/orage-main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='orage-main.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-main.o -MD -MP -MF $(DEPDIR)/orage-main.Tpo -c -o orage-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-main.Tpo $(DEPDIR)/orage-main.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='main.c' object='orage-main.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
 
 orage-main.obj: main.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-main.obj -MD -MP -MF $(DEPDIR)/orage-main.Tpo -c -o orage-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-main.Tpo $(DEPDIR)/orage-main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='orage-main.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-main.obj -MD -MP -MF $(DEPDIR)/orage-main.Tpo -c -o orage-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-main.Tpo $(DEPDIR)/orage-main.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='main.c' object='orage-main.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
 
 orage-mainbox.o: mainbox.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-mainbox.o -MD -MP -MF $(DEPDIR)/orage-mainbox.Tpo -c -o orage-mainbox.o `test -f 'mainbox.c' || echo '$(srcdir)/'`mainbox.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-mainbox.Tpo $(DEPDIR)/orage-mainbox.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mainbox.c' object='orage-mainbox.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-mainbox.o -MD -MP -MF $(DEPDIR)/orage-mainbox.Tpo -c -o orage-mainbox.o `test -f 'mainbox.c' || echo '$(srcdir)/'`mainbox.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-mainbox.Tpo $(DEPDIR)/orage-mainbox.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mainbox.c' object='orage-mainbox.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-mainbox.o `test -f 'mainbox.c' || echo '$(srcdir)/'`mainbox.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-mainbox.o `test -f 'mainbox.c' || echo '$(srcdir)/'`mainbox.c
 
 orage-mainbox.obj: mainbox.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-mainbox.obj -MD -MP -MF $(DEPDIR)/orage-mainbox.Tpo -c -o orage-mainbox.obj `if test -f 'mainbox.c'; then $(CYGPATH_W) 'mainbox.c'; else $(CYGPATH_W) '$(srcdir)/mainbox.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-mainbox.Tpo $(DEPDIR)/orage-mainbox.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mainbox.c' object='orage-mainbox.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-mainbox.obj -MD -MP -MF $(DEPDIR)/orage-mainbox.Tpo -c -o orage-mainbox.obj `if test -f 'mainbox.c'; then $(CYGPATH_W) 'mainbox.c'; else $(CYGPATH_W) '$(srcdir)/mainbox.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-mainbox.Tpo $(DEPDIR)/orage-mainbox.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mainbox.c' object='orage-mainbox.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-mainbox.obj `if test -f 'mainbox.c'; then $(CYGPATH_W) 'mainbox.c'; else $(CYGPATH_W) '$(srcdir)/mainbox.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-mainbox.obj `if test -f 'mainbox.c'; then $(CYGPATH_W) 'mainbox.c'; else $(CYGPATH_W) '$(srcdir)/mainbox.c'; fi`
 
 orage-parameters.o: parameters.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-parameters.o -MD -MP -MF $(DEPDIR)/orage-parameters.Tpo -c -o orage-parameters.o `test -f 'parameters.c' || echo '$(srcdir)/'`parameters.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-parameters.Tpo $(DEPDIR)/orage-parameters.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parameters.c' object='orage-parameters.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-parameters.o -MD -MP -MF $(DEPDIR)/orage-parameters.Tpo -c -o orage-parameters.o `test -f 'parameters.c' || echo '$(srcdir)/'`parameters.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-parameters.Tpo $(DEPDIR)/orage-parameters.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='parameters.c' object='orage-parameters.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-parameters.o `test -f 'parameters.c' || echo '$(srcdir)/'`parameters.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-parameters.o `test -f 'parameters.c' || echo '$(srcdir)/'`parameters.c
 
 orage-parameters.obj: parameters.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-parameters.obj -MD -MP -MF $(DEPDIR)/orage-parameters.Tpo -c -o orage-parameters.obj `if test -f 'parameters.c'; then $(CYGPATH_W) 'parameters.c'; else $(CYGPATH_W) '$(srcdir)/parameters.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-parameters.Tpo $(DEPDIR)/orage-parameters.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parameters.c' object='orage-parameters.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-parameters.obj -MD -MP -MF $(DEPDIR)/orage-parameters.Tpo -c -o orage-parameters.obj `if test -f 'parameters.c'; then $(CYGPATH_W) 'parameters.c'; else $(CYGPATH_W) '$(srcdir)/parameters.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-parameters.Tpo $(DEPDIR)/orage-parameters.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='parameters.c' object='orage-parameters.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-parameters.obj `if test -f 'parameters.c'; then $(CYGPATH_W) 'parameters.c'; else $(CYGPATH_W) '$(srcdir)/parameters.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-parameters.obj `if test -f 'parameters.c'; then $(CYGPATH_W) 'parameters.c'; else $(CYGPATH_W) '$(srcdir)/parameters.c'; fi`
 
 orage-reminder.o: reminder.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-reminder.o -MD -MP -MF $(DEPDIR)/orage-reminder.Tpo -c -o orage-reminder.o `test -f 'reminder.c' || echo '$(srcdir)/'`reminder.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-reminder.Tpo $(DEPDIR)/orage-reminder.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='reminder.c' object='orage-reminder.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-reminder.o -MD -MP -MF $(DEPDIR)/orage-reminder.Tpo -c -o orage-reminder.o `test -f 'reminder.c' || echo '$(srcdir)/'`reminder.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-reminder.Tpo $(DEPDIR)/orage-reminder.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='reminder.c' object='orage-reminder.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-reminder.o `test -f 'reminder.c' || echo '$(srcdir)/'`reminder.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-reminder.o `test -f 'reminder.c' || echo '$(srcdir)/'`reminder.c
 
 orage-reminder.obj: reminder.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-reminder.obj -MD -MP -MF $(DEPDIR)/orage-reminder.Tpo -c -o orage-reminder.obj `if test -f 'reminder.c'; then $(CYGPATH_W) 'reminder.c'; else $(CYGPATH_W) '$(srcdir)/reminder.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-reminder.Tpo $(DEPDIR)/orage-reminder.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='reminder.c' object='orage-reminder.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-reminder.obj -MD -MP -MF $(DEPDIR)/orage-reminder.Tpo -c -o orage-reminder.obj `if test -f 'reminder.c'; then $(CYGPATH_W) 'reminder.c'; else $(CYGPATH_W) '$(srcdir)/reminder.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-reminder.Tpo $(DEPDIR)/orage-reminder.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='reminder.c' object='orage-reminder.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-reminder.obj `if test -f 'reminder.c'; then $(CYGPATH_W) 'reminder.c'; else $(CYGPATH_W) '$(srcdir)/reminder.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-reminder.obj `if test -f 'reminder.c'; then $(CYGPATH_W) 'reminder.c'; else $(CYGPATH_W) '$(srcdir)/reminder.c'; fi`
 
 orage-timezone_names.o: timezone_names.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-timezone_names.o -MD -MP -MF $(DEPDIR)/orage-timezone_names.Tpo -c -o orage-timezone_names.o `test -f 'timezone_names.c' || echo '$(srcdir)/'`timezone_names.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-timezone_names.Tpo $(DEPDIR)/orage-timezone_names.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='timezone_names.c' object='orage-timezone_names.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-timezone_names.o -MD -MP -MF $(DEPDIR)/orage-timezone_names.Tpo -c -o orage-timezone_names.o `test -f 'timezone_names.c' || echo '$(srcdir)/'`timezone_names.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-timezone_names.Tpo $(DEPDIR)/orage-timezone_names.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='timezone_names.c' object='orage-timezone_names.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-timezone_names.o `test -f 'timezone_names.c' || echo '$(srcdir)/'`timezone_names.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-timezone_names.o `test -f 'timezone_names.c' || echo '$(srcdir)/'`timezone_names.c
 
 orage-timezone_names.obj: timezone_names.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-timezone_names.obj -MD -MP -MF $(DEPDIR)/orage-timezone_names.Tpo -c -o orage-timezone_names.obj `if test -f 'timezone_names.c'; then $(CYGPATH_W) 'timezone_names.c'; else $(CYGPATH_W) '$(srcdir)/timezone_names.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-timezone_names.Tpo $(DEPDIR)/orage-timezone_names.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='timezone_names.c' object='orage-timezone_names.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-timezone_names.obj -MD -MP -MF $(DEPDIR)/orage-timezone_names.Tpo -c -o orage-timezone_names.obj `if test -f 'timezone_names.c'; then $(CYGPATH_W) 'timezone_names.c'; else $(CYGPATH_W) '$(srcdir)/timezone_names.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-timezone_names.Tpo $(DEPDIR)/orage-timezone_names.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='timezone_names.c' object='orage-timezone_names.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-timezone_names.obj `if test -f 'timezone_names.c'; then $(CYGPATH_W) 'timezone_names.c'; else $(CYGPATH_W) '$(srcdir)/timezone_names.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-timezone_names.obj `if test -f 'timezone_names.c'; then $(CYGPATH_W) 'timezone_names.c'; else $(CYGPATH_W) '$(srcdir)/timezone_names.c'; fi`
 
 orage-timezone_selection.o: timezone_selection.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-timezone_selection.o -MD -MP -MF $(DEPDIR)/orage-timezone_selection.Tpo -c -o orage-timezone_selection.o `test -f 'timezone_selection.c' || echo '$(srcdir)/'`timezone_selection.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-timezone_selection.Tpo $(DEPDIR)/orage-timezone_selection.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='timezone_selection.c' object='orage-timezone_selection.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-timezone_selection.o -MD -MP -MF $(DEPDIR)/orage-timezone_selection.Tpo -c -o orage-timezone_selection.o `test -f 'timezone_selection.c' || echo '$(srcdir)/'`timezone_selection.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-timezone_selection.Tpo $(DEPDIR)/orage-timezone_selection.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='timezone_selection.c' object='orage-timezone_selection.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-timezone_selection.o `test -f 'timezone_selection.c' || echo '$(srcdir)/'`timezone_selection.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-timezone_selection.o `test -f 'timezone_selection.c' || echo '$(srcdir)/'`timezone_selection.c
 
 orage-timezone_selection.obj: timezone_selection.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-timezone_selection.obj -MD -MP -MF $(DEPDIR)/orage-timezone_selection.Tpo -c -o orage-timezone_selection.obj `if test -f 'timezone_selection.c'; then $(CYGPATH_W) 'timezone_selection.c'; else $(CYGPATH_W) '$(srcdir)/timezone_selection.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-timezone_selection.Tpo $(DEPDIR)/orage-timezone_selection.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='timezone_selection.c' object='orage-timezone_selection.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-timezone_selection.obj -MD -MP -MF $(DEPDIR)/orage-timezone_selection.Tpo -c -o orage-timezone_selection.obj `if test -f 'timezone_selection.c'; then $(CYGPATH_W) 'timezone_selection.c'; else $(CYGPATH_W) '$(srcdir)/timezone_selection.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-timezone_selection.Tpo $(DEPDIR)/orage-timezone_selection.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='timezone_selection.c' object='orage-timezone_selection.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-timezone_selection.obj `if test -f 'timezone_selection.c'; then $(CYGPATH_W) 'timezone_selection.c'; else $(CYGPATH_W) '$(srcdir)/timezone_selection.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-timezone_selection.obj `if test -f 'timezone_selection.c'; then $(CYGPATH_W) 'timezone_selection.c'; else $(CYGPATH_W) '$(srcdir)/timezone_selection.c'; fi`
 
 orage-tray_icon.o: tray_icon.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-tray_icon.o -MD -MP -MF $(DEPDIR)/orage-tray_icon.Tpo -c -o orage-tray_icon.o `test -f 'tray_icon.c' || echo '$(srcdir)/'`tray_icon.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-tray_icon.Tpo $(DEPDIR)/orage-tray_icon.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tray_icon.c' object='orage-tray_icon.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-tray_icon.o -MD -MP -MF $(DEPDIR)/orage-tray_icon.Tpo -c -o orage-tray_icon.o `test -f 'tray_icon.c' || echo '$(srcdir)/'`tray_icon.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-tray_icon.Tpo $(DEPDIR)/orage-tray_icon.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tray_icon.c' object='orage-tray_icon.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-tray_icon.o `test -f 'tray_icon.c' || echo '$(srcdir)/'`tray_icon.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-tray_icon.o `test -f 'tray_icon.c' || echo '$(srcdir)/'`tray_icon.c
 
 orage-tray_icon.obj: tray_icon.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-tray_icon.obj -MD -MP -MF $(DEPDIR)/orage-tray_icon.Tpo -c -o orage-tray_icon.obj `if test -f 'tray_icon.c'; then $(CYGPATH_W) 'tray_icon.c'; else $(CYGPATH_W) '$(srcdir)/tray_icon.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-tray_icon.Tpo $(DEPDIR)/orage-tray_icon.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tray_icon.c' object='orage-tray_icon.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-tray_icon.obj -MD -MP -MF $(DEPDIR)/orage-tray_icon.Tpo -c -o orage-tray_icon.obj `if test -f 'tray_icon.c'; then $(CYGPATH_W) 'tray_icon.c'; else $(CYGPATH_W) '$(srcdir)/tray_icon.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-tray_icon.Tpo $(DEPDIR)/orage-tray_icon.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tray_icon.c' object='orage-tray_icon.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-tray_icon.obj `if test -f 'tray_icon.c'; then $(CYGPATH_W) 'tray_icon.c'; else $(CYGPATH_W) '$(srcdir)/tray_icon.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-tray_icon.obj `if test -f 'tray_icon.c'; then $(CYGPATH_W) 'tray_icon.c'; else $(CYGPATH_W) '$(srcdir)/tray_icon.c'; fi`
 
 orage-tz_zoneinfo_read.o: tz_zoneinfo_read.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-tz_zoneinfo_read.o -MD -MP -MF $(DEPDIR)/orage-tz_zoneinfo_read.Tpo -c -o orage-tz_zoneinfo_read.o `test -f 'tz_zoneinfo_read.c' || echo '$(srcdir)/'`tz_zoneinfo_read.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-tz_zoneinfo_read.Tpo $(DEPDIR)/orage-tz_zoneinfo_read.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tz_zoneinfo_read.c' object='orage-tz_zoneinfo_read.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-tz_zoneinfo_read.o -MD -MP -MF $(DEPDIR)/orage-tz_zoneinfo_read.Tpo -c -o orage-tz_zoneinfo_read.o `test -f 'tz_zoneinfo_read.c' || echo '$(srcdir)/'`tz_zoneinfo_read.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-tz_zoneinfo_read.Tpo $(DEPDIR)/orage-tz_zoneinfo_read.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tz_zoneinfo_read.c' object='orage-tz_zoneinfo_read.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-tz_zoneinfo_read.o `test -f 'tz_zoneinfo_read.c' || echo '$(srcdir)/'`tz_zoneinfo_read.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-tz_zoneinfo_read.o `test -f 'tz_zoneinfo_read.c' || echo '$(srcdir)/'`tz_zoneinfo_read.c
 
 orage-tz_zoneinfo_read.obj: tz_zoneinfo_read.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-tz_zoneinfo_read.obj -MD -MP -MF $(DEPDIR)/orage-tz_zoneinfo_read.Tpo -c -o orage-tz_zoneinfo_read.obj `if test -f 'tz_zoneinfo_read.c'; then $(CYGPATH_W) 'tz_zoneinfo_read.c'; else $(CYGPATH_W) '$(srcdir)/tz_zoneinfo_read.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/orage-tz_zoneinfo_read.Tpo $(DEPDIR)/orage-tz_zoneinfo_read.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tz_zoneinfo_read.c' object='orage-tz_zoneinfo_read.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -MT orage-tz_zoneinfo_read.obj -MD -MP -MF $(DEPDIR)/orage-tz_zoneinfo_read.Tpo -c -o orage-tz_zoneinfo_read.obj `if test -f 'tz_zoneinfo_read.c'; then $(CYGPATH_W) 'tz_zoneinfo_read.c'; else $(CYGPATH_W) '$(srcdir)/tz_zoneinfo_read.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/orage-tz_zoneinfo_read.Tpo $(DEPDIR)/orage-tz_zoneinfo_read.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tz_zoneinfo_read.c' object='orage-tz_zoneinfo_read.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-tz_zoneinfo_read.obj `if test -f 'tz_zoneinfo_read.c'; then $(CYGPATH_W) 'tz_zoneinfo_read.c'; else $(CYGPATH_W) '$(srcdir)/tz_zoneinfo_read.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(orage_CFLAGS) $(CFLAGS) -c -o orage-tz_zoneinfo_read.obj `if test -f 'tz_zoneinfo_read.c'; then $(CYGPATH_W) 'tz_zoneinfo_read.c'; else $(CYGPATH_W) '$(srcdir)/tz_zoneinfo_read.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -752,26 +863,15 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -783,15 +883,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -800,6 +896,21 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -851,10 +962,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -938,19 +1054,19 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
 
 
 @HAVE_DBUS_TRUE@orage-dbus-server.h: $(srcdir)/orage-dbus-service.xml Makefile
diff -Nru orage-4.8.3/src/orage-dbus-client.c orage-4.12.1/src/orage-dbus-client.c
--- orage-4.8.3/src/orage-dbus-client.c	2011-07-24 13:29:54.000000000 +0000
+++ orage-4.12.1/src/orage-dbus-client.c	2015-04-10 10:26:26.000000000 +0000
@@ -99,7 +99,8 @@
     };
 }
 
-gboolean orage_dbus_foreign_add(gchar *file_name, gboolean read_only)
+gboolean orage_dbus_foreign_add(gchar *file_name, gboolean read_only
+        , gchar *name)
 {
     DBusGConnection *connection;
     GError *error = NULL;
@@ -118,6 +119,7 @@
     if (dbus_g_proxy_call(proxy, "AddForeign", &error
                 , G_TYPE_STRING, file_name
                 , G_TYPE_BOOLEAN, read_only
+                , G_TYPE_STRING, name
                 , G_TYPE_INVALID, G_TYPE_INVALID)) {
         return(TRUE);
     }
diff -Nru orage-4.8.3/src/orage-dbus-client.h orage-4.12.1/src/orage-dbus-client.h
--- orage-4.8.3/src/orage-dbus-client.h	2011-07-24 13:29:54.000000000 +0000
+++ orage-4.12.1/src/orage-dbus-client.h	2015-04-10 10:26:26.000000000 +0000
@@ -92,10 +92,10 @@
 inline
 #endif
 gboolean
-org_xfce_calendar_add_foreign (DBusGProxy *proxy, const char * IN_file, const gboolean IN_mode, GError **error)
+org_xfce_calendar_add_foreign (DBusGProxy *proxy, const char * IN_file, const gboolean IN_mode, const char * IN_name, GError **error)
 
 {
-  return dbus_g_proxy_call (proxy, "AddForeign", error, G_TYPE_STRING, IN_file, G_TYPE_BOOLEAN, IN_mode, G_TYPE_INVALID, G_TYPE_INVALID);
+  return dbus_g_proxy_call (proxy, "AddForeign", error, G_TYPE_STRING, IN_file, G_TYPE_BOOLEAN, IN_mode, G_TYPE_STRING, IN_name, G_TYPE_INVALID, G_TYPE_INVALID);
 }
 
 typedef void (*org_xfce_calendar_add_foreign_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
@@ -115,14 +115,14 @@
 inline
 #endif
 DBusGProxyCall*
-org_xfce_calendar_add_foreign_async (DBusGProxy *proxy, const char * IN_file, const gboolean IN_mode, org_xfce_calendar_add_foreign_reply callback, gpointer userdata)
+org_xfce_calendar_add_foreign_async (DBusGProxy *proxy, const char * IN_file, const gboolean IN_mode, const char * IN_name, org_xfce_calendar_add_foreign_reply callback, gpointer userdata)
 
 {
   DBusGAsyncData *stuff;
   stuff = g_new (DBusGAsyncData, 1);
   stuff->cb = G_CALLBACK (callback);
   stuff->userdata = userdata;
-  return dbus_g_proxy_begin_call (proxy, "AddForeign", org_xfce_calendar_add_foreign_async_callback, stuff, g_free, G_TYPE_STRING, IN_file, G_TYPE_BOOLEAN, IN_mode, G_TYPE_INVALID);
+  return dbus_g_proxy_begin_call (proxy, "AddForeign", org_xfce_calendar_add_foreign_async_callback, stuff, g_free, G_TYPE_STRING, IN_file, G_TYPE_BOOLEAN, IN_mode, G_TYPE_STRING, IN_file, G_TYPE_INVALID);
 }
 
 
diff -Nru orage-4.8.3/src/orage-dbus.h orage-4.12.1/src/orage-dbus.h
--- orage-4.8.3/src/orage-dbus.h	2011-07-24 13:29:54.000000000 +0000
+++ orage-4.12.1/src/orage-dbus.h	2015-04-10 10:26:26.000000000 +0000
@@ -26,7 +26,8 @@
 void orage_dbus_start(void);
 gboolean orage_dbus_import_file(gchar *file_name);
 gboolean orage_dbus_export_file(gchar *file_name, gint type, gchar *uids);
-gboolean orage_dbus_foreign_add(gchar *file_name, gboolean read_only);
+gboolean orage_dbus_foreign_add(gchar *file_name, gboolean read_only
+        , gchar *name);
 gboolean orage_dbus_foreign_remove(gchar *file_name);
 
 #endif /* !__ORAGE_DBUS_H__ */
diff -Nru orage-4.8.3/src/orage-dbus-object.c orage-4.12.1/src/orage-dbus-object.c
--- orage-4.8.3/src/orage-dbus-object.c	2011-07-24 13:29:54.000000000 +0000
+++ orage-4.12.1/src/orage-dbus-object.c	2015-04-10 10:26:26.000000000 +0000
@@ -34,7 +34,8 @@
 /* defined in interface.c */
 gboolean orage_import_file(gchar *entry_filename);
 gboolean orage_export_file(gchar *filename, gint type, gchar *uids);
-gboolean orage_foreign_file_add(gchar *filename, gboolean read_only);
+gboolean orage_foreign_file_add(gchar *filename, gboolean read_only
+                , gchar *name);
 gboolean orage_foreign_file_remove(gchar *filename);
 
 struct _OrageDBusClass
@@ -119,10 +120,11 @@
 }
 
 gboolean orage_dbus_service_add_foreign(DBusGProxy *proxy
-        , const char *IN_file, const gboolean IN_mode
+        , const char *IN_file, const gboolean IN_mode, const char *IN_name
         , GError **error)
 {
-    if (orage_foreign_file_add((char *)IN_file, (gboolean)IN_mode)) {
+    if (orage_foreign_file_add((char *)IN_file, (gboolean)IN_mode
+                , (char *)IN_name)) {
         g_message("Orage **: DBUS Foreign file added %s", IN_file);
         return(TRUE);
     }
diff -Nru orage-4.8.3/src/orage-dbus-object.h orage-4.12.1/src/orage-dbus-object.h
--- orage-4.8.3/src/orage-dbus-object.h	2011-07-24 13:29:54.000000000 +0000
+++ orage-4.12.1/src/orage-dbus-object.h	2015-04-10 10:26:26.000000000 +0000
@@ -47,7 +47,7 @@
                 , const char *IN_file, const gint IN_type, const char *IN_uids
                 , GError **error);
 gboolean orage_dbus_service_add_foreign(DBusGProxy *proxy
-                , const char *IN_file, const gboolean IN_mode
+                , const char *IN_file, const gboolean IN_mode, const char *IN_name
                 , GError **error);
 gboolean orage_dbus_service_remove_foreign(DBusGProxy *proxy
                 , const char *IN_file
diff -Nru orage-4.8.3/src/orage-dbus-service.h orage-4.12.1/src/orage-dbus-service.h
--- orage-4.8.3/src/orage-dbus-service.h	2011-07-24 13:29:54.000000000 +0000
+++ orage-4.12.1/src/orage-dbus-service.h	2015-04-10 10:26:26.000000000 +0000
@@ -53,33 +53,34 @@
 #endif /* !G_ENABLE_DEBUG */
 
 
-/* BOOLEAN:STRING,BOOLEAN,POINTER */
-extern void dbus_glib_marshal_orage_BOOLEAN__STRING_BOOLEAN_POINTER (GClosure     *closure,
-                                                                     GValue       *return_value,
-                                                                     guint         n_param_values,
-                                                                     const GValue *param_values,
-                                                                     gpointer      invocation_hint,
-                                                                     gpointer      marshal_data);
+/* BOOLEAN:STRING,BOOLEAN,STRING,POINTER */
+extern void dbus_glib_marshal_orage_BOOLEAN__STRING_BOOLEAN_STRING_POINTER (GClosure     *closure,
+                                                                            GValue       *return_value,
+                                                                            guint         n_param_values,
+                                                                            const GValue *param_values,
+                                                                            gpointer      invocation_hint,
+                                                                            gpointer      marshal_data);
 void
-dbus_glib_marshal_orage_BOOLEAN__STRING_BOOLEAN_POINTER (GClosure     *closure,
-                                                         GValue       *return_value G_GNUC_UNUSED,
-                                                         guint         n_param_values,
-                                                         const GValue *param_values,
-                                                         gpointer      invocation_hint G_GNUC_UNUSED,
-                                                         gpointer      marshal_data)
+dbus_glib_marshal_orage_BOOLEAN__STRING_BOOLEAN_STRING_POINTER (GClosure     *closure,
+                                                                GValue       *return_value G_GNUC_UNUSED,
+                                                                guint         n_param_values,
+                                                                const GValue *param_values,
+                                                                gpointer      invocation_hint G_GNUC_UNUSED,
+                                                                gpointer      marshal_data)
 {
-  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_BOOLEAN_POINTER) (gpointer     data1,
-                                                                    gpointer     arg_1,
-                                                                    gboolean     arg_2,
-                                                                    gpointer     arg_3,
-                                                                    gpointer     data2);
-  register GMarshalFunc_BOOLEAN__STRING_BOOLEAN_POINTER callback;
+  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_BOOLEAN_STRING_POINTER) (gpointer     data1,
+                                                                           gpointer     arg_1,
+                                                                           gboolean     arg_2,
+                                                                           gpointer     arg_3,
+                                                                           gpointer     arg_4,
+                                                                           gpointer     data2);
+  register GMarshalFunc_BOOLEAN__STRING_BOOLEAN_STRING_POINTER callback;
   register GCClosure *cc = (GCClosure*) closure;
   register gpointer data1, data2;
   gboolean v_return;
 
   g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 4);
+  g_return_if_fail (n_param_values == 5);
 
   if (G_CCLOSURE_SWAP_DATA (closure))
     {
@@ -91,12 +92,13 @@
       data1 = g_value_peek_pointer (param_values + 0);
       data2 = closure->data;
     }
-  callback = (GMarshalFunc_BOOLEAN__STRING_BOOLEAN_POINTER) (marshal_data ? marshal_data : cc->callback);
+  callback = (GMarshalFunc_BOOLEAN__STRING_BOOLEAN_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
 
   v_return = callback (data1,
                        g_marshal_value_peek_string (param_values + 1),
                        g_marshal_value_peek_boolean (param_values + 2),
-                       g_marshal_value_peek_pointer (param_values + 3),
+                       g_marshal_value_peek_string (param_values + 3),
+                       g_marshal_value_peek_pointer (param_values + 4),
                        data2);
 
   g_value_set_boolean (return_value, v_return);
@@ -208,14 +210,14 @@
 static const DBusGMethodInfo dbus_glib_orage_methods[] = {
   { (GCallback) orage_dbus_service_load_file, dbus_glib_marshal_orage_BOOLEAN__STRING_POINTER, 0 },
   { (GCallback) orage_dbus_service_export_file, dbus_glib_marshal_orage_BOOLEAN__STRING_INT_STRING_POINTER, 39 },
-  { (GCallback) orage_dbus_service_add_foreign, dbus_glib_marshal_orage_BOOLEAN__STRING_BOOLEAN_POINTER, 98 },
-  { (GCallback) orage_dbus_service_remove_foreign, dbus_glib_marshal_orage_BOOLEAN__STRING_POINTER, 148 },
+  { (GCallback) orage_dbus_service_add_foreign, dbus_glib_marshal_orage_BOOLEAN__STRING_BOOLEAN_STRING_POINTER, 98 },
+  { (GCallback) orage_dbus_service_remove_foreign, dbus_glib_marshal_orage_BOOLEAN__STRING_POINTER, 157 },
 };
 
 const DBusGObjectInfo dbus_glib_orage_object_info = {  1,
   dbus_glib_orage_methods,
   4,
-"org.xfce.calendar\0LoadFile\0S\0file\0I\0s\0\0org.xfce.calendar\0ExportFile\0S\0file\0I\0s\0type\0I\0i\0uids\0I\0s\0\0org.xfce.calendar\0AddForeign\0S\0file\0I\0s\0mode\0I\0b\0\0org.xfce.calendar\0RemoveForeign\0S\0file\0I\0s\0\0\0",
+"org.xfce.calendar\0LoadFile\0S\0file\0I\0s\0\0org.xfce.calendar\0ExportFile\0S\0file\0I\0s\0type\0I\0i\0uids\0I\0s\0\0org.xfce.calendar\0AddForeign\0S\0file\0I\0s\0mode\0I\0b\0name\0I\0s\0\0org.xfce.calendar\0RemoveForeign\0S\0file\0I\0s\0\0\0",
 "\0",
 "\0"
 };
diff -Nru orage-4.8.3/src/orage-dbus-service.xml orage-4.12.1/src/orage-dbus-service.xml
--- orage-4.8.3/src/orage-dbus-service.xml	2011-07-24 13:29:54.000000000 +0000
+++ orage-4.12.1/src/orage-dbus-service.xml	2015-04-10 10:26:26.000000000 +0000
@@ -38,6 +38,7 @@
     <method name="AddForeign">
       <arg type="s" name="file" direction="in" />
       <arg type="b" name="mode" direction="in" />
+      <arg type="s" name="name" direction="in" />
     </method>
     <method name="RemoveForeign">
       <arg type="s" name="file" direction="in" />
diff -Nru orage-4.8.3/src/parameters.c orage-4.12.1/src/parameters.c
--- orage-4.8.3/src/parameters.c	2011-11-25 07:32:58.000000000 +0000
+++ orage-4.12.1/src/parameters.c	2015-04-10 10:26:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2006-2011 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2006-2013 Juha Kautto  (juha at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,95 +47,16 @@
 #include "ical-code.h"
 #include "timezone_selection.h"
 #include "parameters.h"
+#include "parameters_internal.h"
 #include "mainbox.h"
 
+
 extern int g_log_level; /* in function.c */
 
 gboolean check_wakeup(gpointer user_data); /* in main.c*/
 
 static gboolean is_running = FALSE;
 
-typedef struct _Itf
-{
-    GtkTooltips *Tooltips;
-
-    GtkWidget *orage_dialog;
-    GtkWidget *dialog_vbox1;
-    GtkWidget *notebook;
-
-    /* Tabs */
-    /***** Main Tab *****/
-    GtkWidget *setup_tab;
-    GtkWidget *setup_tab_label;
-    GtkWidget *setup_vbox;
-    /* Choose the timezone for appointments */
-    GtkWidget *timezone_frame;
-    GtkWidget *timezone_button;
-    /* Archive period */
-#ifdef HAVE_ARCHIVE
-    GtkWidget *archive_threshold_frame;
-    GtkWidget *archive_threshold_spin;
-#endif
-    /* Choose the sound application for reminders */
-    GtkWidget *sound_application_frame;
-    GtkWidget *sound_application_entry;
-    GtkWidget *sound_application_open_button;
-
-    /***** Display Tab *****/
-    GtkWidget *display_tab;
-    GtkWidget *display_tab_label;
-    GtkWidget *display_vbox;
-    /* Show  border, menu and set stick, ontop */
-    GtkWidget *mode_frame;
-    GtkWidget *show_borders_checkbutton;
-    GtkWidget *show_menu_checkbutton;
-    GtkWidget *show_heading_checkbutton;
-    GtkWidget *show_day_names_checkbutton;
-    GtkWidget *show_weeks_checkbutton;
-    GtkWidget *set_stick_checkbutton;
-    GtkWidget *set_ontop_checkbutton;
-    /* Show in... taskbar pager systray */
-    GtkWidget *show_taskbar_checkbutton;
-    GtkWidget *show_pager_checkbutton;
-    GtkWidget *show_systray_checkbutton;
-    GtkWidget *show_todos_checkbutton;
-    GtkWidget *show_events_spin;
-    /* Start visibity show or hide */
-    GtkWidget *visibility_frame;
-    GSList    *visibility_radiobutton_group;
-    GtkWidget *visibility_show_radiobutton;
-    GtkWidget *visibility_hide_radiobutton;
-    GtkWidget *visibility_minimized_radiobutton;
-
-    /***** Extra Tab *****/
-    GtkWidget *extra_tab;
-    GtkWidget *extra_tab_label;
-    GtkWidget *extra_vbox;
-    /* select_always_today */
-    GtkWidget *select_day_frame;
-    /* GtkWidget *always_today_checkbutton; */
-    GSList    *select_day_radiobutton_group;
-    GtkWidget *select_day_today_radiobutton;
-    GtkWidget *select_day_old_radiobutton;
-    /* icon size */
-    GtkWidget *use_dynamic_icon_frame;
-    GtkWidget *use_dynamic_icon_checkbutton;
-    /* show event/days window from main calendar */
-    GtkWidget *click_to_show_frame;
-    GSList    *click_to_show_radiobutton_group;
-    GtkWidget *click_to_show_days_radiobutton;
-    GtkWidget *click_to_show_events_radiobutton;
-    /* eventlist window number of extra days to show */
-    GtkWidget *el_extra_days_frame;
-    GtkWidget *el_extra_days_spin;
-    /* the rest */
-    GtkWidget *close_button;
-    GtkWidget *help_button;
-    GtkWidget *dialog_action_area1;
-    /* icon size */
-    GtkWidget *use_wakeup_timer_frame;
-    GtkWidget *use_wakeup_timer_checkbutton;
-} Itf;
 
 /* Return the first day of the week, where 0=monday, 6=sunday.
  *     Borrowed from GTK+:s Calendar Widget, but modified
@@ -176,21 +97,35 @@
 
     if (response_id == GTK_RESPONSE_HELP) {
         /* Needs to be in " to keep # */
-        helpdoc = g_strconcat("firefox \"", PACKAGE_DATA_DIR
+        helpdoc = g_strconcat("exo-open \"file://", PACKAGE_DATA_DIR
                 , G_DIR_SEPARATOR_S, "orage"
                 , G_DIR_SEPARATOR_S, "doc"
                 , G_DIR_SEPARATOR_S, "C"
                 , G_DIR_SEPARATOR_S, "orage.html#orage-preferences-window\""
                 , NULL);
-        if (!orage_exec(helpdoc, FALSE, &error))
-            orage_message(100, "start of %s failed: %s", helpdoc
+        if (!orage_exec(helpdoc, FALSE, &error)) {
+            orage_message(10, "%s failed: %s. Trying firefox", helpdoc
                     , error->message);
+            g_clear_error(&error);
+            g_free(helpdoc);
+            helpdoc = g_strconcat("firefox \"file://", PACKAGE_DATA_DIR
+                    , G_DIR_SEPARATOR_S, "orage"
+                    , G_DIR_SEPARATOR_S, "doc"
+                    , G_DIR_SEPARATOR_S, "C"
+                    , G_DIR_SEPARATOR_S, "orage.html#orage-preferences-window\""
+                    , NULL);
+            if (!orage_exec(helpdoc, FALSE, &error)) {
+                orage_message(100, "start of %s failed: %s", helpdoc
+                        , error->message);
+                g_clear_error(&error);
+            }
+        }
+        g_free(helpdoc);
     }
     else { /* delete signal or close response */
         write_parameters();
         is_running = FALSE;
         gtk_widget_destroy(dialog);
-        gtk_object_destroy(GTK_OBJECT(itf->Tooltips));
         g_free(itf);
     }
 }
@@ -273,21 +208,21 @@
     set_calendar();
 }
 
-static void set_todos(void)
-{
-    if (g_par.show_todos)
-        gtk_widget_show_all(((CalWin *)g_par.xfcal)->mTodo_vbox);
-    else
-        gtk_widget_hide_all(((CalWin *)g_par.xfcal)->mTodo_vbox);
-}
-
 static void todos_changed(GtkWidget *dialog, gpointer user_data)
 {
     Itf *itf = (Itf *)user_data;
 
     g_par.show_todos = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
             itf->show_todos_checkbutton));
-    set_todos();
+    if (g_par.show_todos)
+        build_mainbox_todo_box();
+    else {
+        gtk_widget_hide_all(((CalWin *)g_par.xfcal)->mTodo_vbox);
+        /* hide the whole area if also event box does not exist */
+        if (!g_par.show_event_days)
+            gtk_window_resize(GTK_WINDOW(((CalWin *)g_par.xfcal)->mWindow)
+                    , g_par.size_x, 1);
+    }
 }
 
 static void show_events_spin_changed(GtkSpinButton *sb, gpointer user_data)
@@ -295,8 +230,13 @@
     g_par.show_event_days = gtk_spin_button_get_value(sb);
     if (g_par.show_event_days)
         build_mainbox_event_box();
-    else
+    else {
         gtk_widget_hide_all(((CalWin *)g_par.xfcal)->mEvent_vbox);
+        /* hide the whole area if also todo box does not exist */
+        if (!g_par.show_todos)
+            gtk_window_resize(GTK_WINDOW(((CalWin *)g_par.xfcal)->mWindow)
+                    , g_par.size_x, 1);
+    }
 }
 
 static void set_stick(void)
@@ -405,6 +345,24 @@
             itf->click_to_show_days_radiobutton));
 }
 
+static void foreign_alarm_changed(GtkWidget *dialog, gpointer user_data)
+{
+    Itf *itf = (Itf *)user_data;
+
+    g_par.use_foreign_display_alarm_notify = 
+        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
+            itf->foreign_alarm_notification_radiobutton));
+}
+
+static void dw_week_mode_changed(GtkWidget *dialog, gpointer user_data)
+{
+    Itf *itf = (Itf *)user_data;
+
+    g_par.dw_week_mode = 
+        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
+            itf->dw_week_mode_week_radiobutton));
+}
+
 static void sound_application_open_button_clicked(GtkButton *button
         , gpointer user_data)
 {
@@ -486,6 +444,12 @@
     g_par.el_days = gtk_spin_button_get_value(sb);
 }
 
+static void el_only_first_checkbutton_clicked(GtkCheckButton *cb
+        , gpointer user_data)
+{
+    g_par.el_only_first = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb));
+}
+
 /* start monitoring lost seconds due to hibernate or suspend */
 static void set_wakeup_timer()
 {
@@ -504,19 +468,25 @@
 static void use_wakeup_timer_changed(GtkWidget *dialog, gpointer user_data)
 {
     Itf *itf = (Itf *)user_data;
-    GdkPixbuf *orage_logo;
 
     g_par.use_wakeup_timer = gtk_toggle_button_get_active(
             GTK_TOGGLE_BUTTON(itf->use_wakeup_timer_checkbutton));
     set_wakeup_timer();
 }
 
+static void always_quit_changed(GtkWidget *dialog, gpointer user_data)
+{
+    Itf *itf = (Itf *)user_data;
+
+    g_par.close_means_quit = gtk_toggle_button_get_active(
+            GTK_TOGGLE_BUTTON(itf->always_quit_checkbutton));
+}
+
 static void create_parameter_dialog_main_setup_tab(Itf *dialog)
 {
     GtkWidget *hbox, *vbox, *label;
 
     dialog->setup_vbox = gtk_vbox_new(FALSE, 0);
-    /* FIXME: this could be something simpler than framebox */
     dialog->setup_tab = 
             orage_create_framebox_with_content(NULL, dialog->setup_vbox);
     dialog->setup_tab_label = gtk_label_new(_("Main settings"));
@@ -539,9 +509,8 @@
             , _(g_par.local_timezone));
     gtk_box_pack_start(GTK_BOX(vbox)
             , dialog->timezone_button, FALSE, FALSE, 5);
-    gtk_tooltips_set_tip(dialog->Tooltips, dialog->timezone_button
-            , _("You should always define your local timezone.")
-            , NULL);
+    gtk_widget_set_tooltip_text(dialog->timezone_button
+            , _("You should always define your local timezone."));
     g_signal_connect(G_OBJECT(dialog->timezone_button), "clicked"
             , G_CALLBACK(timezone_button_clicked), dialog);
 
@@ -561,9 +530,8 @@
             , dialog->archive_threshold_spin, FALSE, FALSE, 5);
     label = gtk_label_new(_("(0 = no archiving)"));
     gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
-    gtk_tooltips_set_tip(dialog->Tooltips, dialog->archive_threshold_spin
-            , _("Archiving is used to save time and space when handling events.")
-            , NULL);
+    gtk_widget_set_tooltip_text(dialog->archive_threshold_spin
+            , _("Archiving is used to save time and space when handling events."));
     g_signal_connect(G_OBJECT(dialog->archive_threshold_spin), "value-changed"
             , G_CALLBACK(archive_threshold_spin_changed), dialog);
 #endif
@@ -585,70 +553,109 @@
     gtk_box_pack_start(GTK_BOX(hbox)
             , dialog->sound_application_open_button, FALSE, FALSE, 5);
 
-    gtk_tooltips_set_tip(dialog->Tooltips, dialog->sound_application_entry
-            , _("This command is given to shell to make sound in alarms.")
-            , NULL);
+    gtk_widget_set_tooltip_text(dialog->sound_application_entry
+            , _("This command is given to shell to make sound in alarms."));
     g_signal_connect(G_OBJECT(dialog->sound_application_open_button), "clicked"
             , G_CALLBACK(sound_application_open_button_clicked), dialog);
     g_signal_connect(G_OBJECT(dialog->sound_application_entry), "changed"
             , G_CALLBACK(sound_application_changed), dialog);
 }
 
-static void create_parameter_dialog_display_tab(Itf *dialog)
+GtkWidget *create_table(guint rows, guint cols)
 {
-    GtkWidget *hbox, *vbox, *label;
+    GtkWidget *table;
+
+    table = gtk_table_new(rows, cols, FALSE);
+    gtk_container_set_border_width(GTK_CONTAINER(table), 5);
+    gtk_table_set_row_spacings(GTK_TABLE(table), 2);
+    gtk_table_set_col_spacings(GTK_TABLE(table), 6);
+    return table;
+}
+
+void table_add_row(GtkWidget *table, GtkWidget *data1, GtkWidget *data2
+        , guint row)
+{
+    if (data1) {
+        gtk_table_attach(GTK_TABLE(table), data1, 0, 1, row, row+1
+                , (GTK_FILL), (GTK_FILL), 0, 0);
+    }
+    if (data2) {
+        gtk_table_attach(GTK_TABLE(table), data2, 1, 2, row, row+1
+                , (GTK_FILL), (GTK_FILL), 0, 0);
+    }
+}
+
+static void create_parameter_dialog_calendar_setup_tab(Itf *dialog)
+{
+    GtkWidget *hbox, *vbox, *label, *table;
+    gint row;
 
-    dialog->display_vbox = gtk_vbox_new(FALSE, 0);
-    /* FIXME: this could be something simpler than framebox */
-    dialog->display_tab = 
-        orage_create_framebox_with_content(NULL, dialog->display_vbox);
-    dialog->display_tab_label = gtk_label_new(_("Display settings"));
+    dialog->calendar_vbox = gtk_vbox_new(FALSE, 0);
+    dialog->calendar_tab = 
+        orage_create_framebox_with_content(NULL, dialog->calendar_vbox);
+    dialog->calendar_tab_label = gtk_label_new(_("Calendar window"));
     gtk_notebook_append_page(GTK_NOTEBOOK(dialog->notebook)
-          , dialog->display_tab, dialog->display_tab_label);
+          , dialog->calendar_tab, dialog->calendar_tab_label);
 
-    /* Display calendar borders and menu and calendar options or not 
-     * and set stick or ontop */
-    vbox = gtk_vbox_new(TRUE, 0);
+    /***** calendar borders and menu and other calendar visual options *****/
+    table = create_table(3, 2);
     dialog->mode_frame = 
-            orage_create_framebox_with_content(_("Calendar main window"), vbox);
-    gtk_box_pack_start(GTK_BOX(dialog->display_vbox), dialog->mode_frame
+            orage_create_framebox_with_content(_("Calendar visual details")
+                    , table);
+    gtk_box_pack_start(GTK_BOX(dialog->calendar_vbox), dialog->mode_frame
             , FALSE, FALSE, 5);
 
     dialog->show_borders_checkbutton = gtk_check_button_new_with_mnemonic(
             _("Show borders"));
-    gtk_box_pack_start(GTK_BOX(vbox)
-            , dialog->show_borders_checkbutton, FALSE, FALSE, 0);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
             dialog->show_borders_checkbutton), g_par.show_borders);
 
     dialog->show_menu_checkbutton = gtk_check_button_new_with_mnemonic(
             _("Show menu"));
-    gtk_box_pack_start(GTK_BOX(vbox)
-            , dialog->show_menu_checkbutton, FALSE, FALSE, 0);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
             dialog->show_menu_checkbutton), g_par.show_menu);
 
-    dialog->show_heading_checkbutton = gtk_check_button_new_with_mnemonic(
-            _("Show month and year"));
-    gtk_box_pack_start(GTK_BOX(vbox)
-            , dialog->show_heading_checkbutton, FALSE, FALSE, 0);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
-            dialog->show_heading_checkbutton), g_par.show_heading);
+    table_add_row(table, dialog->show_borders_checkbutton
+            , dialog->show_menu_checkbutton, row = 0);
 
     dialog->show_day_names_checkbutton = gtk_check_button_new_with_mnemonic(
             _("Show day names"));
-    gtk_box_pack_start(GTK_BOX(vbox)
-            , dialog->show_day_names_checkbutton, FALSE, FALSE, 0);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
             dialog->show_day_names_checkbutton), g_par.show_day_names);
 
     dialog->show_weeks_checkbutton = gtk_check_button_new_with_mnemonic(
             _("Show week numbers"));
-    gtk_box_pack_start(GTK_BOX(vbox)
-            , dialog->show_weeks_checkbutton, FALSE, FALSE, 0);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
             dialog->show_weeks_checkbutton), g_par.show_weeks);
 
+    table_add_row(table, dialog->show_day_names_checkbutton
+            , dialog->show_weeks_checkbutton, ++row);
+
+    dialog->show_heading_checkbutton = gtk_check_button_new_with_mnemonic(
+            _("Show month and year"));
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
+            dialog->show_heading_checkbutton), g_par.show_heading);
+
+    table_add_row(table, dialog->show_heading_checkbutton, NULL, ++row);
+
+    g_signal_connect(G_OBJECT(dialog->show_borders_checkbutton), "toggled"
+            , G_CALLBACK(borders_changed), dialog);
+    g_signal_connect(G_OBJECT(dialog->show_menu_checkbutton), "toggled"
+            , G_CALLBACK(menu_changed), dialog);
+    g_signal_connect(G_OBJECT(dialog->show_heading_checkbutton), "toggled"
+            , G_CALLBACK(heading_changed), dialog);
+    g_signal_connect(G_OBJECT(dialog->show_day_names_checkbutton), "toggled"
+            , G_CALLBACK(days_changed), dialog);
+    g_signal_connect(G_OBJECT(dialog->show_weeks_checkbutton), "toggled"
+            , G_CALLBACK(weeks_changed), dialog);
+
+    /***** calendar info boxes (under the calendar) *****/
+    vbox = gtk_vbox_new(FALSE, 0);
+    dialog->info_frame = 
+            orage_create_framebox_with_content(_("Calendar info boxes"), vbox);
+    gtk_box_pack_start(GTK_BOX(dialog->calendar_vbox), dialog->info_frame
+            , FALSE, FALSE, 5);
+
     dialog->show_todos_checkbutton = gtk_check_button_new_with_mnemonic(
             _("Show todo list"));
     gtk_box_pack_start(GTK_BOX(vbox)
@@ -662,65 +669,57 @@
     dialog->show_events_spin = gtk_spin_button_new_with_range(0, 31, 1);
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->show_events_spin)
             , g_par.show_event_days);
-    gtk_tooltips_set_tip(dialog->Tooltips, dialog->show_events_spin
-            , _("0 = do not show event list at all"), NULL);
+    gtk_widget_set_tooltip_text(dialog->show_events_spin
+            , _("0 = do not show event list at all"));
     gtk_box_pack_start(GTK_BOX(hbox)
             , dialog->show_events_spin, FALSE, FALSE, 5);
     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-    /*
-    label = gtk_label_new(_("days in event list"));
-    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
-    */
+
+    g_signal_connect(G_OBJECT(dialog->show_todos_checkbutton), "toggled"
+            , G_CALLBACK(todos_changed), dialog);
+    g_signal_connect(G_OBJECT(dialog->show_events_spin), "value-changed"
+            , G_CALLBACK(show_events_spin_changed), dialog);
+
+    /***** Where calendar appears = exists = is visible *****/
+    table = create_table(3, 2);
+    dialog->appearance_frame = 
+            orage_create_framebox_with_content(_("Calendar visibility"), table);
+    gtk_box_pack_start(GTK_BOX(dialog->calendar_vbox), dialog->appearance_frame
+            , FALSE, FALSE, 5);
 
     dialog->set_stick_checkbutton = gtk_check_button_new_with_mnemonic(
             _("Show on all desktops"));
-    gtk_box_pack_start(GTK_BOX(vbox)
-            , dialog->set_stick_checkbutton, FALSE, FALSE, 0);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
             dialog->set_stick_checkbutton), g_par.set_stick);
 
     dialog->set_ontop_checkbutton = gtk_check_button_new_with_mnemonic(
             _("Keep on top"));
-    gtk_box_pack_start(GTK_BOX(vbox)
-            , dialog->set_ontop_checkbutton, FALSE, FALSE, 0);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
             dialog->set_ontop_checkbutton), g_par.set_ontop);
 
+    table_add_row(table, dialog->set_stick_checkbutton
+            , dialog->set_ontop_checkbutton, row = 0);
+
     dialog->show_taskbar_checkbutton = gtk_check_button_new_with_mnemonic(
             _("Show in taskbar"));
-    gtk_box_pack_start(GTK_BOX(vbox)
-            , dialog->show_taskbar_checkbutton, FALSE, FALSE, 0);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
             dialog->show_taskbar_checkbutton), g_par.show_taskbar);
 
     dialog->show_pager_checkbutton = gtk_check_button_new_with_mnemonic(
             _("Show in pager"));
-    gtk_box_pack_start(GTK_BOX(vbox)
-            , dialog->show_pager_checkbutton, FALSE, FALSE, 0);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
             dialog->show_pager_checkbutton), g_par.show_pager);
 
+    table_add_row(table, dialog->show_taskbar_checkbutton
+            , dialog->show_pager_checkbutton, ++row);
+
     dialog->show_systray_checkbutton = gtk_check_button_new_with_mnemonic(
             _("Show in systray"));
-    gtk_box_pack_start(GTK_BOX(vbox)
-            , dialog->show_systray_checkbutton, FALSE, FALSE, 0);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
             dialog->show_systray_checkbutton), g_par.show_systray);
 
-    g_signal_connect(G_OBJECT(dialog->show_borders_checkbutton), "toggled"
-            , G_CALLBACK(borders_changed), dialog);
-    g_signal_connect(G_OBJECT(dialog->show_menu_checkbutton), "toggled"
-            , G_CALLBACK(menu_changed), dialog);
-    g_signal_connect(G_OBJECT(dialog->show_heading_checkbutton), "toggled"
-            , G_CALLBACK(heading_changed), dialog);
-    g_signal_connect(G_OBJECT(dialog->show_day_names_checkbutton), "toggled"
-            , G_CALLBACK(days_changed), dialog);
-    g_signal_connect(G_OBJECT(dialog->show_weeks_checkbutton), "toggled"
-            , G_CALLBACK(weeks_changed), dialog);
-    g_signal_connect(G_OBJECT(dialog->show_todos_checkbutton), "toggled"
-            , G_CALLBACK(todos_changed), dialog);
-    g_signal_connect(G_OBJECT(dialog->show_events_spin), "value-changed"
-            , G_CALLBACK(show_events_spin_changed), dialog);
+    table_add_row(table, dialog->show_systray_checkbutton, NULL, ++row);
+
     g_signal_connect(G_OBJECT(dialog->set_stick_checkbutton), "toggled"
             , G_CALLBACK(stick_changed), dialog);
     g_signal_connect(G_OBJECT(dialog->set_ontop_checkbutton), "toggled"
@@ -732,18 +731,18 @@
     g_signal_connect(G_OBJECT(dialog->show_systray_checkbutton), "toggled"
             , G_CALLBACK(systray_changed), dialog);
 
-    /* how to show when started (show/hide/minimize) */
+    /***** how to show when started (show/hide/minimize) *****/
     dialog->visibility_radiobutton_group = NULL;
     hbox = gtk_hbox_new(TRUE, 0);
     dialog->visibility_frame = orage_create_framebox_with_content(
             _("Calendar start") , hbox);
-    gtk_box_pack_start(GTK_BOX(dialog->display_vbox), dialog->visibility_frame
+    gtk_box_pack_start(GTK_BOX(dialog->calendar_vbox), dialog->visibility_frame
             , FALSE, FALSE, 5);
 
     dialog->visibility_show_radiobutton = gtk_radio_button_new_with_mnemonic(
             NULL, _("Show"));
     gtk_box_pack_start(GTK_BOX(hbox)
-            , dialog->visibility_show_radiobutton, FALSE, FALSE, 0);
+            , dialog->visibility_show_radiobutton, FALSE, TRUE, 0);
     gtk_radio_button_set_group(
             GTK_RADIO_BUTTON(dialog->visibility_show_radiobutton)
             , dialog->visibility_radiobutton_group);
@@ -755,7 +754,7 @@
     dialog->visibility_hide_radiobutton = gtk_radio_button_new_with_mnemonic(
             NULL, _("Hide"));
     gtk_box_pack_start(GTK_BOX(hbox)
-            , dialog->visibility_hide_radiobutton, FALSE, FALSE, 0);
+            , dialog->visibility_hide_radiobutton, TRUE, TRUE, 0);
     gtk_radio_button_set_group(
             GTK_RADIO_BUTTON(dialog->visibility_hide_radiobutton)
             , dialog->visibility_radiobutton_group);
@@ -767,7 +766,7 @@
     dialog->visibility_minimized_radiobutton = 
             gtk_radio_button_new_with_mnemonic(NULL, _("Minimized"));
     gtk_box_pack_start(GTK_BOX(hbox)
-            , dialog->visibility_minimized_radiobutton, FALSE, FALSE, 0);
+            , dialog->visibility_minimized_radiobutton, TRUE, TRUE, 0);
     gtk_radio_button_set_group(
             GTK_RADIO_BUTTON(dialog->visibility_minimized_radiobutton)
             , dialog->visibility_radiobutton_group);
@@ -780,32 +779,19 @@
             , G_CALLBACK(start_changed), dialog);
     g_signal_connect(G_OBJECT(dialog->visibility_minimized_radiobutton)
             , "toggled", G_CALLBACK(start_changed), dialog);
-}
-
-static void create_parameter_dialog_extra_setup_tab(Itf *dialog)
-{
-    GtkWidget *hbox, *vbox, *label;
-
-    dialog->extra_vbox = gtk_vbox_new(FALSE, 0);
-    /* FIXME: this could be something simpler than framebox */
-    dialog->extra_tab = 
-            orage_create_framebox_with_content(NULL, dialog->extra_vbox);
-    dialog->extra_tab_label = gtk_label_new(_("Extra settings"));
-    gtk_notebook_append_page(GTK_NOTEBOOK(dialog->notebook)
-          , dialog->extra_tab, dialog->extra_tab_label);
 
     /****** On Calendar Window Open ******/
     dialog->select_day_radiobutton_group = NULL;
-    vbox = gtk_vbox_new(FALSE, 0);
+    hbox = gtk_hbox_new(TRUE, 0);
     dialog->select_day_frame = orage_create_framebox_with_content(
-            _("On Calendar Window Open"), vbox);
-    gtk_box_pack_start(GTK_BOX(dialog->extra_vbox)
+            _("On calendar window open"), hbox);
+    gtk_box_pack_start(GTK_BOX(dialog->calendar_vbox)
             , dialog->select_day_frame, FALSE, FALSE, 5);
 
     dialog->select_day_today_radiobutton =
-            gtk_radio_button_new_with_mnemonic(NULL, _("Select Today's Date"));
-    gtk_box_pack_start(GTK_BOX(vbox)
-            , dialog->select_day_today_radiobutton, FALSE, FALSE, 0);
+            gtk_radio_button_new_with_mnemonic(NULL, _("Select today's date"));
+    gtk_box_pack_start(GTK_BOX(hbox)
+            , dialog->select_day_today_radiobutton, FALSE, TRUE, 0);
     gtk_radio_button_set_group(
             GTK_RADIO_BUTTON(dialog->select_day_today_radiobutton)
             , dialog->select_day_radiobutton_group);
@@ -816,9 +802,9 @@
 
     dialog->select_day_old_radiobutton =
             gtk_radio_button_new_with_mnemonic(NULL
-                    , _("Select Previously Selected Date"));
-    gtk_box_pack_start(GTK_BOX(vbox)
-            , dialog->select_day_old_radiobutton, FALSE, FALSE, 0);
+                    , _("Select previously selected date"));
+    gtk_box_pack_start(GTK_BOX(hbox)
+            , dialog->select_day_old_radiobutton, TRUE, TRUE, 0);
     gtk_radio_button_set_group(
             GTK_RADIO_BUTTON(dialog->select_day_old_radiobutton)
             , dialog->select_day_radiobutton_group);
@@ -830,37 +816,18 @@
     g_signal_connect(G_OBJECT(dialog->select_day_today_radiobutton), "toggled"
             , G_CALLBACK(select_day_changed), dialog);
 
-    /***** use dynamic tray icon *****/
-    hbox = gtk_vbox_new(FALSE, 0);
-    dialog->use_dynamic_icon_frame = orage_create_framebox_with_content(
-            _("Use dynamic tray icon"), hbox);
-    gtk_box_pack_start(GTK_BOX(dialog->extra_vbox)
-            , dialog->use_dynamic_icon_frame, FALSE, FALSE, 5);
-
-    dialog->use_dynamic_icon_checkbutton = 
-            gtk_check_button_new_with_mnemonic(_("Use dynamic icon"));
-    gtk_box_pack_start(GTK_BOX(hbox)
-            , dialog->use_dynamic_icon_checkbutton, FALSE, FALSE, 5);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
-            dialog->use_dynamic_icon_checkbutton), g_par.use_dynamic_icon);
-    gtk_tooltips_set_tip(dialog->Tooltips, dialog->use_dynamic_icon_checkbutton
-            , _("Dynamic icon shows current month and day of the month.")
-            , NULL);
-    g_signal_connect(G_OBJECT(dialog->use_dynamic_icon_checkbutton), "toggled"
-            , G_CALLBACK(use_dynamic_icon_changed), dialog);
-
-    /***** Start event or day window from main calendar *****/
+    /***** Start event list or day window from main calendar *****/
     dialog->click_to_show_radiobutton_group = NULL;
-    vbox = gtk_vbox_new(FALSE, 0);
+    hbox = gtk_hbox_new(TRUE, 0);
     dialog->click_to_show_frame = orage_create_framebox_with_content(
-            _("Main Calendar double click shows"), vbox);
-    gtk_box_pack_start(GTK_BOX(dialog->extra_vbox)
+            _("Calendar day double click shows"), hbox);
+    gtk_box_pack_start(GTK_BOX(dialog->calendar_vbox)
             , dialog->click_to_show_frame, FALSE, FALSE, 5);
 
     dialog->click_to_show_days_radiobutton =
             gtk_radio_button_new_with_mnemonic(NULL, _("Days view"));
-    gtk_box_pack_start(GTK_BOX(vbox)
-            , dialog->click_to_show_days_radiobutton, FALSE, FALSE, 0);
+    gtk_box_pack_start(GTK_BOX(hbox)
+            , dialog->click_to_show_days_radiobutton, FALSE, TRUE, 0);
     gtk_radio_button_set_group(
             GTK_RADIO_BUTTON(dialog->click_to_show_days_radiobutton)
             , dialog->click_to_show_radiobutton_group);
@@ -871,8 +838,8 @@
 
     dialog->click_to_show_events_radiobutton =
             gtk_radio_button_new_with_mnemonic(NULL, _("Event list"));
-    gtk_box_pack_start(GTK_BOX(vbox)
-            , dialog->click_to_show_events_radiobutton, FALSE, FALSE, 0);
+    gtk_box_pack_start(GTK_BOX(hbox)
+            , dialog->click_to_show_events_radiobutton, TRUE, TRUE, 0);
     gtk_radio_button_set_group(
             GTK_RADIO_BUTTON(dialog->click_to_show_events_radiobutton)
             , dialog->click_to_show_radiobutton_group);
@@ -883,27 +850,112 @@
 
     g_signal_connect(G_OBJECT(dialog->click_to_show_days_radiobutton), "toggled"
             , G_CALLBACK(show_changed), dialog);
+}
 
-    /***** Eventlist window number of extra days to show *****/
-    hbox = gtk_hbox_new(FALSE, 0);
+static void create_parameter_dialog_extra_setup_tab(Itf *dialog)
+{
+    GtkWidget *hbox, *vbox, *label;
+
+    dialog->extra_vbox = gtk_vbox_new(FALSE, 0);
+    dialog->extra_tab = 
+            orage_create_framebox_with_content(NULL, dialog->extra_vbox);
+    dialog->extra_tab_label = gtk_label_new(_("Extra settings"));
+    gtk_notebook_append_page(GTK_NOTEBOOK(dialog->notebook)
+          , dialog->extra_tab, dialog->extra_tab_label);
+
+    /***** Eventlist window extra days and only first *****/
+    vbox = gtk_vbox_new(FALSE, 0);
     dialog->el_extra_days_frame = orage_create_framebox_with_content(
-            _("Eventlist window"), hbox);
+            _("Event list window"), vbox);
     gtk_box_pack_start(GTK_BOX(dialog->extra_vbox)
             , dialog->el_extra_days_frame, FALSE, FALSE, 5);
 
+    hbox = gtk_hbox_new(FALSE, 0);
     label = gtk_label_new(_("Number of extra days to show in event list"));
     gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
-    dialog->el_extra_days_spin = gtk_spin_button_new_with_range(0, 999, 1);
+    dialog->el_extra_days_spin = gtk_spin_button_new_with_range(0, 99999, 1);
+    gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(dialog->el_extra_days_spin), TRUE);
     gtk_box_pack_start(GTK_BOX(hbox)
             , dialog->el_extra_days_spin, FALSE, FALSE, 5);
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->el_extra_days_spin)
             , g_par.el_days);
-    gtk_tooltips_set_tip(dialog->Tooltips, dialog->el_extra_days_spin
-            , _("This is just the default value, you can change it in the actual eventlist window.")
-            , NULL);
+    gtk_widget_set_tooltip_text(dialog->el_extra_days_spin
+            , _("This is just the default value, you can change it in the actual eventlist window."));
+    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
     g_signal_connect(G_OBJECT(dialog->el_extra_days_spin), "value-changed"
             , G_CALLBACK(el_extra_days_spin_changed), dialog);
 
+    hbox = gtk_hbox_new(FALSE, 0);
+    dialog->el_only_first_checkbutton = gtk_check_button_new_with_label(
+            _("Show only first repeating event"));
+    gtk_box_pack_start(GTK_BOX(hbox), dialog->el_only_first_checkbutton
+            , FALSE, FALSE, 5);
+    gtk_toggle_button_set_active(
+            GTK_TOGGLE_BUTTON(dialog->el_only_first_checkbutton)
+                    , g_par.el_only_first);
+    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+    g_signal_connect(G_OBJECT(dialog->el_only_first_checkbutton), "clicked"
+            , G_CALLBACK(el_only_first_checkbutton_clicked), dialog);
+
+
+    /***** Default start day in day view window *****/
+    dialog->dw_week_mode_radiobutton_group = NULL;
+    hbox = gtk_hbox_new(TRUE, 0);
+    dialog->dw_week_mode_frame = orage_create_framebox_with_content(
+            _("Day view window default first day"), hbox);
+    gtk_box_pack_start(GTK_BOX(dialog->extra_vbox)
+            , dialog->dw_week_mode_frame, FALSE, FALSE, 5);
+
+    dialog->dw_week_mode_week_radiobutton =
+            gtk_radio_button_new_with_mnemonic(NULL, _("First day of week"));
+    gtk_box_pack_start(GTK_BOX(hbox)
+            , dialog->dw_week_mode_week_radiobutton, FALSE, TRUE, 0);
+    gtk_radio_button_set_group(
+            GTK_RADIO_BUTTON(dialog->dw_week_mode_week_radiobutton)
+            , dialog->dw_week_mode_radiobutton_group);
+    dialog->dw_week_mode_radiobutton_group = gtk_radio_button_get_group(
+            GTK_RADIO_BUTTON(dialog->dw_week_mode_week_radiobutton));
+    gtk_toggle_button_set_active(
+            GTK_TOGGLE_BUTTON(dialog->dw_week_mode_week_radiobutton)
+            , g_par.dw_week_mode);
+
+    dialog->dw_week_mode_day_radiobutton =
+            gtk_radio_button_new_with_mnemonic(NULL, _("Selected day"));
+    gtk_box_pack_start(GTK_BOX(hbox)
+            , dialog->dw_week_mode_day_radiobutton, TRUE, TRUE, 0);
+    gtk_radio_button_set_group(
+            GTK_RADIO_BUTTON(dialog->dw_week_mode_day_radiobutton)
+            , dialog->dw_week_mode_radiobutton_group);
+    dialog->dw_week_mode_radiobutton_group = gtk_radio_button_get_group(
+            GTK_RADIO_BUTTON(dialog->dw_week_mode_day_radiobutton));
+    gtk_toggle_button_set_active(
+            GTK_TOGGLE_BUTTON(dialog->dw_week_mode_day_radiobutton)
+            , !g_par.dw_week_mode);
+
+    g_signal_connect(G_OBJECT(dialog->dw_week_mode_day_radiobutton)
+            , "toggled", G_CALLBACK(dw_week_mode_changed), dialog);
+
+    /***** use dynamic tray icon *****/
+    hbox = gtk_vbox_new(FALSE, 0);
+    dialog->use_dynamic_icon_frame = orage_create_framebox_with_content(
+            _("Use dynamic tray icon"), hbox);
+    gtk_box_pack_start(GTK_BOX(dialog->extra_vbox)
+            , dialog->use_dynamic_icon_frame, FALSE, FALSE, 5);
+
+    dialog->use_dynamic_icon_checkbutton = 
+            gtk_check_button_new_with_mnemonic(_("Use dynamic icon"));
+    gtk_box_pack_start(GTK_BOX(hbox)
+            , dialog->use_dynamic_icon_checkbutton, FALSE, FALSE, 5);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
+            dialog->use_dynamic_icon_checkbutton), g_par.use_dynamic_icon);
+    gtk_widget_set_tooltip_text(dialog->use_dynamic_icon_checkbutton
+            , _("Dynamic icon shows current month and day of the month."));
+
+    g_signal_connect(G_OBJECT(dialog->use_dynamic_icon_checkbutton), "toggled"
+            , G_CALLBACK(use_dynamic_icon_changed), dialog);
+
     /***** use wakeup timer *****/
     hbox = gtk_vbox_new(FALSE, 0);
     dialog->use_wakeup_timer_frame = orage_create_framebox_with_content(
@@ -917,11 +969,67 @@
             , dialog->use_wakeup_timer_checkbutton, FALSE, FALSE, 5);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
             dialog->use_wakeup_timer_checkbutton), g_par.use_wakeup_timer);
-    gtk_tooltips_set_tip(dialog->Tooltips, dialog->use_wakeup_timer_checkbutton
-            , _("Use this timer if Orage has problems waking up properly after suspend or hibernate. (For example tray icon not refreshed or alarms not firing.)")
-            , NULL);
+    gtk_widget_set_tooltip_text(dialog->use_wakeup_timer_checkbutton
+            , _("Use this timer if Orage has problems waking up properly after suspend or hibernate. (For example tray icon not refreshed or alarms not firing.)"));
+
     g_signal_connect(G_OBJECT(dialog->use_wakeup_timer_checkbutton), "toggled"
             , G_CALLBACK(use_wakeup_timer_changed), dialog);
+
+    /***** Default Display alarm for Foreign files *****/
+    dialog->foreign_alarm_radiobutton_group = NULL;
+    hbox = gtk_hbox_new(TRUE, 0);
+    dialog->foreign_alarm_frame = orage_create_framebox_with_content(
+            _("Foreign file default visual alarm"), hbox);
+    gtk_box_pack_start(GTK_BOX(dialog->extra_vbox)
+            , dialog->foreign_alarm_frame, FALSE, FALSE, 5);
+
+    dialog->foreign_alarm_orage_radiobutton =
+            gtk_radio_button_new_with_mnemonic(NULL, _("Orage window"));
+    gtk_box_pack_start(GTK_BOX(hbox)
+            , dialog->foreign_alarm_orage_radiobutton, FALSE, TRUE, 0);
+    gtk_radio_button_set_group(
+            GTK_RADIO_BUTTON(dialog->foreign_alarm_orage_radiobutton)
+            , dialog->foreign_alarm_radiobutton_group);
+    dialog->foreign_alarm_radiobutton_group = gtk_radio_button_get_group(
+            GTK_RADIO_BUTTON(dialog->foreign_alarm_orage_radiobutton));
+    gtk_toggle_button_set_active(
+            GTK_TOGGLE_BUTTON(dialog->foreign_alarm_orage_radiobutton)
+            , !g_par.use_foreign_display_alarm_notify);
+
+    dialog->foreign_alarm_notification_radiobutton =
+            gtk_radio_button_new_with_mnemonic(NULL, _("Notify notification"));
+    gtk_box_pack_start(GTK_BOX(hbox)
+            , dialog->foreign_alarm_notification_radiobutton, TRUE, TRUE, 0);
+    gtk_radio_button_set_group(
+            GTK_RADIO_BUTTON(dialog->foreign_alarm_notification_radiobutton)
+            , dialog->foreign_alarm_radiobutton_group);
+    dialog->foreign_alarm_radiobutton_group = gtk_radio_button_get_group(
+            GTK_RADIO_BUTTON(dialog->foreign_alarm_notification_radiobutton));
+    gtk_toggle_button_set_active(
+            GTK_TOGGLE_BUTTON(dialog->foreign_alarm_notification_radiobutton)
+            , g_par.use_foreign_display_alarm_notify);
+
+    g_signal_connect(G_OBJECT(dialog->foreign_alarm_notification_radiobutton)
+            , "toggled", G_CALLBACK(foreign_alarm_changed), dialog);
+
+    /***** always quit *****/
+    hbox = gtk_vbox_new(FALSE, 0);
+    dialog->always_quit_frame = orage_create_framebox_with_content(
+            _("Always quit when asked to close"), hbox);
+    gtk_box_pack_start(GTK_BOX(dialog->extra_vbox)
+            , dialog->always_quit_frame, FALSE, FALSE, 5);
+
+    dialog->always_quit_checkbutton = 
+            gtk_check_button_new_with_mnemonic(_("Always quit"));
+    gtk_box_pack_start(GTK_BOX(hbox)
+            , dialog->always_quit_checkbutton, FALSE, FALSE, 5);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
+            dialog->always_quit_checkbutton), g_par.close_means_quit);
+    gtk_widget_set_tooltip_text(dialog->always_quit_checkbutton
+            , _("By default Orage stays open in the background when asked to close. This option changes Orage to quit and never stay in background when it is asked to close."));
+
+    g_signal_connect(G_OBJECT(dialog->always_quit_checkbutton), "toggled"
+            , G_CALLBACK(always_quit_changed), dialog);
 }
 
 static Itf *create_parameter_dialog(void)
@@ -930,7 +1038,6 @@
     GdkPixbuf *orage_logo;
 
     dialog = g_new(Itf, 1);
-    dialog->Tooltips = gtk_tooltips_new();
 
     dialog->orage_dialog = gtk_dialog_new();
     gtk_window_set_default_size(GTK_WINDOW(dialog->orage_dialog), 300, 350);
@@ -953,7 +1060,7 @@
     gtk_container_set_border_width(GTK_CONTAINER(dialog->notebook), 5);
 
     create_parameter_dialog_main_setup_tab(dialog);
-    create_parameter_dialog_display_tab(dialog);
+    create_parameter_dialog_calendar_setup_tab(dialog);
     create_parameter_dialog_extra_setup_tab(dialog);
 
     /* the rest */
@@ -1106,6 +1213,12 @@
     g_par.el_size_x = orage_rc_get_int(orc, "Eventlist window X", 500);
     g_par.el_size_y = orage_rc_get_int(orc, "Eventlist window Y", 350);
     g_par.el_days = orage_rc_get_int(orc, "Eventlist extra days", 0);
+    g_par.el_only_first = orage_rc_get_bool(orc, "Eventlist only first", FALSE);
+    g_par.dw_pos_x = orage_rc_get_int(orc, "Dayview window pos X", 0);
+    g_par.dw_pos_y = orage_rc_get_int(orc, "Dayview window pos Y", 0);
+    g_par.dw_size_x = orage_rc_get_int(orc, "Dayview window X", 690);
+    g_par.dw_size_y = orage_rc_get_int(orc, "Dayview window Y", 390);
+    g_par.dw_week_mode = orage_rc_get_bool(orc, "Dayview week mode", TRUE);
     g_par.show_menu = orage_rc_get_bool(orc, "Show Main Window Menu", TRUE);
     g_par.select_always_today = 
             orage_rc_get_bool(orc, "Select Always Today", FALSE);
@@ -1161,10 +1274,16 @@
         g_par.foreign_data[i].file = orage_rc_get_str(orc, f_par, NULL);
         g_sprintf(f_par, "Foreign file %02d read-only", i);
         g_par.foreign_data[i].read_only = orage_rc_get_bool(orc, f_par, TRUE);
+        g_sprintf(f_par, "Foreign file %02d visible name", i);
+        g_par.foreign_data[i].name = orage_rc_get_str(orc, f_par, g_par.foreign_data[i].file);
     }
+    g_par.use_foreign_display_alarm_notify = orage_rc_get_bool(orc
+            , "Use notify foreign alarm", FALSE);
     g_log_level = orage_rc_get_int(orc, "Logging level", 0);
     g_par.priority_list_limit = orage_rc_get_int(orc, "Priority list limit", 8);
     g_par.use_wakeup_timer = orage_rc_get_bool(orc, "Use wakeup timer", TRUE);
+    g_par.close_means_quit = orage_rc_get_bool(orc, "Always quit", FALSE);
+    g_par.file_close_delay = orage_rc_get_int(orc, "File close delay", 600);
 
     orage_rc_file_close(orc);
 }
@@ -1198,9 +1317,14 @@
     orage_rc_put_int(orc, "Eventlist window X", g_par.el_size_x);
     orage_rc_put_int(orc, "Eventlist window Y", g_par.el_size_y);
     orage_rc_put_int(orc, "Eventlist extra days", g_par.el_days);
+    orage_rc_put_bool(orc, "Eventlist only first", g_par.el_only_first);
+    orage_rc_put_int(orc, "Dayview window pos X", g_par.dw_pos_x);
+    orage_rc_put_int(orc, "Dayview window pos Y", g_par.dw_pos_y);
+    orage_rc_put_int(orc, "Dayview window X", g_par.dw_size_x);
+    orage_rc_put_int(orc, "Dayview window Y", g_par.dw_size_y);
+    orage_rc_put_bool(orc, "Dayview week mode", g_par.dw_week_mode);
     orage_rc_put_bool(orc, "Show Main Window Menu", g_par.show_menu);
-    orage_rc_put_bool(orc, "Select Always Today"
-            , g_par.select_always_today);
+    orage_rc_put_bool(orc, "Select Always Today", g_par.select_always_today);
     orage_rc_put_bool(orc, "Show borders", g_par.show_borders);
     orage_rc_put_bool(orc, "Show heading", g_par.show_heading);
     orage_rc_put_bool(orc, "Show day names", g_par.show_day_names);
@@ -1217,28 +1341,24 @@
     orage_rc_put_bool(orc, "Use dynamic icon", g_par.use_dynamic_icon);
     orage_rc_put_bool(orc, "Use own dynamic icon", g_par.use_own_dynamic_icon);
     orage_rc_put_str(orc, "Own icon file", g_par.own_icon_file);
-    orage_rc_put_str(orc, "Own icon row1 data"
-            , g_par.own_icon_row1_data);
+    orage_rc_put_str(orc, "Own icon row1 data", g_par.own_icon_row1_data);
     orage_rc_put_str(orc, "Own icon row1 color", g_par.own_icon_row1_color);
     orage_rc_put_str(orc, "Own icon row1 font", g_par.own_icon_row1_font);
     orage_rc_put_int(orc, "Own icon row1 x", g_par.own_icon_row1_x);
     orage_rc_put_int(orc, "Own icon row1 y", g_par.own_icon_row1_y);
-    orage_rc_put_str(orc, "Own icon row2 data"
-            , g_par.own_icon_row2_data);
+    orage_rc_put_str(orc, "Own icon row2 data", g_par.own_icon_row2_data);
     orage_rc_put_str(orc, "Own icon row2 color", g_par.own_icon_row2_color);
     orage_rc_put_str(orc, "Own icon row2 font", g_par.own_icon_row2_font);
     orage_rc_put_int(orc, "Own icon row2 x", g_par.own_icon_row2_x);
     orage_rc_put_int(orc, "Own icon row2 y", g_par.own_icon_row2_y);
-    orage_rc_put_str(orc, "Own icon row3 data"
-            , g_par.own_icon_row3_data);
+    orage_rc_put_str(orc, "Own icon row3 data", g_par.own_icon_row3_data);
     orage_rc_put_str(orc, "Own icon row3 color", g_par.own_icon_row3_color);
     orage_rc_put_str(orc, "Own icon row3 font", g_par.own_icon_row3_font);
     orage_rc_put_int(orc, "Own icon row3 x", g_par.own_icon_row3_x);
     orage_rc_put_int(orc, "Own icon row3 y", g_par.own_icon_row3_y);
     /* we write this with X so that we do not read it back unless
      * it is manually changed. It should need changes really seldom. */
-    orage_rc_put_int(orc, "XIcal week start day"
-            , g_par.ical_weekstartday);
+    orage_rc_put_int(orc, "XIcal week start day", g_par.ical_weekstartday);
     orage_rc_put_bool(orc, "Show days", g_par.show_days);
     orage_rc_put_int(orc, "Foreign file count", g_par.foreign_count);
     /* add what we have and remove the rest */
@@ -1247,6 +1367,8 @@
         orage_rc_put_str(orc, f_par, g_par.foreign_data[i].file);
         g_sprintf(f_par, "Foreign file %02d read-only", i);
         orage_rc_put_bool(orc, f_par, g_par.foreign_data[i].read_only);
+        g_sprintf(f_par, "Foreign file %02d visible name", i);
+        orage_rc_put_str(orc, f_par, g_par.foreign_data[i].name);
     }
     for (i = g_par.foreign_count; i < 10;  i++) {
         g_sprintf(f_par, "Foreign file %02d name", i);
@@ -1255,10 +1377,16 @@
         orage_rc_del_item(orc, f_par);
         g_sprintf(f_par, "Foreign file %02d read-only", i);
         orage_rc_del_item(orc, f_par);
+        g_sprintf(f_par, "Foreign file %02d visible name", i);
+        orage_rc_del_item(orc, f_par);
     }
+    orage_rc_put_bool(orc, "Use notify foreign alarm"
+            , g_par.use_foreign_display_alarm_notify);
     orage_rc_put_int(orc, "Logging level", g_log_level);
     orage_rc_put_int(orc, "Priority list limit", g_par.priority_list_limit);
     orage_rc_put_bool(orc, "Use wakeup timer", g_par.use_wakeup_timer);
+    orage_rc_put_bool(orc, "Always quit", g_par.close_means_quit);
+    orage_rc_put_int(orc, "File close delay", g_par.file_close_delay);
 
     orage_rc_file_close(orc);
 }
diff -Nru orage-4.8.3/src/parameters.h orage-4.12.1/src/parameters.h
--- orage-4.8.3/src/parameters.h	2011-11-25 09:04:00.000000000 +0000
+++ orage-4.12.1/src/parameters.h	2015-04-10 10:26:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2006-2011 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2006-2013 Juha Kautto  (juha at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,12 +23,14 @@
 #ifndef __ORAGE_PARAMETERS_H__
 #define __ORAGE_PARAMETERS_H__
 
-#define BORDER 5
 #define ORAGE_WAKEUP_TIMER_PERIOD 60
+
 typedef struct _foreign_file
 {
     char *file;
     gboolean read_only;
+    time_t latest_file_change;
+    char *name;
 } foreign_file;
 
 
@@ -65,9 +67,11 @@
     /* foreign files */
     int foreign_count;
     foreign_file foreign_data[10];
+    gboolean use_foreign_display_alarm_notify; /* changes alarm to notify */
 
     /* other */
     char *orage_file;
+    time_t latest_file_change;
     char *sound_application;
 
     /* List of active alarms */
@@ -110,6 +114,12 @@
     gint el_pos_x, el_pos_y;
     gint el_size_x, el_size_y;
     gint el_days;
+    gboolean el_only_first;
+
+    /* day view window */
+    gint dw_pos_x, dw_pos_y;
+    gint dw_size_x, dw_size_y;
+    gboolean dw_week_mode;
 
     /* show days window from main calendar */
     gboolean show_days; /* true=show days false=show events */
@@ -120,6 +130,12 @@
     /* some systems are not able to wake up properly from suspend/hibernate
        and we need to monitor the status ourselves */
     gboolean use_wakeup_timer;
+
+    /* always quit instead of going to background when asked to close */
+    gboolean close_means_quit;
+
+    /* delayed close length in seconds. 0 = close immediately */
+    gint file_close_delay;
 } global_parameters; /* global parameters */
 
 #ifdef ORAGE_MAIN
diff -Nru orage-4.8.3/src/parameters_internal.h orage-4.12.1/src/parameters_internal.h
--- orage-4.8.3/src/parameters_internal.h	1970-01-01 00:00:00.000000000 +0000
+++ orage-4.12.1/src/parameters_internal.h	2015-04-10 10:26:26.000000000 +0000
@@ -0,0 +1,123 @@
+/*      Orage - Calendar and alarm handler
+ *
+ * Copyright (c) 2006-2013 Juha Kautto  (juha at xfce.org)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the 
+       Free Software Foundation
+       51 Franklin Street, 5th Floor
+       Boston, MA 02110-1301 USA
+
+ */
+
+#ifndef __ORAGE_PARAMETERS_INTERNAL_H__
+#define __ORAGE_PARAMETERS_INTERNAL_H__
+
+typedef struct _Itf
+{
+    GtkWidget *orage_dialog;
+    GtkWidget *dialog_vbox1;
+    GtkWidget *notebook;
+
+    /* Tabs */
+    /***** Main Tab *****/
+    GtkWidget *setup_tab;
+    GtkWidget *setup_tab_label;
+    GtkWidget *setup_vbox;
+    /* Choose the timezone for appointments */
+    GtkWidget *timezone_frame;
+    GtkWidget *timezone_button;
+    /* Archive period */
+#ifdef HAVE_ARCHIVE
+    GtkWidget *archive_threshold_frame;
+    GtkWidget *archive_threshold_spin;
+#endif
+    /* Choose the sound application for reminders */
+    GtkWidget *sound_application_frame;
+    GtkWidget *sound_application_entry;
+    GtkWidget *sound_application_open_button;
+
+    /***** Calendar Window Tab *****/
+    GtkWidget *calendar_tab;
+    GtkWidget *calendar_tab_label;
+    GtkWidget *calendar_vbox;
+    /* Show  border, menu and set stick, ontop */
+    GtkWidget *mode_frame;
+    GtkWidget *show_borders_checkbutton;
+    GtkWidget *show_menu_checkbutton;
+    GtkWidget *show_heading_checkbutton;
+    GtkWidget *show_day_names_checkbutton;
+    GtkWidget *show_weeks_checkbutton;
+    /* Show in... taskbar pager systray */
+    GtkWidget *appearance_frame;
+    GtkWidget *set_stick_checkbutton;
+    GtkWidget *set_ontop_checkbutton;
+    GtkWidget *show_taskbar_checkbutton;
+    GtkWidget *show_pager_checkbutton;
+    GtkWidget *show_systray_checkbutton;
+    /* info boxes */
+    GtkWidget *info_frame;
+    GtkWidget *show_todos_checkbutton;
+    GtkWidget *show_events_spin;
+    /* Start visibity show or hide */
+    GtkWidget *visibility_frame;
+    GSList    *visibility_radiobutton_group;
+    GtkWidget *visibility_show_radiobutton;
+    GtkWidget *visibility_hide_radiobutton;
+    GtkWidget *visibility_minimized_radiobutton;
+    /* select_always_today */
+    GtkWidget *select_day_frame;
+    GSList    *select_day_radiobutton_group;
+    GtkWidget *select_day_today_radiobutton;
+    GtkWidget *select_day_old_radiobutton;
+    /* show eventlist/days window from main calendar */
+    GtkWidget *click_to_show_frame;
+    GSList    *click_to_show_radiobutton_group;
+    GtkWidget *click_to_show_days_radiobutton;
+    GtkWidget *click_to_show_events_radiobutton;
+
+    /***** Extra Tab *****/
+    GtkWidget *extra_tab;
+    GtkWidget *extra_tab_label;
+    GtkWidget *extra_vbox;
+    /* number of extra days to show */
+    GtkWidget *el_extra_days_frame;
+    GtkWidget *el_extra_days_spin;
+    GtkWidget *el_only_first_checkbutton;
+    /* day view week mode */
+    GtkWidget *dw_week_mode_frame;
+    GSList    *dw_week_mode_radiobutton_group;
+    GtkWidget *dw_week_mode_week_radiobutton;
+    GtkWidget *dw_week_mode_day_radiobutton;
+    /* Dynamic icon */
+    GtkWidget *use_dynamic_icon_frame;
+    GtkWidget *use_dynamic_icon_checkbutton;
+    /* Use wakeup timer for suspend */
+    GtkWidget *use_wakeup_timer_frame;
+    GtkWidget *use_wakeup_timer_checkbutton;
+    /* default foreign file display alarm */
+    GtkWidget *foreign_alarm_frame;
+    GSList    *foreign_alarm_radiobutton_group;
+    GtkWidget *foreign_alarm_orage_radiobutton;
+    GtkWidget *foreign_alarm_notification_radiobutton;
+    /* always quit (also when asked to close) */
+    GtkWidget *always_quit_frame;
+    GtkWidget *always_quit_checkbutton;
+
+    /***** the rest in all tabs *****/
+    GtkWidget *close_button;
+    GtkWidget *help_button;
+} Itf;
+
+
+#endif /* !__ORAGE_PARAMETERS_INTERNAL_H__ */
diff -Nru orage-4.8.3/src/reminder.c orage-4.12.1/src/reminder.c
--- orage-4.8.3/src/reminder.c	2011-11-25 07:30:35.000000000 +0000
+++ orage-4.12.1/src/reminder.c	2015-04-10 10:26:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2011 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2003-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -265,7 +265,9 @@
 #endif
     fpath = orage_data_file_location(ORAGE_PERSISTENT_ALARMS_DIR_FILE);
     if (!read_only)  /* we need to empty it before each write */
-        g_remove(fpath);
+        if (g_remove(fpath)) {
+            orage_message(150, P_N "g_remove failed.");
+        }
     if ((orc = (OrageRc *)orage_rc_file_open(fpath, read_only)) == NULL) {
         orage_message(150, P_N "persistent alarms file open failed.");
     }
@@ -709,9 +711,6 @@
     GtkWidget *hdtReminder;
     orage_ddmmhh_hbox_struct *ddmmhh_hbox;
     GtkWidget *e_hbox;
-#if !GTK_CHECK_VERSION(2,16,0)
-    GtkWidget *e_label;
-#endif
     gchar *tmp;
 
 #ifdef ORAGE_DEBUG
@@ -802,15 +801,10 @@
             G_CALLBACK(on_btStopNoiseReminder_clicked), l_alarm);
     }
 
-    btRecreateReminder = gtk_button_new_from_stock("gtk-execute");
-#if GTK_CHECK_VERSION(2,16,0)
+    btRecreateReminder = orage_create_custom_stock_button("gtk-ok"
+            , _("Postpone"));
     gtk_widget_set_tooltip_text(btRecreateReminder
             , _("Remind me again after the specified time"));
-#else
-    /* Note that this goes to the main area. Temporary for the version */
-    e_label = gtk_label_new(_("Press <Execute> to remind me again after the specified time:"));
-    gtk_box_pack_end(GTK_BOX(vbReminder), e_label, FALSE, FALSE, 5);
-#endif
     gtk_dialog_add_action_widget(GTK_DIALOG(wReminder)
             , btRecreateReminder, GTK_RESPONSE_OK);
     g_signal_connect((gpointer) btRecreateReminder, "clicked"
@@ -996,7 +990,6 @@
 {
 #undef P_N
 #define P_N "orage_alarm_clock: "
-    struct tm *t;
     GList *alarm_l;
     alarm_struct *cur_alarm;
     gboolean alarm_raised=FALSE;
@@ -1006,8 +999,7 @@
 #ifdef ORAGE_DEBUG
     orage_message(-100, P_N);
 #endif
-    t = orage_localtime();
-    time_now = orage_tm_time_to_icaltime(t);
+    time_now = orage_tm_time_to_icaltime(orage_localtime());
   /* Check if there are any alarms to show */
     for (alarm_l = g_list_first(g_par.alarm_list);
          alarm_l != NULL && more_alarms;
@@ -1035,7 +1027,7 @@
 {
 #undef P_N
 #define P_N "reset_orage_alarm_clock: "
-    struct tm *t, t_alarm;
+    struct tm *t, t_alarm, t2;
     GList *alarm_l;
     alarm_struct *cur_alarm;
     gchar *next_alarm;
@@ -1050,7 +1042,8 @@
         g_par.alarm_timer = 0;
     }
     if (g_par.alarm_list) { /* we have alarms */
-        t = orage_localtime();
+        memcpy(&t2, orage_localtime(), sizeof(t2));
+        t = &t2;
         t->tm_mon++;
         t->tm_year = t->tm_year + 1900;
         alarm_l = g_list_first(g_par.alarm_list);
@@ -1086,6 +1079,7 @@
     gint year, month, day, hour, minute, second;
     gint dd, hh, min;
     GDate *g_now, *g_alarm;
+    gchar *tmp;
 
 #ifdef ORAGE_DEBUG
     orage_message(-100, P_N);
@@ -1097,10 +1091,8 @@
     }
     t = orage_localtime();
     tooltip = g_string_new(_("Next active alarms:"));
-#if GTK_CHECK_VERSION(2,16,0)
     g_string_prepend(tooltip, "<span foreground=\"blue\" weight=\"bold\" underline=\"single\">");
     g_string_append(tooltip, " </span>");
-#endif
   /* Check if there are any alarms to show */
     for (alarm_l = g_list_first(g_par.alarm_list);
          alarm_l != NULL && more_alarms;
@@ -1137,14 +1129,17 @@
 /*
     orage_message(10, P_N "tooltip: alarm=%s hh=%d hh=%d min=%d", cur_alarm->alarm_time, dd, hh, min);
 */
-#if GTK_CHECK_VERSION(2,16,0)
             g_string_append(tooltip, "<span weight=\"bold\">");
             tooltip_highlight_helper = g_string_new(" </span>");
             if (cur_alarm->temporary) { /* let's add a small mark */
                 g_string_append_c(tooltip_highlight_helper, '[');
             }
-            g_string_append_printf(tooltip_highlight_helper, 
-                    "%s", cur_alarm->title);
+            tmp = cur_alarm->title 
+                ? g_markup_escape_text(cur_alarm->title
+                        , strlen(cur_alarm->title))
+                : g_strdup(_("No title defined"));
+            g_string_append_printf(tooltip_highlight_helper, "%s", tmp);
+            g_free(tmp);
             if (cur_alarm->temporary) { /* let's add a small mark */
                 g_string_append_c(tooltip_highlight_helper, ']');
             }
@@ -1152,11 +1147,6 @@
                     _("\n%02d d %02d h %02d min to: %s"),
                     dd, hh, min, tooltip_highlight_helper->str);
             g_string_free(tooltip_highlight_helper, TRUE);
-#else
-            g_string_append_printf(tooltip, 
-                    _("\n%02d d %02d h %02d min to: %s"),
-                    dd, hh, min, cur_alarm->title);
-#endif
             alarm_cnt++;
         }
         else /* sorted so scan can be stopped */
@@ -1164,13 +1154,7 @@
     }
     if (alarm_cnt == 0)
         g_string_append_printf(tooltip, _("\nNo active alarms found"));
-    /* deprecated since version 2.16 */
-    /* after 2.16 use gtk_status_icon_set_tooltip_markup to get nicer text */
-#if GTK_CHECK_VERSION(2,16,0)
     gtk_status_icon_set_tooltip_markup((GtkStatusIcon *)g_par.trayIcon, tooltip->str);
-#else
-    gtk_status_icon_set_tooltip((GtkStatusIcon *)g_par.trayIcon, tooltip->str);
-#endif
     g_string_free(tooltip, TRUE);
     return(TRUE);
 }
diff -Nru orage-4.8.3/src/reminder.h orage-4.12.1/src/reminder.h
--- orage-4.8.3/src/reminder.h	2011-01-13 10:31:21.000000000 +0000
+++ orage-4.12.1/src/reminder.h	2015-04-10 10:26:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2011 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -60,9 +60,8 @@
 
     gboolean procedure;
     gchar   *cmd;
-    /*
-    gboolean email;
-    */
+/* gboolean email; */
+
     /* this is used to control active alarms */
     active_alarm_struct *active_alarm;
     /* pointer to special data needed for orage window alarm */
diff -Nru orage-4.8.3/src/timezone_names.c orage-4.12.1/src/timezone_names.c
--- orage-4.8.3/src/timezone_names.c	2011-01-13 10:31:30.000000000 +0000
+++ orage-4.12.1/src/timezone_names.c	2015-04-10 10:26:26.000000000 +0000
@@ -38,6 +38,7 @@
     N_("Africa/Accra"),
     N_("Africa/Addis_Ababa"),
     N_("Africa/Algiers"),
+    N_("Africa/Asmara"),
     N_("Africa/Asmera"),
     N_("Africa/Bamako"),
     N_("Africa/Bangui"),
@@ -58,6 +59,7 @@
     N_("Africa/Freetown"),
     N_("Africa/Gaborone"),
     N_("Africa/Harare"),
+    N_("Africa/Juba"),
     N_("Africa/Johannesburg"),
     N_("Africa/Kampala"),
     N_("Africa/Khartoum"),
@@ -94,19 +96,33 @@
     N_("America/Araguaina"),
     N_("America/Argentina/Buenos_Aires"),
     N_("America/Argentina/Catamarca"),
+    N_("America/Argentina/ComodRivadavia"),
     N_("America/Argentina/Cordoba"),
     N_("America/Argentina/Jujuy"),
+    N_("America/Argentina/La_Rioja"),
     N_("America/Argentina/Mendoza"),
+    N_("America/Argentina/Rio_Gallegos"),
+    N_("America/Argentina/Salta"),
+    N_("America/Argentina/San_Juan"),
+    N_("America/Argentina/San_Luis"),
+    N_("America/Argentina/Tucuman"),
+    N_("America/Argentina/Ushuaia"),
     N_("America/Aruba"),
     N_("America/Asuncion"),
+    N_("America/Atikokan"),
+    N_("America/Atka"),
+    N_("America/Bahia"),
+    N_("America/Bahia_Banderas"),
     N_("America/Barbados"),
     N_("America/Belem"),
     N_("America/Belize"),
+    N_("America/Blanc-Sablon"),
     N_("America/Boa_Vista"),
     N_("America/Bogota"),
     N_("America/Boise"),
     N_("America/Buenos_Aires"),
     N_("America/Cambridge_Bay"),
+    N_("America/Campo_Grande"),
     N_("America/Cancun"),
     N_("America/Caracas"),
     N_("America/Catamarca"),
@@ -114,19 +130,24 @@
     N_("America/Cayman"),
     N_("America/Chicago"),
     N_("America/Chihuahua"),
+    N_("America/Coral_Harbour"),
     N_("America/Cordoba"),
     N_("America/Costa_Rica"),
+    N_("America/Creston"),
     N_("America/Cuiaba"),
     N_("America/Curacao"),
+    N_("America/Danmarkshavn"),
     N_("America/Dawson"),
     N_("America/Dawson_Creek"),
     N_("America/Denver"),
     N_("America/Detroit"),
     N_("America/Dominica"),
     N_("America/Edmonton"),
+    N_("America/Ensenada"),
     N_("America/Eirunepe"),
     N_("America/El_Salvador"),
     N_("America/Fortaleza"),
+    N_("America/Fort_Wayne"),
     N_("America/Glace_Bay"),
     N_("America/Godthab"),
     N_("America/Goose_Bay"),
@@ -142,7 +163,11 @@
     N_("America/Indiana/Indianapolis"),
     N_("America/Indiana/Knox"),
     N_("America/Indiana/Marengo"),
+    N_("America/Indiana/Petersburg"),
+    N_("America/Indiana/Tell_City"),
     N_("America/Indiana/Vevay"),
+    N_("America/Indiana/Vincennes"),
+    N_("America/Indiana/Winamac"),
     N_("America/Indianapolis"),
     N_("America/Inuvik"),
     N_("America/Iqaluit"),
@@ -151,20 +176,27 @@
     N_("America/Juneau"),
     N_("America/Kentucky/Louisville"),
     N_("America/Kentucky/Monticello"),
+    N_("America/Knox_IN"),
+    N_("America/Kralendijk"),
     N_("America/La_Paz"),
     N_("America/Lima"),
     N_("America/Los_Angeles"),
     N_("America/Louisville"),
+    N_("America/Lower_Princes"),
     N_("America/Maceio"),
     N_("America/Managua"),
     N_("America/Manaus"),
+    N_("America/Marigot"),
     N_("America/Martinique"),
+    N_("America/Matamoros"),
     N_("America/Mazatlan"),
     N_("America/Mendoza"),
     N_("America/Menominee"),
     N_("America/Merida"),
+    N_("America/Metlakatla"),
     N_("America/Mexico_City"),
     N_("America/Miquelon"),
+    N_("America/Moncton"),
     N_("America/Monterrey"),
     N_("America/Montevideo"),
     N_("America/Montreal"),
@@ -173,26 +205,36 @@
     N_("America/New_York"),
     N_("America/Nipigon"),
     N_("America/Nome"),
+    N_("America/North_Dakota/Beulah"),
+    N_("America/North_Dakota/Center"),
+    N_("America/North_Dakota/New_Salem"),
     N_("America/Noronha"),
+    N_("America/Ojinaga"),
     N_("America/Panama"),
     N_("America/Pangnirtung"),
     N_("America/Paramaribo"),
     N_("America/Phoenix"),
     N_("America/Port-au-Prince"),
     N_("America/Port_of_Spain"),
+    N_("America/Porto_Acre"),
     N_("America/Porto_Velho"),
     N_("America/Puerto_Rico"),
     N_("America/Rainy_River"),
     N_("America/Rankin_Inlet"),
     N_("America/Recife"),
     N_("America/Regina"),
+    N_("America/Resolute"),
     N_("America/Rio_Branco"),
     N_("America/Rosario"),
+    N_("America/Santa_Isabel"),
+    N_("America/Santarem"),
     N_("America/Santiago"),
     N_("America/Santo_Domingo"),
     N_("America/Sao_Paulo"),
     N_("America/Scoresbysund"),
     N_("America/Shiprock"),
+    N_("America/Sitka"),
+    N_("America/St_Barthelemy"),
     N_("America/St_Johns"),
     N_("America/St_Kitts"),
     N_("America/St_Lucia"),
@@ -203,8 +245,10 @@
     N_("America/Thule"),
     N_("America/Thunder_Bay"),
     N_("America/Tijuana"),
+    N_("America/Toronto"),
     N_("America/Tortola"),
     N_("America/Vancouver"),
+    N_("America/Virgin"),
     N_("America/Whitehorse"),
     N_("America/Winnipeg"),
     N_("America/Yakutat"),
@@ -213,9 +257,11 @@
     N_("Antarctica/Casey"),
     N_("Antarctica/Davis"),
     N_("Antarctica/DumontDUrville"),
+    N_("Antarctica/Macquarie"),
     N_("Antarctica/Mawson"),
     N_("Antarctica/McMurdo"),
     N_("Antarctica/Palmer"),
+    N_("Antarctica/Rothera"),
     N_("Antarctica/South_Pole"),
     N_("Antarctica/Syowa"),
     N_("Antarctica/Vostok"),
@@ -229,6 +275,7 @@
     N_("Asia/Aqtau"),
     N_("Asia/Aqtobe"),
     N_("Asia/Ashgabat"),
+    N_("Asia/Ashkhabad"),
     N_("Asia/Baghdad"),
     N_("Asia/Bahrain"),
     N_("Asia/Baku"),
@@ -237,8 +284,11 @@
     N_("Asia/Bishkek"),
     N_("Asia/Brunei"),
     N_("Asia/Calcutta"),
+    N_("Asia/Choibalsan"),
+    N_("Asia/Chongqing"),
     N_("Asia/Chungking"),
     N_("Asia/Colombo"),
+    N_("Asia/Dacca"),
     N_("Asia/Damascus"),
     N_("Asia/Dhaka"),
     N_("Asia/Dili"),
@@ -246,7 +296,9 @@
     N_("Asia/Dushanbe"),
     N_("Asia/Gaza"),
     N_("Asia/Harbin"),
+    N_("Asia/Hebron"),
     N_("Asia/Hong_Kong"),
+    N_("Asia/Ho_Chi_Minh"),
     N_("Asia/Hovd"),
     N_("Asia/Irkutsk"),
     N_("Asia/Istanbul"),
@@ -257,25 +309,37 @@
     N_("Asia/Kamchatka"),
     N_("Asia/Karachi"),
     N_("Asia/Kashgar"),
+    N_("Asia/Kathmandu"),
     N_("Asia/Katmandu"),
+    N_("Asia/Khandyga"),
+    N_("Asia/Kolkata"),
     N_("Asia/Krasnoyarsk"),
     N_("Asia/Kuala_Lumpur"),
     N_("Asia/Kuching"),
     N_("Asia/Kuwait"),
     N_("Asia/Macao"),
+    N_("Asia/Macau"),
     N_("Asia/Magadan"),
+    N_("Asia/Makassar"),
     N_("Asia/Manila"),
     N_("Asia/Muscat"),
     N_("Asia/Nicosia"),
+    N_("Asia/Novokuznetsk"),
     N_("Asia/Novosibirsk"),
     N_("Asia/Omsk"),
+    N_("Asia/Oral"),
     N_("Asia/Phnom_Penh"),
     N_("Asia/Pontianak"),
     N_("Asia/Pyongyang"),
     N_("Asia/Qatar"),
+    N_("Asia/Qyzylorda"),
     N_("Asia/Rangoon"),
     N_("Asia/Riyadh"),
+    N_("Asia/Riyadh87"),
+    N_("Asia/Riyadh88"),
+    N_("Asia/Riyadh89"),
     N_("Asia/Saigon"),
+    N_("Asia/Sakhalin"),
     N_("Asia/Samarkand"),
     N_("Asia/Seoul"),
     N_("Asia/Shanghai"),
@@ -284,11 +348,15 @@
     N_("Asia/Tashkent"),
     N_("Asia/Tbilisi"),
     N_("Asia/Tehran"),
+    N_("Asia/Tel_Aviv"),
+    N_("Asia/Thimbu"),
     N_("Asia/Thimphu"),
     N_("Asia/Tokyo"),
     N_("Asia/Ujung_Pandang"),
     N_("Asia/Ulaanbaatar"),
+    N_("Asia/Ulan_Bator"),
     N_("Asia/Urumqi"),
+    N_("Asia/Ust-Nera"),
     N_("Asia/Vientiane"),
     N_("Asia/Vladivostok"),
     N_("Asia/Yakutsk"),
@@ -300,6 +368,7 @@
     N_("Atlantic/Canary"),
     N_("Atlantic/Cape_Verde"),
     N_("Atlantic/Faeroe"),
+    N_("Atlantic/Faroe"),
     N_("Atlantic/Jan_Mayen"),
     N_("Atlantic/Madeira"),
     N_("Atlantic/Reykjavik"),
@@ -307,16 +376,73 @@
     N_("Atlantic/St_Helena"),
     N_("Atlantic/Stanley"),
     N_("Australia"),
+    N_("Australia/ACT"),
     N_("Australia/Adelaide"),
     N_("Australia/Brisbane"),
     N_("Australia/Broken_Hill"),
+    N_("Australia/Currie"),
     N_("Australia/Darwin"),
+    N_("Australia/Eucla"),
     N_("Australia/Hobart"),
     N_("Australia/Lindeman"),
     N_("Australia/Lord_Howe"),
     N_("Australia/Melbourne"),
     N_("Australia/Perth"),
     N_("Australia/Sydney"),
+    N_("Brazil"),
+    N_("Brazil/Acre"),
+    N_("Brazil/DeNoronha"),
+    N_("Brazil/East"),
+    N_("Brazil/West"),
+    N_("Canada"),
+    N_("Canada/Atlantic"),
+    N_("Canada/Central"),
+    N_("Canada/East-Saskatchewan"),
+    N_("Canada/Eastern"),
+    N_("Canada/Mountain"),
+    N_("Canada/Newfoundland"),
+    N_("Canada/Pacific"),
+    N_("Canada/Saskatchewan"),
+    N_("Canada/Yukon"),
+    N_("Chile"),
+    N_("Chile/Continental"),
+    N_("Chile/EasterIsland"),
+    N_("Etc"),
+    N_("Etc/GMT"),
+    N_("Etc/GMT+0"),
+    N_("Etc/GMT+1"),
+    N_("Etc/GMT+10"),
+    N_("Etc/GMT+11"),
+    N_("Etc/GMT+12"),
+    N_("Etc/GMT+2"),
+    N_("Etc/GMT+3"),
+    N_("Etc/GMT+4"),
+    N_("Etc/GMT+5"),
+    N_("Etc/GMT+6"),
+    N_("Etc/GMT+7"),
+    N_("Etc/GMT+8"),
+    N_("Etc/GMT+9"),
+    N_("Etc/GMT-0"),
+    N_("Etc/GMT-1"),
+    N_("Etc/GMT-10"),
+    N_("Etc/GMT-11"),
+    N_("Etc/GMT-12"),
+    N_("Etc/GMT-13"),
+    N_("Etc/GMT-14"),
+    N_("Etc/GMT-2"),
+    N_("Etc/GMT-3"),
+    N_("Etc/GMT-4"),
+    N_("Etc/GMT-5"),
+    N_("Etc/GMT-6"),
+    N_("Etc/GMT-7"),
+    N_("Etc/GMT-8"),
+    N_("Etc/GMT-9"),
+    N_("Etc/GMT0"),
+    N_("Etc/Greenwich"),
+    N_("Etc/UCT"),
+    N_("Etc/UTC"),
+    N_("Etc/Universal"),
+    N_("Etc/Zulu"),
     N_("Europe"),
     N_("Europe/Amsterdam"),
     N_("Europe/Andorra"),
@@ -328,12 +454,16 @@
     N_("Europe/Brussels"),
     N_("Europe/Bucharest"),
     N_("Europe/Budapest"),
+    N_("Europe/Busingen"),
     N_("Europe/Chisinau"),
     N_("Europe/Copenhagen"),
     N_("Europe/Dublin"),
     N_("Europe/Gibraltar"),
+    N_("Europe/Guernsey"),
     N_("Europe/Helsinki"),
+    N_("Europe/Isle_of_Man"),
     N_("Europe/Istanbul"),
+    N_("Europe/Jersey"),
     N_("Europe/Kaliningrad"),
     N_("Europe/Kiev"),
     N_("Europe/Lisbon"),
@@ -342,12 +472,14 @@
     N_("Europe/Luxembourg"),
     N_("Europe/Madrid"),
     N_("Europe/Malta"),
+    N_("Europe/Mariehamn"),
     N_("Europe/Minsk"),
     N_("Europe/Monaco"),
     N_("Europe/Moscow"),
     N_("Europe/Nicosia"),
     N_("Europe/Oslo"),
     N_("Europe/Paris"),
+    N_("Europe/Podgorica"),
     N_("Europe/Prague"),
     N_("Europe/Riga"),
     N_("Europe/Rome"),
@@ -360,11 +492,13 @@
     N_("Europe/Stockholm"),
     N_("Europe/Tallinn"),
     N_("Europe/Tirane"),
+    N_("Europe/Tiraspol"),
     N_("Europe/Uzhgorod"),
     N_("Europe/Vaduz"),
     N_("Europe/Vatican"),
     N_("Europe/Vienna"),
     N_("Europe/Vilnius"),
+    N_("Europe/Volgograd"),
     N_("Europe/Warsaw"),
     N_("Europe/Zagreb"),
     N_("Europe/Zaporozhye"),
@@ -381,10 +515,19 @@
     N_("Indian/Mauritius"),
     N_("Indian/Mayotte"),
     N_("Indian/Reunion"),
+    N_("Mexico"),
+    N_("Mexico/BajaNorte"),
+    N_("Mexico/BajaSur"),
+    N_("Mexico/General"),
+    N_("Mideast"),
+    N_("Mideast/Riyadh87"),
+    N_("Mideast/Riyadh88"),
+    N_("Mideast/Riyadh89"),
     N_("Pacific"),
     N_("Pacific/Apia"),
     N_("Pacific/Auckland"),
     N_("Pacific/Chatham"),
+    N_("Pacific/Chuuk"),
     N_("Pacific/Easter"),
     N_("Pacific/Efate"),
     N_("Pacific/Enderbury"),
@@ -410,10 +553,12 @@
     N_("Pacific/Pago_Pago"),
     N_("Pacific/Palau"),
     N_("Pacific/Pitcairn"),
+    N_("Pacific/Pohnpei"),
     N_("Pacific/Ponape"),
     N_("Pacific/Port_Moresby"),
     N_("Pacific/Rarotonga"),
     N_("Pacific/Saipan"),
+    N_("Pacific/Samoa"),
     N_("Pacific/Tahiti"),
     N_("Pacific/Tarawa"),
     N_("Pacific/Tongatapu"),
@@ -421,5 +566,33 @@
     N_("Pacific/Wake"),
     N_("Pacific/Wallis"),
     N_("Pacific/Yap"),
+    N_("SystemV"),
+    N_("SystemV/AST4"),
+    N_("SystemV/AST4ADT"),
+    N_("SystemV/CST6"),
+    N_("SystemV/CST6CDT"),
+    N_("SystemV/EST5"),
+    N_("SystemV/EST5/EDT"),
+    N_("SystemV/HST10"),
+    N_("SystemV/MST7"),
+    N_("SystemV/MST7/MNT"),
+    N_("SystemV/PST8"),
+    N_("SystemV/PST8/PDT"),
+    N_("SystemV/YST9"),
+    N_("SystemV/YST9/YDT"),
+    N_("US"),
+    N_("US/Alaska"),
+    N_("US/Aleutian"),
+    N_("US/Arizona"),
+    N_("US/Central"),
+    N_("US/Eastern"),
+    N_("US/East-Indiana"),
+    N_("US/Hawaii"),
+    N_("US/Indiana-Starke"),
+    N_("US/Michigan"),
+    N_("US/Mountain"),
+    N_("US/Pacific"),
+    N_("US/Pacific-New"),
+    N_("US/Samoa"),
 };
 
diff -Nru orage-4.8.3/src/tray_icon.c orage-4.12.1/src/tray_icon.c
--- orage-4.8.3/src/tray_icon.c	2011-11-24 12:31:42.000000000 +0000
+++ orage-4.12.1/src/tray_icon.c	2015-04-10 10:26:26.000000000 +0000
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2006-2011 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2006-2013 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -91,8 +91,8 @@
                 , error->message);
 }
 
-static gboolean button_press_cb(GtkStatusIcon *status_icon, GdkEventButton *event
-        , gpointer user_data)
+static gboolean button_press_cb(GtkStatusIcon *status_icon
+        , GdkEventButton *event, gpointer user_data)
 {
     GdkAtom atom;
     GdkEventClient gev;
@@ -144,12 +144,12 @@
         , char *font, char *color)
 {
     gchar ts[200];
-    gchar row[20];
+    gchar row[90];
     gchar *row_format = "<span foreground=\"%s\" font_desc=\"%s\">%s</span>";
     gchar *strftime_failed = "format_line: strftime %s failed";
 
     if (ORAGE_STR_EXISTS(data)) {
-        if (strftime(row, 19, data, t) == 0) {
+        if (strftime(row, 89, data, t) == 0) {
             g_warning(strftime_failed, data);
             return(FALSE);
         }
diff -Nru orage-4.8.3/src/tz_zoneinfo_read.c orage-4.12.1/src/tz_zoneinfo_read.c
--- orage-4.8.3/src/tz_zoneinfo_read.c	2011-11-24 09:58:21.000000000 +0000
+++ orage-4.12.1/src/tz_zoneinfo_read.c	2015-04-10 10:26:26.000000000 +0000
@@ -146,7 +146,12 @@
     in_head = in_buf;
     in_tail = in_buf + file_stat->st_size - 1;
     file = fopen(file_name, "r");
-    if (!fread(in_buf, 1, file_stat->st_size, file))
+    if (!file) {
+            printf("read_file: file open error (%s)\n", file_name);
+            perror("\tfread");
+            return;
+    }
+    if (fread(in_buf, 1, file_stat->st_size, file) < file_stat->st_size)
         if (ferror(file)) {
             printf("read_file: file read failed (%s)\n", file_name);
             fclose(file);
@@ -649,17 +654,16 @@
             /* error reading the parameter file */
             printf("check_parameters: in_file name not found from (%s) \n"
                 , TZ_CONVERT_PAR_FILE_LOC);
-            fclose(par_file);
         }
         else { /* no errors */
             in_file = malloc(par_file_stat.st_size+1);
-            if (!fread(in_file, 1, par_file_stat.st_size, par_file)
+            if ((fread(in_file, 1, par_file_stat.st_size, par_file) 
+                        < par_file_stat.st_size)
             && (ferror(par_file))) {
                 printf("check_parameters: error reading (%s)\n"
                         , TZ_CONVERT_PAR_FILE_LOC);
                 free(in_file);
                 in_file = NULL;
-                fclose(par_file);
             }
             else { 
                 /* terminate with nul */
@@ -676,6 +680,7 @@
                 }
             }
         }
+        fclose(par_file);
     }
     if (in_file == NULL) /* in file not found */
         in_file = strdup(DEFAULT_OS_ZONEINFO_DIRECTORY);
@@ -806,7 +811,7 @@
         return;
     }
     zone_tab_buf = malloc(zone_tab_file_stat.st_size+1);
-    if (!fread(zone_tab_buf, 1, zone_tab_file_stat.st_size, zone_tab_file)
+    if ((fread(zone_tab_buf, 1, zone_tab_file_stat.st_size, zone_tab_file) < zone_tab_file_stat.st_size)
     && (ferror(zone_tab_file))) {
         printf("read_os_timezones: zone.tab file read failed (%s)\n"
                 , zone_tab_file_name);
@@ -862,7 +867,7 @@
         return;
     }
     country_buf = malloc(country_file_stat.st_size+1);
-    if (fread(country_buf, 1, country_file_stat.st_size, country_file)
+    if ((fread(country_buf, 1, country_file_stat.st_size, country_file) < country_file_stat.st_size)
     && (ferror(country_file))) {
         printf("read_countries: iso3166.tab file read failed (%s)\n"
                 , country_file_name);
@@ -897,10 +902,11 @@
         return;
     }
     zones_tab_buf = malloc(zones_tab_file_stat.st_size+1);
-    if (!fread(zones_tab_buf, 1, zones_tab_file_stat.st_size, zones_tab_file)
+    if ((fread(zones_tab_buf, 1, zones_tab_file_stat.st_size, zones_tab_file) < zones_tab_file_stat.st_size)
     && (ferror(zones_tab_file))) {
         printf("read_ical_timezones: zones.tab file read failed (%s)\n"
                 , ICAL_ZONES_TAB_FILE_LOC);
+        fclose(zones_tab_file);
         perror("\tfread");
         return;
     }
diff -Nru orage-4.8.3/tz_convert/Makefile.in orage-4.12.1/tz_convert/Makefile.in
--- orage-4.8.3/tz_convert/Makefile.in	2012-01-04 12:52:49.000000000 +0000
+++ orage-4.12.1/tz_convert/Makefile.in	2015-04-10 10:26:55.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,12 +81,13 @@
 target_triplet = @target@
 @HAVE_LIBPOTPT_TRUE@bin_PROGRAMS = tz_convert$(EXEEXT)
 subdir = tz_convert
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -52,24 +97,54 @@
 tz_convert_OBJECTS = $(am_tz_convert_OBJECTS)
 am__DEPENDENCIES_1 =
 tz_convert_DEPENDENCIES = $(am__DEPENDENCIES_1)
-tz_convert_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+tz_convert_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(tz_convert_CFLAGS) \
 	$(CFLAGS) $(tz_convert_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(tz_convert_SOURCES)
 DIST_SOURCES = $(tz_convert_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -91,15 +166,39 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -125,6 +224,7 @@
 DBUS_VERSION = @DBUS_VERSION@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -148,6 +248,10 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -173,6 +277,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -198,6 +303,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -218,6 +325,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -246,11 +354,12 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -326,14 +435,19 @@
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -354,7 +468,8 @@
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -367,9 +482,10 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-tz_convert$(EXEEXT): $(tz_convert_OBJECTS) $(tz_convert_DEPENDENCIES) 
+
+tz_convert$(EXEEXT): $(tz_convert_OBJECTS) $(tz_convert_DEPENDENCIES) $(EXTRA_tz_convert_DEPENDENCIES) 
 	@rm -f tz_convert$(EXEEXT)
-	$(tz_convert_LINK) $(tz_convert_OBJECTS) $(tz_convert_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(tz_convert_LINK) $(tz_convert_OBJECTS) $(tz_convert_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -380,39 +496,39 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tz_convert-tz_convert.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 tz_convert-tz_convert.o: tz_convert.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tz_convert_CFLAGS) $(CFLAGS) -MT tz_convert-tz_convert.o -MD -MP -MF $(DEPDIR)/tz_convert-tz_convert.Tpo -c -o tz_convert-tz_convert.o `test -f 'tz_convert.c' || echo '$(srcdir)/'`tz_convert.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/tz_convert-tz_convert.Tpo $(DEPDIR)/tz_convert-tz_convert.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tz_convert.c' object='tz_convert-tz_convert.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tz_convert_CFLAGS) $(CFLAGS) -MT tz_convert-tz_convert.o -MD -MP -MF $(DEPDIR)/tz_convert-tz_convert.Tpo -c -o tz_convert-tz_convert.o `test -f 'tz_convert.c' || echo '$(srcdir)/'`tz_convert.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tz_convert-tz_convert.Tpo $(DEPDIR)/tz_convert-tz_convert.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tz_convert.c' object='tz_convert-tz_convert.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tz_convert_CFLAGS) $(CFLAGS) -c -o tz_convert-tz_convert.o `test -f 'tz_convert.c' || echo '$(srcdir)/'`tz_convert.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tz_convert_CFLAGS) $(CFLAGS) -c -o tz_convert-tz_convert.o `test -f 'tz_convert.c' || echo '$(srcdir)/'`tz_convert.c
 
 tz_convert-tz_convert.obj: tz_convert.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tz_convert_CFLAGS) $(CFLAGS) -MT tz_convert-tz_convert.obj -MD -MP -MF $(DEPDIR)/tz_convert-tz_convert.Tpo -c -o tz_convert-tz_convert.obj `if test -f 'tz_convert.c'; then $(CYGPATH_W) 'tz_convert.c'; else $(CYGPATH_W) '$(srcdir)/tz_convert.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/tz_convert-tz_convert.Tpo $(DEPDIR)/tz_convert-tz_convert.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tz_convert.c' object='tz_convert-tz_convert.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tz_convert_CFLAGS) $(CFLAGS) -MT tz_convert-tz_convert.obj -MD -MP -MF $(DEPDIR)/tz_convert-tz_convert.Tpo -c -o tz_convert-tz_convert.obj `if test -f 'tz_convert.c'; then $(CYGPATH_W) 'tz_convert.c'; else $(CYGPATH_W) '$(srcdir)/tz_convert.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tz_convert-tz_convert.Tpo $(DEPDIR)/tz_convert-tz_convert.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tz_convert.c' object='tz_convert-tz_convert.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tz_convert_CFLAGS) $(CFLAGS) -c -o tz_convert-tz_convert.obj `if test -f 'tz_convert.c'; then $(CYGPATH_W) 'tz_convert.c'; else $(CYGPATH_W) '$(srcdir)/tz_convert.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tz_convert_CFLAGS) $(CFLAGS) -c -o tz_convert-tz_convert.obj `if test -f 'tz_convert.c'; then $(CYGPATH_W) 'tz_convert.c'; else $(CYGPATH_W) '$(srcdir)/tz_convert.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -421,11 +537,18 @@
 	-rm -rf .libs _libs
 install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -454,30 +577,17 @@
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -489,15 +599,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -506,24 +612,26 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -570,10 +678,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -659,20 +772,20 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-man1 install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-man \
-	uninstall-man1
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-man1 \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-man uninstall-man1
 
 
 @MAINTAINER_MODE_TRUE@tz_convert.1: tz_convert.xml
diff -Nru orage-4.8.3/tz_convert/tz_convert.c orage-4.12.1/tz_convert/tz_convert.c
--- orage-4.8.3/tz_convert/tz_convert.c	2011-01-20 21:24:39.000000000 +0000
+++ orage-4.12.1/tz_convert/tz_convert.c	2015-04-10 10:26:26.000000000 +0000
@@ -133,7 +133,12 @@
     in_head = in_buf;
     in_tail = in_buf + file_stat->st_size - 1;
     file = fopen(file_name, "r");
-    if (!fread(in_buf, 1, file_stat->st_size, file))
+    if (!file) {
+        printf("read_file: file open failed (%s)\n", file_name);
+        perror("\tfopen");
+        return;
+    }
+    if (fread(in_buf, 1, file_stat->st_size, file) < file_stat->st_size)
         if (ferror(file)) {
             printf("read_file: file read failed (%s)\n", file_name);
             fclose(file);
@@ -495,7 +500,8 @@
         , struct ical_timezone_data *prev) {
     unsigned long tc_time;
     unsigned int tct_i, abbr_i;
-    struct ical_timezone_data data;
+    struct ical_timezone_data 
+        data = { {0, 0, 0, 0, 0, 0, 0}, 0, 0, 0, 0, 0, 0, 0, NULL};
 
     /* get timechange time */
     in_head = begin_timechanges;
@@ -1264,9 +1270,13 @@
                 res = val;
                 break;
             case 3:
+                if (in_file)
+                    free(in_file);
                 in_file = strdup(tmp_str);
                 break;
             case 4:
+                if (out_file)
+                    free(out_file);
                 out_file = strdup(tmp_str);
                 break;
             case 5:
@@ -1277,6 +1287,8 @@
                         , ignore_older);
                 break;
             case 7:
+                if (timezone_name)
+                    free(timezone_name);
                 timezone_name = strdup(tmp_str);
                 break;
             case 8:
@@ -1383,7 +1395,7 @@
     }
 
     ical_zone_buf = malloc(ical_zone_stat.st_size+1);
-    if (!fread(ical_zone_buf, 1, ical_zone_stat.st_size, ical_zone_tab)
+    if ((fread(ical_zone_buf, 1, ical_zone_stat.st_size, ical_zone_tab) < ical_zone_stat.st_size)
     && (ferror(ical_zone_tab))) {
         printf("add_zone_tabs: error reading (%s).\n", ical_zone);
         perror("\tfread");
diff -Nru orage-4.8.3/xfcalendar.spec orage-4.12.1/xfcalendar.spec
--- orage-4.8.3/xfcalendar.spec	2012-01-04 12:53:01.000000000 +0000
+++ orage-4.12.1/xfcalendar.spec	2015-04-10 10:27:06.000000000 +0000
@@ -1,6 +1,6 @@
 Summary: 	Time-managing application for xfce4.
 Name: 		orage
-Version: 	4.8.3
+Version: 	4.12.1
 Release: 	1
 License:	GPL
 URL: 		http://www.xfce.org/